From owner-svn-src-head@freebsd.org Sun Nov 4 00:32:30 2018 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 5CDEE10EE103; Sun, 4 Nov 2018 00:32:30 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E06F072EFD; Sun, 4 Nov 2018 00:32:29 +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 A8BC421177; Sun, 4 Nov 2018 00:32:29 +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 wA40WTwU014402; Sun, 4 Nov 2018 00:32:29 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA40WTr6014399; Sun, 4 Nov 2018 00:32:29 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201811040032.wA40WTr6014399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 4 Nov 2018 00:32:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340107 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 340107 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E06F072EFD X-Spamd-Result: default: False [-0.77 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.66)[-0.658,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 00:32:30 -0000 Author: kib Date: Sun Nov 4 00:32:28 2018 New Revision: 340107 URL: https://svnweb.freebsd.org/changeset/base/340107 Log: Remove Obj_Entry textsize member. It is unused after r340102, and more important, I do not see how to define textsize in both practically useful and correct way, for binaries with more that one executable segments. Sponsored by: The FreeBSD Foundation Modified: head/libexec/rtld-elf/map_object.c head/libexec/rtld-elf/rtld.c head/libexec/rtld-elf/rtld.h Modified: head/libexec/rtld-elf/map_object.c ============================================================================== --- head/libexec/rtld-elf/map_object.c Sat Nov 3 23:37:13 2018 (r340106) +++ head/libexec/rtld-elf/map_object.c Sun Nov 4 00:32:28 2018 (r340107) @@ -287,7 +287,6 @@ map_object(int fd, const char *path, const struct stat } obj->mapbase = mapbase; obj->mapsize = mapsize; - obj->textsize = text_end - base_vaddr; obj->vaddrbase = base_vaddr; obj->relocbase = mapbase - base_vaddr; obj->dynamic = (const Elf_Dyn *)(obj->relocbase + phdyn->p_vaddr); Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Nov 3 23:37:13 2018 (r340106) +++ head/libexec/rtld-elf/rtld.c Sun Nov 4 00:32:28 2018 (r340107) @@ -1415,10 +1415,6 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t e obj->vaddrbase; } nsegs++; - if ((ph->p_flags & PF_X) == PF_X) { - obj->textsize = MAX(obj->textsize, - round_page(ph->p_vaddr + ph->p_memsz) - obj->vaddrbase); - } break; case PT_DYNAMIC: Modified: head/libexec/rtld-elf/rtld.h ============================================================================== --- head/libexec/rtld-elf/rtld.h Sat Nov 3 23:37:13 2018 (r340106) +++ head/libexec/rtld-elf/rtld.h Sun Nov 4 00:32:28 2018 (r340107) @@ -151,7 +151,6 @@ typedef struct Struct_Obj_Entry { /* These items are computed by map_object() or by digest_phdr(). */ caddr_t mapbase; /* Base address of mapped region */ size_t mapsize; /* Size of mapped region in bytes */ - size_t textsize; /* Size of text segment in bytes */ Elf_Addr vaddrbase; /* Base address in shared object file */ caddr_t relocbase; /* Relocation constant = mapbase - vaddrbase */ const Elf_Dyn *dynamic; /* Dynamic section */ From owner-svn-src-head@freebsd.org Sun Nov 4 06:24:28 2018 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 609C110F55C1; Sun, 4 Nov 2018 06:24:28 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E5DCF7B61A; Sun, 4 Nov 2018 06:24:27 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 C6B3624AA6; Sun, 4 Nov 2018 06:24:27 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA46ORXU093507; Sun, 4 Nov 2018 06:24:27 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA46ORHV093505; Sun, 4 Nov 2018 06:24:27 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201811040624.wA46ORHV093505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sun, 4 Nov 2018 06:24:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340108 - in head: lib/libpmc lib/libpmc/pmu-events lib/libpmc/pmu-events/arch/x86/amdfam17h sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head: lib/libpmc lib/libpmc/pmu-events lib/libpmc/pmu-events/arch/x86/amdfam17h sys/dev/hwpmc X-SVN-Commit-Revision: 340108 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E5DCF7B61A X-Spamd-Result: default: False [-0.71 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.60)[-0.599,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 06:24:28 -0000 Author: mmacy Date: Sun Nov 4 06:24:27 2018 New Revision: 340108 URL: https://svnweb.freebsd.org/changeset/base/340108 Log: Add aditional counter descriptions to AMD 0x17 Submitted by: Somalapuram Amaranath MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D17401 Added: head/lib/libpmc/pmu-events/arch/x86/amdfam17h/data-fabric.json (contents, props changed) head/lib/libpmc/pmu-events/arch/x86/amdfam17h/l3cache.json (contents, props changed) Modified: head/lib/libpmc/libpmc_pmu_util.c head/lib/libpmc/pmu-events/jevents.c head/sys/dev/hwpmc/hwpmc_amd.c head/sys/dev/hwpmc/hwpmc_amd.h Modified: head/lib/libpmc/libpmc_pmu_util.c ============================================================================== --- head/lib/libpmc/libpmc_pmu_util.c Sun Nov 4 00:32:28 2018 (r340107) +++ head/lib/libpmc/libpmc_pmu_util.c Sun Nov 4 06:24:27 2018 (r340108) @@ -146,6 +146,8 @@ pmu_alias_get(const char *name) struct pmu_event_desc { uint64_t ped_period; uint64_t ped_offcore_rsp; + uint64_t ped_l3_thread; + uint64_t ped_l3_slice; uint32_t ped_event; uint32_t ped_frontend; uint32_t ped_ldlat; @@ -270,6 +272,10 @@ pmu_parse_event(struct pmu_event_desc *ped, const char ped->ped_ch_mask = strtol(value, NULL, 16); else if (strcmp(key, "config1") == 0) ped->ped_config1 = strtol(value, NULL, 16); + else if (strcmp(key, "l3_thread_mask") == 0) + ped->ped_l3_thread = strtol(value, NULL, 16); + else if (strcmp(key, "l3_slice_mask") == 0) + ped->ped_l3_slice = strtol(value, NULL, 16); else { debug = getenv("PMUDEBUG"); if (debug != NULL && strcmp(debug, "true") == 0 && value != NULL) @@ -407,33 +413,50 @@ pmc_pmu_print_counter_full(const char *ev) } static int -pmc_pmu_amd_pmcallocate(const char *event_name __unused, struct pmc_op_pmcallocate *pm, +pmc_pmu_amd_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, struct pmu_event_desc *ped) { struct pmc_md_amd_op_pmcallocate *amd; + const struct pmu_event *pe; + int idx = -1; amd = &pm->pm_md.pm_amd; - amd->pm_amd_config = AMD_PMC_TO_EVENTMASK(ped->ped_event); if (ped->ped_umask > 0) { pm->pm_caps |= PMC_CAP_QUALIFIER; amd->pm_amd_config |= AMD_PMC_TO_UNITMASK(ped->ped_umask); } pm->pm_class = PMC_CLASS_K8; + pe = pmu_event_get(NULL, event_name, &idx); - if ((pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0 || - (pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == - (PMC_CAP_USER|PMC_CAP_SYSTEM)) - amd->pm_amd_config |= (AMD_PMC_USR | AMD_PMC_OS); - else if (pm->pm_caps & PMC_CAP_USER) - amd->pm_amd_config |= AMD_PMC_USR; - else if (pm->pm_caps & PMC_CAP_SYSTEM) - amd->pm_amd_config |= AMD_PMC_OS; - if (ped->ped_edge) - amd->pm_amd_config |= AMD_PMC_EDGE; - if (ped->ped_inv) - amd->pm_amd_config |= AMD_PMC_EDGE; - if (pm->pm_caps & PMC_CAP_INTERRUPT) - amd->pm_amd_config |= AMD_PMC_INT; + if (strcmp("l3cache", pe->topic) == 0){ + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_L3_CACHE; + amd->pm_amd_config |= AMD_PMC_TO_L3SLICE(ped->ped_l3_slice); + amd->pm_amd_config |= AMD_PMC_TO_L3CORE(ped->ped_l3_thread); + } + else if (strcmp("data fabric", pe->topic) == 0){ + + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK_DF(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_DATA_FABRIC; + } + else{ + amd->pm_amd_config |= AMD_PMC_TO_EVENTMASK(ped->ped_event); + amd->pm_amd_sub_class = PMC_AMD_SUB_CLASS_CORE; + if ((pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0 || + (pm->pm_caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == + (PMC_CAP_USER|PMC_CAP_SYSTEM)) + amd->pm_amd_config |= (AMD_PMC_USR | AMD_PMC_OS); + else if (pm->pm_caps & PMC_CAP_USER) + amd->pm_amd_config |= AMD_PMC_USR; + else if (pm->pm_caps & PMC_CAP_SYSTEM) + amd->pm_amd_config |= AMD_PMC_OS; + if (ped->ped_edge) + amd->pm_amd_config |= AMD_PMC_EDGE; + if (ped->ped_inv) + amd->pm_amd_config |= AMD_PMC_EDGE; + if (pm->pm_caps & PMC_CAP_INTERRUPT) + amd->pm_amd_config |= AMD_PMC_INT; + } return (0); } Added: head/lib/libpmc/pmu-events/arch/x86/amdfam17h/data-fabric.json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libpmc/pmu-events/arch/x86/amdfam17h/data-fabric.json Sun Nov 4 06:24:27 2018 (r340108) @@ -0,0 +1,2668 @@ +[ + { + "EventName": "df_ccm_reqa.Node0.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0x0F" + }, + { + "EventName": "df_ccm_reqa.Node1.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0x2F" + }, + { + "EventName": "df_ccm_reqa.Node2.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0x4F" + }, + { + "EventName": "df_ccm_reqa.Node3.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0x6F" + }, + { + "EventName": "df_ccm_reqa.Node4.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0x8F" + }, + { + "EventName": "df_ccm_reqa.Node5.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0xAF" + }, + { + "EventName": "df_ccm_reqa.Node6.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0xCF" + }, + { + "EventName": "df_ccm_reqa.Node7.anydram", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Any DRAM transaction", + "UMask": "0xEF" + }, + { + "EventName": "df_ccm_reqa.Node0.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0x0E" + }, + { + "EventName": "df_ccm_reqa.Node1.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0x2E" + }, + { + "EventName": "df_ccm_reqa.Node2.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0x4E" + }, + { + "EventName": "df_ccm_reqa.Node3.wrsizedfullzero", + "EventCode": "0x8E", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0x6E" + }, + { + "EventName": "df_ccm_reqa.Node4.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0x8E" + }, + { + "EventName": "df_ccm_reqa.Node5.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0xAE" + }, + { + "EventName": "df_ccm_reqa.Node6.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0xCE" + }, + { + "EventName": "df_ccm_reqa.Node7.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered WrSizedFullZero", + "UMask": "0xEE" + }, + { + "EventName": "df_ccm_reqa.Node0.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x0D" + }, + { + "EventName": "df_ccm_reqa.Node1.wrsizedfullnc", + "EventCode": "0x8A", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x2D" + }, + { + "EventName": "df_ccm_reqa.Node2.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x4D" + }, + { + "EventName": "df_ccm_reqa.Node3.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x6D" + }, + { + "EventName": "df_ccm_reqa.Node4.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x8D" + }, + { + "EventName": "df_ccm_reqa.Node5.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0xAD" + }, + { + "EventName": "df_ccm_reqa.Node6.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0xCD" + }, + { + "EventName": "df_ccm_reqa.Node7.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0xED" + }, + { + "EventName": "df_ccm_reqa.Node0.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x0C" + }, + { + "EventName": "df_ccm_reqa.Node1.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x2C" + }, + { + "EventName": "df_ccm_reqa.Node2.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x4C" + }, + { + "EventName": "df_ccm_reqa.Node3.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x6C" + }, + { + "EventName": "df_ccm_reqa.Node4.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x8C" + }, + { + "EventName": "df_ccm_reqa.Node5.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0xAC" + }, + { + "EventName": "df_ccm_reqa.Node6.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0xCC" + }, + { + "EventName": "df_ccm_reqa.Node7.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0xEC" + }, + { + "EventName": "df_ccm_reqa.Node0.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0x0B" + }, + { + "EventName": "df_ccm_reqa.Node1.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0x2B" + }, + { + "EventName": "df_ccm_reqa.Node2.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0x4B" + }, + { + "EventName": "df_ccm_reqa.Node3.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0x6B" + }, + { + "EventName": "df_ccm_reqa.Node4.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0x8B" + }, + { + "EventName": "df_ccm_reqa.Node5.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0xAB" + }, + { + "EventName": "df_ccm_reqa.Node6.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0xCB" + }, + { + "EventName": "df_ccm_reqa.Node7.wrsizedfullzero", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullzero", + "UMask": "0xEB" + }, + { + "EventName": "df_ccm_reqa.Node0.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x0A" + }, + { + "EventName": "df_ccm_reqa.Node1.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x2A" + }, + { + "EventName": "df_ccm_reqa.Node2.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x4A" + }, + { + "EventName": "df_ccm_reqa.Node3.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x6A" + }, + { + "EventName": "df_ccm_reqa.Node4.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0x8A" + }, + { + "EventName": "df_ccm_reqa.Node5.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0xAA" + }, + { + "EventName": "df_ccm_reqa.Node6.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0xCA" + }, + { + "EventName": "df_ccm_reqa.Node7.wrsizedfullnc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsizedfullnc", + "UMask": "0xEA" + }, + { + "EventName": "df_ccm_reqa.Node0.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x09" + }, + { + "EventName": "df_ccm_reqa.Node1.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x29" + }, + { + "EventName": "df_ccm_reqa.Node2.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x49" + }, + { + "EventName": "df_ccm_reqa.Node3.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x69" + }, + { + "EventName": "df_ccm_reqa.Node4.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0x89" + }, + { + "EventName": "df_ccm_reqa.Node5.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0xA9" + }, + { + "EventName": "df_ccm_reqa.Node6.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0xC9" + }, + { + "EventName": "df_ccm_reqa.Node7.wrsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wrsized", + "UMask": "0xE9" + }, + { + "EventName": "df_ccm_reqa.Node0.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0x08" + }, + { + "EventName": "df_ccm_reqa.Node1.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0x28" + }, + { + "EventName": "df_ccm_reqa.Node2.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0x48" + }, + { + "EventName": "df_ccm_reqa.Node3.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0x68" + }, + { + "EventName": "df_ccm_reqa.Node4.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0x88" + }, + { + "EventName": "df_ccm_reqa.Node5.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0xA8" + }, + { + "EventName": "df_ccm_reqa.Node6.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0xC8" + }, + { + "EventName": "df_ccm_reqa.Node7.rdsizednc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsizednc", + "UMask": "0xE8" + }, + { + "EventName": "df_ccm_reqa.Node0.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0x07" + }, + { + "EventName": "df_ccm_reqa.Node1.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0x27" + }, + { + "EventName": "df_ccm_reqa.Node2.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0x47" + }, + { + "EventName": "df_ccm_reqa.Node3.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0x67" + }, + { + "EventName": "df_ccm_reqa.Node4.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0x87" + }, + { + "EventName": "df_ccm_reqa.Node5.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0xA7" + }, + { + "EventName": "df_ccm_reqa.Node6.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0xC7" + }, + { + "EventName": "df_ccm_reqa.Node7.rdsized", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdsized", + "UMask": "0xE7" + }, + { + "EventName": "df_ccm_reqa.Node0.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0x06" + }, + { + "EventName": "df_ccm_reqa.Node1.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0x26" + }, + { + "EventName": "df_ccm_reqa.Node2.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0x46" + }, + { + "EventName": "df_ccm_reqa.Node3.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0x66" + }, + { + "EventName": "df_ccm_reqa.Node4.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0x86" + }, + { + "EventName": "df_ccm_reqa.Node5.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0xA6" + }, + { + "EventName": "df_ccm_reqa.Node6.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0xC6" + }, + { + "EventName": "df_ccm_reqa.Node7.specdramrd", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered specdramrd", + "UMask": "0xE6" + }, + { + "EventName": "df_ccm_reqa.Node0.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0x05" + }, + { + "EventName": "df_ccm_reqa.Node1.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0x25" + }, + { + "EventName": "df_ccm_reqa.Node2.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0x45" + }, + { + "EventName": "df_ccm_reqa.Node3.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0x65" + }, + { + "EventName": "df_ccm_reqa.Node4.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0x85" + }, + { + "EventName": "df_ccm_reqa.Node5.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0xA5" + }, + { + "EventName": "df_ccm_reqa.Node6.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0xC5" + }, + { + "EventName": "df_ccm_reqa.Node7.anyrdblk", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered anyrdblk", + "UMask": "0xE5" + }, + { + "EventName": "df_ccm_reqa.Node0.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0x04" + }, + { + "EventName": "df_ccm_reqa.Node1.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0x24" + }, + { + "EventName": "df_ccm_reqa.Node2.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0x44" + }, + { + "EventName": "df_ccm_reqa.Node3.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0x64" + }, + { + "EventName": "df_ccm_reqa.Node4.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0x84" + }, + { + "EventName": "df_ccm_reqa.Node5.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0xA4" + }, + { + "EventName": "df_ccm_reqa.Node6.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0xC4" + }, + { + "EventName": "df_ccm_reqa.Node7.rdvlkc", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkc", + "UMask": "0xE4" + }, + { + "EventName": "df_ccm_reqa.Node0.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0x03" + }, + { + "EventName": "df_ccm_reqa.Node1.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0x23" + }, + { + "EventName": "df_ccm_reqa.Node2.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0x43" + }, + { + "EventName": "df_ccm_reqa.Node3.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0x63" + }, + { + "EventName": "df_ccm_reqa.Node4.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0x83" + }, + { + "EventName": "df_ccm_reqa.Node5.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0xA3" + }, + { + "EventName": "df_ccm_reqa.Node6.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0xC3" + }, + { + "EventName": "df_ccm_reqa.Node7.rdvlkx", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkx", + "UMask": "0xE3" + }, + { + "EventName": "df_ccm_reqa.Node0.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0x02" + }, + { + "EventName": "df_ccm_reqa.Node1.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0x22" + }, + { + "EventName": "df_ccm_reqa.Node2.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0x42" + }, + { + "EventName": "df_ccm_reqa.Node3.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0x62" + }, + { + "EventName": "df_ccm_reqa.Node4.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0x82" + }, + { + "EventName": "df_ccm_reqa.Node5.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0xA2" + }, + { + "EventName": "df_ccm_reqa.Node6.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0xC2" + }, + { + "EventName": "df_ccm_reqa.Node7.rdvlks", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlks", + "UMask": "0xE2" + }, + { + "EventName": "df_ccm_reqa.Node0.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0x01" + }, + { + "EventName": "df_ccm_reqa.Node1.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0x21" + }, + { + "EventName": "df_ccm_reqa.Node2.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0x41" + }, + { + "EventName": "df_ccm_reqa.Node3.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0x61" + }, + { + "EventName": "df_ccm_reqa.Node4.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0x81" + }, + { + "EventName": "df_ccm_reqa.Node5.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0xA1" + }, + { + "EventName": "df_ccm_reqa.Node6.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0xC1" + }, + { + "EventName": "df_ccm_reqa.Node7.rdvlkl", + "EventCode": "0x8B", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered rdvlkl", + "UMask": "0xE1" + }, + { + "EventName": "df_ccm_reqb.Node0.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0x0E" + }, + { + "EventName": "df_ccm_reqb.Node1.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0x2E" + }, + { + "EventName": "df_ccm_reqb.Node2.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0x4E" + }, + { + "EventName": "df_ccm_reqb.Node3.chgtox", + "EventCode": "0x8E", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0x6E" + }, + { + "EventName": "df_ccm_reqb.Node4.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0x8E" + }, + { + "EventName": "df_ccm_reqb.Node5.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0xAE" + }, + { + "EventName": "df_ccm_reqb.Node6.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0xCE" + }, + { + "EventName": "df_ccm_reqb.Node7.chgtox", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered chgtox", + "UMask": "0xEE" + }, + { + "EventName": "df_ccm_reqb.Node0.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0x0D" + }, + { + "EventName": "df_ccm_reqb.Node1.vicblkfull.", + "EventCode": "0x8A", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0x2D" + }, + { + "EventName": "df_ccm_reqb.Node2.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0x4D" + }, + { + "EventName": "df_ccm_reqb.Node3.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0x6D" + }, + { + "EventName": "df_ccm_reqb.Node4.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0x8D" + }, + { + "EventName": "df_ccm_reqb.Node5.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0xAD" + }, + { + "EventName": "df_ccm_reqb.Node6.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0xCD" + }, + { + "EventName": "df_ccm_reqb.Node7.vicblkfull.", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfull.", + "UMask": "0xED" + }, + { + "EventName": "df_ccm_reqb.Node0.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0x0C" + }, + { + "EventName": "df_ccm_reqb.Node1.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0x2C" + }, + { + "EventName": "df_ccm_reqb.Node2.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0x4C" + }, + { + "EventName": "df_ccm_reqb.Node3.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0x6C" + }, + { + "EventName": "df_ccm_reqb.Node4.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0x8C" + }, + { + "EventName": "df_ccm_reqb.Node5.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0xAC" + }, + { + "EventName": "df_ccm_reqb.Node6.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0xCC" + }, + { + "EventName": "df_ccm_reqb.Node7.wbinvblkall", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered wbinvblkall", + "UMask": "0xEC" + }, + { + "EventName": "df_ccm_reqb.Node0.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0x0B" + }, + { + "EventName": "df_ccm_reqb.Node1.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0x2B" + }, + { + "EventName": "df_ccm_reqb.Node2.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0x4B" + }, + { + "EventName": "df_ccm_reqb.Node3.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0x6B" + }, + { + "EventName": "df_ccm_reqb.Node4.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0x8B" + }, + { + "EventName": "df_ccm_reqb.Node5.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0xAB" + }, + { + "EventName": "df_ccm_reqb.Node6.vicblkfullzero", + "EventCode": "0x8c", + "BriefDescription": "Data Fabric CCM Performance Monitor Event DF CCM Request Ordered vicblkfullzero", + "UMask": "0xCB" + }, + { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sun Nov 4 06:35:49 2018 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 43A4110F5B56; Sun, 4 Nov 2018 06:35:49 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B9EE37BCD9; Sun, 4 Nov 2018 06:35:48 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 9B01F24C4A; Sun, 4 Nov 2018 06:35:48 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA46Zm0k098609; Sun, 4 Nov 2018 06:35:48 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA46ZmWO098608; Sun, 4 Nov 2018 06:35:48 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811040635.wA46ZmWO098608@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Sun, 4 Nov 2018 06:35:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340110 - head/sbin/ipfw X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/sbin/ipfw X-SVN-Commit-Revision: 340110 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B9EE37BCD9 X-Spamd-Result: default: False [-0.71 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.60)[-0.599,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 06:35:49 -0000 Author: eugen Date: Sun Nov 4 06:35:48 2018 New Revision: 340110 URL: https://svnweb.freebsd.org/changeset/base/340110 Log: ipfw(8): clarify layer2 processing abilities Make it clear that ipfw action set for layer2 frames it a bit limited. PR: 59835 Reviewed by: yuripv MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D17719 Modified: head/sbin/ipfw/ipfw.8 Modified: head/sbin/ipfw/ipfw.8 ============================================================================== --- head/sbin/ipfw/ipfw.8 Sun Nov 4 06:25:07 2018 (r340109) +++ head/sbin/ipfw/ipfw.8 Sun Nov 4 06:35:48 2018 (r340110) @@ -511,6 +511,27 @@ ipfw add 10 skipto 4000 all from any to any layer2 out .Pp (yes, at the moment there is no way to differentiate between ether_demux and bdg_forward). +.Pp +Also note that only actions +.Cm allow, +.Cm deny, +.Cm netgraph, +.Cm ngtee +and related to +.Cm dummynet +are processed for +.Cm layer2 +frames and all other actions act as if they were +.Cm allow +for such frames. +Full set of actions is supported for IP packets without +.Cm layer2 +headers only. +For example, +.Cm divert +action does not divert +.Cm layer2 +frames. .Sh SYNTAX In general, each keyword or argument must be provided as a separate command line argument, with no leading or trailing From owner-svn-src-head@freebsd.org Sun Nov 4 06:39:03 2018 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 5449610F5E42; Sun, 4 Nov 2018 06:39:03 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D68F7C02C; Sun, 4 Nov 2018 06:39:02 +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 4FF3324C53; Sun, 4 Nov 2018 06:39:02 +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 wA46d2MX098792; Sun, 4 Nov 2018 06:39:02 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA46d2Ot098791; Sun, 4 Nov 2018 06:39:02 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201811040639.wA46d2Ot098791@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 4 Nov 2018 06:39:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340111 - head/usr.sbin/nfsd X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/usr.sbin/nfsd X-SVN-Commit-Revision: 340111 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6D68F7C02C X-Spamd-Result: default: False [-0.65 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.54)[-0.542,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 06:39:03 -0000 Author: bapt Date: Sun Nov 4 06:39:01 2018 New Revision: 340111 URL: https://svnweb.freebsd.org/changeset/base/340111 Log: nfsd: Factorize code Factorize code by using struct sockaddr_storage to handle both ipv6 and ipv4 Discussed with: rmacklem Reviewed by: manu MFC after: 1 month Sponsored by: Gandi.net Differential Revision: https://reviews.freebsd.org/D13223 Modified: head/usr.sbin/nfsd/nfsd.c Modified: head/usr.sbin/nfsd/nfsd.c ============================================================================== --- head/usr.sbin/nfsd/nfsd.c Sun Nov 4 06:35:48 2018 (r340110) +++ head/usr.sbin/nfsd/nfsd.c Sun Nov 4 06:39:01 2018 (r340111) @@ -160,10 +160,8 @@ main(int argc, char **argv) struct addrinfo *ai_udp, *ai_tcp, *ai_udp6, *ai_tcp6, hints; struct netconfig *nconf_udp, *nconf_tcp, *nconf_udp6, *nconf_tcp6; struct netbuf nb_udp, nb_tcp, nb_udp6, nb_tcp6; - struct sockaddr_in inetpeer; - struct sockaddr_in6 inet6peer; + struct sockaddr_storage peer; fd_set ready, sockbits; - fd_set v4bits, v6bits; int ch, connect_type_cnt, i, maxsock, msgsock; socklen_t len; int on = 1, unregister, reregister, sock; @@ -480,8 +478,6 @@ main(int argc, char **argv) } (void)signal(SIGUSR1, cleanup); - FD_ZERO(&v4bits); - FD_ZERO(&v6bits); FD_ZERO(&sockbits); rpcbregcnt = 0; @@ -663,7 +659,6 @@ main(int argc, char **argv) } freeaddrinfo(ai_tcp); FD_SET(tcpsock, &sockbits); - FD_SET(tcpsock, &v4bits); maxsock = tcpsock; connect_type_cnt++; } @@ -742,7 +737,6 @@ main(int argc, char **argv) } freeaddrinfo(ai_tcp6); FD_SET(tcp6sock, &sockbits); - FD_SET(tcp6sock, &v6bits); if (maxsock < tcp6sock) maxsock = tcp6sock; connect_type_cnt++; @@ -816,52 +810,25 @@ main(int argc, char **argv) } for (tcpsock = 0; tcpsock <= maxsock; tcpsock++) { if (FD_ISSET(tcpsock, &ready)) { - if (FD_ISSET(tcpsock, &v4bits)) { - len = sizeof(inetpeer); - if ((msgsock = accept(tcpsock, - (struct sockaddr *)&inetpeer, &len)) < 0) { - error = errno; - syslog(LOG_ERR, "accept failed: %m"); - if (error == ECONNABORTED || - error == EINTR) - continue; - nfsd_exit(1); - } - memset(inetpeer.sin_zero, 0, - sizeof(inetpeer.sin_zero)); - if (setsockopt(msgsock, SOL_SOCKET, - SO_KEEPALIVE, (char *)&on, sizeof(on)) < 0) - syslog(LOG_ERR, - "setsockopt SO_KEEPALIVE: %m"); - addsockargs.sock = msgsock; - addsockargs.name = (caddr_t)&inetpeer; - addsockargs.namelen = len; - nfssvc(nfssvc_addsock, &addsockargs); - (void)close(msgsock); - } else if (FD_ISSET(tcpsock, &v6bits)) { - len = sizeof(inet6peer); - if ((msgsock = accept(tcpsock, - (struct sockaddr *)&inet6peer, - &len)) < 0) { - error = errno; - syslog(LOG_ERR, - "accept failed: %m"); - if (error == ECONNABORTED || - error == EINTR) - continue; - nfsd_exit(1); - } - if (setsockopt(msgsock, SOL_SOCKET, - SO_KEEPALIVE, (char *)&on, - sizeof(on)) < 0) - syslog(LOG_ERR, "setsockopt " - "SO_KEEPALIVE: %m"); - addsockargs.sock = msgsock; - addsockargs.name = (caddr_t)&inet6peer; - addsockargs.namelen = len; - nfssvc(nfssvc_addsock, &addsockargs); - (void)close(msgsock); + len = sizeof(peer); + if ((msgsock = accept(tcpsock, + (struct sockaddr *)&peer, &len)) < 0) { + error = errno; + syslog(LOG_ERR, "accept failed: %m"); + if (error == ECONNABORTED || + error == EINTR) + continue; + nfsd_exit(1); } + if (setsockopt(msgsock, SOL_SOCKET, + SO_KEEPALIVE, (char *)&on, sizeof(on)) < 0) + syslog(LOG_ERR, + "setsockopt SO_KEEPALIVE: %m"); + addsockargs.sock = msgsock; + addsockargs.name = (caddr_t)&peer; + addsockargs.namelen = len; + nfssvc(nfssvc_addsock, &addsockargs); + (void)close(msgsock); } } } From owner-svn-src-head@freebsd.org Sun Nov 4 06:47:22 2018 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 3683910F62B8; Sun, 4 Nov 2018 06:47:22 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1F727C52E; Sun, 4 Nov 2018 06:47:21 +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 8D4B224DED; Sun, 4 Nov 2018 06:47:21 +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 wA46lLT4003719; Sun, 4 Nov 2018 06:47:21 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA46lLQp003718; Sun, 4 Nov 2018 06:47:21 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201811040647.wA46lLQp003718@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 4 Nov 2018 06:47:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340112 - head/etc X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/etc X-SVN-Commit-Revision: 340112 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B1F727C52E X-Spamd-Result: default: False [-0.60 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.49)[-0.491,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 06:47:22 -0000 Author: bapt Date: Sun Nov 4 06:47:21 2018 New Revision: 340112 URL: https://svnweb.freebsd.org/changeset/base/340112 Log: Simplify a bit distrib-dirs target Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D3915 Modified: head/etc/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sun Nov 4 06:39:01 2018 (r340111) +++ head/etc/Makefile Sun Nov 4 06:47:21 2018 (r340112) @@ -157,35 +157,29 @@ distrib-cleanup: .PHONY done distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY - @set ${MTREES}; \ - while test $$# -ge 2; do \ - m=${.CURDIR}/$$1; \ - shift; \ - d=${DESTDIR}$$1; \ - shift; \ - test -d $$d || mkdir -p $$d; \ - ${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \ - ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ - ${MTREE_FILTER} $$m | \ - ${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \ - -p $$d; \ - done; true +.for _m _d in ${MTREES} + @m=${.CURDIR}/${_m}; \ + d=${DESTDIR}${_d}; \ + test -d $$d || mkdir -p $$d; \ + ${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \ + ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ + ${MTREE_FILTER} $$m | \ + ${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \ + -p $$d; \ +.endfor .if defined(NO_ROOT) - @set ${MTREES}; \ - while test $$# -ge 2; do \ - m=${.CURDIR}/$$1; \ - shift; \ - d=$$1; \ - test "$$d" == "/" && d=""; \ - d=${DISTBASE}$$d; \ - shift; \ - test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ - ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \ - "sed s#^\.#.$$d# | ${METALOG.add}" ; \ - ${MTREE_FILTER} $$m | \ - ${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \ - ${METALOG.add} ; \ - done; true +.for _m _d in ${MTREES} + @m=${.CURDIR}/${_m}; \ + d=${_d}; \ + test "$$d" == "/" && d=""; \ + d=${DISTBASE}$$d; \ + test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ + ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \ + "sed s#^\.#.$$d# | ${METALOG.add}" ; \ + ${MTREE_FILTER} $$m | \ + ${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \ + ${METALOG.add} ; \ +.endfor .endif .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ From owner-svn-src-head@freebsd.org Sun Nov 4 06:59:14 2018 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 47D9210F695B; Sun, 4 Nov 2018 06:59:14 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C89917CD1E; Sun, 4 Nov 2018 06:59:13 +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 A8FF124F94; Sun, 4 Nov 2018 06:59:13 +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 wA46xDHD009332; Sun, 4 Nov 2018 06:59:13 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA46xDIL009331; Sun, 4 Nov 2018 06:59:13 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201811040659.wA46xDIL009331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 4 Nov 2018 06:59:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340113 - head/etc X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/etc X-SVN-Commit-Revision: 340113 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C89917CD1E X-Spamd-Result: default: False [-0.59 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.48)[-0.485,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 06:59:14 -0000 Author: bapt Date: Sun Nov 4 06:59:13 2018 New Revision: 340113 URL: https://svnweb.freebsd.org/changeset/base/340113 Log: Fix bad copy/paste Modified: head/etc/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sun Nov 4 06:47:21 2018 (r340112) +++ head/etc/Makefile Sun Nov 4 06:59:13 2018 (r340113) @@ -165,7 +165,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ ${MTREE_FILTER} $$m | \ ${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \ - -p $$d; \ + -p $$d .endfor .if defined(NO_ROOT) .for _m _d in ${MTREES} @@ -178,7 +178,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY "sed s#^\.#.$$d# | ${METALOG.add}" ; \ ${MTREE_FILTER} $$m | \ ${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \ - ${METALOG.add} ; \ + ${METALOG.add} .endfor .endif .if ${MK_NLS} != "no" From owner-svn-src-head@freebsd.org Sun Nov 4 08:03:10 2018 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 4C71D10F7F9B; Sun, 4 Nov 2018 08:03:10 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 869227E66E; Sun, 4 Nov 2018 08:03:09 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (c-73-225-95-163.hsd1.wa.comcast.net [73.225.95.163]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id wA47hePZ018868 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 4 Nov 2018 00:43:41 -0700 (PDT) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r339898 - head/lib/libc/amd64/sys To: Charlie Li , Konstantin Belousov Cc: Brooks Davis , svn-src-head@freebsd.org, toolchain@freebsd.org, current@freebsd.org References: <201810300011.w9U0BUui038857@repo.freebsd.org> <20181101160406.GA60233__23941.7825396687$1541088368$gmane$org@spindle.one-eyed-alien.net> <20181103152936.GQ5335@kib.kiev.ua> From: Julian Elischer Message-ID: Date: Sun, 4 Nov 2018 00:43:34 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Rspamd-Queue-Id: 869227E66E X-Spamd-Result: default: False [-0.71 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[163.95.225.73.zen.spamhaus.org : 127.0.0.10]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-0.58)[-0.583,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-0.01)[asn: 36236(-0.00), country: US(-0.06)]; ASN(0.00)[asn:36236, ipnet:204.109.60.0/22, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 08:03:10 -0000 what's an ifunc? From owner-svn-src-head@freebsd.org Sun Nov 4 09:22:09 2018 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 E869910FA186; Sun, 4 Nov 2018 09:22:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1894481385; Sun, 4 Nov 2018 09:22:08 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:470:7a58::15b3:c8ad:df1e:e89e] (unknown [IPv6:2001:470:7a58:0:15b3:c8ad:df1e:e89e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id BB38E152D0; Sun, 4 Nov 2018 10:22:06 +0100 (CET) From: Dimitry Andric Message-Id: <38169F22-F99D-4F47-9C21-A8C82D44E700@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_B001353D-2319-48F5-944F-7AAC0C34630F"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r339898 - head/lib/libc/amd64/sys Date: Sun, 4 Nov 2018 10:22:02 +0100 In-Reply-To: Cc: Charlie Li , Konstantin Belousov , svn-src-head@freebsd.org, toolchain@freebsd.org, current@freebsd.org To: Julian Elischer References: <201810300011.w9U0BUui038857@repo.freebsd.org> <20181101160406.GA60233__23941.7825396687$1541088368$gmane$org@spindle.one-eyed-alien.net> <20181103152936.GQ5335@kib.kiev.ua> X-Mailer: Apple Mail (2.3445.9.1) X-Rspamd-Queue-Id: 1894481385 X-Spamd-Result: default: False [-1.58 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; NEURAL_SPAM_SHORT(0.14)[0.139,0]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-0.01)[country: US(-0.06)]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 09:22:09 -0000 --Apple-Mail=_B001353D-2319-48F5-944F-7AAC0C34630F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 4 Nov 2018, at 08:43, Julian Elischer wrote: >=20 > what's an ifunc? This is a GNU extension, an "indirect function". It allows you to provide multiple different implementations of the same function, for instance optimized for specific CPU types, and choose between them at dynamic link time (e.g. at run time). See the following for more information: https://sourceware.org/glibc/wiki/GNU_IFUNC = https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-i= func-function-attribute -Dimitry --Apple-Mail=_B001353D-2319-48F5-944F-7AAC0C34630F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCW966OgAKCRCwXqMKLiCW o+u8AJ9iSQOO+bA4097obCAXwlkQ7nkh9QCdEbl4GrpQAWjKlu3s3BTtrji9dqE= =0hnj -----END PGP SIGNATURE----- --Apple-Mail=_B001353D-2319-48F5-944F-7AAC0C34630F-- From owner-svn-src-head@freebsd.org Sun Nov 4 10:14:09 2018 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 5588410FBE03; Sun, 4 Nov 2018 10:14:09 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C49F484223; Sun, 4 Nov 2018 10:14:08 +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 9FE2227021; Sun, 4 Nov 2018 10:14:08 +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 wA4AE8bu013203; Sun, 4 Nov 2018 10:14:08 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4AE8b9013202; Sun, 4 Nov 2018 10:14:08 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201811041014.wA4AE8b9013202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 4 Nov 2018 10:14:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340114 - head/etc X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/etc X-SVN-Commit-Revision: 340114 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C49F484223 X-Spamd-Result: default: False [-0.11 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.00)[-0.003,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 10:14:09 -0000 Author: bapt Date: Sun Nov 4 10:14:08 2018 New Revision: 340114 URL: https://svnweb.freebsd.org/changeset/base/340114 Log: Simplify NLS alias handling by using native make(1) multi variable for loops Deleted: head/etc/nls.alias Modified: head/etc/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sun Nov 4 06:59:13 2018 (r340113) +++ head/etc/Makefile Sun Nov 4 10:14:08 2018 (r340114) @@ -4,6 +4,8 @@ .include FILESGROUPS= FILES +NLS_ALIASES= POSIX C \ + en_US.US_ASCII C # No need as it is empty and just causes rebuilds since this file does so much. UPDATE_DEPENDFILE= no @@ -182,11 +184,9 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY .endfor .endif .if ${MK_NLS} != "no" - set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ - while [ $$# -gt 0 ] ; do \ - ${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \ - shift; shift; \ - done +.for alias nls in ${NLS_ALIASES} + ${INSTALL_SYMLINK} "${nls}" "${DESTDIR}${SHAREDIR}/nls/${alias}" +.endfor .endif etc-examples: ${META_DEPS} From owner-svn-src-head@freebsd.org Sun Nov 4 11:12:03 2018 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 CD21C10FD093 for ; Sun, 4 Nov 2018 11:12:02 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) Received: from sonic307-8.consmr.mail.gq1.yahoo.com (sonic307-8.consmr.mail.gq1.yahoo.com [98.137.64.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CCAD860B2 for ; Sun, 4 Nov 2018 11:12:01 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) X-YMail-OSG: bSl7iUgVM1lAwrdaV1RR7b2pfDol_QUSlnxGLal6dX5iUIXBr_c3nI5rBgghldx huPeKvHcRaouV0yEt86tj97QU3CxljxgerJr1bh_QpjxVoHkItXmV2laZoRKL.wDOaTWAVF8gzt4 bxLByxDZKiB7gqTyYeHh5UhWXyO9CSW3hYty3fO5jrahmUTvKzPbsE.BGmKJPPl_aWux.tLNn6iF gT.FHwCwI2oi8Qj5_i75WCgXyxQButoJRDg0MCMp3_R25RisgC4Gb51Z_Kw_Ue9PQWKtzhtPZ.js A7XrofOxwvixYOyWxJ8LCQyOyVfLb6Wc1VxGsgYRCua6iIm5Qc3A3Uad6YmZ_R.lHwDE..UNQmI0 aLqs4NTEpWdPml_.vHPwqX21qEeyXpUa1DYlqBIL4xyVYMmu66hd.l6O1Miq3Q1Q7RYxI0OPuXqJ fuoIM6.wun9V.0PhtOIfNNAsRz1B6jFeQXwHwHqTbB3PnOvJ2ORNMCkUHxsjmTleU9.2TmL0kvg8 nhLG5m.XQBJ9ImYQYyrTq8vBrIZMjh.c374vjZT8vechFPxGikJwOsMICwsyKUuFpCr3My.KxWfc RwTx6mZ4it964qIlRJuiFyaiW9q3Y8benlnHnVCPjY8eE.cWbW3raxHDVkcSbMY6sIWbe8JJQO9M 1heq2j2whQagNnN5GO.aaM06seSRNoUiqkzhntp2FPYGeyT02ABYZcLIqp4CqY3oxnorDI1jowaI 294H4g2wuHKkJCjr5qElM4eB.XXKLlUyBBf5x7qSxMGPtPRAOVPwLFOVRDIM7kgZ.h901fWw9nEC V1cKWcC66iMzwFsk8IrM2_6tQflI5OTVWsBQ10LpazCrjCwJEkM9prmaP58H6hU06JIn2WUKF.rI D_zjgdvvbvtTxYBvACFQumj0oG2.qh7F0TqTdL5TDfiyB7GTNYFDhDp61IwITLy6oevKvlqg_nJy T6cOdz3PFVaoRsPIaFObZUmLp89bbh.fbPb5O5FEs9TIGA42.CI69dNAqoSvVJJEBh2GhSFRSrcH tnxvlHPLEkyOXjWcWQ0KQqtRGmcsuWQnmrqDQm8NTO_PVBEn_sQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic307.consmr.mail.gq1.yahoo.com with HTTP; Sun, 4 Nov 2018 11:12:00 +0000 Received: from c-76-115-7-162.hsd1.or.comcast.net (EHLO [192.168.1.25]) ([76.115.7.162]) by smtp412.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 221455b6560763aa1b44ae06a2be6af1; Sun, 04 Nov 2018 11:11:56 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r339876 - head/libexec/rtld-elf From: Mark Millard In-Reply-To: <20181103195157.GT5335@kib.kiev.ua> Date: Sun, 4 Nov 2018 03:11:55 -0800 Cc: svn-src-head@freebsd.org, Alexander Richardson Content-Transfer-Encoding: quoted-printable Message-Id: <7FB28CEE-9997-4F8E-B401-F6D0A1C7884C@yahoo.com> References: <003A49D7-6E8B-4775-A70B-E0EB44505D4B@yahoo.com> <20181102113827.GM5335@kib.kiev.ua> <7B29A4C8-228D-41CB-B594-98DFA456E9C8@yahoo.com> <20181102155234.GN5335@kib.kiev.ua> <20181102185014.GP5335@kib.kiev.ua> <34554290-D26E-4FED-A598-4FB3E313EA92@yahoo.com> <20181103154955.GR5335@kib.kiev.ua> <1AD60949-F621-4F24-8985-B02102824EB1@yahoo.com> <20181103195157.GT5335@kib.kiev.ua> To: Konstantin Belousov X-Mailer: Apple Mail (2.3445.9.1) X-Rspamd-Queue-Id: 0CCAD860B2 X-Spamd-Result: default: False [0.63 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.89)[0.895,0]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MX_GOOD(-0.01)[cached: mta6.am0.yahoodns.net]; RCVD_IN_DNSWL_NONE(0.00)[32.64.137.98.list.dnswl.org : 127.0.5.0]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; IP_SCORE(0.24)[ipnet: 98.137.64.0/21(0.70), asn: 36647(0.56), country: US(-0.06)]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/21, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 11:12:03 -0000 On 2018-Nov-3, at 12:51 PM, Konstantin Belousov = wrote: > On Sat, Nov 03, 2018 at 12:04:53PM -0700, Mark Millard wrote: >> 80903 ld-elf.so.1 CALL = mmap(0x10000,0xb000,0,0x6010,0xff= ffffff,0x10000,0,0) >> 80903 ld-elf.so.1 RET mmap -1 errno 12 Cannot allocate memory >=20 > This is the allocation of VA for the whole binary. I guess that the = normal > non-PIE binary virtual base on arm is 0x10000. >=20 > I put the arm PIE base at 0x12000, which obviously causes the conflict > between pre-loaded ld-elf.so.1 and later attempt to mmap the binary at > the linked address. In fact I am happy that we added MAP_EXCL and it > catched the situation. >=20 > You can try to change ET_DYN_LOAD_ADDR on arm: >=20 > diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h > index 7424b45e78f..28fc14e3dae 100644 > --- a/sys/arm/include/elf.h > +++ b/sys/arm/include/elf.h > @@ -84,7 +84,7 @@ __ElfType(Auxinfo); > */ > #define MAGIC_TRAMP_NUMBER 0x5c000003 >=20 > -#define ET_DYN_LOAD_ADDR 0x12000 > +#define ET_DYN_LOAD_ADDR 0x500000 >=20 > /* Flags passed in AT_HWCAP. */ > #define HWCAP_SWP 0x00000001 /* Unsupported, = never set. */ I finally got to building-for, installing-on, booting-the, and testing-the armv7 issue. The change worked: # /libexec/ld-elf.so.1 /bin/ls -c1 .cshrc .history .k5login .lesshst .lldb .login .profile .shrc .subversion (and so on). =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-svn-src-head@freebsd.org Sun Nov 4 13:34:51 2018 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 1AA041101BFC; Sun, 4 Nov 2018 13:34:51 +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 E34EA6E7D5; Sun, 4 Nov 2018 13:34:49 +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 wA4DYYFr057524 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 4 Nov 2018 15:34:38 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua wA4DYYFr057524 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id wA4DYYQr057523; Sun, 4 Nov 2018 15:34:34 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 4 Nov 2018 15:34:34 +0200 From: Konstantin Belousov To: Julian Elischer Cc: Charlie Li , Brooks Davis , svn-src-head@freebsd.org, toolchain@freebsd.org, current@freebsd.org Subject: Re: svn commit: r339898 - head/lib/libc/amd64/sys Message-ID: <20181104133434.GZ5335@kib.kiev.ua> References: <201810300011.w9U0BUui038857@repo.freebsd.org> <20181101160406.GA60233__23941.7825396687$1541088368$gmane$org@spindle.one-eyed-alien.net> <20181103152936.GQ5335@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-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-Rspamd-Queue-Id: E34EA6E7D5 X-Spamd-Result: default: False [-0.91 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.89)[-0.891,0]; IP_SCORE(-0.01)[country: US(-0.06)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_TLS_LAST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 13:34:51 -0000 On Sun, Nov 04, 2018 at 12:43:34AM -0700, Julian Elischer wrote: > what's an ifunc? > A special kind of relocation, controlled by the user code. From owner-svn-src-head@freebsd.org Sun Nov 4 14:11:40 2018 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 E85AB10D459E; Sun, 4 Nov 2018 14:11:39 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76B94716D1; Sun, 4 Nov 2018 14:11:39 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 58E74178E; Sun, 4 Nov 2018 14:11:39 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4EBdBF039626; Sun, 4 Nov 2018 14:11:39 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4EBdeH039625; Sun, 4 Nov 2018 14:11:39 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <201811041411.wA4EBdeH039625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Sun, 4 Nov 2018 14:11:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340115 - head/lib/msun/man X-SVN-Group: head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/lib/msun/man X-SVN-Commit-Revision: 340115 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 76B94716D1 X-Spamd-Result: default: False [-0.88 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.77)[-0.771,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 14:11:40 -0000 Author: 0mp (ports committer) Date: Sun Nov 4 14:11:38 2018 New Revision: 340115 URL: https://svnweb.freebsd.org/changeset/base/340115 Log: csqrt(3): Fix some typos in the manual page Submitted by: Steve Kargl Reviewed by: eadler Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17831 Modified: head/lib/msun/man/csqrt.3 Modified: head/lib/msun/man/csqrt.3 ============================================================================== --- head/lib/msun/man/csqrt.3 Sun Nov 4 10:14:08 2018 (r340114) +++ head/lib/msun/man/csqrt.3 Sun Nov 4 14:11:38 2018 (r340115) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 30, 2008 +.Dd November 4, 2018 .Dt CSQRT 3 .Os .Sh NAME @@ -78,7 +78,7 @@ k + \*(Na*I \*(Na + \*(Na*I \& .Pp For numbers with negative imaginary parts, the above special cases apply given the identity: -.Dl csqrt(conj(z) = conj(sqrt(z)) +.Dl csqrt(conj(z)) = conj(csqrt(z)) Note that the sign of \*(Na is indeterminate. Also, if the real or imaginary part of the input is finite and an \*(Na is generated, an invalid exception will be thrown. From owner-svn-src-head@freebsd.org Sun Nov 4 16:09:02 2018 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 23F6810DB897; Sun, 4 Nov 2018 16:09:02 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D83377710; Sun, 4 Nov 2018 16:09:01 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 F3F0429E5; Sun, 4 Nov 2018 16:09:00 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4G90g9004979; Sun, 4 Nov 2018 16:09:00 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4G8xel004970; Sun, 4 Nov 2018 16:08:59 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201811041608.wA4G8xel004970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Sun, 4 Nov 2018 16:08:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340127 - in head: contrib/expat contrib/expat/doc contrib/expat/examples contrib/expat/lib contrib/expat/tests contrib/expat/tests/benchmark contrib/expat/xmlwf lib/libexpat X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: in head: contrib/expat contrib/expat/doc contrib/expat/examples contrib/expat/lib contrib/expat/tests contrib/expat/tests/benchmark contrib/expat/xmlwf lib/libexpat X-SVN-Commit-Revision: 340127 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1D83377710 X-Spamd-Result: default: False [-0.82 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.71)[-0.708,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 16:09:02 -0000 Author: vangyzen Date: Sun Nov 4 16:08:59 2018 New Revision: 340127 URL: https://svnweb.freebsd.org/changeset/base/340127 Log: Update expat to 2.2.6 Update contrib/expat by merging from the vendor branch. Update expat_config.h manually, using make -C /usr/ports/textproc/expat2 configure as a baseline. MFC after: 1 month Relnotes: yes Security: yes; see contrib/expat/Changes since 2.2.0 Sponsored by: Dell EMC Isilon Added: head/contrib/expat/AUTHORS - copied unchanged from r340088, vendor/expat/dist/AUTHORS head/contrib/expat/Makefile.am - copied unchanged from r340088, vendor/expat/dist/Makefile.am head/contrib/expat/README.md - copied unchanged from r340088, vendor/expat/dist/README.md head/contrib/expat/doc/Makefile.am - copied unchanged from r340088, vendor/expat/dist/doc/Makefile.am head/contrib/expat/doc/Makefile.in - copied unchanged from r340088, vendor/expat/dist/doc/Makefile.in head/contrib/expat/examples/Makefile.am - copied unchanged from r340088, vendor/expat/dist/examples/Makefile.am head/contrib/expat/examples/Makefile.in - copied unchanged from r340088, vendor/expat/dist/examples/Makefile.in head/contrib/expat/lib/Makefile.am - copied unchanged from r340088, vendor/expat/dist/lib/Makefile.am head/contrib/expat/lib/Makefile.in - copied unchanged from r340088, vendor/expat/dist/lib/Makefile.in head/contrib/expat/lib/loadlibrary.c - copied unchanged from r340088, vendor/expat/dist/lib/loadlibrary.c head/contrib/expat/lib/siphash.h - copied unchanged from r340088, vendor/expat/dist/lib/siphash.h head/contrib/expat/run.sh.in - copied unchanged from r340088, vendor/expat/dist/run.sh.in head/contrib/expat/test-driver-wrapper.sh - copied unchanged from r340088, vendor/expat/dist/test-driver-wrapper.sh head/contrib/expat/tests/Makefile.am - copied unchanged from r340088, vendor/expat/dist/tests/Makefile.am head/contrib/expat/tests/Makefile.in - copied unchanged from r340088, vendor/expat/dist/tests/Makefile.in head/contrib/expat/tests/benchmark/Makefile.am - copied unchanged from r340088, vendor/expat/dist/tests/benchmark/Makefile.am head/contrib/expat/tests/benchmark/Makefile.in - copied unchanged from r340088, vendor/expat/dist/tests/benchmark/Makefile.in head/contrib/expat/tests/benchmark/benchmark.sln - copied unchanged from r340088, vendor/expat/dist/tests/benchmark/benchmark.sln head/contrib/expat/tests/memcheck.c - copied unchanged from r340088, vendor/expat/dist/tests/memcheck.c head/contrib/expat/tests/memcheck.h - copied unchanged from r340088, vendor/expat/dist/tests/memcheck.h head/contrib/expat/tests/runtests.sln - copied unchanged from r340088, vendor/expat/dist/tests/runtests.sln head/contrib/expat/tests/structdata.c - copied unchanged from r340088, vendor/expat/dist/tests/structdata.c head/contrib/expat/tests/structdata.h - copied unchanged from r340088, vendor/expat/dist/tests/structdata.h head/contrib/expat/tests/udiffer.py - copied unchanged from r340088, vendor/expat/dist/tests/udiffer.py head/contrib/expat/tests/xmltest.log.expected - copied unchanged from r340088, vendor/expat/dist/tests/xmltest.log.expected head/contrib/expat/xmlwf/Makefile.am - copied unchanged from r340088, vendor/expat/dist/xmlwf/Makefile.am head/contrib/expat/xmlwf/Makefile.in - copied unchanged from r340088, vendor/expat/dist/xmlwf/Makefile.in Deleted: head/contrib/expat/MANIFEST head/contrib/expat/README Modified: head/contrib/expat/COPYING (contents, props changed) head/contrib/expat/Changes (contents, props changed) head/contrib/expat/FREEBSD-Xlist (contents, props changed) head/contrib/expat/Makefile.in (contents, props changed) head/contrib/expat/configure.ac (contents, props changed) head/contrib/expat/doc/reference.html (contents, props changed) head/contrib/expat/doc/xmlwf.1 (contents, props changed) head/contrib/expat/doc/xmlwf.xml (contents, props changed) head/contrib/expat/examples/elements.c (contents, props changed) head/contrib/expat/examples/outline.c (contents, props changed) head/contrib/expat/expat_config.h.in (contents, props changed) head/contrib/expat/lib/ascii.h (contents, props changed) head/contrib/expat/lib/asciitab.h (contents, props changed) head/contrib/expat/lib/expat.h (contents, props changed) head/contrib/expat/lib/expat_external.h (contents, props changed) head/contrib/expat/lib/iasciitab.h (contents, props changed) head/contrib/expat/lib/internal.h (contents, props changed) head/contrib/expat/lib/latin1tab.h (contents, props changed) head/contrib/expat/lib/nametab.h (contents, props changed) head/contrib/expat/lib/utf8tab.h (contents, props changed) head/contrib/expat/lib/xmlparse.c (contents, props changed) head/contrib/expat/lib/xmlrole.c (contents, props changed) head/contrib/expat/lib/xmlrole.h (contents, props changed) head/contrib/expat/lib/xmltok.c (contents, props changed) head/contrib/expat/lib/xmltok.h (contents, props changed) head/contrib/expat/lib/xmltok_impl.c (contents, props changed) head/contrib/expat/lib/xmltok_impl.h (contents, props changed) head/contrib/expat/lib/xmltok_ns.c (contents, props changed) head/contrib/expat/tests/benchmark/benchmark.c (contents, props changed) head/contrib/expat/tests/chardata.c (contents, props changed) head/contrib/expat/tests/chardata.h (contents, props changed) head/contrib/expat/tests/minicheck.c (contents, props changed) head/contrib/expat/tests/minicheck.h (contents, props changed) head/contrib/expat/tests/runtests.c (contents, props changed) head/contrib/expat/tests/runtestspp.cpp (contents, props changed) head/contrib/expat/tests/xmltest.sh (contents, props changed) head/contrib/expat/xmlwf/codepage.c (contents, props changed) head/contrib/expat/xmlwf/codepage.h (contents, props changed) head/contrib/expat/xmlwf/ct.c (contents, props changed) head/contrib/expat/xmlwf/filemap.h (contents, props changed) head/contrib/expat/xmlwf/readfilemap.c (contents, props changed) head/contrib/expat/xmlwf/unixfilemap.c (contents, props changed) head/contrib/expat/xmlwf/win32filemap.c (contents, props changed) head/contrib/expat/xmlwf/xmlfile.c (contents, props changed) head/contrib/expat/xmlwf/xmlfile.h (contents, props changed) head/contrib/expat/xmlwf/xmlmime.c (contents, props changed) head/contrib/expat/xmlwf/xmlmime.h (contents, props changed) head/contrib/expat/xmlwf/xmltchar.h (contents, props changed) head/contrib/expat/xmlwf/xmlurl.h (contents, props changed) head/contrib/expat/xmlwf/xmlwf.c (contents, props changed) head/contrib/expat/xmlwf/xmlwin32url.cxx (contents, props changed) head/lib/libexpat/expat_config.h head/lib/libexpat/libbsdxml.3 Directory Properties: head/contrib/expat/ (props changed) head/contrib/expat/doc/style.css (props changed) head/contrib/expat/tests/README.txt (props changed) head/contrib/expat/tests/benchmark/README.txt (props changed) Copied: head/contrib/expat/AUTHORS (from r340088, vendor/expat/dist/AUTHORS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/expat/AUTHORS Sun Nov 4 16:08:59 2018 (r340127, copy of r340088, vendor/expat/dist/AUTHORS) @@ -0,0 +1,10 @@ +Expat is brought to you by: + +Clark Cooper +Fred L. Drake, Jr. +Greg Stein +James Clark +Karl Waclawek +Rhodri James +Sebastian Pipping +Steven Solie Modified: head/contrib/expat/COPYING ============================================================================== --- head/contrib/expat/COPYING Sun Nov 4 15:49:06 2018 (r340126) +++ head/contrib/expat/COPYING Sun Nov 4 16:08:59 2018 (r340127) @@ -1,5 +1,5 @@ Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001-2016 Expat maintainers +Copyright (c) 2001-2017 Expat maintainers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Modified: head/contrib/expat/Changes ============================================================================== --- head/contrib/expat/Changes Sun Nov 4 15:49:06 2018 (r340126) +++ head/contrib/expat/Changes Sun Nov 4 16:08:59 2018 (r340127) @@ -1,3 +1,333 @@ +NOTE: We are looking for help with a few things: + https://github.com/libexpat/libexpat/labels/help%20wanted + If you can help, please get in touch. Thanks! + +Release 2.2.6 Sun August 12 2018 + Bug fixes: + #170 #206 Avoid doing arithmetic with NULL pointers in XML_GetBuffer + #204 #205 Fix 2.2.5 regression with suspend-resume while parsing + a document like '' + + Other changes: + #165 #168 Autotools: Fix docbook-related configure syntax error + #166 Autotools: Avoid grep option `-q` for Solaris + #167 Autotools: Support + ./configure DOCBOOK_TO_MAN="xmlto man --skip-validation" + #159 #167 Autotools: Support DOCBOOK_TO_MAN command which produces + xmlwf.1 rather than XMLWF.1; also covers case insensitive + file systems + #181 Autotools: Drop -rpath option passed to libtool + #188 Autotools: Detect and deny SGML docbook2man as ours is XML + #188 Autotools/CMake: Support command db2x_docbook2man as well + #174 CMake: Introduce option WARNINGS_AS_ERRORS, defaults to OFF + #184 #185 CMake: Introduce option MSVC_USE_STATIC_CRT, defaults to OFF + #207 #208 CMake: Introduce option XML_UNICODE and XML_UNICODE_WCHAR_T, + both defaulting to OFF + #175 CMake: Prefer check_symbol_exists over check_function_exists + #176 CMake: Create the same pkg-config file as with GNU Autotools + #178 #179 CMake: Use GNUInstallDirs module to set proper defaults for + install directories + #208 CMake: Utilize expat_config.h.cmake for XML_DEV_URANDOM + #180 Windows: Fix compilation of test suite for Visual Studio 2008 + #131 #173 #202 Address compiler warnings + #187 #190 #200 Fix miscellaneous typos + Version info bumped from 7:7:6 to 7:8:6 + + Special thanks to: + Anton Maklakov + Benjamin Peterson + Brad King + Franek Korta + Frank Rast + Joe Orton + luzpaz + Pedro Vicente + Rainer Jung + Rhodri James + Rolf Ade + Rolf Eike Beer + Thomas Beutlich + Tomasz Kłoczko + +Release 2.2.5 Tue October 31 2017 + Bug fixes: + #8 If the parser runs out of memory, make sure its internal + state reflects the memory it actually has, not the memory + it wanted to have. + #11 The default handler wasn't being called when it should for + a SYSTEM or PUBLIC doctype if an entity declaration handler + was registered. + #137 #138 Fix a case of mistakenly reported parsing success where + XML_StopParser was called from an element handler + #162 Function XML_ErrorString was returning NULL rather than + a message for code XML_ERROR_INVALID_ARGUMENT + introduced with release 2.2.1 + + Other changes: + #106 xmlwf: Add argument -N adding notation declarations + #75 #106 Test suite: Resolve expected failure cases where xmlwf + output was incomplete + #127 Windows: Fix test suite compilation + #126 #127 Windows: Fix compilation for Visual Studio 2012 + Windows: Upgrade shipped project files to Visual Studio 2017 + #33 #132 tests: Mass-fix compilation for XML_UNICODE_WCHAR_T + #129 examples: Fix compilation for XML_UNICODE_WCHAR_T + #130 benchmark: Fix compilation for XML_UNICODE_WCHAR_T + #144 xmlwf: Fix compilation for XML_UNICODE_WCHAR_T; still needs + Windows or MinGW for 2-byte wchar_t + #9 Address two Clang Static Analyzer false positives + #59 Resolve troublesome macros hiding parser struct membership + and dereferencing that pointer + #6 Resolve superfluous internal malloc/realloc switch + #153 #155 Improve docbook2x-man detection + #160 Undefine NDEBUG in the test suite (rather than rejecting it) + #161 Address compiler warnings + Version info bumped from 7:6:6 to 7:7:6 + + Special thanks to: + Benbuck Nason + Hans Wennborg + José Gutiérrez de la Concha + Pedro Monreal Gonzalez + Rhodri James + Rolf Ade + Stephen Groat + and + Core Infrastructure Initiative + +Release 2.2.4 Sat August 19 2017 + Bug fixes: + #115 Fix copying of partial characters for UTF-8 input + + Other changes: + #109 Fix "make check" for non-x86 architectures that default + to unsigned type char (-128..127 rather than 0..255) + #109 coverage.sh: Cover -funsigned-char + Autotools: Introduce --without-xmlwf argument + #65 Autotools: Replace handwritten Makefile with GNU Automake + #43 CMake: Auto-detect high quality entropy extractors, add new + option USE_libbsd=ON to use arc4random_buf of libbsd + #74 CMake: Add -fno-strict-aliasing only where supported + #114 CMake: Always honor manually set BUILD_* options + #114 CMake: Compile man page if docbook2x-man is available, only + #117 Include file tests/xmltest.log.expected in source tarball + (required for "make run-xmltest") + #117 Include (existing) Visual Studio 2013 files in source tarball + Improve test suite error output + #111 Fix some typos in documentation + Version info bumped from 7:5:6 to 7:6:6 + + Special thanks to: + Jakub Wilk + Joe Orton + Lin Tian + Rolf Eike Beer + +Release 2.2.3 Wed August 2 2017 + Security fixes: + #82 CVE-2017-11742 -- Windows: Fix DLL hijacking vulnerability + using Steve Holme's LoadLibrary wrapper for/of cURL + + Bug fixes: + #85 Fix a dangling pointer issue related to realloc + + Other changes: + Increase code coverage + #91 Linux: Allow getrandom to fail if nonblocking pool has not + yet been initialized and read /dev/urandom then, instead. + This is in line with what recent Python does. + #81 Pre-10.7/Lion macOS: Support entropy from arc4random + #86 Check that a UTF-16 encoding in an XML declaration has the + right endianness + #4 #5 #7 Recover correctly when some reallocations fail + Repair "./configure && make" for systems without any + provider of high quality entropy + and try reading /dev/urandom on those + Ensure that user-defined character encodings have converter + functions when they are needed + Fix mis-leading description of argument -c in xmlwf.1 + Rely on macro HAVE_ARC4RANDOM_BUF (rather than __CloudABI__) + for CloudABI + #100 Fix use of SIPHASH_MAIN in siphash.h + #23 Test suite: Fix memory leaks + Version info bumped from 7:4:6 to 7:5:6 + + Special thanks to: + Chanho Park + Joe Orton + Pascal Cuoq + Rhodri James + Simon McVittie + Vadim Zeitlin + Viktor Szakats + and + Core Infrastructure Initiative + +Release 2.2.2 Wed July 12 2017 + Security fixes: + #43 Protect against compilation without any source of high + quality entropy enabled, e.g. with CMake build system; + commit ff0207e6076e9828e536b8d9cd45c9c92069b895 + #60 Windows with _UNICODE: + Unintended use of LoadLibraryW with a non-wide string + resulted in failure to load advapi32.dll and degradation + in quality of used entropy when compiled with _UNICODE for + Windows; you can launch existing binaries with + EXPAT_ENTROPY_DEBUG=1 in the environment to inspect the + quality of entropy used during runtime; commits + * 95b95032f907ef1cd17ee7a9a1768010a825d61d + * 73a5a2e9c081f49f2d775cf7ced864158b68dc80 + [MOX-006] Fix non-NULL parser parameter validation in XML_Parse; + resulted in NULL dereference, previously; + commit ac256dafdffc9622ab0dc2c62fcecb0dfcfa71fe + + Bug fixes: + #69 Fix improper use of unsigned long long integer literals + + Other changes: + #73 Start requiring a C99 compiler + #49 Fix "==" Bashism in configure script + #50 Fix too eager getrandom detection for Debian GNU/kFreeBSD + #52 and macOS + #51 Address lack of stdint.h in Visual Studio 2003 to 2008 + #58 Address compile warnings + #68 Fix "./buildconf.sh && ./configure" for some versions + of Dash for /bin/sh + #72 CMake: Ease use of Expat in context of a parent project + with multiple CMakeLists.txt files + #72 CMake: Resolve mistaken executable permissions + #76 Address compile warning with -DNDEBUG (not recommended!) + #77 Address compile warning about macro redefinition + + Special thanks to: + Alexander Bluhm + Ben Boeckel + Cătălin Răceanu + Kerin Millar + László Böszörményi + S. P. Zeidler + Segev Finer + Václav Slavík + Victor Stinner + Viktor Szakats + and + Radically Open Security + +Release 2.2.1 Sat June 17 2017 + Security fixes: + CVE-2017-9233 -- External entity infinite loop DoS + Details: https://libexpat.github.io/doc/cve-2017-9233/ + Commit c4bf96bb51dd2a1b0e185374362ee136fe2c9d7f + [MOX-002] CVE-2016-9063 -- Detect integer overflow; commit + d4f735b88d9932bd5039df2335eefdd0723dbe20 + (Fixed version of existing downstream patches!) + (SF.net) #539 Fix regression from fix to CVE-2016-0718 cutting off + longer tag names; commits + * 896b6c1fd3b842f377d1b62135dccf0a579cf65d + * af507cef2c93cb8d40062a0abe43a4f4e9158fb2 + #16 * 0dbbf43fdb20f593ddf4fa1ff67288000dd4a7fd + #25 More integer overflow detection (function poolGrow); commits + * 810b74e4703dcfdd8f404e3cb177d44684775143 + * 44178553f3539ce69d34abee77a05e879a7982ac + [MOX-002] Detect overflow from len=INT_MAX call to XML_Parse; commits + * 4be2cb5afcc018d996f34bbbce6374b7befad47f + * 7e5b71b748491b6e459e5c9a1d090820f94544d8 + [MOX-005] #30 Use high quality entropy for hash initialization: + * arc4random_buf on BSD, systems with libbsd + (when configured with --with-libbsd), CloudABI + * RtlGenRandom on Windows XP / Server 2003 and later + * getrandom on Linux 3.17+ + In a way, that's still part of CVE-2016-5300. + https://github.com/libexpat/libexpat/pull/30/commits + [MOX-005] For the low quality entropy extraction fallback code, + the parser instance address can no longer leak, commit + 04ad658bd3079dd15cb60fc67087900f0ff4b083 + [MOX-003] Prevent use of uninitialised variable; commit + [MOX-004] a4dc944f37b664a3ca7199c624a98ee37babdb4b + Add missing parameter validation to public API functions + and dedicated error code XML_ERROR_INVALID_ARGUMENT: + [MOX-006] * NULL checks; commits + * d37f74b2b7149a3a95a680c4c4cd2a451a51d60a (merge/many) + * 9ed727064b675b7180c98cb3d4f75efba6966681 + * 6a747c837c50114dfa413994e07c0ba477be4534 + * Negative length (XML_Parse); commit + [MOX-002] 70db8d2538a10f4c022655d6895e4c3e78692e7f + [MOX-001] #35 Change hash algorithm to William Ahern's version of SipHash + to go further with fixing CVE-2012-0876. + https://github.com/libexpat/libexpat/pull/39/commits + + Bug fixes: + #32 Fix sharing of hash salt across parsers; + relevant where XML_ExternalEntityParserCreate is called + prior to XML_Parse, in particular (e.g. FBReader) + #28 xmlwf: Auto-disable use of memory-mapping (and parsing + as a single chunk) for files larger than ~1 GB (2^30 bytes) + rather than failing with error "out of memory" + #3 Fix double free after malloc failure in DTD code; commit + 7ae9c3d3af433cd4defe95234eae7dc8ed15637f + #17 Fix memory leak on parser error for unbound XML attribute + prefix with new namespaces defined in the same tag; + found by Google's OSS-Fuzz; commits + * 16f87daae5a16132e479e4f71862128c7a915c73 + * b47dbc9745932c160893d433220e462bd605f8cd + xmlwf on Windows: Add missing calls to CloseHandle + + New features: + #30 Introduced environment switch EXPAT_ENTROPY_DEBUG=1 + for runtime debugging of entropy extraction + + Other changes: + Increase code coverage + #33 Reject use of XML_UNICODE_WCHAR_T with sizeof(wchar_t) != 2; + XML_UNICODE_WCHAR_T was never meant to be used outside + of Windows; 4-byte wchar_t is common on Linux + (SF.net) #538 Start using -fno-strict-aliasing + (SF.net) #540 Support compilation against cloudlibc of CloudABI + Allow MinGW cross-compilation + (SF.net) #534 CMake: Introduce option "BUILD_doc" (enabled by default) + to bypass compilation of the xmlwf.1 man page + (SF.net) pr2 CMake: Introduce option "INSTALL" (enabled by default) + to bypass installation of expat files + CMake: Fix ninja support + Autotools: Add parameters --enable-xml-context [COUNT] + and --disable-xml-context; default of context of 1024 + bytes enabled unchanged + #14 Drop AmigaOS 4.x code and includes + #14 Drop ancient build systems: + * Borland C++ Builder + * OpenVMS + * Open Watcom + * Visual Studio 6.0 + * Pre-X Mac OS (MPW Makefile) + If you happen to rely on some of these, please get in + touch for joining with maintenance. + #10 Move from WIN32 to _WIN32 + #13 Fix "make run-xmltest" order instability + Address compile warnings + Bump version info from 7:2:6 to 7:3:6 + Add AUTHORS file + + Infrastructure: + #1 Migrate from SourceForge to GitHub (except downloads): + https://github.com/libexpat/ + #1 Re-create http://libexpat.org/ project website + Start utilizing Travis CI + + Special thanks to: + Andy Wang + Don Lewis + Ed Schouten + Karl Waclawek + Pascal Cuoq + Rhodri James + Sergei Nikulov + Tobias Taschner + Viktor Szakats + and + Core Infrastructure Initiative + Mozilla Foundation (MOSS Track 3: Secure Open Source) + Radically Open Security + Release 2.2.0 Tue June 21 2016 Security fixes: #537 CVE-2016-0718 -- Fix crash on malformed input @@ -63,24 +393,25 @@ Release 2.1.1 Sat March 12 2016 libtool now invoked with --verbose Release 2.1.0 Sat March 24 2012 + - Security fixes: + #2958794: CVE-2012-1148 - Memory leak in poolGrow. + #2895533: CVE-2012-1147 - Resource leak in readfilemap.c. + #3496608: CVE-2012-0876 - Hash DOS attack. + #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8(). + #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences. - Bug Fixes: #1742315: Harmful XML_ParserCreateNS suggestion. - #2895533: CVE-2012-1147 - Resource leak in readfilemap.c. #1785430: Expat build fails on linux-amd64 with gcc version>=4.1 -O3. #1983953, 2517952, 2517962, 2649838: Build modifications using autoreconf instead of buildconf.sh. #2815947, #2884086: OBJEXT and EXEEXT support while building. - #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences. #2517938: xmlwf should return non-zero exit status if not well-formed. #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml. #2855609: Dangling positionPtr after error. - #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8(). - #2958794: CVE-2012-1148 - Memory leak in poolGrow. #2990652: CMake support. #3010819: UNEXPECTED_STATE with a trailing "%" in entity value. - #3206497: Unitialized memory returned from XML_Parse. + #3206497: Uninitialized memory returned from XML_Parse. #3287849: make check fails on mingw-w64. - #3496608: CVE-2012-0876 - Hash DOS attack. - Patches: #1749198: pkg-config support. #3010222: Fix for bug #3010819. Modified: head/contrib/expat/FREEBSD-Xlist ============================================================================== --- head/contrib/expat/FREEBSD-Xlist Sun Nov 4 15:49:06 2018 (r340126) +++ head/contrib/expat/FREEBSD-Xlist Sun Nov 4 16:08:59 2018 (r340127) @@ -6,6 +6,7 @@ *.dsw *.m4 *.pc.in +*.vcxproj* *config.h CMake* Configure* @@ -14,6 +15,7 @@ bcb5 configure conftools doc/valid-xhtml10.png +expat.sln m4 vms win32 Copied: head/contrib/expat/Makefile.am (from r340088, vendor/expat/dist/Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/expat/Makefile.am Sun Nov 4 16:08:59 2018 (r340127, copy of r340088, vendor/expat/dist/Makefile.am) @@ -0,0 +1,153 @@ +# +# __ __ _ +# ___\ \/ /_ __ __ _| |_ +# / _ \\ /| '_ \ / _` | __| +# | __// \| |_) | (_| | |_ +# \___/_/\_\ .__/ \__,_|\__| +# |_| XML parser +# +# Copyright (c) 2017 Expat development team +# Licensed under the MIT license: +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the +# following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +# USE OR OTHER DEALINGS IN THE SOFTWARE. + +AUTOMAKE_OPTIONS = \ + dist-bzip2 \ + foreign \ + no-dist-gzip \ + subdir-objects + +ACLOCAL_AMFLAGS = -I m4 +LIBTOOLFLAGS = --verbose + +SUBDIRS = lib examples tests # lib goes first to build first +if WITH_XMLWF +SUBDIRS += xmlwf doc +endif + +pkgconfig_DATA = expat.pc +pkgconfigdir = $(libdir)/pkgconfig + + +_EXTRA_DIST_CMAKE = \ + CMakeLists.txt \ + CMake.README \ + ConfigureChecks.cmake \ + expat_config.h.cmake + +_EXTRA_DIST_WINDOWS = \ + examples/elements.vcxproj \ + examples/elements.vcxproj.filters \ + examples/outline.vcxproj \ + examples/outline.vcxproj.filters \ + \ + lib/expat_static.vcxproj \ + lib/expat_static.vcxproj.filters \ + lib/expat.vcxproj \ + lib/expat.vcxproj.filters \ + lib/expatw_static.vcxproj \ + lib/expatw_static.vcxproj.filters \ + lib/expatw.vcxproj \ + lib/expatw.vcxproj.filters \ + \ + tests/benchmark/benchmark.sln \ + tests/benchmark/benchmark.vcxproj \ + \ + tests/runtests.sln \ + tests/runtests.vcxproj \ + tests/runtests.vcxproj.filters \ + \ + win32/expat.iss \ + win32/MANIFEST.txt \ + win32/README.txt \ + \ + xmlwf/xmlwf.vcxproj \ + xmlwf/xmlwf.vcxproj.filters \ + \ + expat.sln + +EXTRA_DIST = \ + $(_EXTRA_DIST_CMAKE) \ + $(_EXTRA_DIST_WINDOWS) \ + \ + conftools/expat.m4 \ + conftools/get-version.sh \ + conftools/PrintPath \ + \ + Changes \ + README.md \ + test-driver-wrapper.sh + + +.PHONY: buildlib +buildlib: + @echo 'ERROR: Running "make buildlib LIBRARY=libexpatw.la"' >&2 + @echo 'ERROR: is no longer supported. INSTEAD please:' >&2 + @echo 'ERROR:' >&2 + @echo 'ERROR: * Mass-patch Makefile.am, e.g.' >&2 + @echo 'ERROR: # find -name Makefile.am -exec sed \' >&2 + @echo 'ERROR: -e "s,libexpat\.la,libexpatw.la," \' >&2 + @echo 'ERROR: -e "s,libexpat_la,libexpatw_la," \' >&2 + @echo 'ERROR: -i {} +' >&2 + @echo 'ERROR:' >&2 + @echo 'ERROR: * Run automake to re-generate Makefile.in files' >&2 + @echo 'ERROR:' >&2 + @echo 'ERROR: * Use "./configure --without-xmlwf" and/or' >&2 + @echo 'ERROR: "make -C lib all install" to bypass compilation' >&2 + @echo 'ERROR: of xmlwf (e.g. with -DXML_UNICODE)' >&2 + @echo 'ERROR:' >&2 + @false + + +.PHONY: run-benchmark +run-benchmark: + $(MAKE) -C tests/benchmark + ./run.sh tests/benchmark/benchmark@EXEEXT@ -n $(top_srcdir)/../testdata/largefiles/recset.xml 65535 3 + +tests/xmlts.zip: + if test "$(XMLTS_ZIP)" = ""; then \ + wget --output-document=tests/xmlts.zip \ + https://www.w3.org/XML/Test/xmlts20080827.zip; \ + else \ + cp $(XMLTS_ZIP) tests/xmlts.zip; \ + fi + +tests/xmlconf: tests/xmlts.zip + cd tests && unzip -q xmlts.zip + +.PHONY: run-xmltest +run-xmltest: tests/xmlconf +if WITH_XMLWF + $(MAKE) -C xmlwf + tests/xmltest.sh "$(PWD)/run.sh $(PWD)/xmlwf/xmlwf@EXEEXT@" 2>&1 | tee tests/xmltest.log + dos2unix tests/xmltest.log + diff -u tests/xmltest.log.expected tests/xmltest.log +else + @echo 'ERROR: xmlwf is needed for "make run-xmltest".' >&2 + @echo 'ERROR: Please re-configure without --without-xmlwf.' >&2 + @false +endif + +.PHONY: qa +qa: + ./qa.sh address + ./qa.sh memory + ./qa.sh undefined + ./qa.sh coverage Modified: head/contrib/expat/Makefile.in ============================================================================== --- head/contrib/expat/Makefile.in Sun Nov 4 15:49:06 2018 (r340126) +++ head/contrib/expat/Makefile.in Sun Nov 4 16:08:59 2018 (r340127) @@ -1,194 +1,1019 @@ -################################################################ -# Process this file with top-level configure script to produce Makefile +# Makefile.in generated by automake 1.15.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2017 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + # -# Copyright 2000 Clark Cooper +# __ __ _ +# ___\ \/ /_ __ __ _| |_ +# / _ \\ /| '_ \ / _` | __| +# | __// \| |_) | (_| | |_ +# \___/_/\_\ .__/ \__,_|\__| +# |_| XML parser # -# This file is part of EXPAT. +# Copyright (c) 2017 Expat development team +# Licensed under the MIT license: # -# EXPAT is free software; you can redistribute it and/or modify it -# under the terms of the License (based on the MIT/X license) contained -# in the file COPYING that comes with this distribution. +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to the +# following conditions: # -# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. # +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +# NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +# USE OR OTHER DEALINGS IN THE SOFTWARE. +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@WITH_XMLWF_TRUE@am__append_1 = xmlwf doc +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/conftools/ac_c_bigendian_cross.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = expat_config.h +CONFIG_CLEAN_FILES = expat.pc run.sh +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +DATA = $(pkgconfig_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)expat_config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope +DIST_SUBDIRS = lib examples tests xmlwf doc +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/expat.pc.in \ + $(srcdir)/expat_config.h.in $(srcdir)/run.sh.in \ + $(top_srcdir)/conftools/compile \ + $(top_srcdir)/conftools/config.guess \ + $(top_srcdir)/conftools/config.sub \ + $(top_srcdir)/conftools/install-sh \ + $(top_srcdir)/conftools/ltmain.sh \ + $(top_srcdir)/conftools/missing AUTHORS COPYING \ + conftools/compile conftools/config.guess conftools/config.sub \ + conftools/install-sh conftools/ltmain.sh conftools/missing +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FILEMAP = @FILEMAP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBAGE = @LIBAGE@ +LIBCURRENT = @LIBCURRENT@ +LIBOBJS = @LIBOBJS@ +LIBREVISION = @LIBREVISION@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ - +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -VPATH = @srcdir@ +AUTOMAKE_OPTIONS = \ + dist-bzip2 \ + foreign \ + no-dist-gzip \ + subdir-objects -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -libdir = @libdir@ -includedir = @includedir@ -man1dir = @mandir@/man1 +ACLOCAL_AMFLAGS = -I m4 +LIBTOOLFLAGS = --verbose *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sun Nov 4 16:58:56 2018 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 7225610DCC6F; Sun, 4 Nov 2018 16:58:56 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0080379EEC; Sun, 4 Nov 2018 16:58:56 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 D5BB63891; Sun, 4 Nov 2018 16:58:55 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4GwtKt031288; Sun, 4 Nov 2018 16:58:55 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4Gwt30031287; Sun, 4 Nov 2018 16:58:55 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201811041658.wA4Gwt30031287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov Date: Sun, 4 Nov 2018 16:58:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340128 - head/usr.bin/man X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: head/usr.bin/man X-SVN-Commit-Revision: 340128 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0080379EEC X-Spamd-Result: default: False [-0.26 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.15)[-0.146,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 16:58:56 -0000 Author: yuripv Date: Sun Nov 4 16:58:55 2018 New Revision: 340128 URL: https://svnweb.freebsd.org/changeset/base/340128 Log: Teach man(1) about C.UTF-8. While here, use LANG as the proper source to select man pages language/encoding, falling back to LC_CTYPE. Reviewed by: bapt Approved by: kib (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17835 Modified: head/usr.bin/man/man.sh Modified: head/usr.bin/man/man.sh ============================================================================== --- head/usr.bin/man/man.sh Sun Nov 4 16:08:59 2018 (r340127) +++ head/usr.bin/man/man.sh Sun Nov 4 16:58:55 2018 (r340128) @@ -662,6 +662,7 @@ man_setup_width() { # Setup necessary locale variables. man_setup_locale() { local lang_cc + local locstr locpaths='.' man_charset='US-ASCII' @@ -670,18 +671,25 @@ man_setup_locale() { if [ -n "$oflag" ]; then decho 'Using non-localized manpages' else - # Use the locale tool to give us the proper LC_CTYPE + # Use the locale tool to give us proper locale information eval $( $LOCALE ) - case "$LC_CTYPE" in + if [ -n "$LANG" ]; then + locstr=$LANG + else + locstr=$LC_CTYPE + fi + + case "$locstr" in C) ;; + C.UTF-8) ;; POSIX) ;; [a-z][a-z]_[A-Z][A-Z]\.*) - lang_cc="${LC_CTYPE%.*}" - man_lang="${LC_CTYPE%_*}" + lang_cc="${locstr%.*}" + man_lang="${locstr%_*}" man_country="${lang_cc#*_}" - man_charset="${LC_CTYPE#*.}" - locpaths="$LC_CTYPE" + man_charset="${locstr#*.}" + locpaths="$locstr" locpaths="$locpaths:$man_lang.$man_charset" if [ "$man_lang" != "en" ]; then locpaths="$locpaths:en.$man_charset" From owner-svn-src-head@freebsd.org Sun Nov 4 17:12:55 2018 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 EB97F10DD575; Sun, 4 Nov 2018 17:12: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1CC5C7A85A; Sun, 4 Nov 2018 17:12: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 EEF783CA4; Sun, 4 Nov 2018 17:12: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 wA4HCr21041470; Sun, 4 Nov 2018 17:12:53 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4HCrCf041469; Sun, 4 Nov 2018 17:12:53 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041712.wA4HCrCf041469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 4 Nov 2018 17:12:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340129 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340129 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1CC5C7A85A X-Spamd-Result: default: False [-0.37 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.26)[-0.261,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 17:12:55 -0000 Author: oshogbo Date: Sun Nov 4 17:12:53 2018 New Revision: 340129 URL: https://svnweb.freebsd.org/changeset/base/340129 Log: capsicum: allow ppoll(2) in capability mode We already allow to use poll(2). There is no reason to disallow ppoll(2). PR: 232495 Submitted by: Stefan Grundmann Reviewed by: cem, oshogbo MFC after: 2 weeks Modified: head/sys/kern/capabilities.conf Modified: head/sys/kern/capabilities.conf ============================================================================== --- head/sys/kern/capabilities.conf Sun Nov 4 16:58:55 2018 (r340128) +++ head/sys/kern/capabilities.conf Sun Nov 4 17:12:53 2018 (r340129) @@ -486,9 +486,9 @@ pipe2 ## ## Allow poll(2), which will be scoped by capability rights. -## XXXRW: We don't yet do that scoping. ## poll +ppoll ## ## Allow I/O-related file descriptors, subject to capability rights. From owner-svn-src-head@freebsd.org Sun Nov 4 17:23:00 2018 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 AA69F10DDB1A; Sun, 4 Nov 2018 17:23:00 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 153757B111; Sun, 4 Nov 2018 17:23:00 +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 EA5EF3E5B; Sun, 4 Nov 2018 17:22: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 wA4HMx9T046961; Sun, 4 Nov 2018 17:22:59 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4HMxHw046959; Sun, 4 Nov 2018 17:22:59 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041722.wA4HMxHw046959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Sun, 4 Nov 2018 17:22:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340130 - head/lib/libcapsicum X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/lib/libcapsicum X-SVN-Commit-Revision: 340130 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 153757B111 X-Spamd-Result: default: False [-0.16 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.05)[-0.052,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 17:23:00 -0000 Author: oshogbo Date: Sun Nov 4 17:22:58 2018 New Revision: 340130 URL: https://svnweb.freebsd.org/changeset/base/340130 Log: libcapsicum: Introduce caph_{rights,ioctls,fcntls}_limit The idea behind those functions is not to force consumers to remember that there is a need to check errno on failure. We already have a caph_enter(3) function which does the same for cap_enter(2). MFC after: 2 weeks Modified: head/lib/libcapsicum/Makefile head/lib/libcapsicum/capsicum_helpers.3 head/lib/libcapsicum/capsicum_helpers.h Modified: head/lib/libcapsicum/Makefile ============================================================================== --- head/lib/libcapsicum/Makefile Sun Nov 4 17:12:53 2018 (r340129) +++ head/lib/libcapsicum/Makefile Sun Nov 4 17:22:58 2018 (r340130) @@ -8,6 +8,7 @@ MAN+= capsicum_helpers.3 MLINKS+=capsicum_helpers.3 caph_enter.3 MLINKS+=capsicum_helpers.3 caph_enter_casper.3 +MLINKS+=capsicum_helpers.3 caph_rights_limit.3 MLINKS+=capsicum_helpers.3 caph_limit_stream.3 MLINKS+=capsicum_helpers.3 caph_limit_stdin.3 MLINKS+=capsicum_helpers.3 caph_limit_stderr.3 Modified: head/lib/libcapsicum/capsicum_helpers.3 ============================================================================== --- head/lib/libcapsicum/capsicum_helpers.3 Sun Nov 4 17:12:53 2018 (r340129) +++ head/lib/libcapsicum/capsicum_helpers.3 Sun Nov 4 17:22:58 2018 (r340130) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 18, 2018 +.Dd November 4, 2018 .Dt CAPSICUM_HELPERS 3 .Os .Sh NAME @@ -34,7 +34,12 @@ .Nm caph_limit_stdout , .Nm caph_limit_stdio , .Nm caph_cache_tzdata , -.Nm caph_cache_catpages +.Nm caph_cache_catpages , +.Nm caph_enter , +.Nm caph_enter_casper , +.Nm caph_rights_limit , +.Nm caph_ioctls_limit , +.Nm caph_fcntls_limit .Nd "set of the capsicum helpers, part of the libcapsicum" .Sh LIBRARY .Lb libcapsicum @@ -45,8 +50,12 @@ .Ft int .Fn caph_enter_casper "void" .Ft int -.Fn caph_limit_stream "int fd" "int flags" +.Fn caph_rights_limit "inf fd" "const cap_righst_t *rights" .Ft int +.Fn caph_ioctls_limit "inf fd" "const unsigned long *cmds" "size_t ncmds" +.Ft int +.Fn caph_fcntls_limit "inf fd" "uint32_t fcntlrights" +.Ft int .Fn caph_limit_stdin "void" .Ft int .Fn caph_limit_stderr "void" @@ -60,9 +69,17 @@ .Fn caph_cache_catpages "void" .Sh DESCRIPTION The -.Nm caph_enter -is equivalent to the -.Xr cap_enter 2 +.Nm caph_enter , +.Nm caph_rights_limit , +.Nm caph_ioctls_limit +and +.Nm caph_fcntls_limit +are respectively equivalent to +.Xr cap_enter 2 , +.Xr cap_rights_limit 2 , +.Xr cap_ioctls_limit 2 +and +.Xr cap_fcntls_limit 2 , it returns success when the kernel is built without support of the capability mode. .Pp @@ -125,4 +142,5 @@ among others. .Ed .Sh SEE ALSO .Xr cap_enter 2 , +.Xr cap_rights_limit 2 , .Xr rights 4 Modified: head/lib/libcapsicum/capsicum_helpers.h ============================================================================== --- head/lib/libcapsicum/capsicum_helpers.h Sun Nov 4 17:12:53 2018 (r340129) +++ head/lib/libcapsicum/capsicum_helpers.h Sun Nov 4 17:22:58 2018 (r340130) @@ -136,6 +136,35 @@ caph_enter(void) return (0); } +static __inline int +caph_rights_limit(int fd, const cap_rights_t *rights) +{ + + if (cap_rights_limit(fd, rights) < 0 && errno != ENOSYS) + return (-1); + + return (0); +} + +static __inline int +caph_ioctls_limit(int fd, const unsigned long *cmds, size_t ncmds) +{ + + if (cap_ioctls_limit(fd, cmds, ncmds) < 0 && errno != ENOSYS) + return (-1); + + return (0); +} + +static __inline int +caph_fcntls_limit(int fd, uint32_t fcntlrights) +{ + + if (caph_fcntls_limit(fd, fcntlrights) < 0 && errno != ENOSYS) + return (-1); + + return (0); +} static __inline int caph_enter_casper(void) From owner-svn-src-head@freebsd.org Sun Nov 4 17:56:21 2018 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 8BBED10E04B3; Sun, 4 Nov 2018 17:56:21 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 020237CBC0; Sun, 4 Nov 2018 17:56:21 +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 8DDED43BC; Sun, 4 Nov 2018 17:56: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 wA4HuIdR062976; Sun, 4 Nov 2018 17:56:18 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4HuGdV062868; Sun, 4 Nov 2018 17:56:16 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201811041756.wA4HuGdV062868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Sun, 4 Nov 2018 17:56:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340132 - in head: bin/ed share/man/man5 share/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head: bin/ed share/man/man5 share/mk tools/build/options X-SVN-Commit-Revision: 340132 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 020237CBC0 X-Spamd-Result: default: False [-0.03 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.08)[0.075,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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, 04 Nov 2018 17:56:21 -0000 Author: cem Date: Sun Nov 4 17:56:16 2018 New Revision: 340132 URL: https://svnweb.freebsd.org/changeset/base/340132 Log: Drop ed(1) "crypto" You should not be using DES. You should not have been using DES for the past 30 years. The ed DES-CBC scheme lacked several desirable properties of a sealed document system, even ignoring DES itself. In particular, it did not provide the "integrity" cryptographic property (detection of tampering), and it treated ASCII passwords as 64-bit keys (instead of using a KDF like scrypt or PBKDF2). Some general approaches ed(1) users might consider to replace the removed DES mode: 1. Full disk encryption with something like AES-XTS. This is easy to conceptualize, design, and implement, and it provides confidentiality for data at rest. Like CBC, it lacks tampering protection. Examples include GELI, LUKS, FileVault2. 2. Encrypted overlay ("stackable") filesystems (EncFS, PEFS?, CryptoFS, others). 3. Native encryption at the filesystem layer. Ext4/F2FS, ZFS, APFS, and NTFS all have some flavor of this. 4. Storing your files unencrypted. It's not like DES was doing you much good. If you have DES-CBC scrambled files produced by ed(1) prior to this change, you may decrypt them with: openssl des-cbc -d -iv 0 -K -in -out Reviewed by: allanjude, bapt, emaste Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D17829 Deleted: head/bin/ed/cbc.c head/tools/build/options/WITHOUT_ED_CRYPTO Modified: head/bin/ed/Makefile head/bin/ed/POSIX head/bin/ed/README head/bin/ed/ed.1 head/bin/ed/ed.h head/bin/ed/io.c head/bin/ed/main.c head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk Modified: head/bin/ed/Makefile ============================================================================== --- head/bin/ed/Makefile Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/Makefile Sun Nov 4 17:56:16 2018 (r340132) @@ -4,13 +4,8 @@ PACKAGE=runtime PROG= ed -SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +SRCS= buf.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 - -.if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" -CFLAGS+=-DDES -LIBADD= crypto -.endif .include <bsd.prog.mk> Modified: head/bin/ed/POSIX ============================================================================== --- head/bin/ed/POSIX Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/POSIX Sun Nov 4 17:56:16 2018 (r340132) @@ -25,29 +25,20 @@ EXTENSIONS iv) `z' for scrolling through the buffer, and v) BSD line addressing syntax (i.e., `^' and `%') is recognized. -2) If crypt(3) is available, files can be read and written using DES - encryption. The `x' command prompts the user to enter a key used for - encrypting/ decrypting subsequent reads and writes. If only a newline - is entered as the key, then encryption is disabled. Otherwise, a key - is read in the same manner as a password entry. The key remains in - effect until encryption is disabled. For more information on the - encryption algorithm, see the bdes(1) man page. Encryption/decryption - should be fully compatible with SunOS des(1). - -3) The POSIX interactive global commands `G' and `V' are extended to +2) The POSIX interactive global commands `G' and `V' are extended to support multiple commands, including `a', `i' and `c'. The command format is the same as for the global commands `g' and `v', i.e., one command per line with each line, except for the last, ending in a backslash (\). -4) An extension to the POSIX file commands `E', `e', `r', `W' and `w' is +3) An extension to the POSIX file commands `E', `e', `r', `W' and `w' is that <file> arguments are processed for backslash escapes, i.e., any character preceded by a backslash is interpreted literally. If the first unescaped character of a <file> argument is a bang (!), then the rest of the line is interpreted as a shell command, and no escape processing is performed by ed. -5) For SunOS ed(1) compatibility, ed runs in restricted mode if invoked +4) For SunOS ed(1) compatibility, ed runs in restricted mode if invoked as red. This limits editing of files in the local directory only and prohibits shell commands. Modified: head/bin/ed/README ============================================================================== --- head/bin/ed/README Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/README Sun Nov 4 17:56:16 2018 (r340132) @@ -9,7 +9,6 @@ compile with little trouble. Otherwise, the macros SP should be redefined to disable interrupts. The following compiler directives are recognized: -DES - to add encryption support (requires crypt(3)) NO_REALLOC_NULL - if realloc(3) does not accept a NULL pointer BACKWARDS - for backwards compatibility NEED_INSQUE - if insque(3) is missing Modified: head/bin/ed/ed.1 ============================================================================== --- head/bin/ed/ed.1 Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/ed.1 Sun Nov 4 17:56:16 2018 (r340132) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd February 5, 2017 +.Dd November 3, 2018 .Dt ED 1 .Os .Sh NAME @@ -9,12 +9,12 @@ .Sh SYNOPSIS .Nm .Op Fl -.Op Fl sx +.Op Fl s .Op Fl p Ar string .Op Ar file .Nm red .Op Fl -.Op Fl sx +.Op Fl s .Op Fl p Ar string .Op Ar file .Sh DESCRIPTION @@ -141,11 +141,6 @@ Suppress diagnostics. This should be used if .Nm Ns 's standard input is from a script. -.It Fl x -Prompt for an encryption key to be used in subsequent reads and writes -(see the -.Em x -command). .It Fl p Ar string Specify a command prompt. This may be toggled on and off with the @@ -865,12 +860,6 @@ This is similar to the .Em w command, expect that the previous contents of file is not clobbered. The current address is unchanged. -.It x -Prompt for an encryption key which is used in subsequent reads and -writes. -If a newline alone is entered as the key, then encryption is -turned off. -Otherwise, echoing is disabled while a key is read. .It Pf (.+1)z n Scroll .Ar n Modified: head/bin/ed/ed.h ============================================================================== --- head/bin/ed/ed.h Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/ed.h Sun Nov 4 17:56:16 2018 (r340132) @@ -175,18 +175,7 @@ if ((i) > (n)) { \ /* NEWLINE_TO_NUL: overwrite newlines with ASCII NULs */ #define NEWLINE_TO_NUL(s, l) translit_text(s, l, '\n', '\0') -#ifdef ED_DES_INCLUDES -void des_error(const char *); -void expand_des_key(char *, char *); -void set_des_key(DES_cblock *); -#endif -/* Other DES support stuff */ -void init_des_cipher(void); -int flush_des_file(FILE *); -int get_des_char(FILE *); -int put_des_char(int, FILE *); - /* Local Function Declarations */ void add_line_node(line_t *); int append_lines(long); @@ -280,6 +269,5 @@ extern long u_current_addr; extern long rows; extern int cols; extern int newline_added; -extern int des; extern int scripted; extern int patlock; Modified: head/bin/ed/io.c ============================================================================== --- head/bin/ed/io.c Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/io.c Sun Nov 4 17:56:16 2018 (r340132) @@ -76,8 +76,6 @@ read_stream(FILE *fp, long n) int len; isbinary = newline_added = 0; - if (des) - init_des_cipher(); for (current_addr = n; (len = get_stream_line(fp)) > 0; size += len) { SPL1(); if (put_sbuf_line(sbuf) == NULL) { @@ -106,8 +104,6 @@ read_stream(FILE *fp, long n) newline_added = 1; newline_added = appended ? newline_added : o_newline_added; isbinary = isbinary | o_isbinary; - if (des) - size += 8 - size % 8; /* adjust DES size */ return size; } @@ -119,8 +115,8 @@ get_stream_line(FILE *fp) int c; int i = 0; - while (((c = des ? get_des_char(fp) : getc(fp)) != EOF || (!feof(fp) && - !ferror(fp))) && c != '\n') { + while (((c = getc(fp)) != EOF || (!feof(fp) && !ferror(fp))) && + c != '\n') { REALLOC(sbuf, sbufsz, i + 1, ERR); if (!(sbuf[i++] = c)) isbinary = 1; @@ -180,8 +176,6 @@ write_stream(FILE *fp, long n, long m) char *s; int len; - if (des) - init_des_cipher(); for (; n && n <= m; n++, lp = lp->q_forw) { if ((s = get_sbuf_line(lp)) == NULL) return ERR; @@ -192,10 +186,6 @@ write_stream(FILE *fp, long n, long m) return ERR; size += len; } - if (des) { - flush_des_file(fp); /* flush buffer */ - size += 8 - size % 8; /* adjust DES size */ - } return size; } @@ -205,7 +195,7 @@ int put_stream_line(FILE *fp, const char *s, int len) { while (len--) - if ((des ? put_des_char(*s++, fp) : fputc(*s++, fp)) < 0) { + if (fputc(*s++, fp) < 0) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "cannot write file"; return ERR; Modified: head/bin/ed/main.c ============================================================================== --- head/bin/ed/main.c Sun Nov 4 17:56:09 2018 (r340131) +++ head/bin/ed/main.c Sun Nov 4 17:56:16 2018 (r340132) @@ -47,10 +47,6 @@ __FBSDID("$FreeBSD$"); * The buffering algorithm is attributed to Rodney Ruddock of * the University of Guelph, Guelph, Ontario. * - * The cbc.c encryption code is adapted from - * the bdes program by Matt Bishop of Dartmouth College, - * Hanover, NH. - * */ #include <sys/types.h> @@ -81,7 +77,6 @@ int ibufsz; /* ed command-line buffer size */ char *ibufp; /* pointer to ed command-line buffer */ /* global flags */ -int des = 0; /* if set, use crypt(3) for i/o */ static int garrulous = 0; /* if set, print all error messages */ int isbinary; /* if set, buffer contains ASCII NULs */ int isglobal; /* if set, doing a global command */ @@ -121,11 +116,7 @@ top: scripted = 1; break; case 'x': /* use crypt */ -#ifdef DES - des = get_keyword(); -#else fprintf(stderr, "crypt unavailable\n?\n"); -#endif break; default: @@ -821,13 +812,8 @@ exec_command(void) return ERR; } GET_COMMAND_SUFFIX(); -#ifdef DES - des = get_keyword(); - break; -#else errmsg = "crypt unavailable"; return ERR; -#endif case 'z': #ifdef BACKWARDS if (check_addr_range(first_addr = 1, current_addr + 1) < 0) Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sun Nov 4 17:56:09 2018 (r340131) +++ head/share/man/man5/src.conf.5 Sun Nov 4 17:56:16 2018 (r340132) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd October 30, 2018 +.Dd November 3, 2018 .Dt SRC.CONF 5 .Os .Sh NAME @@ -624,10 +624,6 @@ Set this if you do not want to link and .Pa /sbin dynamically. -.It Va WITHOUT_ED_CRYPTO -Set to build -.Xr ed 1 -without support for encryption/decryption. .It Va WITHOUT_EE Set to not build and install .Xr edit 1 , Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sun Nov 4 17:56:09 2018 (r340131) +++ head/share/mk/src.opts.mk Sun Nov 4 17:56:16 2018 (r340132) @@ -90,7 +90,6 @@ __DEFAULT_YES_OPTIONS = \ DICT \ DMAGENT \ DYNAMICROOT \ - ED_CRYPTO \ EE \ EFI \ ELFTOOLCHAIN_BOOTSTRAP \ From owner-svn-src-head@freebsd.org Sun Nov 4 18:24:12 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3C37910E1615; Sun, 4 Nov 2018 18:24:12 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C0F4C7DF67; Sun, 4 Nov 2018 18:24:11 +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 A15A64906; Sun, 4 Nov 2018 18:24:11 +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 wA4IOBWm078586; Sun, 4 Nov 2018 18:24:11 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4IOBH6078585; Sun, 4 Nov 2018 18:24:11 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041824.wA4IOBH6078585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 18:24:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340133 - head/contrib/expat/lib X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/contrib/expat/lib X-SVN-Commit-Revision: 340133 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C0F4C7DF67 X-Spamd-Result: default: False [-0.18 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.07)[-0.068,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 18:24:12 -0000 Author: oshogbo Date: Sun Nov 4 18:24:11 2018 New Revision: 340133 URL: https://svnweb.freebsd.org/changeset/base/340133 Log: Un-break build libexpact. The writeRandomBytes_arc4random is not used if the arc4random_buf is available. This caused compiler to throw warnings which are treated as an error in libexpact. Approved by: vangyzen Modified: head/contrib/expat/lib/xmlparse.c Modified: head/contrib/expat/lib/xmlparse.c ============================================================================== --- head/contrib/expat/lib/xmlparse.c Sun Nov 4 17:56:16 2018 (r340132) +++ head/contrib/expat/lib/xmlparse.c Sun Nov 4 18:24:11 2018 (r340133) @@ -747,7 +747,7 @@ writeRandomBytes_dev_urandom(void * target, size_t cou #endif /* ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) */ -#if defined(HAVE_ARC4RANDOM) +#if defined(HAVE_ARC4RANDOM) && ! defined(HAVE_ARC4RANDOM_BUF) static void writeRandomBytes_arc4random(void * target, size_t count) { @@ -765,7 +765,7 @@ writeRandomBytes_arc4random(void * target, size_t coun } } -#endif /* defined(HAVE_ARC4RANDOM) */ +#endif /* defined(HAVE_ARC4RANDOM) && ! defined(HAVE_ARC4RANDOM_BUF) */ #ifdef _WIN32 From owner-svn-src-head@freebsd.org Sun Nov 4 18:37:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8784310E1CCE; Sun, 4 Nov 2018 18:37:10 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 38C4A7E781; Sun, 4 Nov 2018 18:37:09 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-lj1-x22e.google.com with SMTP id k19-v6so5967949lji.11; Sun, 04 Nov 2018 10:37:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Cf3zLiVP5P+DSrkGziEu5Hx2f7A/+h93v/DQkU8OVtk=; b=p7nH/vbUtXgYJ9XZqIGp2ESCGqvi1kzz/S2rvwDIlNLXjD7b5mkWGjMex0nXYRIeGB 0B6UY2wH/zlespJM15zaiqC8gu1bSGtt3UfwFHR2SuGvbTCz0aZxEy6BicBsp16u9QU7 0L9uN0YoyosW1E3o9HR5OozWxUAndO9XZoOv5S3aZJgPW4osgd09tu8Hxuxg5gXyaI+M bAbzIpFHvoFtPBXiQm8H/fcAOe/OCJDp+zUgpWtPQJ9vd1Q/w+bulukuDyOqB1J9jp3r wBYjgFcdIBmRvpZszipj0v7Bg311If/A+DvPxDUl5KoZAf1muhUjiXEfvyFBnqhK4Pvd yTFA== 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:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=Cf3zLiVP5P+DSrkGziEu5Hx2f7A/+h93v/DQkU8OVtk=; b=fi+ou1FXZTRplBpTErqmjmbQoB8UmT++0BSHd7IVPv4p3RvULN3Iip/ZIF9eJEUHBT W2a+GzyTP0ebmMDooOkM8tVUnaQo12WFsD6FCps4j1Txwz1YSMomkwVnGFHd7Ihmncb+ 2ZwdnKimxnYFYk9Pad0DK1U261919TVcB1VZ2m+AHbK/yeCwx+ffHlRJNsVxACEE3mxb mLXYBLiUDWqZnNZzL2Qr+wRMiTsBggJJlbvi1OxcteEgFxL0Cmp/VLN0lffClu3HpWqp QO5KrGYH+DRgew/FitXxSln7eKBwHYKnBfYtJfjBI3NjZ7iazwayHo24Woqtq7v9Tgl6 3uSw== X-Gm-Message-State: AGRZ1gLMHnnpdkXNqq5+hUg+2H/3gW7c5IIWsUIOHaQO/FbiLuVfpFkc g7vvHMK84tmUmeuXx0OiKmXUlTgO X-Google-Smtp-Source: AJdET5c65f/RlPtzwD17i3Aq59ts3ZHHGTRT2ejvjK0sBXsspXRcW4oyRtTSz4j4NXH/5e71uE15bA== X-Received: by 2002:a2e:9819:: with SMTP id a25-v6mr13500596ljj.6.1541356627272; Sun, 04 Nov 2018 10:37:07 -0800 (PST) Received: from x-wing (87-206-170-77.dynamic.chello.pl. [87.206.170.77]) by smtp.gmail.com with ESMTPSA id 18-v6sm6051270ljp.49.2018.11.04.10.37.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 04 Nov 2018 10:37:05 -0800 (PST) Sender: Mariusz Zaborski <oshogbo.vx@gmail.com> Date: Sun, 4 Nov 2018 19:37:01 +0100 From: Mariusz Zaborski <oshogbo@freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340133 - head/contrib/expat/lib Message-ID: <20181104183701.GA56945@x-wing> References: <201811041824.wA4IOBH6078585@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline In-Reply-To: <201811041824.wA4IOBH6078585@repo.freebsd.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: 38C4A7E781 X-Spamd-Result: default: False [-3.44 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[e.2.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.89)[-0.890,0]; IP_SCORE(-0.74)[ipnet: 2a00:1450::/32(-2.24), asn: 15169(-1.37), country: US(-0.07)]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[oshogbo@freebsd.org,oshogbovx@gmail.com]; MID_RHS_NOT_FQDN(0.50)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[oshogbo@freebsd.org,oshogbovx@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 18:37:10 -0000 --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 04, 2018 at 06:24:11PM +0000, Mariusz Zaborski wrote: > Author: oshogbo > Date: Sun Nov 4 18:24:11 2018 > New Revision: 340133 > URL: https://svnweb.freebsd.org/changeset/base/340133 >=20 > Log: > Un-break build libexpact. > =20 > The writeRandomBytes_arc4random is not used if the arc4random_buf > is available. This caused compiler to throw warnings which are treated = as > an error in libexpact. > =20 > Approved by: vangyzen s/expact/expat/g Sorry for that. Thanks, --=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 --7JfCtLOvnd9MIVvH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkD1x0xkJXVVY1Gwf38KEGuLGxWQFAlvfPEoACgkQ38KEGuLG xWT3ug//cmzOg7w1VCol5bl1ewUJbel/vf6Dtu3ZvmXM1n1d/dHNQ8DDLget+qqN XC7YHh88lgSzrZ/TSdfeE6A27Rem8l3llQi7sh9iBIfAVOXhTZrI+2o92zrbbK9I EomCSBfCXW4BLTLqoPP16e6HUYq1JTWC4KZU63i29BWoAhxqXDBWFpp4pxrL7S0R f3A5sDtpqVx7FSXwjedAouh232hHmPWgnNYZjV3umOLMK+pevY6Xv9uQhy9RNvjv /41GKEHM2twT6hyKktbC2j9zQElXEbj+9XBQHhXyLG0HT7rbLQtpby3FsHpUBBmO KE8zAiKcRMe/x4N4sYx7nfUWziCOHzQQcjDuaE1Fnt8jKBuf/j0dpb0jEovj4jac arwFfoAE7abPb+76gDNl30oBVtG9Y7o71QzW8IdZZwmRzNYjLZJ5/xTcjAxqzQOx 5E57/nS/zMRXN6UaalVmFZdjz5e8S9OEyyY1PbjrUk55b6c7PYLlcP3ZAOazmxqp Cy+nbUJQUUFrEg3EP+qn6J4ufy07Hs4ZSo1+EPX7PbKeRN3GvYRTEoDW6XA0prJp BlM9eS6J/bwi8ToLeOUKVOgo0KRLnqxNPn9XaHDWKpZa/AgClqXC+etJQEjoI+mH GPTp/6ki5de7iOkQNrkEXMltvNOjBvJS8A95pVFTpOC9ZnRZCHU= =SfOt -----END PGP SIGNATURE----- --7JfCtLOvnd9MIVvH-- From owner-svn-src-head@freebsd.org Sun Nov 4 18:53:00 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 2FA3410E24E6; Sun, 4 Nov 2018 18:53:00 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 958977F80C; Sun, 4 Nov 2018 18:52: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 76B484DEB; Sun, 4 Nov 2018 18:52: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 wA4IqxI4094035; Sun, 4 Nov 2018 18:52:59 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4IqxOm094034; Sun, 4 Nov 2018 18:52:59 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041852.wA4IqxOm094034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 18:52:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340134 - head/lib/libcapsicum X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/lib/libcapsicum X-SVN-Commit-Revision: 340134 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 958977F80C X-Spamd-Result: default: False [-0.53 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.42)[-0.423,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 18:53:00 -0000 Author: oshogbo Date: Sun Nov 4 18:52:59 2018 New Revision: 340134 URL: https://svnweb.freebsd.org/changeset/base/340134 Log: Fix a recusive call introduce in the r340130. Modified: head/lib/libcapsicum/capsicum_helpers.h Modified: head/lib/libcapsicum/capsicum_helpers.h ============================================================================== --- head/lib/libcapsicum/capsicum_helpers.h Sun Nov 4 18:24:11 2018 (r340133) +++ head/lib/libcapsicum/capsicum_helpers.h Sun Nov 4 18:52:59 2018 (r340134) @@ -160,7 +160,7 @@ static __inline int caph_fcntls_limit(int fd, uint32_t fcntlrights) { - if (caph_fcntls_limit(fd, fcntlrights) < 0 && errno != ENOSYS) + if (cap_fcntls_limit(fd, fcntlrights) < 0 && errno != ENOSYS) return (-1); return (0); From owner-svn-src-head@freebsd.org Sun Nov 4 19:10:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 1703510E34A8; Sun, 4 Nov 2018 19:10:46 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 77023814DA; Sun, 4 Nov 2018 19:10:45 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 57F344FE3; Sun, 4 Nov 2018 19:10:45 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4JAjja006250; Sun, 4 Nov 2018 19:10:45 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JAio9006247; Sun, 4 Nov 2018 19:10:44 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811041910.wA4JAio9006247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sun, 4 Nov 2018 19:10:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340135 - in head: share/man/man4 sys/netgraph X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head: share/man/man4 sys/netgraph X-SVN-Commit-Revision: 340135 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 77023814DA X-Spamd-Result: default: False [-0.52 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.41)[-0.415,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:10:46 -0000 Author: eugen Date: Sun Nov 4 19:10:44 2018 New Revision: 340135 URL: https://svnweb.freebsd.org/changeset/base/340135 Log: Make ng_pptpgre(8) netgraph node be able to restore order for packets reordered in transit instead of dropping them altogether. It uses sequence numbers of PPtPGRE packets. A set of new sysctl(8) added to control this ability or disable it: net.graph.pptpgre.reorder_max (1) defines maximum length of node's private reorder queue used to keep data waiting for late packets. Zero value disables reordering. Default value 1 allows the node to restore the order for two packets swapped in transit. Greater values allow the node to deliver packets being late after more packets in sequence at cost of increased kernel memory usage. net.graph.pptpgre.reorder_timeout (1) defines time value in miliseconds used to wait for late packets. It may be useful to increase this if reordering spot is distant. MFC after: 1 month Modified: head/share/man/man4/ng_pptpgre.4 head/sys/netgraph/ng_pptpgre.c head/sys/netgraph/ng_pptpgre.h Modified: head/share/man/man4/ng_pptpgre.4 ============================================================================== --- head/share/man/man4/ng_pptpgre.4 Sun Nov 4 18:52:59 2018 (r340134) +++ head/share/man/man4/ng_pptpgre.4 Sun Nov 4 19:10:44 2018 (r340135) @@ -35,7 +35,7 @@ .\" $FreeBSD$ .\" $Whistle: ng_pptpgre.8,v 1.2 1999/12/08 00:20:53 archie Exp $ .\" -.Dd November 13, 2012 +.Dd November 4, 2018 .Dt NG_PPTPGRE 4 .Os .Sh NAME @@ -141,11 +141,33 @@ This command atomically gets and resets the node stati This node shuts down upon receipt of a .Dv NGM_SHUTDOWN control message, or when both hooks have been disconnected. +.Sh SYSCTL VARIABLES +A set of +.Xr sysctl 8 +variables controls ability of this node to deal with some +amount of packet reorder that sometimes happens in transit. +Packet reorder results in packet drops (unless the order is restored) +as PPP protocol can not deliver reordered data. +These variables are shown below together +with their default value and meaning: +.Bl -tag -width indent +.It Va net.graph.pptpgre.reorder_max: 1 +Defines maximum length of node's private reorder queue +used to keep data waiting for late packets. +Zero value disables reordering. +Default value allows the node to restore the order for two packets swapped +in transit. +Greater values allow the node to deliver packets being late after more +packets in sequence at cost of increased kernel memory usage. +.It Va net.graph.pptpgre.reorder_timeout: 1 +Defines time value in miliseconds used to wait for late packets. +.El .Sh SEE ALSO .Xr netgraph 4 , .Xr ng_ksocket 4 , .Xr ng_ppp 4 , -.Xr ngctl 8 +.Xr ngctl 8 , +.Xr sysctl 8 .Rs .%A K. Hamzeh .%A G. Pall Modified: head/sys/netgraph/ng_pptpgre.c ============================================================================== --- head/sys/netgraph/ng_pptpgre.c Sun Nov 4 18:52:59 2018 (r340134) +++ head/sys/netgraph/ng_pptpgre.c Sun Nov 4 19:10:44 2018 (r340135) @@ -64,6 +64,7 @@ #include <sys/mutex.h> #include <sys/endian.h> #include <sys/errno.h> +#include <sys/sysctl.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -124,6 +125,8 @@ typedef u_int64_t pptptime_t; #define PPTP_MIN_TIMEOUT (PPTP_TIME_SCALE / 83) /* 12 milliseconds */ #define PPTP_MAX_TIMEOUT (3 * PPTP_TIME_SCALE) /* 3 seconds */ +#define PPTP_REORDER_TIMEOUT 1 + /* When we receive a packet, we wait to see if there's an outgoing packet we can piggy-back the ACK off of. These parameters determine the mimimum and maxmimum length of time we're willing to wait in order to do that. @@ -142,6 +145,34 @@ typedef u_int64_t pptptime_t; #define SESSHASHSIZE 0x0020 #define SESSHASH(x) (((x) ^ ((x) >> 8)) & (SESSHASHSIZE - 1)) +SYSCTL_NODE(_net_graph, OID_AUTO, pptpgre, CTLFLAG_RW, 0, "PPTPGRE"); + +/* + * Reorder queue maximum length. Zero disables reorder. + * + * The node may keep reorder_max queue entries per session + * if reorder is enabled, plus allocate one more for short time. + * + * Be conservative in memory consumption by default. + * Lots of sessions with large queues can overflow M_NETGRAPH zone. + */ +static int reorder_max = 1; /* reorder up to two swapped packets in a row */ +SYSCTL_UINT(_net_graph_pptpgre, OID_AUTO, reorder_max, CTLFLAG_RWTUN, + &reorder_max, 0, "Reorder queue maximum length"); + +static int reorder_timeout = PPTP_REORDER_TIMEOUT; +SYSCTL_UINT(_net_graph_pptpgre, OID_AUTO, reorder_timeout, CTLFLAG_RWTUN, + &reorder_timeout, 0, "Reorder timeout is milliseconds"); + +/* Packet reorder FIFO queue */ +struct ng_pptpgre_roq { + SLIST_ENTRY(ng_pptpgre_roq) next; /* next entry of the queue */ + item_p item; /* netgraph item */ + u_int32_t seq; /* packet sequence number */ +}; +SLIST_HEAD(ng_pptpgre_roq_head, ng_pptpgre_roq); +typedef struct ng_pptpgre_roq_head roqh; + /* We keep packet retransmit and acknowlegement state in this struct */ struct ng_pptpgre_sess { node_p node; /* this node pointer */ @@ -161,6 +192,9 @@ struct ng_pptpgre_sess { u_int32_t winAck; /* seq when xmitWin will grow */ pptptime_t timeSent[PPTP_XMIT_WIN]; LIST_ENTRY(ng_pptpgre_sess) sessions; + roqh roq; /* reorder queue head */ + u_int8_t roq_len; /* reorder queue length */ + struct callout reorderTimer; /* reorder timeout handler */ }; typedef struct ng_pptpgre_sess *hpriv_p; @@ -187,13 +221,19 @@ static ng_disconnect_t ng_pptpgre_disconnect; static int ng_pptpgre_xmit(hpriv_p hpriv, item_p item); static void ng_pptpgre_start_send_ack_timer(hpriv_p hpriv); static void ng_pptpgre_start_recv_ack_timer(hpriv_p hpriv); +static void ng_pptpgre_start_reorder_timer(hpriv_p hpriv); static void ng_pptpgre_recv_ack_timeout(node_p node, hook_p hook, void *arg1, int arg2); static void ng_pptpgre_send_ack_timeout(node_p node, hook_p hook, void *arg1, int arg2); +static void ng_pptpgre_reorder_timeout(node_p node, hook_p hook, + void *arg1, int arg2); static hpriv_p ng_pptpgre_find_session(priv_p privp, u_int16_t cid); static void ng_pptpgre_reset(hpriv_p hpriv); static pptptime_t ng_pptpgre_time(void); +static void ng_pptpgre_ack(const hpriv_p hpriv); +static int ng_pptpgre_sendq(const hpriv_p hpriv, roqh *q, + const struct ng_pptpgre_roq *st); /* Parse type for struct ng_pptpgre_conf */ static const struct ng_parse_struct_field ng_pptpgre_conf_type_fields[] @@ -291,6 +331,10 @@ ng_pptpgre_constructor(node_p node) ng_callout_init(&priv->uppersess.rackTimer); priv->uppersess.node = node; + SLIST_INIT(&priv->uppersess.roq); + priv->uppersess.roq_len = 0; + ng_callout_init(&priv->uppersess.reorderTimer); + for (i = 0; i < SESSHASHSIZE; i++) LIST_INIT(&priv->sesshash[i]); @@ -348,6 +392,11 @@ ng_pptpgre_newhook(node_p node, hook_p hook, const cha hpriv->conf.cid = cid; hpriv->node = node; hpriv->hook = hook; + + SLIST_INIT(&hpriv->roq); + hpriv->roq_len = 0; + ng_callout_init(&hpriv->reorderTimer); + NG_HOOK_SET_PRIVATE(hook, hpriv); hash = SESSHASH(cid); @@ -646,7 +695,50 @@ done: return (error); } +static void +ng_pptpgre_ack(const hpriv_p hpriv) +{ + mtx_assert(&hpriv->mtx, MA_OWNED); + if (!(callout_pending(&hpriv->sackTimer))) { + /* If delayed ACK is disabled, send it now */ + if (!hpriv->conf.enableDelayedAck) { /* ack now */ + ng_pptpgre_xmit(hpriv, NULL); + /* ng_pptpgre_xmit() drops the mutex */ + return; + } + /* ack later */ + ng_pptpgre_start_send_ack_timer(hpriv); + mtx_unlock(&hpriv->mtx); + return; + } + mtx_unlock(&hpriv->mtx); +} + /* + * Delivers packets from the queue "q" to upper layers. Frees delivered + * entries with the exception of one equal to "st" that is allocated + * on caller's stack and not on the heap. + */ +static int +ng_pptpgre_sendq(const hpriv_p hpriv, roqh *q, const struct ng_pptpgre_roq *st) +{ + struct ng_pptpgre_roq *np; + struct mbuf *m; + int error = 0; + + mtx_assert(&hpriv->mtx, MA_NOTOWNED); + while (!SLIST_EMPTY(q)) { + np = SLIST_FIRST(q); + SLIST_REMOVE_HEAD(q, next); + NGI_GET_M(np->item, m); + NG_FWD_NEW_DATA(error, np->item, hpriv->hook, m); + if (np != st) + free(np, M_NETGRAPH); + } + return (error); +} + +/* * Handle an incoming packet. The packet includes the IP header. */ static int @@ -661,7 +753,14 @@ ng_pptpgre_rcvdata_lower(hook_p hook, item_p item) int error = 0; struct mbuf *m; - NGI_GET_M(item, m); + roqh sendq = SLIST_HEAD_INITIALIZER(sendq); /* send queue on stack */ + struct ng_pptpgre_roq *last = NULL; /* last packet in the sendq */ + struct ng_pptpgre_roq *np, *prev; + struct ng_pptpgre_roq temp = { { NULL }, NULL, 0 }; + long diff; + u_int32_t seq; + + m = NGI_M(item); /* Update stats */ priv->stats.recvPackets++; priv->stats.recvOctets += m->m_pkthdr.len; @@ -673,18 +772,23 @@ ng_pptpgre_rcvdata_lower(hook_p hook, item_p item) } /* Safely pull up the complete IP+GRE headers */ - if (m->m_len < sizeof(*ip) + sizeof(*gre) - && (m = m_pullup(m, sizeof(*ip) + sizeof(*gre))) == NULL) { - priv->stats.memoryFailures++; - ERROUT(ENOBUFS); + if (m->m_len < sizeof(*ip) + sizeof(*gre)) { + if ((m = m_pullup(m, sizeof(*ip) + sizeof(*gre))) == NULL) { + priv->stats.memoryFailures++; + _NGI_M(item) = NULL; + ERROUT(ENOBUFS); + } + _NGI_M(item) = m; } ip = mtod(m, const struct ip *); iphlen = ip->ip_hl << 2; if (m->m_len < iphlen + sizeof(*gre)) { if ((m = m_pullup(m, iphlen + sizeof(*gre))) == NULL) { priv->stats.memoryFailures++; + _NGI_M(item) = NULL; ERROUT(ENOBUFS); } + _NGI_M(item) = m; ip = mtod(m, const struct ip *); } gre = (const struct greheader *)((const u_char *)ip + iphlen); @@ -696,8 +800,10 @@ ng_pptpgre_rcvdata_lower(hook_p hook, item_p item) if (m->m_len < iphlen + grelen) { if ((m = m_pullup(m, iphlen + grelen)) == NULL) { priv->stats.memoryFailures++; + _NGI_M(item) = NULL; ERROUT(ENOBUFS); } + _NGI_M(item) = m; ip = mtod(m, const struct ip *); gre = (const struct greheader *)((const u_char *)ip + iphlen); } @@ -726,7 +832,6 @@ ng_pptpgre_rcvdata_lower(hook_p hook, item_p item) const u_int32_t ack = be32dec(&gre->data[gre->hasSeq]); const int index = ack - hpriv->recvAck - 1; long sample; - long diff; /* Sanity check ack value */ if (PPTP_SEQ_DIFF(ack, hpriv->xmitSeq) > 0) { @@ -773,54 +878,178 @@ ng_pptpgre_rcvdata_lower(hook_p hook, item_p item) badAck: /* See if frame contains any data */ - if (gre->hasSeq) { - const u_int32_t seq = be32dec(&gre->data[0]); + if (!gre->hasSeq) { /* no data to deliver */ + priv->stats.recvLoneAcks++; + mtx_unlock(&hpriv->mtx); + ERROUT(0); + } - /* Sanity check sequence number */ - if (PPTP_SEQ_DIFF(seq, hpriv->recvSeq) <= 0) { - if (seq == hpriv->recvSeq) - priv->stats.recvDuplicates++; - else - priv->stats.recvOutOfOrder++; + seq = be32dec(&gre->data[0]); + + diff = PPTP_SEQ_DIFF(seq, hpriv->recvSeq); + if (diff <= 0) { /* late or duplicate packet */ + if (diff < 0 && reorder_max == 0) /* reorder disabled */ + priv->stats.recvOutOfOrder++; /* late */ + else + priv->stats.recvDuplicates++; /* duplicate */ + mtx_unlock(&hpriv->mtx); + ERROUT(EINVAL); + } + + /* Trim mbuf down to internal payload */ + m_adj(m, iphlen + grelen); + if (extralen > 0) + m_adj(m, -extralen); + +#define INIT_SENDQ(t) do { \ + t.item = item; \ + t.seq = seq; \ + SLIST_INSERT_HEAD(&sendq, &t, next); \ + last = &t; \ + hpriv->recvSeq = seq; \ + goto deliver; \ + } while(0) + + if (diff == 1) + /* the packet came in order, place it at the start of sendq */ + INIT_SENDQ(temp); + + /* The packet came too early, try to enqueue it. + * + * Check for duplicate in the queue. After this loop, "prev" will be + * NULL if the packet should become new head of the queue, + * or else it should be inserted after the "prev". + */ + prev = SLIST_FIRST(&hpriv->roq); + SLIST_FOREACH(np, &hpriv->roq, next) { + diff = PPTP_SEQ_DIFF(np->seq, seq); + if (diff == 0) { /* do not add duplicate, drop it */ + priv->stats.recvDuplicates++; mtx_unlock(&hpriv->mtx); ERROUT(EINVAL); } - hpriv->recvSeq = seq; + if (diff > 0) { /* we found newer packet */ + if (np == prev) /* that is the head of the queue */ + prev = NULL; /* put current packet to the head */ + break; + } + prev = np; + } - /* We need to acknowledge this packet; do it soon... */ - if (!(callout_pending(&hpriv->sackTimer))) { - /* If delayed ACK is disabled, send it now */ - if (!hpriv->conf.enableDelayedAck) { /* ack now */ - ng_pptpgre_xmit(hpriv, NULL); - /* ng_pptpgre_xmit() drops the mutex */ - } else { /* ack later */ - ng_pptpgre_start_send_ack_timer(hpriv); - mtx_unlock(&hpriv->mtx); - } - } else - mtx_unlock(&hpriv->mtx); + priv->stats.recvOutOfOrder++; /* duplicate not found */ + if (hpriv->roq_len < reorder_max) + goto enqueue; /* reorder enabled and there is a room */ - /* Trim mbuf down to internal payload */ - m_adj(m, iphlen + grelen); - if (extralen > 0) - m_adj(m, -extralen); + /* + * There is no room in the queue or reorder disabled. + * + * It the latter case, we may still have non-empty reorder queue + * if reorder was disabled in process of reordering. + * Then we correctly deliver the queue without growing it. + * + * In both cases, no malloc()'s until the queue is shortened. + */ + priv->stats.recvReorderOverflow++; + if (prev == NULL) { /* new packet goes before the head */ + INIT_SENDQ(temp); /* of reorder queue, so put it to sendq */ + } +#undef INIT_SENDQ - mtx_assert(&hpriv->mtx, MA_NOTOWNED); + /* + * Current packet goes after the head of reorder queue. + * Move the head to sendq to make room for current packet. + */ + np = SLIST_FIRST(&hpriv->roq); + if (prev == np) + prev = NULL; + SLIST_REMOVE_HEAD(&hpriv->roq, next); + hpriv->roq_len--; /* we are allowed to use malloc() now */ + SLIST_INSERT_HEAD(&sendq, np, next); + last = np; + hpriv->recvSeq = np->seq; - /* Deliver frame to upper layers */ +enqueue: + np = malloc(sizeof(*np), M_NETGRAPH, M_NOWAIT | M_ZERO); + if (np == NULL) { + priv->stats.memoryFailures++; + /* + * Emergency: we cannot save new data. + * Flush the queue delivering all queued packets preceeding + * current one despite of gaps. + */ + while (!SLIST_EMPTY(&hpriv->roq)) { + np = SLIST_FIRST(&hpriv->roq); + if (np->seq > seq) + break; + SLIST_REMOVE_HEAD(&hpriv->roq, next); + hpriv->roq_len--; + if (last == NULL) + SLIST_INSERT_HEAD(&sendq, np, next); + else + SLIST_INSERT_AFTER(last, np, next); + last = np; + } + + /* + * Pretend we got all packets till the current one + * and acknowledge it. + */ + hpriv->recvSeq = seq; + ng_pptpgre_ack(hpriv); /* drops lock */ + ng_pptpgre_sendq(hpriv, &sendq, &temp); NG_FWD_NEW_DATA(error, item, hpriv->hook, m); + ERROUT(ENOMEM); + } + + /* Add current (early) packet to the reorder queue. */ + np->item = item; + np->seq = seq; + if (prev == NULL) + SLIST_INSERT_HEAD(&hpriv->roq, np, next); + else + SLIST_INSERT_AFTER(prev, np, next); + hpriv->roq_len++; + +deliver: + /* Look if we have some packets in sequence after sendq. */ + while (!SLIST_EMPTY(&hpriv->roq)) { + np = SLIST_FIRST(&hpriv->roq); + if (PPTP_SEQ_DIFF(np->seq, hpriv->recvSeq) > 1) + break; /* the gap in the sequence */ + + /* "np" is in sequence, move it to the sendq. */ + SLIST_REMOVE_HEAD(&hpriv->roq, next); + hpriv->roq_len--; + hpriv->recvSeq = np->seq; + + if (last == NULL) + SLIST_INSERT_HEAD(&sendq, np, next); + else + SLIST_INSERT_AFTER(last, np, next); + last = np; + } + + if (SLIST_EMPTY(&hpriv->roq)) { + if (callout_pending(&hpriv->reorderTimer)) + ng_uncallout(&hpriv->reorderTimer, hpriv->node); } else { - priv->stats.recvLoneAcks++; + if (!callout_pending(&hpriv->reorderTimer)) + ng_pptpgre_start_reorder_timer(hpriv); + } + + if (SLIST_EMPTY(&sendq)) { + /* Current packet has been queued, nothing to free/deliver. */ mtx_unlock(&hpriv->mtx); - NG_FREE_ITEM(item); - NG_FREE_M(m); /* no data to deliver */ + return (error); } + /* We need to acknowledge last packet; do it soon... */ + ng_pptpgre_ack(hpriv); /* drops lock */ + ng_pptpgre_sendq(hpriv, &sendq, &temp); return (error); done: NG_FREE_ITEM(item); - NG_FREE_M(m); return (error); } @@ -916,6 +1145,68 @@ ng_pptpgre_send_ack_timeout(node_p node, hook_p hook, mtx_assert(&hpriv->mtx, MA_NOTOWNED); } +/* + * Start a timer for the reorder queue. This assumes the timer is not + * already running. + */ +static void +ng_pptpgre_start_reorder_timer(hpriv_p hpriv) +{ + int ticks; + + /* Be conservative: timeout can happen up to 1 tick early */ + ticks = (((reorder_timeout * hz) + 1000 - 1) / 1000) + 1; + ng_callout(&hpriv->reorderTimer, hpriv->node, hpriv->hook, + ticks, ng_pptpgre_reorder_timeout, hpriv, 0); +} + +/* + * The oldest packet spent too much time in the reorder queue. + * Deliver it and next packets in sequence, if any. + */ +static void +ng_pptpgre_reorder_timeout(node_p node, hook_p hook, void *arg1, int arg2) +{ + const priv_p priv = NG_NODE_PRIVATE(node); + const hpriv_p hpriv = arg1; + roqh sendq = SLIST_HEAD_INITIALIZER(sendq); + struct ng_pptpgre_roq *np, *last = NULL; + + priv->stats.recvReorderTimeouts++; + mtx_lock(&hpriv->mtx); + if (SLIST_EMPTY(&hpriv->roq)) { /* should not happen */ + mtx_unlock(&hpriv->mtx); + return; + } + + last = np = SLIST_FIRST(&hpriv->roq); + hpriv->roq_len--; + SLIST_REMOVE_HEAD(&hpriv->roq, next); + SLIST_INSERT_HEAD(&sendq, np, next); + + /* Look if we have more packets in sequence */ + while (!SLIST_EMPTY(&hpriv->roq)) { + np = SLIST_FIRST(&hpriv->roq); + if (PPTP_SEQ_DIFF(np->seq, last->seq) > 1) + break; /* the gap in the sequence */ + + /* Next packet is in sequence, move it to the sendq. */ + hpriv->roq_len--; + SLIST_REMOVE_HEAD(&hpriv->roq, next); + SLIST_INSERT_AFTER(last, np, next); + last = np; + } + + hpriv->recvSeq = last->seq; + if (!SLIST_EMPTY(&hpriv->roq)) + ng_pptpgre_start_reorder_timer(hpriv); + + /* We need to acknowledge last packet; do it soon... */ + ng_pptpgre_ack(hpriv); /* drops lock */ + ng_pptpgre_sendq(hpriv, &sendq, NULL); + mtx_assert(&hpriv->mtx, MA_NOTOWNED); +} + /************************************************************************* MISC FUNCTIONS *************************************************************************/ @@ -943,6 +1234,8 @@ ng_pptpgre_find_session(priv_p privp, u_int16_t cid) static void ng_pptpgre_reset(hpriv_p hpriv) { + struct ng_pptpgre_roq *np; + /* Reset adaptive timeout state */ hpriv->ato = PPTP_MAX_TIMEOUT; hpriv->rtt = PPTP_TIME_SCALE / 10; @@ -965,6 +1258,16 @@ ng_pptpgre_reset(hpriv_p hpriv) /* Stop timers */ ng_uncallout(&hpriv->sackTimer, hpriv->node); ng_uncallout(&hpriv->rackTimer, hpriv->node); + ng_uncallout(&hpriv->reorderTimer, hpriv->node); + + /* Clear reorder queue */ + while (!SLIST_EMPTY(&hpriv->roq)) { + np = SLIST_FIRST(&hpriv->roq); + SLIST_REMOVE_HEAD(&hpriv->roq, next); + NG_FREE_ITEM(np->item); + free(np, M_NETGRAPH); + } + hpriv->roq_len = 0; } /* Modified: head/sys/netgraph/ng_pptpgre.h ============================================================================== --- head/sys/netgraph/ng_pptpgre.h Sun Nov 4 18:52:59 2018 (r340134) +++ head/sys/netgraph/ng_pptpgre.h Sun Nov 4 19:10:44 2018 (r340135) @@ -100,6 +100,10 @@ struct ng_pptpgre_stats { u_int32_t recvLoneAcks; /* ack-only packets rec'd */ u_int32_t recvAckTimeouts; /* times peer failed to ack in time */ u_int32_t memoryFailures; /* times we couldn't allocate memory */ + u_int32_t recvReorderOverflow; /* times we dropped GRE packet + due to overflow of reorder queue */ + u_int32_t recvReorderTimeouts; /* times we flushed reorder queue + due to timeout */ }; /* Keep this in sync with the above structure definition */ @@ -120,6 +124,8 @@ struct ng_pptpgre_stats { { "recvLoneAcks", &ng_parse_uint32_type }, \ { "recvAckTimeouts", &ng_parse_uint32_type }, \ { "memoryFailures", &ng_parse_uint32_type }, \ + { "recvReorderOverflow", &ng_parse_uint32_type}, \ + { "recvReorderTimeouts", &ng_parse_uint32_type}, \ { NULL } \ } From owner-svn-src-head@freebsd.org Sun Nov 4 19:11:33 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D65F710E354A; Sun, 4 Nov 2018 19:11:33 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 65AB28189D; Sun, 4 Nov 2018 19:11:33 +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 46AC2501D; Sun, 4 Nov 2018 19:11:33 +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 wA4JBXQd007193; Sun, 4 Nov 2018 19:11:33 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JBXKv007192; Sun, 4 Nov 2018 19:11:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201811041911.wA4JBXKv007192@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov <kib@FreeBSD.org> Date: Sun, 4 Nov 2018 19:11:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340136 - head/sys/arm/include X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/arm/include X-SVN-Commit-Revision: 340136 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 65AB28189D X-Spamd-Result: default: False [-0.55 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.44)[-0.436,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:11:34 -0000 Author: kib Date: Sun Nov 4 19:11:32 2018 New Revision: 340136 URL: https://svnweb.freebsd.org/changeset/base/340136 Log: Move the fixed base for PIE loading on arm. Existing base causes conflicts for direct execution of ld-elf.so.1 because default linking base for non-PIE binaries is 0x10000. Reported and tested by: Mark Millard <marklmi26-fbsd@yahoo.com> Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/arm/include/elf.h Modified: head/sys/arm/include/elf.h ============================================================================== --- head/sys/arm/include/elf.h Sun Nov 4 19:10:44 2018 (r340135) +++ head/sys/arm/include/elf.h Sun Nov 4 19:11:32 2018 (r340136) @@ -84,7 +84,7 @@ __ElfType(Auxinfo); */ #define MAGIC_TRAMP_NUMBER 0x5c000003 -#define ET_DYN_LOAD_ADDR 0x12000 +#define ET_DYN_LOAD_ADDR 0x500000 /* Flags passed in AT_HWCAP. */ #define HWCAP_SWP 0x00000001 /* Unsupported, never set. */ From owner-svn-src-head@freebsd.org Sun Nov 4 19:21:13 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D182310E3C80; Sun, 4 Nov 2018 19:21:13 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 600BB8257E; Sun, 4 Nov 2018 19:21:13 +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 4104451AB; Sun, 4 Nov 2018 19:21:13 +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 wA4JLD3Q011481; Sun, 4 Nov 2018 19:21:13 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JLDCa011480; Sun, 4 Nov 2018 19:21:13 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811041921.wA4JLDCa011480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Sun, 4 Nov 2018 19:21:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340137 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 340137 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 600BB8257E X-Spamd-Result: default: False [-0.52 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.41)[-0.415,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:21:14 -0000 Author: emaste Date: Sun Nov 4 19:21:12 2018 New Revision: 340137 URL: https://svnweb.freebsd.org/changeset/base/340137 Log: rtld: move relro enforcement after ifunc processing Previously the combination of relro (implicit), -z now and ifunc use resulted in a segfault when applying ifuncs after relro (test binary here just calls amd64_get_fsbase()): | % env LD_DEBUG=1 libexec/rtld-elf/obj/ld-elf.so.1 a.out | ... | enforcing main obj relro | ... | resolving ifuncs | reloc_jmpslot: *0x203198 = 0x189368ea4570 | zsh: bus error (core dumped) LD_DEBUG=1 obj/ld-elf.so.1 ~/a.out Reported by: Shawn Webb Reviewed by: kib Sponsored by: The FreeBSD Foundation Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sun Nov 4 19:11:32 2018 (r340136) +++ head/libexec/rtld-elf/rtld.c Sun Nov 4 19:21:12 2018 (r340137) @@ -700,10 +700,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr if (do_copy_relocations(obj_main) == -1) rtld_die(); - dbg("enforcing main obj relro"); - if (obj_enforce_relro(obj_main) == -1) - rtld_die(); - if (getenv(_LD("DUMP_REL_POST")) != NULL) { dump_relocations(obj_main); exit (0); @@ -737,6 +733,10 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr if (resolve_objects_ifunc(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', SYMLOOK_EARLY, NULL) == -1) + rtld_die(); + + dbg("enforcing main obj relro"); + if (obj_enforce_relro(obj_main) == -1) rtld_die(); if (!obj_main->crt_no_init) { From owner-svn-src-head@freebsd.org Sun Nov 4 19:24:54 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 76C6210E8325; Sun, 4 Nov 2018 19:24: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0C88182949; Sun, 4 Nov 2018 19:24: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 E17B1530F; Sun, 4 Nov 2018 19:24: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 wA4JOrsl016326; Sun, 4 Nov 2018 19:24:53 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JOnGL016303; Sun, 4 Nov 2018 19:24:49 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041924.wA4JOnGL016303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 19:24:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340138 - in head: bin/dd sbin/dhclient sbin/md5 usr.bin/cmp usr.bin/diff usr.bin/diff3 usr.bin/elfdump usr.bin/indent usr.bin/jot usr.bin/ktrdump usr.bin/lam usr.bin/rwho usr.bin/tee u... X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: in head: bin/dd sbin/dhclient sbin/md5 usr.bin/cmp usr.bin/diff usr.bin/diff3 usr.bin/elfdump usr.bin/indent usr.bin/jot usr.bin/ktrdump usr.bin/lam usr.bin/rwho usr.bin/tee usr.bin/uniq usr.bin/units... X-SVN-Commit-Revision: 340138 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0C88182949 X-Spamd-Result: default: False [-0.53 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.42)[-0.419,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:24:54 -0000 Author: oshogbo Date: Sun Nov 4 19:24:49 2018 New Revision: 340138 URL: https://svnweb.freebsd.org/changeset/base/340138 Log: capsicum: use a new capsicum helpers in tools Use caph_{rights,ioctls,fcntls}_limit to simplify the code. Modified: head/bin/dd/dd.c head/sbin/dhclient/bpf.c head/sbin/dhclient/dhclient.c head/sbin/md5/md5.c head/usr.bin/cmp/cmp.c head/usr.bin/diff/diffreg.c head/usr.bin/diff3/diff3.c head/usr.bin/elfdump/elfdump.c head/usr.bin/indent/indent.c head/usr.bin/jot/jot.c head/usr.bin/ktrdump/ktrdump.c head/usr.bin/lam/lam.c head/usr.bin/rwho/rwho.c head/usr.bin/tee/tee.c head/usr.bin/uniq/uniq.c head/usr.bin/units/units.c head/usr.bin/write/write.c head/usr.sbin/rwhod/rwhod.c Modified: head/bin/dd/dd.c ============================================================================== --- head/bin/dd/dd.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/bin/dd/dd.c Sun Nov 4 19:24:49 2018 (r340138) @@ -157,7 +157,7 @@ setup(void) getfdtype(&in); cap_rights_init(&rights, CAP_READ, CAP_SEEK); - if (cap_rights_limit(in.fd, &rights) == -1 && errno != ENOSYS) + if (caph_rights_limit(in.fd, &rights) == -1) err(1, "unable to limit capability rights"); if (files_cnt > 1 && !(in.flags & ISTAPE)) @@ -188,10 +188,9 @@ setup(void) getfdtype(&out); - if (cap_rights_limit(out.fd, &rights) == -1 && errno != ENOSYS) + if (caph_rights_limit(out.fd, &rights) == -1) err(1, "unable to limit capability rights"); - if (cap_ioctls_limit(out.fd, cmds, nitems(cmds)) == -1 && - errno != ENOSYS) + if (caph_ioctls_limit(out.fd, cmds, nitems(cmds)) == -1) err(1, "unable to limit capability rights"); if (in.fd != STDIN_FILENO && out.fd != STDIN_FILENO) { Modified: head/sbin/dhclient/bpf.c ============================================================================== --- head/sbin/dhclient/bpf.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/sbin/dhclient/bpf.c Sun Nov 4 19:24:49 2018 (r340138) @@ -57,6 +57,8 @@ __FBSDID("$FreeBSD$"); #include <netinet/udp.h> #include <netinet/if_ether.h> +#include <capsicum_helpers.h> + #define BPF_FORMAT "/dev/bpf%d" /* @@ -164,7 +166,7 @@ if_register_send(struct interface_info *info) error("Cannot lock bpf"); cap_rights_init(&rights, CAP_WRITE); - if (cap_rights_limit(info->wfdesc, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(info->wfdesc, &rights) < 0) error("Can't limit bpf descriptor: %m"); /* @@ -270,9 +272,9 @@ if_register_receive(struct interface_info *info) error("Cannot lock bpf"); cap_rights_init(&rights, CAP_IOCTL, CAP_EVENT, CAP_READ); - if (cap_rights_limit(info->rfdesc, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(info->rfdesc, &rights) < 0) error("Can't limit bpf descriptor: %m"); - if (cap_ioctls_limit(info->rfdesc, cmds, 2) < 0 && errno != ENOSYS) + if (caph_ioctls_limit(info->rfdesc, cmds, 2) < 0) error("Can't limit ioctls for bpf descriptor: %m"); } Modified: head/sbin/dhclient/dhclient.c ============================================================================== --- head/sbin/dhclient/dhclient.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/sbin/dhclient/dhclient.c Sun Nov 4 19:24:49 2018 (r340138) @@ -512,7 +512,7 @@ main(int argc, char *argv[]) close(pipe_fd[0]); privfd = pipe_fd[1]; cap_rights_init(&rights, CAP_READ, CAP_WRITE); - if (cap_rights_limit(privfd, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(privfd, &rights) < 0) error("can't limit private descriptor: %m"); if ((fd = open(path_dhclient_db, O_RDONLY|O_EXLOCK|O_CREAT, 0)) == -1) @@ -526,7 +526,7 @@ main(int argc, char *argv[]) if (shutdown(routefd, SHUT_WR) < 0) error("can't shutdown route socket: %m"); cap_rights_init(&rights, CAP_EVENT, CAP_READ); - if (cap_rights_limit(routefd, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(routefd, &rights) < 0) error("can't limit route socket: %m"); endpwent(); @@ -1928,12 +1928,10 @@ rewrite_client_leases(void) error("can't create %s: %m", path_dhclient_db); cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_FSYNC, CAP_FTRUNCATE, CAP_SEEK, CAP_WRITE); - if (cap_rights_limit(fileno(leaseFile), &rights) < 0 && - errno != ENOSYS) { + if (caph_rights_limit(fileno(leaseFile), &rights) < 0) { error("can't limit lease descriptor: %m"); } - if (cap_fcntls_limit(fileno(leaseFile), CAP_FCNTL_GETFL) < 0 && - errno != ENOSYS) { + if (caph_fcntls_limit(fileno(leaseFile), CAP_FCNTL_GETFL) < 0) { error("can't limit lease descriptor fcntls: %m"); } } else { @@ -2460,20 +2458,24 @@ go_daemon(void) cap_rights_init(&rights); - if (pidfile != NULL) + if (pidfile != NULL) { pidfile_write(pidfile); + if (caph_rights_limit(pidfile_fileno(pidfile), &rights) < 0) + error("can't limit pidfile descriptor: %m"); + } + if (nullfd != -1) { close(nullfd); nullfd = -1; } - if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(STDIN_FILENO, &rights) < 0) error("can't limit stdin: %m"); cap_rights_init(&rights, CAP_WRITE); - if (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(STDOUT_FILENO, &rights) < 0) error("can't limit stdout: %m"); - if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(STDERR_FILENO, &rights) < 0) error("can't limit stderr: %m"); } Modified: head/sbin/md5/md5.c ============================================================================== --- head/sbin/md5/md5.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/sbin/md5/md5.c Sun Nov 4 19:24:49 2018 (r340138) @@ -242,8 +242,8 @@ main(int argc, char *argv[]) if (*(argv + 1) == NULL) { #ifdef HAVE_CAPSICUM cap_rights_init(&rights, CAP_READ); - if ((cap_rights_limit(fd, &rights) < 0 && - errno != ENOSYS) || caph_enter() < 0) + if (caph_rights_limit(fd, &rights) < 0 || + caph_enter() < 0) err(1, "capsicum"); #endif } Modified: head/usr.bin/cmp/cmp.c ============================================================================== --- head/usr.bin/cmp/cmp.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/cmp/cmp.c Sun Nov 4 19:24:49 2018 (r340138) @@ -163,22 +163,21 @@ main(int argc, char *argv[]) } cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_MMAP_R); - if (cap_rights_limit(fd1, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fd1, &rights) < 0) err(ERR_EXIT, "unable to limit rights for %s", file1); - if (cap_rights_limit(fd2, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fd2, &rights) < 0) err(ERR_EXIT, "unable to limit rights for %s", file2); /* Required for fdopen(3). */ fcntls = CAP_FCNTL_GETFL; - if (cap_fcntls_limit(fd1, fcntls) < 0 && errno != ENOSYS) + if (caph_fcntls_limit(fd1, fcntls) < 0) err(ERR_EXIT, "unable to limit fcntls for %s", file1); - if (cap_fcntls_limit(fd2, fcntls) < 0 && errno != ENOSYS) + if (caph_fcntls_limit(fd2, fcntls) < 0) err(ERR_EXIT, "unable to limit fcntls for %s", file2); if (!special) { cap_rights_init(&rights); - if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && - errno != ENOSYS) { + if (caph_rights_limit(STDIN_FILENO, &rights) < 0) { err(ERR_EXIT, "unable to limit stdio"); } } Modified: head/usr.bin/diff/diffreg.c ============================================================================== --- head/usr.bin/diff/diffreg.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/diff/diffreg.c Sun Nov 4 19:24:49 2018 (r340138) @@ -319,11 +319,9 @@ diffreg(char *file1, char *file2, int flags, int capsi if (capsicum) { cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); - if (cap_rights_limit(fileno(f1), &rights_ro) < 0 - && errno != ENOSYS) + if (caph_rights_limit(fileno(f1), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file1); - if (cap_rights_limit(fileno(f2), &rights_ro) < 0 && - errno != ENOSYS) + if (caph_rights_limit(fileno(f2), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file2); if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { /* stding has already been limited */ Modified: head/usr.bin/diff3/diff3.c ============================================================================== --- head/usr.bin/diff3/diff3.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/diff3/diff3.c Sun Nov 4 19:24:49 2018 (r340138) @@ -717,19 +717,19 @@ main(int argc, char **argv) fp[0] = fopen(file1, "r"); if (fp[0] == NULL) err(2, "Can't open %s", file1); - if (cap_rights_limit(fileno(fp[0]), &rights_ro) < 0) + if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file1); fp[1] = fopen(file2, "r"); if (fp[1] == NULL) err(2, "Can't open %s", file2); - if (cap_rights_limit(fileno(fp[1]), &rights_ro) < 0) + if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file2); fp[2] = fopen(file3, "r"); if (fp[2] == NULL) err(2, "Can't open %s", file3); - if (cap_rights_limit(fileno(fp[2]), &rights_ro) < 0) + if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) err(2, "unable to limit rights on: %s", file3); if (pipe(fd13)) Modified: head/usr.bin/elfdump/elfdump.c ============================================================================== --- head/usr.bin/elfdump/elfdump.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/elfdump/elfdump.c Sun Nov 4 19:24:49 2018 (r340138) @@ -557,7 +557,7 @@ main(int ac, char **av) if ((out = fopen(optarg, "w")) == NULL) err(1, "%s", optarg); cap_rights_init(&rights, CAP_FSTAT, CAP_WRITE); - if (cap_rights_limit(fileno(out), &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fileno(out), &rights) < 0) err(1, "unable to limit rights for %s", optarg); break; case '?': @@ -572,10 +572,10 @@ main(int ac, char **av) fstat(fd, &sb) < 0) err(1, "%s", *av); cap_rights_init(&rights, CAP_MMAP_R); - if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fd, &rights) < 0) err(1, "unable to limit rights for %s", *av); cap_rights_init(&rights); - if ((cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS) || + if (caph_rights_limit(STDIN_FILENO, &rights) < 0 || caph_limit_stdout() < 0 || caph_limit_stderr() < 0) { err(1, "unable to limit rights for stdio"); } Modified: head/usr.bin/indent/indent.c ============================================================================== --- head/usr.bin/indent/indent.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/indent/indent.c Sun Nov 4 19:24:49 2018 (r340138) @@ -245,10 +245,10 @@ main(int argc, char **argv) /* Restrict input/output descriptors and enter Capsicum sandbox. */ cap_rights_init(&rights, CAP_FSTAT, CAP_WRITE); - if (cap_rights_limit(fileno(output), &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fileno(output), &rights) < 0) err(EXIT_FAILURE, "unable to limit rights for %s", out_name); cap_rights_init(&rights, CAP_FSTAT, CAP_READ); - if (cap_rights_limit(fileno(input), &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fileno(input), &rights) < 0) err(EXIT_FAILURE, "unable to limit rights for %s", in_name); if (caph_enter() < 0) err(EXIT_FAILURE, "unable to enter capability mode"); Modified: head/usr.bin/jot/jot.c ============================================================================== --- head/usr.bin/jot/jot.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/jot/jot.c Sun Nov 4 19:24:49 2018 (r340138) @@ -114,7 +114,7 @@ main(int argc, char **argv) if (caph_limit_stdio() < 0) err(1, "unable to limit rights for stdio"); cap_rights_init(&rights); - if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(STDIN_FILENO, &rights) < 0) err(1, "unable to limit rights for stdin"); /* Modified: head/usr.bin/ktrdump/ktrdump.c ============================================================================== --- head/usr.bin/ktrdump/ktrdump.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/ktrdump/ktrdump.c Sun Nov 4 19:24:49 2018 (r340138) @@ -132,8 +132,7 @@ main(int ac, char **av) if ((in = open(optarg, O_RDONLY)) == -1) err(1, "%s", optarg); cap_rights_init(&rights, CAP_FSTAT, CAP_MMAP_R); - if (cap_rights_limit(in, &rights) < 0 && - errno != ENOSYS) + if (caph_rights_limit(in, &rights) < 0) err(1, "unable to limit rights for %s", optarg); break; Modified: head/usr.bin/lam/lam.c ============================================================================== --- head/usr.bin/lam/lam.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/lam/lam.c Sun Nov 4 19:24:49 2018 (r340138) @@ -136,8 +136,7 @@ getargs(char *av[]) else if ((ip->fp = fopen(p, "r")) == NULL) { err(1, "%s", p); } - if (cap_rights_limit(fileno(ip->fp), &rights_ro) < 0 - && errno != ENOSYS) + if (caph_rights_limit(fileno(ip->fp), &rights_ro) < 0) err(1, "unable to limit rights on: %s", p); ip->pad = P; if (!ip->sepstring) Modified: head/usr.bin/rwho/rwho.c ============================================================================== --- head/usr.bin/rwho/rwho.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/rwho/rwho.c Sun Nov 4 19:24:49 2018 (r340138) @@ -129,7 +129,7 @@ main(int argc, char *argv[]) dfd = dirfd(dirp); mp = myutmp; cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); - if (cap_rights_limit(dfd, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(dfd, &rights) < 0) err(1, "cap_rights_limit failed: %s", _PATH_RWHODIR); /* * Cache files required for time(3) and localtime(3) before entering @@ -147,7 +147,7 @@ main(int argc, char *argv[]) f = openat(dfd, dp->d_name, O_RDONLY); if (f < 0) continue; - if (cap_rights_limit(f, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(f, &rights) < 0) err(1, "cap_rights_limit failed: %s", dp->d_name); cc = read(f, (char *)&wd, sizeof(struct whod)); if (cc < WHDRSIZE) { Modified: head/usr.bin/tee/tee.c ============================================================================== --- head/usr.bin/tee/tee.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/tee/tee.c Sun Nov 4 19:24:49 2018 (r340138) @@ -147,7 +147,7 @@ add(int fd, const char *name) err(EXIT_FAILURE, "unable to limit stdout"); } else { cap_rights_init(&rights, CAP_WRITE, CAP_FSTAT); - if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fd, &rights) < 0) err(EXIT_FAILURE, "unable to limit rights"); } Modified: head/usr.bin/uniq/uniq.c ============================================================================== --- head/usr.bin/uniq/uniq.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/uniq/uniq.c Sun Nov 4 19:24:49 2018 (r340138) @@ -143,14 +143,14 @@ main (int argc, char *argv[]) if (argc > 0 && strcmp(argv[0], "-") != 0) ifp = file(ifn = argv[0], "r"); cap_rights_init(&rights, CAP_FSTAT, CAP_READ); - if (cap_rights_limit(fileno(ifp), &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(fileno(ifp), &rights) < 0) err(1, "unable to limit rights for %s", ifn); cap_rights_init(&rights, CAP_FSTAT, CAP_WRITE); if (argc > 1) ofp = file(argv[1], "w"); else cap_rights_set(&rights, CAP_IOCTL); - if (cap_rights_limit(fileno(ofp), &rights) < 0 && errno != ENOSYS) { + if (caph_rights_limit(fileno(ofp), &rights) < 0) { err(1, "unable to limit rights for %s", argc > 1 ? argv[1] : "stdout"); } @@ -159,8 +159,7 @@ main (int argc, char *argv[]) cmd = TIOCGETA; /* required by isatty(3) in printf(3) */ - if (cap_ioctls_limit(fileno(ofp), &cmd, 1) < 0 && - errno != ENOSYS) { + if (caph_ioctls_limit(fileno(ofp), &cmd, 1) < 0) { err(1, "unable to limit ioctls for %s", argc > 1 ? argv[1] : "stdout"); } Modified: head/usr.bin/units/units.c ============================================================================== --- head/usr.bin/units/units.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/units/units.c Sun Nov 4 19:24:49 2018 (r340138) @@ -156,8 +156,7 @@ readunits(const char *userfile) } } cap_rights_init(&unitfilerights, CAP_READ, CAP_FSTAT); - if (cap_rights_limit(fileno(unitfile), &unitfilerights) < 0 - && errno != ENOSYS) + if (caph_rights_limit(fileno(unitfile), &unitfilerights) < 0) err(1, "cap_rights_limit() failed"); while (!feof(unitfile)) { if (!fgets(line, sizeof(line), unitfile)) Modified: head/usr.bin/write/write.c ============================================================================== --- head/usr.bin/write/write.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.bin/write/write.c Sun Nov 4 19:24:49 2018 (r340138) @@ -97,7 +97,7 @@ main(int argc, char **argv) err(1, "open(/dev)"); cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL, CAP_LOOKUP, CAP_PWRITE); - if (cap_rights_limit(devfd, &rights) < 0 && errno != ENOSYS) + if (caph_rights_limit(devfd, &rights) < 0) err(1, "can't limit devfd rights"); /* @@ -106,15 +106,15 @@ main(int argc, char **argv) */ cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL, CAP_READ, CAP_WRITE); - if ((cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS) || - (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS) || - (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS) || - (cap_ioctls_limit(STDIN_FILENO, cmds, nitems(cmds)) < 0 && errno != ENOSYS) || - (cap_ioctls_limit(STDOUT_FILENO, cmds, nitems(cmds)) < 0 && errno != ENOSYS) || - (cap_ioctls_limit(STDERR_FILENO, cmds, nitems(cmds)) < 0 && errno != ENOSYS) || - (cap_fcntls_limit(STDIN_FILENO, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) || - (cap_fcntls_limit(STDOUT_FILENO, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) || - (cap_fcntls_limit(STDERR_FILENO, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS)) + if (caph_rights_limit(STDIN_FILENO, &rights) < 0 || + caph_rights_limit(STDOUT_FILENO, &rights) < 0 || + caph_rights_limit(STDERR_FILENO, &rights) < 0 || + caph_ioctls_limit(STDIN_FILENO, cmds, nitems(cmds)) < 0 || + caph_ioctls_limit(STDOUT_FILENO, cmds, nitems(cmds)) < 0 || + caph_ioctls_limit(STDERR_FILENO, cmds, nitems(cmds)) < 0 || + caph_fcntls_limit(STDIN_FILENO, CAP_FCNTL_GETFL) < 0 || + caph_fcntls_limit(STDOUT_FILENO, CAP_FCNTL_GETFL) < 0 || + caph_fcntls_limit(STDERR_FILENO, CAP_FCNTL_GETFL) < 0) err(1, "can't limit stdio rights"); caph_cache_catpages(); Modified: head/usr.sbin/rwhod/rwhod.c ============================================================================== --- head/usr.sbin/rwhod/rwhod.c Sun Nov 4 19:21:12 2018 (r340137) +++ head/usr.sbin/rwhod/rwhod.c Sun Nov 4 19:24:49 2018 (r340138) @@ -369,7 +369,7 @@ receiver_process(void) } cap_rights_init(&rights, CAP_CREATE, CAP_FSTAT, CAP_FTRUNCATE, CAP_LOOKUP, CAP_SEEK, CAP_WRITE); - if (cap_rights_limit(dirfd, &rights) < 0 && errno != ENOSYS) { + if (caph_rights_limit(dirfd, &rights) < 0) { syslog(LOG_WARNING, "cap_rights_limit: %m"); exit(1); } @@ -415,7 +415,7 @@ receiver_process(void) continue; } cap_rights_init(&rights, CAP_FSTAT, CAP_FTRUNCATE, CAP_WRITE); - if (cap_rights_limit(whod, &rights) < 0 && errno != ENOSYS) { + if (caph_rights_limit(whod, &rights) < 0) { syslog(LOG_WARNING, "cap_rights_limit: %m"); exit(1); } From owner-svn-src-head@freebsd.org Sun Nov 4 19:29:20 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5349610E8563; Sun, 4 Nov 2018 19:29:20 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CEAF182BAF; Sun, 4 Nov 2018 19:29:19 +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 AFDB7531A; Sun, 4 Nov 2018 19:29:19 +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 wA4JTJ0a016545; Sun, 4 Nov 2018 19:29:19 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JTJTN016543; Sun, 4 Nov 2018 19:29:19 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041929.wA4JTJTN016543@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 19:29:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340139 - head/lib/libcasper/services/cap_dns X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/lib/libcasper/services/cap_dns X-SVN-Commit-Revision: 340139 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CEAF182BAF X-Spamd-Result: default: False [-0.40 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.29)[-0.290,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:29:20 -0000 Author: oshogbo Date: Sun Nov 4 19:29:19 2018 New Revision: 340139 URL: https://svnweb.freebsd.org/changeset/base/340139 Log: libcasper: Document the cap_getaddrinfo and cap_getnameinfo functions Reviewed by: hrs Differential Revision: https://reviews.freebsd.org/D16929 Modified: head/lib/libcasper/services/cap_dns/Makefile head/lib/libcasper/services/cap_dns/cap_dns.3 Modified: head/lib/libcasper/services/cap_dns/Makefile ============================================================================== --- head/lib/libcasper/services/cap_dns/Makefile Sun Nov 4 19:24:49 2018 (r340138) +++ head/lib/libcasper/services/cap_dns/Makefile Sun Nov 4 19:29:19 2018 (r340139) @@ -30,6 +30,7 @@ MLINKS+=cap_dns.3 libcap_dns.3 MLINKS+=cap_dns.3 cap_gethostbyname.3 MLINKS+=cap_dns.3 cap_gethostbyname2.3 MLINKS+=cap_dns.3 cap_gethostbyaddr.3 +MLINKS+=cap_dns.3 cap_getaddrinfo.3 MLINKS+=cap_dns.3 cap_getnameinfo.3 MLINKS+=cap_dns.3 cap_dns_type_limit.3 MLINKS+=cap_dns.3 cap_dns_family_limit.3 Modified: head/lib/libcasper/services/cap_dns/cap_dns.3 ============================================================================== --- head/lib/libcasper/services/cap_dns/cap_dns.3 Sun Nov 4 19:24:49 2018 (r340138) +++ head/lib/libcasper/services/cap_dns/cap_dns.3 Sun Nov 4 19:29:19 2018 (r340139) @@ -24,14 +24,15 @@ .\" .\" $FreeBSD$ .\" -.Dd March 18, 2018 +.Dd November 4, 2018 .Dt CAP_DNS 3 .Os .Sh NAME +.Nm cap_getaddrinfo , +.Nm cap_getnameinfo , .Nm cap_gethostbyname , .Nm cap_gethostbyname2 , .Nm cap_gethostbyaddr , -.Nm cap_getnameinfo , .Nm cap_dns_type_limit , .Nm cap_dns_family_limit .Nd "library for getting network host entry in capability mode" @@ -41,6 +42,10 @@ .In sys/nv.h .In libcasper.h .In casper/cap_dns.h +.Ft int +.Fn cap_getaddrinfo "cap_channel_t *chan" "const char *hostname" "const char *servname" "const struct addrinfo *hints" "struct addrinfo **res" +.Ft int +.Fn cap_getnameinfo "cap_channel_t *chan" "const struct sockaddr *sa" "socklen_t salen" "char *host" "size_t hostlen" "char *serv" "size_t servlen" "int flags" .Ft "struct hostent *" .Fn cap_gethostbyname "const cap_channel_t *chan" "const char *name" .Ft "struct hostent *" @@ -48,12 +53,23 @@ .Ft "struct hostent *" .Fn cap_gethostbyaddr "const cap_channel_t *chan" "const void *addr" "socklen_t len" "int af" .Ft "int" -.Fn cap_getnameinfo "const cap_channel_t *chan" "const void *name" "int namelen" -.Ft "int" .Fn cap_dns_type_limit "cap_channel_t *chan" "const char * const *types" "size_t ntypes" .Ft "int" .Fn cap_dns_family_limit "const cap_channel_t *chan" "const int *families" "size_t nfamilies" .Sh DESCRIPTION +.Bf -symbolic +The +.Fn cap_getaddrinfo , +and +.Fn cap_getnameinfo , +functions are preferred over the +.Fn cap_gethostbyname , +.Fn cap_gethostbyname2 , +and +.Fn cap_gethostbyaddr +functions. +.Ef +.Pp The functions .Fn cap_gethostbyname , .Fn cap_gethostbyname2 , From owner-svn-src-head@freebsd.org Sun Nov 4 19:31:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C0F8310E882B; Sun, 4 Nov 2018 19:31:45 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4E9DD82F4C; Sun, 4 Nov 2018 19:31:45 +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 18AEC538F; Sun, 4 Nov 2018 19:31:45 +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 wA4JViu8020413; Sun, 4 Nov 2018 19:31:44 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JViqI020412; Sun, 4 Nov 2018 19:31:44 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041931.wA4JViqI020412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 19:31:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340140 - head/lib/libcasper/services/cap_dns X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/lib/libcasper/services/cap_dns X-SVN-Commit-Revision: 340140 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4E9DD82F4C X-Spamd-Result: default: False [-0.40 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.29)[-0.288,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:31:46 -0000 Author: oshogbo Date: Sun Nov 4 19:31:44 2018 New Revision: 340140 URL: https://svnweb.freebsd.org/changeset/base/340140 Log: libcasper: Update example in man page to use cap_getnameinfo function. Reviewed by: hrs Differential Revision: https://reviews.freebsd.org/D16931 Modified: head/lib/libcasper/services/cap_dns/cap_dns.3 Modified: head/lib/libcasper/services/cap_dns/cap_dns.3 ============================================================================== --- head/lib/libcasper/services/cap_dns/cap_dns.3 Sun Nov 4 19:29:19 2018 (r340139) +++ head/lib/libcasper/services/cap_dns/cap_dns.3 Sun Nov 4 19:31:44 2018 (r340140) @@ -160,19 +160,22 @@ capability to create the casper service and uses it to resolve an IP address. .Bd -literal cap_channel_t *capcas, *capdns; -const char *typelimit = "ADDR"; -int familylimit; +int familylimit, error; const char *ipstr = "127.0.0.1"; -struct in_addr ip; -struct hostent *hp; +const char *typelimit = "ADDR"; +char hname[NI_MAXHOST]; +struct addrinfo hints, *res; /* Open capability to Casper. */ capcas = cap_init(); if (capcas == NULL) err(1, "Unable to contact Casper"); +/* Cache NLA for gai_strerror. */ +caph_cache_catpages(); + /* Enter capability mode sandbox. */ -if (cap_enter() < 0 && errno != ENOSYS) +if (caph_enter() < 0) err(1, "Unable to enter capability mode"); /* Use Casper capability to create capability to the system.dns service. */ @@ -183,28 +186,34 @@ if (capdns == NULL) /* Close Casper capability, we don't need it anymore. */ cap_close(capcas); -/* Limit system.dns to reverse DNS lookups. */ -if (cap_dns_type_limit(capdns, &typelimit, 1) < 0) - err(1, "Unable to limit access to the system.dns service"); - /* Limit system.dns to reserve IPv4 addresses */ familylimit = AF_INET; if (cap_dns_family_limit(capdns, &familylimit, 1) < 0) err(1, "Unable to limit access to the system.dns service"); -/* Convert IP address in C-string to in_addr. */ -if (!inet_aton(ipstr, &ip)) - errx(1, "Unable to parse IP address %s.", ipstr); +/* Convert IP address in C-string to struct sockaddr. */ +memset(&hints, 0, sizeof(hints)); +hints.ai_family = familylimit; +hints.ai_flags = AI_NUMERICHOST; +error = cap_getaddrinfo(capdns, ipstr, NULL, &hints, &res); +if (error != 0) + errx(1, "cap_getaddrinfo(): %s: %s", ipstr, gai_strerror(error)); +/* Limit system.dns to reverse DNS lookups. */ +if (cap_dns_type_limit(capdns, &typelimit, 1) < 0) + err(1, "Unable to limit access to the system.dns service"); + /* Find hostname for the given IP address. */ -hp = cap_gethostbyaddr(capdns, (const void *)&ip, sizeof(ip), AF_INET); -if (hp == NULL) - errx(1, "No name associated with %s.", ipstr); +error = cap_getnameinfo(capdns, res->ai_addr, res->ai_addrlen, hname, sizeof(hname), + NULL, 0, 0); +if (error != 0) + errx(1, "cap_getnameinfo(): %s: %s", ipstr, gai_strerror(error)); -printf("Name associated with %s is %s.\\n", ipstr, hp->h_name); +printf("Name associated with %s is %s.\\n", ipstr, hname); .Ed .Sh SEE ALSO .Xr cap_enter 2 , +.Xr caph_enter 3 , .Xr err 3 , .Xr gethostbyaddr 3 , .Xr gethostbyname 3 , From owner-svn-src-head@freebsd.org Sun Nov 4 19:38:56 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 37E8110E8ADA; Sun, 4 Nov 2018 19:38:56 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 564DD8326A; Sun, 4 Nov 2018 19:38:55 +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 1CA7954F0; Sun, 4 Nov 2018 19:38:55 +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 wA4Jcsva021681; Sun, 4 Nov 2018 19:38:54 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4Jcsoh021678; Sun, 4 Nov 2018 19:38:54 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041938.wA4Jcsoh021678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 19:38:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340141 - in head/lib/libcasper/services/cap_dns: . tests X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: in head/lib/libcasper/services/cap_dns: . tests X-SVN-Commit-Revision: 340141 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 564DD8326A X-Spamd-Result: default: False [-0.44 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.33)[-0.327,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:38:56 -0000 Author: oshogbo Date: Sun Nov 4 19:38:54 2018 New Revision: 340141 URL: https://svnweb.freebsd.org/changeset/base/340141 Log: libcasper: fix limitations in dns service The getaddrinfo(3) and gethostbyname(3) are used to return the address for a given hostname. The getnameinfo(3) and gethostbyaddr(3) are used to return hostname for a given address. Right now in casper, we have two limitations: - NAME which allows resolving DNS names. - ADDR which allows to do revert DNS lookups. Before this change the rights was mixed up: NAME - getnameinfo(3) and gethostbyname(3) ADDR - gethostbyaddr(3) and getaddrinfo(3) Which no matters on limitation allowed us to resolve DNS names and do DNS lookups basically by using a different set of functions. Now the NAME type allows getaddrinfo(3) and gethostbyname (3)functions, and the ADDR names allow to use gethostbyaddr(3) and getnameinfo(3) functions. Reviewed by: pjd, bcr MFC after: 3 weeks Discussed with: hrs Differential Revision: https://reviews.freebsd.org/D16930 Modified: head/lib/libcasper/services/cap_dns/cap_dns.3 head/lib/libcasper/services/cap_dns/cap_dns.c head/lib/libcasper/services/cap_dns/tests/dns_test.c Modified: head/lib/libcasper/services/cap_dns/cap_dns.3 ============================================================================== --- head/lib/libcasper/services/cap_dns/cap_dns.3 Sun Nov 4 19:31:44 2018 (r340140) +++ head/lib/libcasper/services/cap_dns/cap_dns.3 Sun Nov 4 19:38:54 2018 (r340141) @@ -134,19 +134,21 @@ or .Dv NAME . The .Dv ADDR -means that functions -.Fn cap_gethostbyname , -.Fn cap_gethostbyname2 +means that reverse DNS lookups are allowed with +.Fn cap_getnameinfo and .Fn cap_gethostbyaddr -are allowed. +functions. In case when .Va type is set to .Dv NAME -the -.Fn cap_getnameinfo -function is allowed. +the name resolution is allowed with +.Fn cap_getaddrinfo , +.Fn cap_gethostbyname , +and +.Fn cap_gethostbyname2 +functions. .It family ( NV_TYPE_NUMBER ) The .Va family Modified: head/lib/libcasper/services/cap_dns/cap_dns.c ============================================================================== --- head/lib/libcasper/services/cap_dns/cap_dns.c Sun Nov 4 19:31:44 2018 (r340140) +++ head/lib/libcasper/services/cap_dns/cap_dns.c Sun Nov 4 19:38:54 2018 (r340141) @@ -524,7 +524,7 @@ dns_getnameinfo(const nvlist_t *limits, const nvlist_t socklen_t salen; int error, flags; - if (!dns_allowed_type(limits, "NAME")) + if (!dns_allowed_type(limits, "ADDR")) return (NO_RECOVERY); error = 0; @@ -617,7 +617,7 @@ dns_getaddrinfo(const nvlist_t *limits, const nvlist_t unsigned int ii; int error, family, n; - if (!dns_allowed_type(limits, "ADDR")) + if (!dns_allowed_type(limits, "NAME")) return (NO_RECOVERY); hostname = dnvlist_get_string(nvlin, "hostname", NULL); Modified: head/lib/libcasper/services/cap_dns/tests/dns_test.c ============================================================================== --- head/lib/libcasper/services/cap_dns/tests/dns_test.c Sun Nov 4 19:31:44 2018 (r340140) +++ head/lib/libcasper/services/cap_dns/tests/dns_test.c Sun Nov 4 19:38:54 2018 (r340141) @@ -393,7 +393,8 @@ main(void) CHECK(cap_dns_family_limit(capdns, families, 2) == 0); CHECK(runtest(capdns) == - (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6)); + (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 | + GETADDRINFO_AF_INET | GETADDRINFO_AF_INET6)); cap_close(capdns); @@ -419,9 +420,7 @@ main(void) CHECK(cap_dns_family_limit(capdns, families, 2) == 0); CHECK(runtest(capdns) == - (GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6 | - GETADDRINFO_AF_INET | GETADDRINFO_AF_INET6)); - + (GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6)); cap_close(capdns); /* @@ -512,7 +511,8 @@ main(void) CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capdns) == (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET)); + CHECK(runtest(capdns) == + (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETADDRINFO_AF_INET)); cap_close(capdns); @@ -548,7 +548,8 @@ main(void) CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capdns) == GETHOSTBYNAME2_AF_INET6); + CHECK(runtest(capdns) == + (GETHOSTBYNAME2_AF_INET6 | GETADDRINFO_AF_INET6)); cap_close(capdns); @@ -584,7 +585,7 @@ main(void) CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capdns) == (GETHOSTBYADDR_AF_INET | GETADDRINFO_AF_INET)); + CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET); cap_close(capdns); @@ -620,8 +621,7 @@ main(void) CHECK(cap_dns_family_limit(capdns, families, 1) == -1 && errno == ENOTCAPABLE); - CHECK(runtest(capdns) == (GETHOSTBYADDR_AF_INET6 | - GETADDRINFO_AF_INET6)); + CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET6); cap_close(capdns); @@ -657,7 +657,8 @@ main(void) errno == ENOTCAPABLE); /* Do the limits still hold? */ - CHECK(runtest(capdns) == (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET)); + CHECK(runtest(capdns) == (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | + GETADDRINFO_AF_INET)); cap_close(capdns); @@ -691,8 +692,7 @@ main(void) errno == ENOTCAPABLE); /* Do the limits still hold? */ - CHECK(runtest(capdns) == (GETHOSTBYADDR_AF_INET6 | - GETADDRINFO_AF_INET6)); + CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET6); cap_close(capdns); From owner-svn-src-head@freebsd.org Sun Nov 4 19:44:00 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4A53110E8E11; Sun, 4 Nov 2018 19:44:00 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 93A2E836FF; Sun, 4 Nov 2018 19:43: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 7486D5697; Sun, 4 Nov 2018 19:43: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 wA4Jhx9r026651; Sun, 4 Nov 2018 19:43:59 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4JhxWO026650; Sun, 4 Nov 2018 19:43:59 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811041943.wA4JhxWO026650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 19:43:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340142 - head/lib/libcasper/services/cap_grp X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/lib/libcasper/services/cap_grp X-SVN-Commit-Revision: 340142 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 93A2E836FF X-Spamd-Result: default: False [-0.40 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.29)[-0.293,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 19:44:00 -0000 Author: oshogbo Date: Sun Nov 4 19:43:59 2018 New Revision: 340142 URL: https://svnweb.freebsd.org/changeset/base/340142 Log: libcasper: using explicit_bzero in cap_grp service Please notice that we still don't clean information in nvlist structures. Submitted by: David CARLIER <devnexen@gmail.com> Differential Revision: https://reviews.freebsd.org/D16777 Modified: head/lib/libcasper/services/cap_grp/cap_grp.c Modified: head/lib/libcasper/services/cap_grp/cap_grp.c ============================================================================== --- head/lib/libcasper/services/cap_grp/cap_grp.c Sun Nov 4 19:38:54 2018 (r340141) +++ head/lib/libcasper/services/cap_grp/cap_grp.c Sun Nov 4 19:43:59 2018 (r340142) @@ -157,7 +157,7 @@ group_unpack(const nvlist_t *nvl, struct group *grp, c if (!nvlist_exists_string(nvl, "gr_name")) return (EINVAL); - memset(grp, 0, sizeof(*grp)); + explicit_bzero(grp, sizeof(*grp)); error = group_unpack_string(nvl, "gr_name", &grp->gr_name, &buffer, &bufsize); From owner-svn-src-head@freebsd.org Sun Nov 4 20:26:30 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4C83210EA442; Sun, 4 Nov 2018 20:26:30 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C819984D08; Sun, 4 Nov 2018 20:26:29 +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 A35E45D23; Sun, 4 Nov 2018 20:26:29 +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 wA4KQTEs047021; Sun, 4 Nov 2018 20:26:29 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4KQToh047020; Sun, 4 Nov 2018 20:26:29 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811042026.wA4KQToh047020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Sun, 4 Nov 2018 20:26:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340143 - head/sbin/ping X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sbin/ping X-SVN-Commit-Revision: 340143 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C819984D08 X-Spamd-Result: default: False [-0.65 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.54)[-0.540,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 20:26:30 -0000 Author: oshogbo Date: Sun Nov 4 20:26:29 2018 New Revision: 340143 URL: https://svnweb.freebsd.org/changeset/base/340143 Log: ping: simplify use of Casper There is no need to check if capdns is NULL. If we will build the system without casper all cap_gethostaddr will be replaced by the standard functions. Modified: head/sbin/ping/ping.c Modified: head/sbin/ping/ping.c ============================================================================== --- head/sbin/ping/ping.c Sun Nov 4 19:43:59 2018 (r340142) +++ head/sbin/ping/ping.c Sun Nov 4 20:26:29 2018 (r340143) @@ -566,11 +566,7 @@ main(int argc, char *const *argv) if (inet_aton(source, &sock_in.sin_addr) != 0) { shostname = source; } else { - if (capdns != NULL) - hp = cap_gethostbyname2(capdns, source, - AF_INET); - else - hp = gethostbyname2(source, AF_INET); + hp = cap_gethostbyname2(capdns, source, AF_INET); if (!hp) errx(EX_NOHOST, "cannot resolve %s: %s", source, hstrerror(h_errno)); @@ -598,10 +594,7 @@ main(int argc, char *const *argv) if (inet_aton(target, &to->sin_addr) != 0) { hostname = target; } else { - if (capdns != NULL) - hp = cap_gethostbyname2(capdns, target, AF_INET); - else - hp = gethostbyname2(target, AF_INET); + hp = cap_gethostbyname2(capdns, target, AF_INET); if (!hp) errx(EX_NOHOST, "cannot resolve %s: %s", target, hstrerror(h_errno)); @@ -1693,10 +1686,7 @@ pr_addr(struct in_addr ina) if (options & F_NUMERIC) return inet_ntoa(ina); - if (capdns != NULL) - hp = cap_gethostbyaddr(capdns, (char *)&ina, 4, AF_INET); - else - hp = gethostbyaddr((char *)&ina, 4, AF_INET); + hp = cap_gethostbyaddr(capdns, (char *)&ina, 4, AF_INET); if (hp == NULL) return inet_ntoa(ina); From owner-svn-src-head@freebsd.org Sun Nov 4 22:09:38 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0E5A110EEB69 for <svn-src-head@mailman.ysv.freebsd.org>; Sun, 4 Nov 2018 22:09:38 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw1-xc2c.google.com (mail-yw1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 74E008A0A7 for <svn-src-head@freebsd.org>; Sun, 4 Nov 2018 22:09:36 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw1-xc2c.google.com with SMTP id h21-v6so2923069ywa.3 for <svn-src-head@freebsd.org>; Sun, 04 Nov 2018 14:09:36 -0800 (PST) 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=flseR0bxkbgGjzyaaLoP6yPLJUGvNz3VN0SLeod+q/E=; b=G4gQQWSPm9kcCxMn3eKT7SLDdnu75cQoRkRecKyIEBYwWunTizOnn/22voitAzWEzG 2KwT4ZJH28YheB4a2VrV5P/Od1quiy4uAwXbTzYw85COR8/CSEH7fUzoHEuSrAdCR7K9 xyfoaQiGDnJ/x2ugWtf8e+gA+pETLQPeTNlY4FdI7RUCRUysPUtfrcocHsjoqZqRb6zA uL1MGUadI2wXCSap8KDlaBdUT7NkJGoKqbKbjSTSIHQLDnOKxDy8ApuvTinlKCTVMk4h Z4TOZJQNHfizWQvdpjjD04dthr0qsCeBasTkFkISHxCnPgQiUOM8gEB49BZP4W1etYA6 uBUw== 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=flseR0bxkbgGjzyaaLoP6yPLJUGvNz3VN0SLeod+q/E=; b=EH0dSr+r4OwXaRI2ZTAtdTL/5z62928mvXJF0WQf0SAJhgNT7BppvtM8vgVu9++rY3 0h6O520EKP2YR+C0s9wJ2jjd4JR2DU37FGYls0XuaBmOvfqsfjH1HvBFSPi+T9hVn/Id skE8ojWhDTgW0VAxLbvyRYxx1990PVu1AwWU2AWU7Grj19q+2kNzYjQIqHO8RijwEaIr SOOri1p63JJxJTIKGMoZOzrkoFn/LsmWQhsY3xvu9XStAATl2ma7N1NTCTjp7YQd1VgQ ZdPWiwYTWvLxG58jISEEUec8vBbo8XJsUKwhr5H9BOQX/r9T3cq9U2S+B6QgMReB46tr YMEA== X-Gm-Message-State: AGRZ1gIhgg7rV4nN0LoFmBkgHQ/ac765Yo5bSTMvB+5cg+LVlR7EMQ6Q cuW4NHDSd1u/fs58V96GhTTiHnBvjLoNtmD8V0Ey7w== X-Google-Smtp-Source: AJdET5dw84KVWx3FgUBIDYLbM/L+GVU3DFUN0uYi3o42eTYyi1n/p68MiP9LBhfoc/2JdsZrvJkjC5RKxwjTBPCOpQE= X-Received: by 2002:a0d:e081:: with SMTP id j123-v6mr18890224ywe.267.1541369375827; Sun, 04 Nov 2018 14:09:35 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a25:b901:0:0:0:0:0 with HTTP; Sun, 4 Nov 2018 14:09:35 -0800 (PST) In-Reply-To: <201810221939.w9MJdKiW071014@repo.freebsd.org> References: <201810221939.w9MJdKiW071014@repo.freebsd.org> From: Oliver Pinter <oliver.pinter@hardenedbsd.org> Date: Sun, 4 Nov 2018 23:09:35 +0100 Message-ID: <CAPQ4fft9F6cVjVOn+3AT9FLx8EvC6g9W3kAFq-md-BVz6y7GBw@mail.gmail.com> Subject: Re: svn commit: r339609 - in head/release: amd64 i386 powerpc sparc64 To: Ed Maste <emaste@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 74E008A0A7 X-Spamd-Result: default: False [-0.72 / 200.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; MX_GOOD(-0.01)[cached: alt1.aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[c.2.c.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.01)[-0.005,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.20)[ipnet: 2607:f8b0::/32(0.22), asn: 15169(-1.16), country: US(-0.07)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 22:09:38 -0000 On 10/22/18, Ed Maste <emaste@freebsd.org> wrote: > Author: emaste > Date: Mon Oct 22 19:39:20 2018 > New Revision: 339609 > URL: https://svnweb.freebsd.org/changeset/base/339609 > > Log: > release: set -e to exit on error in iso image scripts > > Reviewed by: gjb > Differential Revision: https://reviews.freebsd.org/D17651 > > Modified: > head/release/amd64/mkisoimages.sh > head/release/i386/mkisoimages.sh > head/release/powerpc/mkisoimages.sh > head/release/sparc64/mkisoimages.sh > > Modified: head/release/amd64/mkisoimages.sh This commit catches an warning / error in cd generation for amd64, with this error: >>> Installing everything completed on Mon Oct 22 18:07:00 UTC 2018 -------------------------------------------------------------- 1+0 records in 1+0 records out 4096 bytes transferred in 0.000197 secs (20757002 bytes/sec) 200+0 records in 200+0 records out 819200 bytes transferred in 0.020971 secs (39064121 bytes/sec) newfs_msdos: cannot get number of sectors per track: Operation not supported newfs_msdos: cannot get number of heads: Operation not supported newfs_msdos: trim 25 sectors to adjust to a multiple of 63 /dev/md0: 1532 sectors in 1532 FAT12 clusters (512 bytes/cluster) BytesPerSec=512 SecPerClust=1 ResSectors=1 FATs=2 RootDirEnts=512 Sectors=1575 Media=0xf8 FATsecs=5 SecPerTrack=63 Heads=1 HiddenSecs=0 cp: chown: efi/efi/boot/bootx64.efi: Invalid argument 1+0 records in 1+0 records out The last working cd generation was before this commit: https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-amd64/1361/console And after this commit it breaks on the above line: https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-amd64/ in ${SRCTOP}/release/amd64/mkisoimages.sh the -p option can't work when you copy to a FAT FS, so the easiest fix would be to remove the -p option from cp's line. Other problem with a script after the set -e changes, that if something fails, no one cleans up the created md devices. > ============================================================================== > --- head/release/amd64/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) > +++ head/release/amd64/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) > @@ -23,6 +23,8 @@ > # extra-bits-dir, if provided, contains additional files to be merged > # into base-bits-dir as part of making the image. > > +set -e > + > if [ -z $ETDUMP ]; then > ETDUMP=etdump > fi > > Modified: head/release/i386/mkisoimages.sh > ============================================================================== > --- head/release/i386/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) > +++ head/release/i386/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) > @@ -23,6 +23,8 @@ > # extra-bits-dir, if provided, contains additional files to be merged > # into base-bits-dir as part of making the image. > > +set -e > + > if [ "$1" = "-b" ]; then > # This is highly x86-centric and will be used directly below. > bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" > > Modified: head/release/powerpc/mkisoimages.sh > ============================================================================== > --- head/release/powerpc/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) > +++ head/release/powerpc/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) > @@ -23,6 +23,7 @@ > # extra-bits-dir, if provided, contains additional files to be merged > # into base-bits-dir as part of making the image. > > +set -e > > if [ "$1" = "-b" ]; then > bootable=1 > > Modified: head/release/sparc64/mkisoimages.sh > ============================================================================== > --- head/release/sparc64/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) > +++ head/release/sparc64/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) > @@ -22,6 +22,8 @@ > # resulting ISO image, base-bits-dir contains the image contents and > # extra-bits-dir, if provided, contains additional files to be merged > # into base-bits-dir as part of making the image. > +set -e > + > if [ $# -lt 3 ]; then > echo "Usage: $0 [-b] image-label image-name base-bits-dir > [extra-bits-dir]" > /dev/stderr > exit 1 > _______________________________________________ > 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 Nov 4 22:13:24 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 12D7710EEDE7; Sun, 4 Nov 2018 22:13:24 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CED18A4FB; Sun, 4 Nov 2018 22:13:23 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 58FF66F35; Sun, 4 Nov 2018 22:13:23 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4MDNi4003699; Sun, 4 Nov 2018 22:13:23 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4MDMdQ003695; Sun, 4 Nov 2018 22:13:22 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201811042213.wA4MDMdQ003695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov <yuripv@FreeBSD.org> Date: Sun, 4 Nov 2018 22:13:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340144 - in head: lib/libc/locale share/ctypedef tools/tools/locale tools/tools/locale/tools X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: in head: lib/libc/locale share/ctypedef tools/tools/locale tools/tools/locale/tools X-SVN-Commit-Revision: 340144 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7CED18A4FB X-Spamd-Result: default: False [-0.55 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.44)[-0.444,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 04 Nov 2018 22:13:24 -0000 Author: yuripv Date: Sun Nov 4 22:13:22 2018 New Revision: 340144 URL: https://svnweb.freebsd.org/changeset/base/340144 Log: Add hybrid C.UTF-8 locale being identical to default C locale except that it uses the same ctype maps and functions as other UTF-8 locales. Reviewed by: bapt, cem, eadler Approved by: kib (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17833 Added: head/share/ctypedef/C.UTF-8.src - copied unchanged from r340143, head/share/ctypedef/en_US.UTF-8.src Deleted: head/share/ctypedef/en_US.UTF-8.src Modified: head/lib/libc/locale/collate.c head/lib/libc/locale/ldpart.c head/share/ctypedef/Makefile head/tools/tools/locale/Makefile head/tools/tools/locale/tools/cldr2def.pl Modified: head/lib/libc/locale/collate.c ============================================================================== --- head/lib/libc/locale/collate.c Sun Nov 4 20:26:29 2018 (r340143) +++ head/lib/libc/locale/collate.c Sun Nov 4 22:13:22 2018 (r340144) @@ -84,7 +84,8 @@ destruct_collate(void *t) void * __collate_load(const char *encoding, __unused locale_t unused) { - if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { + if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0 || + strncmp(encoding, "C.", 2) == 0) { return &__xlocale_C_collate; } struct xlocale_collate *table = calloc(sizeof(struct xlocale_collate), 1); @@ -122,7 +123,8 @@ __collate_load_tables_l(const char *encoding, struct x table->__collate_load_error = 1; /* 'encoding' must be already checked. */ - if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { + if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0 || + strncmp(encoding, "C.", 2) == 0) { return (_LDP_CACHE); } Modified: head/lib/libc/locale/ldpart.c ============================================================================== --- head/lib/libc/locale/ldpart.c Sun Nov 4 20:26:29 2018 (r340143) +++ head/lib/libc/locale/ldpart.c Sun Nov 4 22:13:22 2018 (r340144) @@ -63,7 +63,8 @@ __part_load_locale(const char *name, size_t namesize, bufsize; /* 'name' must be already checked. */ - if (strcmp(name, "C") == 0 || strcmp(name, "POSIX") == 0) { + if (strcmp(name, "C") == 0 || strcmp(name, "POSIX") == 0 || + strncmp(name, "C.", 2) == 0) { *using_locale = 0; return (_LDP_CACHE); } Copied: head/share/ctypedef/C.UTF-8.src (from r340143, head/share/ctypedef/en_US.UTF-8.src) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/ctypedef/C.UTF-8.src Sun Nov 4 22:13:22 2018 (r340144, copy of r340143, head/share/ctypedef/en_US.UTF-8.src) @@ -0,0 +1,6372 @@ +# Warning: Do not edit. This file is automatically generated from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- + +comment_char * +escape_char / + +LC_CTYPE + +********************************************************************** +* 0x0000 - 0x007F Basic Latin +* 0x0080 - 0x00FF Latin-1 Supplement +* 0x0100 - 0x017F Latin Extended-A +* 0x0180 - 0x024F Latin Extended-B +* 0x0250 - 0x02AF IPA Extensions +* 0x1D00 - 0x1D7F Phonetic Extensions +* 0x1D80 - 0x1DBF Phonetic Extensions Supplement +* 0x1E00 - 0x1EFF Latin Extended Additional +* 0x2150 - 0x218F Number Forms (partial - Roman Numerals) +* 0x2C60 - 0x2C7F Latin Extended-C +* 0xA720 - 0xA7FF Latin Extended-D +* 0xAB30 - 0xAB6F Latin Extended-E +* 0xFB00 - 0xFF4F Alphabetic Presentation Forms (partial) +* 0xFF00 - 0xFFEF Halfwidth and Fullwidth Forms (partial) +********************************************************************** +upper <A>;...;<Z>;/ + <LATIN_CAPITAL_LETTER_A_WITH_GRAVE>;...;<LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_O_WITH_STROKE>;...;<LATIN_CAPITAL_LETTER_THORN>;/ + <LATIN_CAPITAL_LETTER_A_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_A_WITH_BREVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_OGONEK>;/ + <LATIN_CAPITAL_LETTER_C_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_C_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_C_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_C_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_D_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_D_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_E_WITH_BREVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_OGONEK>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_G_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_G_WITH_BREVE>;/ + <LATIN_CAPITAL_LETTER_G_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_G_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_H_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_H_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_I_WITH_TILDE>;/ + <LATIN_CAPITAL_LETTER_I_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_I_WITH_BREVE>;/ + <LATIN_CAPITAL_LETTER_I_WITH_OGONEK>;/ + <LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LIGATURE_IJ>;/ + <LATIN_CAPITAL_LETTER_J_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_K_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_L_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_L_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_L_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT>;/ + <LATIN_CAPITAL_LETTER_L_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_N_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_N_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_N_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_ENG>;/ + <LATIN_CAPITAL_LETTER_O_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_O_WITH_BREVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_DOUBLE_ACUTE>;/ + <LATIN_CAPITAL_LIGATURE_OE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_R_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_S_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_S_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_S_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_S_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_T_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_T_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_T_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_TILDE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_U_WITH_BREVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_RING_ABOVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DOUBLE_ACUTE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_OGONEK>;/ + <LATIN_CAPITAL_LETTER_W_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_B_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_B_WITH_TOPBAR>;/ + <LATIN_CAPITAL_LETTER_TONE_SIX>;/ + <LATIN_CAPITAL_LETTER_OPEN_O>;/ + <LATIN_CAPITAL_LETTER_C_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_AFRICAN_D>;...;<LATIN_CAPITAL_LETTER_D_WITH_TOPBAR>;/ + <LATIN_CAPITAL_LETTER_REVERSED_E>;...;<LATIN_CAPITAL_LETTER_F_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_G_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_GAMMA>;/ + <LATIN_CAPITAL_LETTER_IOTA>;...;<LATIN_CAPITAL_LETTER_K_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_TURNED_M>;/ + <LATIN_CAPITAL_LETTER_N_WITH_LEFT_HOOK>;/ + <LATIN_CAPITAL_LETTER_O_WITH_MIDDLE_TILDE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HORN>;/ + <LATIN_CAPITAL_LETTER_OI>;/ + <LATIN_CAPITAL_LETTER_P_WITH_HOOK>;/ + <LATIN_LETTER_YR>;/ + <LATIN_CAPITAL_LETTER_TONE_TWO>;/ + <LATIN_CAPITAL_LETTER_ESH>;/ + <LATIN_CAPITAL_LETTER_T_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_T_WITH_RETROFLEX_HOOK>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HORN>;/ + <LATIN_CAPITAL_LETTER_UPSILON>;...;<LATIN_CAPITAL_LETTER_Y_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_EZH>;/ + <LATIN_CAPITAL_LETTER_EZH_REVERSED>;/ + <LATIN_CAPITAL_LETTER_TONE_FIVE>;/ + <LATIN_CAPITAL_LETTER_DZ_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_LJ>;/ + <LATIN_CAPITAL_LETTER_NJ>;/ + <LATIN_CAPITAL_LETTER_A_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_I_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_O_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_U_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS_AND_CARON>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_A_WITH_DOT_ABOVE_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_AE_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_G_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_G_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_K_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_O_WITH_OGONEK>;/ + <LATIN_CAPITAL_LETTER_O_WITH_OGONEK_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_EZH_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_DZ>;/ + <LATIN_CAPITAL_LETTER_G_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_HWAIR>;...;<LATIN_CAPITAL_LETTER_N_WITH_GRAVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_AE_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_STROKE_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_DOUBLE_GRAVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_INVERTED_BREVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_DOUBLE_GRAVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_INVERTED_BREVE>;/ + <LATIN_CAPITAL_LETTER_I_WITH_DOUBLE_GRAVE>;/ + <LATIN_CAPITAL_LETTER_I_WITH_INVERTED_BREVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_DOUBLE_GRAVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_INVERTED_BREVE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_DOUBLE_GRAVE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_INVERTED_BREVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DOUBLE_GRAVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_INVERTED_BREVE>;/ + <LATIN_CAPITAL_LETTER_S_WITH_COMMA_BELOW>;/ + <LATIN_CAPITAL_LETTER_T_WITH_COMMA_BELOW>;/ + <LATIN_CAPITAL_LETTER_YOGH>;/ + <LATIN_CAPITAL_LETTER_H_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_N_WITH_LONG_RIGHT_LEG>;/ + <LATIN_CAPITAL_LETTER_OU>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_A_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_O_WITH_TILDE_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_O_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_DOT_ABOVE_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_A_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_C_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_L_WITH_BAR>;/ + <LATIN_CAPITAL_LETTER_T_WITH_DIAGONAL_STROKE>;/ + <LATIN_CAPITAL_LETTER_GLOTTAL_STOP>;/ + <LATIN_CAPITAL_LETTER_B_WITH_STROKE>;...;<LATIN_CAPITAL_LETTER_E_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_J_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_SMALL_Q_WITH_HOOK_TAIL>;/ + <LATIN_CAPITAL_LETTER_R_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_RING_BELOW>;/ + <LATIN_CAPITAL_LETTER_B_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_B_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_B_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_C_WITH_CEDILLA_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_D_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_D_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_D_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_D_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_D_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_MACRON_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_CAPITAL_LETTER_E_WITH_TILDE_BELOW>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CEDILLA_AND_BREVE>;/ + <LATIN_CAPITAL_LETTER_F_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_G_WITH_MACRON>;/ + <LATIN_CAPITAL_LETTER_H_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_H_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_H_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_H_WITH_CEDILLA>;/ + <LATIN_CAPITAL_LETTER_H_WITH_BREVE_BELOW>;/ + <LATIN_CAPITAL_LETTER_I_WITH_TILDE_BELOW>;/ + <LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_K_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_K_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_K_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_L_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_L_WITH_DOT_BELOW_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_L_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_L_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_CAPITAL_LETTER_M_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_M_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_M_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_N_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_N_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_N_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_N_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_CAPITAL_LETTER_O_WITH_TILDE_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_TILDE_AND_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_MACRON_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_P_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_P_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_R_WITH_DOT_BELOW_AND_MACRON>;/ + <LATIN_CAPITAL_LETTER_R_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_S_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_S_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_S_WITH_ACUTE_AND_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_S_WITH_CARON_AND_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_S_WITH_DOT_BELOW_AND_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_T_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_T_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_T_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_T_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS_BELOW>;/ + <LATIN_CAPITAL_LETTER_U_WITH_TILDE_BELOW>;/ + <LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_CAPITAL_LETTER_U_WITH_TILDE_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_MACRON_AND_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_V_WITH_TILDE>;/ + <LATIN_CAPITAL_LETTER_V_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_W_WITH_GRAVE>;/ + <LATIN_CAPITAL_LETTER_W_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_W_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_W_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_W_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_X_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_X_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_DOT_ABOVE>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_CIRCUMFLEX>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_LINE_BELOW>;/ + <LATIN_CAPITAL_LETTER_SHARP_S>;/ + <LATIN_CAPITAL_LETTER_A_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_A_WITH_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX_AND_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX_AND_TILDE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX_AND_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_A_WITH_BREVE_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_BREVE_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_BREVE_AND_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_BREVE_AND_TILDE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_BREVE_AND_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_E_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_E_WITH_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_TILDE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_AND_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_AND_TILDE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_AND_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_I_WITH_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_I_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_O_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX_AND_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX_AND_TILDE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX_AND_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HORN_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HORN_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HORN_AND_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HORN_AND_TILDE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_HORN_AND_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_U_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HORN_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HORN_AND_GRAVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HORN_AND_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HORN_AND_TILDE>;/ + <LATIN_CAPITAL_LETTER_U_WITH_HORN_AND_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_GRAVE>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_HOOK_ABOVE>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_TILDE>;/ + <LATIN_CAPITAL_LETTER_MIDDLE-WELSH_LL>;/ + <LATIN_CAPITAL_LETTER_MIDDLE-WELSH_V>;/ + <LATIN_CAPITAL_LETTER_Y_WITH_LOOP>;/ + <KELVIN_SIGN>;/ + <ANGSTROM_SIGN>;/ + <TURNED_CAPITAL_F>;/ + <ROMAN_NUMERAL_ONE>;...;<ROMAN_NUMERAL_ONE_THOUSAND>;/ + <ROMAN_NUMERAL_REVERSED_ONE_HUNDRED>;/ + <LATIN_CAPITAL_LETTER_L_WITH_DOUBLE_BAR>;/ + <LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_TILDE>;...;<LATIN_CAPITAL_LETTER_R_WITH_TAIL>;/ + <LATIN_CAPITAL_LETTER_H_WITH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_K_WITH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_ALPHA>;...;<LATIN_CAPITAL_LETTER_TURNED_ALPHA>;/ + <LATIN_CAPITAL_LETTER_W_WITH_HOOK>;/ + <LATIN_CAPITAL_LETTER_HALF_H>;/ + <LATIN_CAPITAL_LETTER_S_WITH_SWASH_TAIL>;/ + <LATIN_CAPITAL_LETTER_Z_WITH_SWASH_TAIL>;/ + <LATIN_CAPITAL_LETTER_EGYPTOLOGICAL_ALEF>;/ + <LATIN_CAPITAL_LETTER_EGYPTOLOGICAL_AIN>;/ + <LATIN_CAPITAL_LETTER_HENG>;/ + <LATIN_CAPITAL_LETTER_TZ>;/ + <LATIN_CAPITAL_LETTER_TRESILLO>;/ + <LATIN_CAPITAL_LETTER_CUATRILLO>;/ + <LATIN_CAPITAL_LETTER_CUATRILLO_WITH_COMMA>;/ + <LATIN_CAPITAL_LETTER_AA>;/ + <LATIN_CAPITAL_LETTER_AO>;/ + <LATIN_CAPITAL_LETTER_AU>;/ + <LATIN_CAPITAL_LETTER_AV>;/ + <LATIN_CAPITAL_LETTER_AV_WITH_HORIZONTAL_BAR>;/ + <LATIN_CAPITAL_LETTER_AY>;/ + <LATIN_CAPITAL_LETTER_REVERSED_C_WITH_DOT>;/ + <LATIN_CAPITAL_LETTER_K_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_K_WITH_DIAGONAL_STROKE>;/ + <LATIN_CAPITAL_LETTER_K_WITH_STROKE_AND_DIAGONAL_STROKE>;/ + <LATIN_CAPITAL_LETTER_BROKEN_L>;/ + <LATIN_CAPITAL_LETTER_L_WITH_HIGH_STROKE>;/ + <LATIN_CAPITAL_LETTER_O_WITH_LONG_STROKE_OVERLAY>;/ + <LATIN_CAPITAL_LETTER_O_WITH_LOOP>;/ + <LATIN_CAPITAL_LETTER_OO>;/ + <LATIN_CAPITAL_LETTER_P_WITH_STROKE_THROUGH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_P_WITH_FLOURISH>;/ + <LATIN_CAPITAL_LETTER_P_WITH_SQUIRREL_TAIL>;/ + <LATIN_CAPITAL_LETTER_Q_WITH_STROKE_THROUGH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_Q_WITH_DIAGONAL_STROKE>;/ + <LATIN_CAPITAL_LETTER_R_ROTUNDA>;/ + <LATIN_CAPITAL_LETTER_RUM_ROTUNDA>;/ + <LATIN_CAPITAL_LETTER_V_WITH_DIAGONAL_STROKE>;/ + <LATIN_CAPITAL_LETTER_VY>;/ + <LATIN_CAPITAL_LETTER_VISIGOTHIC_Z>;/ + <LATIN_CAPITAL_LETTER_THORN_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_THORN_WITH_STROKE_THROUGH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_VEND>;/ + <LATIN_CAPITAL_LETTER_ET>;/ + <LATIN_CAPITAL_LETTER_IS>;/ + <LATIN_CAPITAL_LETTER_CON>;/ + <LATIN_CAPITAL_LETTER_INSULAR_D>;/ + <LATIN_CAPITAL_LETTER_INSULAR_F>;/ + <LATIN_CAPITAL_LETTER_INSULAR_G>;/ + <LATIN_CAPITAL_LETTER_TURNED_INSULAR_G>;/ + <LATIN_CAPITAL_LETTER_TURNED_L>;/ + <LATIN_CAPITAL_LETTER_INSULAR_R>;/ + <LATIN_CAPITAL_LETTER_INSULAR_S>;/ + <LATIN_CAPITAL_LETTER_INSULAR_T>;/ + <LATIN_CAPITAL_LETTER_SALTILLO>;/ + <LATIN_CAPITAL_LETTER_TURNED_H>;/ + <LATIN_CAPITAL_LETTER_N_WITH_DESCENDER>;/ + <LATIN_CAPITAL_LETTER_C_WITH_BAR>;/ + <LATIN_CAPITAL_LETTER_B_WITH_FLOURISH>;/ + <LATIN_CAPITAL_LETTER_F_WITH_STROKE>;/ + <LATIN_CAPITAL_LETTER_VOLAPUK_AE>;/ + <LATIN_CAPITAL_LETTER_VOLAPUK_OE>;/ + <LATIN_CAPITAL_LETTER_VOLAPUK_UE>;/ + <LATIN_CAPITAL_LETTER_G_WITH_OBLIQUE_STROKE>;/ + <LATIN_CAPITAL_LETTER_K_WITH_OBLIQUE_STROKE>;/ + <LATIN_CAPITAL_LETTER_N_WITH_OBLIQUE_STROKE>;/ + <LATIN_CAPITAL_LETTER_R_WITH_OBLIQUE_STROKE>;/ + <LATIN_CAPITAL_LETTER_S_WITH_OBLIQUE_STROKE>;/ + <LATIN_CAPITAL_LETTER_H_WITH_HOOK>;...;<LATIN_CAPITAL_LETTER_SMALL_CAPITAL_I>;/ + <LATIN_CAPITAL_LETTER_TURNED_K>;...;<LATIN_CAPITAL_LETTER_BETA>;/ + <LATIN_CAPITAL_LETTER_OMEGA>;/ + <FULLWIDTH_LATIN_CAPITAL_LETTER_A>;...;<FULLWIDTH_LATIN_CAPITAL_LETTER_Z> +lower <a>;...;<z>;/ + <FEMININE_ORDINAL_INDICATOR>;/ + <MASCULINE_ORDINAL_INDICATOR>;/ + <LATIN_SMALL_LETTER_SHARP_S>;...;<LATIN_SMALL_LETTER_O_WITH_DIAERESIS>;/ + <LATIN_SMALL_LETTER_O_WITH_STROKE>;...;<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS>;/ + <LATIN_SMALL_LETTER_A_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_A_WITH_BREVE>;/ + <LATIN_SMALL_LETTER_A_WITH_OGONEK>;/ + <LATIN_SMALL_LETTER_C_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_C_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_C_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_C_WITH_CARON>;/ + <LATIN_SMALL_LETTER_D_WITH_CARON>;/ + <LATIN_SMALL_LETTER_D_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_E_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_E_WITH_BREVE>;/ + <LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_E_WITH_OGONEK>;/ + <LATIN_SMALL_LETTER_E_WITH_CARON>;/ + <LATIN_SMALL_LETTER_G_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_G_WITH_BREVE>;/ + <LATIN_SMALL_LETTER_G_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_G_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_H_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_H_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_I_WITH_TILDE>;/ + <LATIN_SMALL_LETTER_I_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_I_WITH_BREVE>;/ + <LATIN_SMALL_LETTER_I_WITH_OGONEK>;/ + <LATIN_SMALL_LETTER_DOTLESS_I>;/ + <LATIN_SMALL_LIGATURE_IJ>;/ + <LATIN_SMALL_LETTER_J_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_K_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_KRA>;/ + <LATIN_SMALL_LETTER_L_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_L_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_L_WITH_CARON>;/ + <LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT>;/ + <LATIN_SMALL_LETTER_L_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_N_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_N_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_N_WITH_CARON>;/ + <LATIN_SMALL_LETTER_N_PRECEDED_BY_APOSTROPHE>;/ + <LATIN_SMALL_LETTER_ENG>;/ + <LATIN_SMALL_LETTER_O_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_O_WITH_BREVE>;/ + <LATIN_SMALL_LETTER_O_WITH_DOUBLE_ACUTE>;/ + <LATIN_SMALL_LIGATURE_OE>;/ + <LATIN_SMALL_LETTER_R_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_R_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_R_WITH_CARON>;/ + <LATIN_SMALL_LETTER_S_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_S_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_S_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_S_WITH_CARON>;/ + <LATIN_SMALL_LETTER_T_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_T_WITH_CARON>;/ + <LATIN_SMALL_LETTER_T_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_U_WITH_TILDE>;/ + <LATIN_SMALL_LETTER_U_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_U_WITH_BREVE>;/ + <LATIN_SMALL_LETTER_U_WITH_RING_ABOVE>;/ + <LATIN_SMALL_LETTER_U_WITH_DOUBLE_ACUTE>;/ + <LATIN_SMALL_LETTER_U_WITH_OGONEK>;/ + <LATIN_SMALL_LETTER_W_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_Y_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_Z_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_Z_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_Z_WITH_CARON>;/ + <LATIN_SMALL_LETTER_LONG_S>;/ + <LATIN_SMALL_LETTER_B_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_B_WITH_TOPBAR>;/ + <LATIN_SMALL_LETTER_TONE_SIX>;/ + <LATIN_SMALL_LETTER_C_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_D_WITH_TOPBAR>;/ + <LATIN_SMALL_LETTER_TURNED_DELTA>;/ + <LATIN_SMALL_LETTER_F_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_HV>;/ + <LATIN_SMALL_LETTER_K_WITH_HOOK>;...;<LATIN_SMALL_LETTER_LAMBDA_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_N_WITH_LONG_RIGHT_LEG>;/ + <LATIN_SMALL_LETTER_O_WITH_HORN>;/ + <LATIN_SMALL_LETTER_OI>;/ + <LATIN_SMALL_LETTER_P_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_TONE_TWO>;/ + <LATIN_LETTER_REVERSED_ESH_LOOP>;/ + <LATIN_SMALL_LETTER_T_WITH_PALATAL_HOOK>;/ + <LATIN_SMALL_LETTER_T_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_U_WITH_HORN>;/ + <LATIN_SMALL_LETTER_Y_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_Z_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_EZH_REVERSED>;/ + <LATIN_SMALL_LETTER_EZH_WITH_TAIL>;/ + <LATIN_SMALL_LETTER_TONE_FIVE>;...;<LATIN_LETTER_WYNN>;/ + <LATIN_SMALL_LETTER_DZ_WITH_CARON>;/ + <LATIN_SMALL_LETTER_LJ>;/ + <LATIN_SMALL_LETTER_NJ>;/ + <LATIN_SMALL_LETTER_A_WITH_CARON>;/ + <LATIN_SMALL_LETTER_I_WITH_CARON>;/ + <LATIN_SMALL_LETTER_O_WITH_CARON>;/ + <LATIN_SMALL_LETTER_U_WITH_CARON>;/ + <LATIN_SMALL_LETTER_U_WITH_DIAERESIS_AND_MACRON>;/ + <LATIN_SMALL_LETTER_U_WITH_DIAERESIS_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_U_WITH_DIAERESIS_AND_CARON>;/ + <LATIN_SMALL_LETTER_U_WITH_DIAERESIS_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_TURNED_E>;/ + <LATIN_SMALL_LETTER_A_WITH_DIAERESIS_AND_MACRON>;/ + <LATIN_SMALL_LETTER_A_WITH_DOT_ABOVE_AND_MACRON>;/ + <LATIN_SMALL_LETTER_AE_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_G_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_G_WITH_CARON>;/ + <LATIN_SMALL_LETTER_K_WITH_CARON>;/ + <LATIN_SMALL_LETTER_O_WITH_OGONEK>;/ + <LATIN_SMALL_LETTER_O_WITH_OGONEK_AND_MACRON>;/ + <LATIN_SMALL_LETTER_EZH_WITH_CARON>;/ + <LATIN_SMALL_LETTER_J_WITH_CARON>;/ + <LATIN_SMALL_LETTER_DZ>;/ + <LATIN_SMALL_LETTER_G_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_N_WITH_GRAVE>;/ + <LATIN_SMALL_LETTER_A_WITH_RING_ABOVE_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_AE_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_O_WITH_STROKE_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_A_WITH_DOUBLE_GRAVE>;/ + <LATIN_SMALL_LETTER_A_WITH_INVERTED_BREVE>;/ + <LATIN_SMALL_LETTER_E_WITH_DOUBLE_GRAVE>;/ + <LATIN_SMALL_LETTER_E_WITH_INVERTED_BREVE>;/ + <LATIN_SMALL_LETTER_I_WITH_DOUBLE_GRAVE>;/ + <LATIN_SMALL_LETTER_I_WITH_INVERTED_BREVE>;/ + <LATIN_SMALL_LETTER_O_WITH_DOUBLE_GRAVE>;/ + <LATIN_SMALL_LETTER_O_WITH_INVERTED_BREVE>;/ + <LATIN_SMALL_LETTER_R_WITH_DOUBLE_GRAVE>;/ + <LATIN_SMALL_LETTER_R_WITH_INVERTED_BREVE>;/ + <LATIN_SMALL_LETTER_U_WITH_DOUBLE_GRAVE>;/ + <LATIN_SMALL_LETTER_U_WITH_INVERTED_BREVE>;/ + <LATIN_SMALL_LETTER_S_WITH_COMMA_BELOW>;/ + <LATIN_SMALL_LETTER_T_WITH_COMMA_BELOW>;/ + <LATIN_SMALL_LETTER_YOGH>;/ + <LATIN_SMALL_LETTER_H_WITH_CARON>;/ + <LATIN_SMALL_LETTER_D_WITH_CURL>;/ + <LATIN_SMALL_LETTER_OU>;/ + <LATIN_SMALL_LETTER_Z_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_A_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_E_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_O_WITH_DIAERESIS_AND_MACRON>;/ + <LATIN_SMALL_LETTER_O_WITH_TILDE_AND_MACRON>;/ + <LATIN_SMALL_LETTER_O_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_O_WITH_DOT_ABOVE_AND_MACRON>;/ + <LATIN_SMALL_LETTER_Y_WITH_MACRON>;...;<LATIN_SMALL_LETTER_QP_DIGRAPH>;/ + <LATIN_SMALL_LETTER_C_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_S_WITH_SWASH_TAIL>;/ + <LATIN_SMALL_LETTER_Z_WITH_SWASH_TAIL>;/ + <LATIN_SMALL_LETTER_GLOTTAL_STOP>;/ + <LATIN_SMALL_LETTER_E_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_J_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_Q_WITH_HOOK_TAIL>;/ + <LATIN_SMALL_LETTER_R_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_Y_WITH_STROKE>;...;<LATIN_SMALL_LETTER_REVERSED_R_WITH_FISHHOOK>;/ + <LATIN_LETTER_SMALL_CAPITAL_R>;...;<LATIN_SMALL_LETTER_EZH_WITH_CURL>;/ + <LATIN_LETTER_PHARYNGEAL_VOICED_FRICATIVE>;...;<MODIFIER_LETTER_SMALL_Y>;/ + <MODIFIER_LETTER_SMALL_GAMMA>;...;<MODIFIER_LETTER_SMALL_REVERSED_GLOTTAL_STOP>;/ + <LATIN_LETTER_SMALL_CAPITAL_A>;...;<LATIN_LETTER_AIN>;/ + <MODIFIER_LETTER_CAPITAL_A>;...;<MODIFIER_LETTER_CAPITAL_R>;/ + <MODIFIER_LETTER_CAPITAL_T>;...;<MODIFIER_LETTER_SMALL_AIN>;/ + <LATIN_SUBSCRIPT_SMALL_LETTER_I>;...;<LATIN_SUBSCRIPT_SMALL_LETTER_V>;/ + <LATIN_SMALL_LETTER_UE>;...;<LATIN_SMALL_LETTER_TURNED_G>;/ + <LATIN_SMALL_LETTER_INSULAR_G>;...;<LATIN_SMALL_LETTER_UPSILON_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_B_WITH_PALATAL_HOOK>;...;<MODIFIER_LETTER_SMALL_EZH>;/ + <LATIN_SMALL_LETTER_A_WITH_RING_BELOW>;/ + <LATIN_SMALL_LETTER_B_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_B_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_B_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_C_WITH_CEDILLA_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_D_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_D_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_D_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_D_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_D_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_SMALL_LETTER_E_WITH_MACRON_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_E_WITH_MACRON_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_SMALL_LETTER_E_WITH_TILDE_BELOW>;/ + <LATIN_SMALL_LETTER_E_WITH_CEDILLA_AND_BREVE>;/ + <LATIN_SMALL_LETTER_F_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_G_WITH_MACRON>;/ + <LATIN_SMALL_LETTER_H_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_H_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_H_WITH_DIAERESIS>;/ + <LATIN_SMALL_LETTER_H_WITH_CEDILLA>;/ + <LATIN_SMALL_LETTER_H_WITH_BREVE_BELOW>;/ + <LATIN_SMALL_LETTER_I_WITH_TILDE_BELOW>;/ + <LATIN_SMALL_LETTER_I_WITH_DIAERESIS_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_K_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_K_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_K_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_L_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_L_WITH_DOT_BELOW_AND_MACRON>;/ + <LATIN_SMALL_LETTER_L_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_L_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_SMALL_LETTER_M_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_M_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_M_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_N_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_N_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_N_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_N_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_SMALL_LETTER_O_WITH_TILDE_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_O_WITH_TILDE_AND_DIAERESIS>;/ + <LATIN_SMALL_LETTER_O_WITH_MACRON_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_O_WITH_MACRON_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_P_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_P_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_R_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_R_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_R_WITH_DOT_BELOW_AND_MACRON>;/ + <LATIN_SMALL_LETTER_R_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_S_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_S_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_S_WITH_ACUTE_AND_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_S_WITH_CARON_AND_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_S_WITH_DOT_BELOW_AND_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_T_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_T_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_T_WITH_LINE_BELOW>;/ + <LATIN_SMALL_LETTER_T_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_SMALL_LETTER_U_WITH_DIAERESIS_BELOW>;/ + <LATIN_SMALL_LETTER_U_WITH_TILDE_BELOW>;/ + <LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX_BELOW>;/ + <LATIN_SMALL_LETTER_U_WITH_TILDE_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_U_WITH_MACRON_AND_DIAERESIS>;/ + <LATIN_SMALL_LETTER_V_WITH_TILDE>;/ + <LATIN_SMALL_LETTER_V_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_W_WITH_GRAVE>;/ + <LATIN_SMALL_LETTER_W_WITH_ACUTE>;/ + <LATIN_SMALL_LETTER_W_WITH_DIAERESIS>;/ + <LATIN_SMALL_LETTER_W_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_W_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_X_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_X_WITH_DIAERESIS>;/ + <LATIN_SMALL_LETTER_Y_WITH_DOT_ABOVE>;/ + <LATIN_SMALL_LETTER_Z_WITH_CIRCUMFLEX>;/ + <LATIN_SMALL_LETTER_Z_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_Z_WITH_LINE_BELOW>;...;<LATIN_SMALL_LETTER_LONG_S_WITH_HIGH_STROKE>;/ + <LATIN_SMALL_LETTER_DELTA>;/ + <LATIN_SMALL_LETTER_A_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_A_WITH_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX_AND_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX_AND_TILDE>;/ + <LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX_AND_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_A_WITH_BREVE_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_A_WITH_BREVE_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_A_WITH_BREVE_AND_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_A_WITH_BREVE_AND_TILDE>;/ + <LATIN_SMALL_LETTER_A_WITH_BREVE_AND_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_E_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_E_WITH_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_E_WITH_TILDE>;/ + <LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_AND_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_AND_TILDE>;/ + <LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_AND_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_I_WITH_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_I_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_O_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_O_WITH_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX_AND_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX_AND_TILDE>;/ + <LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX_AND_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_O_WITH_HORN_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_O_WITH_HORN_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_O_WITH_HORN_AND_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_O_WITH_HORN_AND_TILDE>;/ + <LATIN_SMALL_LETTER_O_WITH_HORN_AND_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_U_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_U_WITH_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_U_WITH_HORN_AND_ACUTE>;/ + <LATIN_SMALL_LETTER_U_WITH_HORN_AND_GRAVE>;/ + <LATIN_SMALL_LETTER_U_WITH_HORN_AND_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_U_WITH_HORN_AND_TILDE>;/ + <LATIN_SMALL_LETTER_U_WITH_HORN_AND_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_Y_WITH_GRAVE>;/ + <LATIN_SMALL_LETTER_Y_WITH_DOT_BELOW>;/ + <LATIN_SMALL_LETTER_Y_WITH_HOOK_ABOVE>;/ + <LATIN_SMALL_LETTER_Y_WITH_TILDE>;/ + <LATIN_SMALL_LETTER_MIDDLE-WELSH_LL>;/ + <LATIN_SMALL_LETTER_MIDDLE-WELSH_V>;/ + <LATIN_SMALL_LETTER_Y_WITH_LOOP>;/ + <SUPERSCRIPT_LATIN_SMALL_LETTER_I>;/ + <SUPERSCRIPT_LATIN_SMALL_LETTER_N>;/ + <LATIN_SUBSCRIPT_SMALL_LETTER_A>;...;<LATIN_SUBSCRIPT_SMALL_LETTER_T>;/ + <TURNED_SMALL_F>;/ + <SMALL_ROMAN_NUMERAL_ONE>;...;<SMALL_ROMAN_NUMERAL_ONE_THOUSAND>;/ + <LATIN_SMALL_LETTER_REVERSED_C>;/ + <LATIN_SMALL_LETTER_L_WITH_DOUBLE_BAR>;/ + <LATIN_SMALL_LETTER_A_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_T_WITH_DIAGONAL_STROKE>;/ + <LATIN_SMALL_LETTER_H_WITH_DESCENDER>;/ + <LATIN_SMALL_LETTER_K_WITH_DESCENDER>;/ + <LATIN_SMALL_LETTER_Z_WITH_DESCENDER>;/ + <LATIN_SMALL_LETTER_V_WITH_RIGHT_HOOK>;/ + <LATIN_SMALL_LETTER_W_WITH_HOOK>;/ + <LATIN_SMALL_LETTER_V_WITH_CURL>;/ + <LATIN_SMALL_LETTER_HALF_H>;...;<MODIFIER_LETTER_CAPITAL_V>;/ + <LATIN_SMALL_LETTER_EGYPTOLOGICAL_ALEF>;/ + <LATIN_SMALL_LETTER_EGYPTOLOGICAL_AIN>;/ + <LATIN_SMALL_LETTER_HENG>;/ + <LATIN_SMALL_LETTER_TZ>;/ + <LATIN_SMALL_LETTER_TRESILLO>;/ + <LATIN_SMALL_LETTER_CUATRILLO>;/ + <LATIN_SMALL_LETTER_CUATRILLO_WITH_COMMA>;...;<LATIN_LETTER_SMALL_CAPITAL_S>;/ + <LATIN_SMALL_LETTER_AA>;/ + <LATIN_SMALL_LETTER_AO>;/ + <LATIN_SMALL_LETTER_AU>;/ + <LATIN_SMALL_LETTER_AV>;/ + <LATIN_SMALL_LETTER_AV_WITH_HORIZONTAL_BAR>;/ + <LATIN_SMALL_LETTER_AY>;/ + <LATIN_SMALL_LETTER_REVERSED_C_WITH_DOT>;/ + <LATIN_SMALL_LETTER_K_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_K_WITH_DIAGONAL_STROKE>;/ + <LATIN_SMALL_LETTER_K_WITH_STROKE_AND_DIAGONAL_STROKE>;/ + <LATIN_SMALL_LETTER_BROKEN_L>;/ + <LATIN_SMALL_LETTER_L_WITH_HIGH_STROKE>;/ + <LATIN_SMALL_LETTER_O_WITH_LONG_STROKE_OVERLAY>;/ + <LATIN_SMALL_LETTER_O_WITH_LOOP>;/ + <LATIN_SMALL_LETTER_OO>;/ + <LATIN_SMALL_LETTER_P_WITH_STROKE_THROUGH_DESCENDER>;/ + <LATIN_SMALL_LETTER_P_WITH_FLOURISH>;/ + <LATIN_SMALL_LETTER_P_WITH_SQUIRREL_TAIL>;/ + <LATIN_SMALL_LETTER_Q_WITH_STROKE_THROUGH_DESCENDER>;/ + <LATIN_SMALL_LETTER_Q_WITH_DIAGONAL_STROKE>;/ + <LATIN_SMALL_LETTER_R_ROTUNDA>;/ + <LATIN_SMALL_LETTER_RUM_ROTUNDA>;/ + <LATIN_SMALL_LETTER_V_WITH_DIAGONAL_STROKE>;/ + <LATIN_SMALL_LETTER_VY>;/ + <LATIN_SMALL_LETTER_VISIGOTHIC_Z>;/ + <LATIN_SMALL_LETTER_THORN_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_THORN_WITH_STROKE_THROUGH_DESCENDER>;/ + <LATIN_SMALL_LETTER_VEND>;/ + <LATIN_SMALL_LETTER_ET>;/ + <LATIN_SMALL_LETTER_IS>;/ + <LATIN_SMALL_LETTER_CON>;...;<LATIN_SMALL_LETTER_UM>;/ + <LATIN_SMALL_LETTER_INSULAR_D>;/ + <LATIN_SMALL_LETTER_INSULAR_F>;/ + <LATIN_SMALL_LETTER_TURNED_INSULAR_G>;/ + <LATIN_SMALL_LETTER_TURNED_L>;/ + <LATIN_SMALL_LETTER_INSULAR_R>;/ + <LATIN_SMALL_LETTER_INSULAR_S>;/ + <LATIN_SMALL_LETTER_INSULAR_T>;/ + <LATIN_SMALL_LETTER_SALTILLO>;/ + <LATIN_SMALL_LETTER_L_WITH_RETROFLEX_HOOK_AND_BELT>;/ + <LATIN_SMALL_LETTER_N_WITH_DESCENDER>;/ + <LATIN_SMALL_LETTER_C_WITH_BAR>;...;<LATIN_SMALL_LETTER_H_WITH_PALATAL_HOOK>;/ + <LATIN_SMALL_LETTER_B_WITH_FLOURISH>;/ + <LATIN_SMALL_LETTER_F_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_VOLAPUK_AE>;/ + <LATIN_SMALL_LETTER_VOLAPUK_OE>;/ + <LATIN_SMALL_LETTER_VOLAPUK_UE>;/ + <LATIN_SMALL_LETTER_G_WITH_OBLIQUE_STROKE>;/ + <LATIN_SMALL_LETTER_K_WITH_OBLIQUE_STROKE>;/ + <LATIN_SMALL_LETTER_N_WITH_OBLIQUE_STROKE>;/ + <LATIN_SMALL_LETTER_R_WITH_OBLIQUE_STROKE>;/ + <LATIN_SMALL_LETTER_S_WITH_OBLIQUE_STROKE>;/ + <LATIN_SMALL_LETTER_BETA>;/ + <LATIN_SMALL_LETTER_OMEGA>;/ + <MODIFIER_LETTER_CAPITAL_H_WITH_STROKE>;...;<LATIN_LETTER_SMALL_CAPITAL_TURNED_M>;/ + <LATIN_SMALL_LETTER_BARRED_ALPHA>;...;<LATIN_SMALL_LETTER_OPEN_O_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_INVERTED_OE>;...;<LATIN_SMALL_LETTER_Y_WITH_SHORT_RIGHT_LEG>;/ + <MODIFIER_LETTER_SMALL_HENG>;...;<LATIN_SMALL_LETTER_INVERTED_ALPHA>;/ + <LATIN_SMALL_LIGATURE_FF>;...;<LATIN_SMALL_LIGATURE_ST>;/ + <FULLWIDTH_LATIN_SMALL_LETTER_A>;...;<FULLWIDTH_LATIN_SMALL_LETTER_Z> +alpha <LATIN_LETTER_TWO_WITH_STROKE>;/ + <LATIN_LETTER_DENTAL_CLICK>;...;<LATIN_LETTER_RETROFLEX_CLICK>;/ + <LATIN_CAPITAL_LETTER_D_WITH_SMALL_LETTER_Z_WITH_CARON>;/ + <LATIN_CAPITAL_LETTER_L_WITH_SMALL_LETTER_J>;/ + <LATIN_CAPITAL_LETTER_N_WITH_SMALL_LETTER_J>;/ + <LATIN_CAPITAL_LETTER_D_WITH_SMALL_LETTER_Z>;/ + <LATIN_LETTER_GLOTTAL_STOP>;/ + <ROMAN_NUMERAL_ONE_THOUSAND_C_D>;...;<ROMAN_NUMERAL_TEN_THOUSAND>;/ + <ROMAN_NUMERAL_SIX_LATE_FORM>;...;<ROMAN_NUMERAL_ONE_HUNDRED_THOUSAND>;/ + <LATIN_LETTER_SINOLOGICAL_DOT>;/ + <LATIN_EPIGRAPHIC_LETTER_SIDEWAYS_I>;/ + <LATIN_EPIGRAPHIC_LETTER_REVERSED_F>;...;<LATIN_EPIGRAPHIC_LETTER_ARCHAIC_M> +space <tab>;...;<carriage-return>;/ + <space> +cntrl <NULL>;...;<INFORMATION_SEPARATOR_ONE>;/ + <DELETE> +graph <EXCLAMATION_MARK>;...;<TILDE>;/ + <FEMININE_ORDINAL_INDICATOR>;/ + <MASCULINE_ORDINAL_INDICATOR>;/ + <LATIN_CAPITAL_LETTER_A_WITH_GRAVE>;...;<LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_O_WITH_STROKE>;...;<LATIN_SMALL_LETTER_O_WITH_DIAERESIS>;/ + <LATIN_SMALL_LETTER_O_WITH_STROKE>;...;<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS>;/ + <LATIN_CAPITAL_LETTER_A_WITH_MACRON>;...;<LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT>;/ + <LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT>;...;<LATIN_SMALL_LETTER_LONG_S>;/ + <LATIN_SMALL_LETTER_B_WITH_STROKE>;...;<LATIN_LETTER_WYNN>;/ + <LATIN_LETTER_DENTAL_CLICK>;...;<LATIN_SMALL_LETTER_O_WITH_STROKE_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_A_WITH_DOUBLE_GRAVE>;...;<LATIN_SMALL_LETTER_S_WITH_SWASH_TAIL>;/ + <LATIN_SMALL_LETTER_Z_WITH_SWASH_TAIL>;...;<LATIN_SMALL_LETTER_REVERSED_R_WITH_FISHHOOK>;/ + <LATIN_LETTER_SMALL_CAPITAL_R>;...;<MODIFIER_LETTER_SMALL_Y>;/ + <MODIFIER_LETTER_SMALL_GAMMA>;...;<MODIFIER_LETTER_SMALL_REVERSED_GLOTTAL_STOP>;/ + <LATIN_LETTER_SMALL_CAPITAL_A>;...;<LATIN_LETTER_AIN>;/ + <MODIFIER_LETTER_CAPITAL_A>;...;<MODIFIER_LETTER_CAPITAL_R>;/ + <MODIFIER_LETTER_CAPITAL_T>;...;<MODIFIER_LETTER_SMALL_AIN>;/ + <LATIN_SUBSCRIPT_SMALL_LETTER_I>;...;<LATIN_SUBSCRIPT_SMALL_LETTER_V>;/ + <LATIN_SMALL_LETTER_UE>;...;<LATIN_SMALL_LETTER_TURNED_G>;/ + <LATIN_SMALL_LETTER_INSULAR_G>;...;<LATIN_SMALL_LETTER_UPSILON_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_B_WITH_PALATAL_HOOK>;...;<MODIFIER_LETTER_SMALL_EZH>;/ + <LATIN_CAPITAL_LETTER_A_WITH_RING_BELOW>;...;<LATIN_SMALL_LETTER_M_WITH_ACUTE>;/ + <LATIN_CAPITAL_LETTER_M_WITH_DOT_ABOVE>;...;<LATIN_SMALL_LETTER_V_WITH_DOT_BELOW>;/ + <LATIN_CAPITAL_LETTER_W_WITH_GRAVE>;...;<LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX_AND_ACUTE>;/ + <LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX_AND_GRAVE>;...;<LATIN_SMALL_LETTER_Y_WITH_LOOP>;/ + <SUPERSCRIPT_LATIN_SMALL_LETTER_I>;/ + <SUPERSCRIPT_LATIN_SMALL_LETTER_N>;/ + <LATIN_SUBSCRIPT_SMALL_LETTER_A>;...;<LATIN_SUBSCRIPT_SMALL_LETTER_T>;/ + <KELVIN_SIGN>;/ + <ANGSTROM_SIGN>;/ + <TURNED_CAPITAL_F>;/ + <TURNED_SMALL_F>;/ + <ROMAN_NUMERAL_ONE>;...;<SMALL_ROMAN_NUMERAL_ONE_THOUSAND>;/ + <ROMAN_NUMERAL_ONE_THOUSAND_C_D>;...;<ROMAN_NUMERAL_ONE_HUNDRED_THOUSAND>;/ + <LATIN_CAPITAL_LETTER_L_WITH_DOUBLE_BAR>;...;<LATIN_CAPITAL_LETTER_Z_WITH_SWASH_TAIL>;/ + <LATIN_CAPITAL_LETTER_EGYPTOLOGICAL_ALEF>;...;<LATIN_SMALL_LETTER_REVERSED_C_WITH_DOT>;/ + <LATIN_CAPITAL_LETTER_K_WITH_STROKE>;...;<LATIN_SMALL_LETTER_TURNED_INSULAR_G>;/ + <LATIN_CAPITAL_LETTER_TURNED_L>;...;<LATIN_SMALL_LETTER_INSULAR_T>;/ + <LATIN_CAPITAL_LETTER_SALTILLO>;...;<LATIN_CAPITAL_LETTER_SMALL_CAPITAL_I>;/ + <LATIN_CAPITAL_LETTER_TURNED_K>;...;<LATIN_SMALL_LETTER_OMEGA>;/ + <LATIN_EPIGRAPHIC_LETTER_SIDEWAYS_I>;...;<LATIN_EPIGRAPHIC_LETTER_ARCHAIC_M>;/ + <LATIN_SMALL_LETTER_BARRED_ALPHA>;...;<LATIN_SMALL_LETTER_OPEN_O_WITH_STROKE>;/ + <LATIN_SMALL_LETTER_INVERTED_OE>;...;<LATIN_SMALL_LETTER_Y_WITH_SHORT_RIGHT_LEG>;/ + <MODIFIER_LETTER_SMALL_HENG>;...;<LATIN_SMALL_LETTER_INVERTED_ALPHA>;/ + <LATIN_SMALL_LIGATURE_FF>;...;<LATIN_SMALL_LIGATURE_ST>;/ + <FULLWIDTH_LATIN_CAPITAL_LETTER_A>;...;<FULLWIDTH_LATIN_CAPITAL_LETTER_Z>;/ + <FULLWIDTH_LATIN_SMALL_LETTER_A>;...;<FULLWIDTH_LATIN_SMALL_LETTER_Z> +punct <EXCLAMATION_MARK>;...;<NUMBER_SIGN>;/ + <PERCENT_SIGN>;...;<ASTERISK>;/ + <COMMA>;...;<SOLIDUS>;/ + <COLON>;/ + <SEMICOLON>;/ + <QUESTION_MARK>;/ + <COMMERCIAL_AT>;/ + <LEFT_SQUARE_BRACKET>;...;<RIGHT_SQUARE_BRACKET>;/ + <LOW_LINE>;/ + <LEFT_CURLY_BRACKET>;/ + <RIGHT_CURLY_BRACKET> +digit <zero>;...;<nine> +xdigit <zero>;...;<nine>;/ + <A>;...;<F>;/ + <a>;...;<f> +blank <tab>;/ + <space> +toupper (<a>,<A>);/ + (<b>,<B>);/ + (<c>,<C>);/ + (<d>,<D>);/ + (<e>,<E>);/ + (<f>,<F>);/ + (<g>,<G>);/ + (<h>,<H>);/ + (<i>,<I>);/ + (<j>,<J>);/ + (<k>,<K>);/ + (<l>,<L>);/ + (<m>,<M>);/ + (<n>,<N>);/ + (<o>,<O>);/ + (<p>,<P>);/ + (<q>,<Q>);/ + (<r>,<R>);/ + (<s>,<S>);/ + (<t>,<T>);/ + (<u>,<U>);/ + (<v>,<V>);/ + (<w>,<W>);/ + (<x>,<X>);/ + (<y>,<Y>);/ + (<z>,<Z>);/ + (<LATIN_SMALL_LETTER_A_WITH_GRAVE>,<LATIN_CAPITAL_LETTER_A_WITH_GRAVE>);/ + (<LATIN_SMALL_LETTER_A_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_A_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_A_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_A_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_A_WITH_TILDE>,<LATIN_CAPITAL_LETTER_A_WITH_TILDE>);/ + (<LATIN_SMALL_LETTER_A_WITH_DIAERESIS>,<LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS>);/ + (<LATIN_SMALL_LETTER_A_WITH_RING_ABOVE>,<LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE>);/ + (<LATIN_SMALL_LETTER_AE>,<LATIN_CAPITAL_LETTER_AE>);/ + (<LATIN_SMALL_LETTER_C_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_C_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_E_WITH_GRAVE>,<LATIN_CAPITAL_LETTER_E_WITH_GRAVE>);/ + (<LATIN_SMALL_LETTER_E_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_E_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_E_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_E_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_E_WITH_DIAERESIS>,<LATIN_CAPITAL_LETTER_E_WITH_DIAERESIS>);/ + (<LATIN_SMALL_LETTER_I_WITH_GRAVE>,<LATIN_CAPITAL_LETTER_I_WITH_GRAVE>);/ + (<LATIN_SMALL_LETTER_I_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_I_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_I_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_I_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_I_WITH_DIAERESIS>,<LATIN_CAPITAL_LETTER_I_WITH_DIAERESIS>);/ + (<LATIN_SMALL_LETTER_ETH>,<LATIN_CAPITAL_LETTER_ETH>);/ + (<LATIN_SMALL_LETTER_N_WITH_TILDE>,<LATIN_CAPITAL_LETTER_N_WITH_TILDE>);/ + (<LATIN_SMALL_LETTER_O_WITH_GRAVE>,<LATIN_CAPITAL_LETTER_O_WITH_GRAVE>);/ + (<LATIN_SMALL_LETTER_O_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_O_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_O_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_O_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_O_WITH_TILDE>,<LATIN_CAPITAL_LETTER_O_WITH_TILDE>);/ + (<LATIN_SMALL_LETTER_O_WITH_DIAERESIS>,<LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS>);/ + (<LATIN_SMALL_LETTER_O_WITH_STROKE>,<LATIN_CAPITAL_LETTER_O_WITH_STROKE>);/ + (<LATIN_SMALL_LETTER_U_WITH_GRAVE>,<LATIN_CAPITAL_LETTER_U_WITH_GRAVE>);/ + (<LATIN_SMALL_LETTER_U_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_U_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_U_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_U_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_U_WITH_DIAERESIS>,<LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS>);/ + (<LATIN_SMALL_LETTER_Y_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_Y_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_THORN>,<LATIN_CAPITAL_LETTER_THORN>);/ + (<LATIN_SMALL_LETTER_Y_WITH_DIAERESIS>,<LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS>);/ + (<LATIN_SMALL_LETTER_A_WITH_MACRON>,<LATIN_CAPITAL_LETTER_A_WITH_MACRON>);/ + (<LATIN_SMALL_LETTER_A_WITH_BREVE>,<LATIN_CAPITAL_LETTER_A_WITH_BREVE>);/ + (<LATIN_SMALL_LETTER_A_WITH_OGONEK>,<LATIN_CAPITAL_LETTER_A_WITH_OGONEK>);/ + (<LATIN_SMALL_LETTER_C_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_C_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_C_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_C_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_C_WITH_DOT_ABOVE>,<LATIN_CAPITAL_LETTER_C_WITH_DOT_ABOVE>);/ + (<LATIN_SMALL_LETTER_C_WITH_CARON>,<LATIN_CAPITAL_LETTER_C_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_D_WITH_CARON>,<LATIN_CAPITAL_LETTER_D_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_D_WITH_STROKE>,<LATIN_CAPITAL_LETTER_D_WITH_STROKE>);/ + (<LATIN_SMALL_LETTER_E_WITH_MACRON>,<LATIN_CAPITAL_LETTER_E_WITH_MACRON>);/ + (<LATIN_SMALL_LETTER_E_WITH_BREVE>,<LATIN_CAPITAL_LETTER_E_WITH_BREVE>);/ + (<LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE>,<LATIN_CAPITAL_LETTER_E_WITH_DOT_ABOVE>);/ + (<LATIN_SMALL_LETTER_E_WITH_OGONEK>,<LATIN_CAPITAL_LETTER_E_WITH_OGONEK>);/ + (<LATIN_SMALL_LETTER_E_WITH_CARON>,<LATIN_CAPITAL_LETTER_E_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_G_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_G_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_G_WITH_BREVE>,<LATIN_CAPITAL_LETTER_G_WITH_BREVE>);/ + (<LATIN_SMALL_LETTER_G_WITH_DOT_ABOVE>,<LATIN_CAPITAL_LETTER_G_WITH_DOT_ABOVE>);/ + (<LATIN_SMALL_LETTER_G_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_G_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_H_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_H_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_H_WITH_STROKE>,<LATIN_CAPITAL_LETTER_H_WITH_STROKE>);/ + (<LATIN_SMALL_LETTER_I_WITH_TILDE>,<LATIN_CAPITAL_LETTER_I_WITH_TILDE>);/ + (<LATIN_SMALL_LETTER_I_WITH_MACRON>,<LATIN_CAPITAL_LETTER_I_WITH_MACRON>);/ + (<LATIN_SMALL_LETTER_I_WITH_BREVE>,<LATIN_CAPITAL_LETTER_I_WITH_BREVE>);/ + (<LATIN_SMALL_LETTER_I_WITH_OGONEK>,<LATIN_CAPITAL_LETTER_I_WITH_OGONEK>);/ + (<LATIN_SMALL_LETTER_DOTLESS_I>,<I>);/ + (<LATIN_SMALL_LIGATURE_IJ>,<LATIN_CAPITAL_LIGATURE_IJ>);/ + (<LATIN_SMALL_LETTER_J_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_J_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_K_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_K_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_L_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_L_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_L_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_L_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_L_WITH_CARON>,<LATIN_CAPITAL_LETTER_L_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_L_WITH_MIDDLE_DOT>,<LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_DOT>);/ + (<LATIN_SMALL_LETTER_L_WITH_STROKE>,<LATIN_CAPITAL_LETTER_L_WITH_STROKE>);/ + (<LATIN_SMALL_LETTER_N_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_N_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_N_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_N_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_N_WITH_CARON>,<LATIN_CAPITAL_LETTER_N_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_ENG>,<LATIN_CAPITAL_LETTER_ENG>);/ + (<LATIN_SMALL_LETTER_O_WITH_MACRON>,<LATIN_CAPITAL_LETTER_O_WITH_MACRON>);/ + (<LATIN_SMALL_LETTER_O_WITH_BREVE>,<LATIN_CAPITAL_LETTER_O_WITH_BREVE>);/ + (<LATIN_SMALL_LETTER_O_WITH_DOUBLE_ACUTE>,<LATIN_CAPITAL_LETTER_O_WITH_DOUBLE_ACUTE>);/ + (<LATIN_SMALL_LIGATURE_OE>,<LATIN_CAPITAL_LIGATURE_OE>);/ + (<LATIN_SMALL_LETTER_R_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_R_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_R_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_R_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_R_WITH_CARON>,<LATIN_CAPITAL_LETTER_R_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_S_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_S_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_S_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_S_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_S_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_S_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_S_WITH_CARON>,<LATIN_CAPITAL_LETTER_S_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_T_WITH_CEDILLA>,<LATIN_CAPITAL_LETTER_T_WITH_CEDILLA>);/ + (<LATIN_SMALL_LETTER_T_WITH_CARON>,<LATIN_CAPITAL_LETTER_T_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_T_WITH_STROKE>,<LATIN_CAPITAL_LETTER_T_WITH_STROKE>);/ + (<LATIN_SMALL_LETTER_U_WITH_TILDE>,<LATIN_CAPITAL_LETTER_U_WITH_TILDE>);/ + (<LATIN_SMALL_LETTER_U_WITH_MACRON>,<LATIN_CAPITAL_LETTER_U_WITH_MACRON>);/ + (<LATIN_SMALL_LETTER_U_WITH_BREVE>,<LATIN_CAPITAL_LETTER_U_WITH_BREVE>);/ + (<LATIN_SMALL_LETTER_U_WITH_RING_ABOVE>,<LATIN_CAPITAL_LETTER_U_WITH_RING_ABOVE>);/ + (<LATIN_SMALL_LETTER_U_WITH_DOUBLE_ACUTE>,<LATIN_CAPITAL_LETTER_U_WITH_DOUBLE_ACUTE>);/ + (<LATIN_SMALL_LETTER_U_WITH_OGONEK>,<LATIN_CAPITAL_LETTER_U_WITH_OGONEK>);/ + (<LATIN_SMALL_LETTER_W_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_W_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_Y_WITH_CIRCUMFLEX>,<LATIN_CAPITAL_LETTER_Y_WITH_CIRCUMFLEX>);/ + (<LATIN_SMALL_LETTER_Z_WITH_ACUTE>,<LATIN_CAPITAL_LETTER_Z_WITH_ACUTE>);/ + (<LATIN_SMALL_LETTER_Z_WITH_DOT_ABOVE>,<LATIN_CAPITAL_LETTER_Z_WITH_DOT_ABOVE>);/ + (<LATIN_SMALL_LETTER_Z_WITH_CARON>,<LATIN_CAPITAL_LETTER_Z_WITH_CARON>);/ + (<LATIN_SMALL_LETTER_LONG_S>,<S>);/ + (<LATIN_SMALL_LETTER_B_WITH_STROKE>,<LATIN_CAPITAL_LETTER_B_WITH_STROKE>);/ + (<LATIN_SMALL_LETTER_B_WITH_TOPBAR>,<LATIN_CAPITAL_LETTER_B_WITH_TOPBAR>);/ + (<LATIN_SMALL_LETTER_TONE_SIX>,<LATIN_CAPITAL_LETTER_TONE_SIX>);/ + (<LATIN_SMALL_LETTER_C_WITH_HOOK>,<LATIN_CAPITAL_LETTER_C_WITH_HOOK>);/ + (<LATIN_SMALL_LETTER_D_WITH_TOPBAR>,<LATIN_CAPITAL_LETTER_D_WITH_TOPBAR>);/ + (<LATIN_SMALL_LETTER_F_WITH_HOOK>,<LATIN_CAPITAL_LETTER_F_WITH_HOOK>);/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Mon Nov 5 00:20:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7BE9F10F2B3F; Mon, 5 Nov 2018 00:20:59 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A3378E6DC; Mon, 5 Nov 2018 00:20:59 +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 DF90510330; Mon, 5 Nov 2018 00:20:58 +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 wA50Kwgd066155; Mon, 5 Nov 2018 00:20:58 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA50KwVK066153; Mon, 5 Nov 2018 00:20:58 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811050020.wA50KwVK066153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans <kevans@FreeBSD.org> Date: Mon, 5 Nov 2018 00:20:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340146 - in head: lib usr.sbin X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: lib usr.sbin X-SVN-Commit-Revision: 340146 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0A3378E6DC X-Spamd-Result: default: False [-1.04 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.26)[-0.261,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.66)[-0.664,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 00:20:59 -0000 Author: kevans Date: Mon Nov 5 00:20:58 2018 New Revision: 340146 URL: https://svnweb.freebsd.org/changeset/base/340146 Log: Move pmc* bits behind MK_PMC to fix WITHOUT_PMC build No objection from: mmacy MFC after: 3 days Modified: head/lib/Makefile head/usr.sbin/Makefile Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sun Nov 4 23:28:56 2018 (r340145) +++ head/lib/Makefile Mon Nov 5 00:20:58 2018 (r340146) @@ -70,8 +70,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libpathconv \ libpcap \ libpjdlog \ - libpmc \ - libpmcstat \ ${_libproc} \ libprocstat \ libregex \ @@ -200,6 +198,7 @@ _libdl= libdl .endif SUBDIR.${MK_OPENSSL}+= libmp +SUBDIR.${MK_PMC}+= libpmc libpmcstat SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Sun Nov 4 23:28:56 2018 (r340145) +++ head/usr.sbin/Makefile Mon Nov 5 00:20:58 2018 (r340146) @@ -59,9 +59,6 @@ SUBDIR= adduser \ nologin \ pciconf \ periodic \ - pmcannotate \ - pmccontrol \ - pmcstat \ pnfsdscopymr \ pnfsdsfile \ pnfsdskill \ @@ -191,7 +188,7 @@ SUBDIR.${MK_PKGBOOTSTRAP}+= pkg .if ${COMPILER_FEATURES:Mc++11} SUBDIR.${MK_PMC}+= pmc .endif -SUBDIR.${MK_PMC}+= pmcstudy +SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy SUBDIR.${MK_PORTSNAP}+= portsnap SUBDIR.${MK_PPP}+= ppp SUBDIR.${MK_QUOTAS}+= edquota From owner-svn-src-head@freebsd.org Mon Nov 5 01:53:22 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0561010F4B74; Mon, 5 Nov 2018 01:53: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 88A536A664; Mon, 5 Nov 2018 01:53:21 +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 69C9B11359; Mon, 5 Nov 2018 01:53:21 +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 wA51rLDZ016231; Mon, 5 Nov 2018 01:53:21 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA51rLaV016230; Mon, 5 Nov 2018 01:53:21 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201811050153.wA51rLaV016230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits <jhibbits@FreeBSD.org> Date: Mon, 5 Nov 2018 01:53:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340147 - 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: 340147 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 88A536A664 X-Spamd-Result: default: False [-0.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.24)[-0.237,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.52)[-0.520,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 01:53:22 -0000 Author: jhibbits Date: Mon Nov 5 01:53:20 2018 New Revision: 340147 URL: https://svnweb.freebsd.org/changeset/base/340147 Log: powerpc/SMP: Don't spam the console with AP bringup messages Especially on new POWER9 systems, the console can be filled with SMP: AP CPU #XX launched messages. This can also slow down the console printing. Instead, do what x86 now does, as of r333335, and print it all on one line, unless bootverbose is set. Modified: head/sys/powerpc/powerpc/mp_machdep.c Modified: head/sys/powerpc/powerpc/mp_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/mp_machdep.c Mon Nov 5 00:20:58 2018 (r340146) +++ head/sys/powerpc/powerpc/mp_machdep.c Mon Nov 5 01:53:20 2018 (r340147) @@ -100,7 +100,11 @@ machdep_ap_bootstrap(void) /* Serialize console output and AP count increment */ mtx_lock_spin(&ap_boot_mtx); ap_awake++; - printf("SMP: AP CPU #%d launched\n", PCPU_GET(cpuid)); + if (bootverbose) + printf("SMP: AP CPU #%d launched\n", PCPU_GET(cpuid)); + else + printf("%s%d%s", ap_awake == 2 ? "Launching APs: " : "", + PCPU_GET(cpuid), ap_awake == mp_ncpus ? "\n" : " "); mtx_unlock_spin(&ap_boot_mtx); while(smp_started == 0) From owner-svn-src-head@freebsd.org Mon Nov 5 08:11:17 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 877DD10FBDB5; Mon, 5 Nov 2018 08:11:17 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 151777466B; Mon, 5 Nov 2018 08:11:17 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 EA73C150BA; Mon, 5 Nov 2018 08:11:16 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA58BGlD007338; Mon, 5 Nov 2018 08:11:16 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA58BGwr007337; Mon, 5 Nov 2018 08:11:16 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201811050811.wA58BGwr007337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy <mmacy@FreeBSD.org> Date: Mon, 5 Nov 2018 08:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340149 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 340149 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 151777466B X-Spamd-Result: default: False [-0.97 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.22)[-0.218,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.64)[-0.644,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 08:11:17 -0000 Author: mmacy Date: Mon Nov 5 08:11:16 2018 New Revision: 340149 URL: https://svnweb.freebsd.org/changeset/base/340149 Log: hwpmc: limit wait for user callchain collection to 1 tick The hwpmc pcpu sample buffer is prone to head of line blocking when waiting for user process to return to user space and collect a pending callchain. If more than one tick has elapsed between the time the sample entry was marked for collection and the time that the hardclock pmc handler runs to copy the records to a larger temporary buffer, mark the sample entry as not in use. This changes reduces the number of samples marked as not valid when collecting under load from ~99.5% to 5-20%. Reported by: mjg@ MFC after: 3 days Modified: head/sys/dev/hwpmc/hwpmc_mod.c Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Mon Nov 5 06:59:41 2018 (r340148) +++ head/sys/dev/hwpmc/hwpmc_mod.c Mon Nov 5 08:11:16 2018 (r340149) @@ -4949,8 +4949,11 @@ pmc_process_samples(int cpu, ring_type_t ring) /* If there is a pending AST wait for completion */ if (ps->ps_nsamples == PMC_USER_CALLCHAIN_PENDING) { - /* if sample is more than 65 ms old, drop it */ - if (ticks - ps->ps_ticks > (hz >> 4)) { + /* if we've been waiting more than 1 tick to + * collect a callchain for this record then + * drop it and move on. + */ + if (ticks - ps->ps_ticks > 1) { /* * track how often we hit this as it will * preferentially lose user samples From owner-svn-src-head@freebsd.org Mon Nov 5 08:30:08 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 463E810FC1CF; Mon, 5 Nov 2018 08:30:08 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE16274D3C; Mon, 5 Nov 2018 08:30:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ivaldir.etoilebsd.net (etoilebsd.net [178.32.217.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 7829216F72; Mon, 5 Nov 2018 08:30:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by ivaldir.etoilebsd.net (Postfix, from userid 1001) id A6247978DF; Mon, 5 Nov 2018 09:30:06 +0100 (CET) Date: Mon, 5 Nov 2018 09:30:06 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Yuri Pankov <yuripv@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340144 - in head: lib/libc/locale share/ctypedef tools/tools/locale tools/tools/locale/tools Message-ID: <20181105083006.7crw6vhyq3vimxlm@ivaldir.net> References: <201811042213.wA4MDMdQ003695@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7sx36d5qgvcn4gg2" Content-Disposition: inline In-Reply-To: <201811042213.wA4MDMdQ003695@repo.freebsd.org> User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: AE16274D3C X-Spamd-Result: default: False [-3.98 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.976,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.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.80)[-0.795,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 08:30:08 -0000 --7sx36d5qgvcn4gg2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 04, 2018 at 10:13:22PM +0000, Yuri Pankov wrote: > Author: yuripv > Date: Sun Nov 4 22:13:22 2018 > New Revision: 340144 > URL: https://svnweb.freebsd.org/changeset/base/340144 >=20 > Log: > Add hybrid C.UTF-8 locale being identical to default C locale except > that it uses the same ctype maps and functions as other UTF-8 locales. > =20 > Reviewed by: bapt, cem, eadler > Approved by: kib (mentor, implicit) > Differential Revision: https://reviews.freebsd.org/D17833 >=20 Excellent, do you plan to MFC that so freebsd 12.1 and freebsd 11.3 can ben= efit it? Best regards, Bapt --7sx36d5qgvcn4gg2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlvf/3sACgkQY4mL3PG3 PlrtvhAAhIqxplGS8EEdzLFUtwNmTlk6AZsF/MmG11HWSqhSFWgu+ixfcZIYwVbY lqsz2XE7WFcl3adN9HVH4lirHgD+qICD7NkkYyf7YrVPLsigWsrpAz4u0ET53KZo 0Oe+w88eU7vpE/engFZAH1JrMdPPv62K58u9HEa3aJ+TgHPbrVxvzJbuQ9dPG9DB 3yMGZ5rl04UUHV6dxkjbfi273+Xq478VrKdq48/AKNZirHPUvSUYMHi2j7+Ki/7O tM7JqAKfa0rv1I6dvlxCdIwZAYUowl4zLMnKggPp/fT9g7ZiKgTQFj7JPKewY1nr Yh+MDK2cByNDMcMZSDEr8V8ChHzreni4iBRxLpHnFxi5xtUb+pD3lS7b9D0d9OeJ K8kzBWaDyVwXG49zDJgUNnLFb80N6TE59bpnW2NIdEwdSVE7sxO4zBVK0Kp67z12 85okxilmwhL4e1d28R1OJb3QXoplgeFlbkma6cidLbbrlIL2V2DPOezWa2cce+L2 133ZVjJUxQkk1g1h/DVawejh1JYWhs8+fMGwW7hMHMv45k8Tz8dj/vIfwXBdCUSz uKEHfG6P5cJLefecCaSs9Lm8QRfxQ8pmLeC3Yqo2d61d/D60415ml6BZPa3FOKWS 4/pJMd8hWuCo0IBP6Sx7CVcNRod35K/HUZzK8lb02IRKC+KYEXM= =nnhV -----END PGP SIGNATURE----- --7sx36d5qgvcn4gg2-- From owner-svn-src-head@freebsd.org Mon Nov 5 08:48:05 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C5B9110FC806; Mon, 5 Nov 2018 08:48:04 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (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 C1EAA7589A; Mon, 5 Nov 2018 08:48:03 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DE73E2251B; Mon, 5 Nov 2018 03:47:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 05 Nov 2018 03:47:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=pN7oGb oQlUM9aIoAHlhIUwtWTU5aPzdZwjqzDFkTJnk=; b=NtoHmdE3zwoWi5KK67z3fH 2MAgJr9JNf3OSV4E9QXLUJNV5J8zmHwNRt3R4BGrkU4Gbv83aW7I2BqRyYp+24cO 7La2L4/HeqULPub+W+0FZjqedMKG0vs8UIOn+XAObCANtvYk8LVxNcb2rI5X/+ZO dlgBSOWsu6A9kq0wxJXxt3zNzV5lI+ye7gr1fjg+SXQT7M/8W6i0GKxJ82qeIljD 1xsNR7t2iPVprn7SKEqY7ZTeZwREZXYKr5sB2VivNvJ04ykeQKfkuhIQxdKk1eiv nn0viYQCiXqRnMEDARmTKfsAPRBJ0h0LgJdfwaQUJlXMjXwZw9fbPXxhijzv69aQ == X-ME-Sender: <xms:vAPgWw91ocvQb-q3rcpmvFyOvMVzIFCZqGpcQYA5zwF2Qj_sxrJgXA> X-ME-Proxy: <xmx:vAPgW0mlmrguCp3MTHMRhj65ZRH4wTQqC13w5dvtv1umA0ntwWw5UA> <xmx:vAPgW5bj4asaYj_Yj1lm7hutxMZ0QtRQYoBcRRVHclsKJ3PgOng6bw> <xmx:vAPgW0qClU-ce2CzTpLc3RKNIPAfKfhtknA6V_By-2_TcMTRjHqZOg> <xmx:vAPgW_GZ5MWikPtJpD1Szghbr0KjehZ_6_O3sGiNrHyaGfexMmW48g> <xmx:vAPgW19JslI29kTnqeRGZf1f103sFI012UPRMVKB0psegN-bIlrmeA> <xmx:vAPgW9DgTgnBquVnOZ7Hl8IfRZrz8dgeWcHhpZbqXX1z8RP92VSV1A> Received: from [192.168.1.2] (unknown [92.50.223.72]) by mail.messagingengine.com (Postfix) with ESMTPA id C5FF9E454E; Mon, 5 Nov 2018 03:47:54 -0500 (EST) Subject: Re: svn commit: r340144 - in head: lib/libc/locale share/ctypedef tools/tools/locale tools/tools/locale/tools To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201811042213.wA4MDMdQ003695@repo.freebsd.org> <20181105083006.7crw6vhyq3vimxlm@ivaldir.net> From: Yuri Pankov <yuripv@FreeBSD.org> Openpgp: preference=signencrypt Autocrypt: addr=yuripv@FreeBSD.org; keydata= xsBNBFu8u6IBCADB11gP0QwnorrHjqAtKLHKHNHskhy0s7jqJKfx0YqXgVBKGLJ9/mjLAz0F CBNvemHSDDTs0mEZ9cBKKi6cmsav6+UQgr//yai6hvXLBJqKchSFO4MhmdvBtsGFq1yKz5Zi uhjmimKyIpgBgvMdbgGbGq6cnSB2uEPmZuJr419SVRODOkXukU+F5WHgaHzDdHAIu1asCt2B +6msxqIqlFWcXyZyTGicTGGvC/PFIsVRUtD1dIJANTC876g7DTb7LZXWiWwJpSJ4GKMXMHVX Ct9BoQ4i3nhKbOxb6Io1wsy+NFyWsTJ9KYrxKKPJP3oG8BWb/cqlFqnE4eNSsiq2q7krABEB AAHNH1l1cmkgUGFua292IDx5dXJpcHZAeXVyaXB2Lm5ldD7CwJcEEwEIAEECGwMFCQWjmoAF CwkIBwMFFQoJCAsFFgMCAQACHgECF4AWIQT4arc+w94tPi0v/3CTi+B/sSrhbAUCW708wAIZ AQAKCRCTi+B/sSrhbPxBB/961alcU091O+yKT5/oReHVc/PX0Tz4sW3V44AcgLfYlrZavCro EFz90qmCrl0xqEwuAKcC4bjmL8SjPWAhSN6IH9nxdw+HeZnAPiHm/q679Bu47+nHBl3qD/9p +t1PkKeKZfaWToFMt1nq06ytSu6VLMCwLdlDNe6DReX0ex/afEqKsuaIZSKL4UYjRwklp8PU Uf98QkrfapyHB67hQMzfI4tPeJaYyv0cTgfq3kUWJx1V6Xi0b6Zxj4ZrB2TXvaMO5g7yhU9E E3WWAvoe4FgB3a7dHe8atnHhq5+Cuvm6+LD4Jh7jvMAE5UMN+xxQpnGpNghHjaCy4vXrLRBZ nhRYzsBNBFu8u6IBCADKih3Q933rDNj4ZA8FhBQ2RlmBgvwOLcDPIL3h0V7h38y3+HisgFSc XACDsdrTlYZ1bRXkD9FHENynBcv0l/3uGJDk8jaGIDE0TP8OQBRp+IaU9/BHnAqrKxTJGIol Dahy2m+yx2yhdc6B4ujWMDqCF1rWOD+ymOWw+VLllOkrHcZa5PJtX9UOGbApZl8ZTM8El4CA NN8F1bg9MWzUi+8LYoGWGc+BwsFS1OUB1c4SPgMu5fD4Wfsr9yRl06fdpEA2YT7B/j5/5RSC 0sE2Zs/tmJ/JRflHJ12ycj59ma2xQMfEJF40hZDpMFQmZvbVqgEg3ocQcltjbxlIKZ/mjC4z ABEBAAHCwHwEGAEKACYWIQT4arc+w94tPi0v/3CTi+B/sSrhbAUCW7y7ogIbDAUJBaOagAAK CRCTi+B/sSrhbIDcCACqAZMcoxUBLZa40a5b24j5i1jplvCYYb3h+Q5lt5+BFJ87kCb4dJuU D3kh2i29BrxWQWa9WNue9ozxeYkbkfXubQYXexVolRsnh64OdGsE8KvorBFBB3zdK/GRt2Jy +jsnTfUWuQllbzMP0MfhCDMk1Mo8WvDH2/cOEP/yLKf20a+cd6nLs7bidjmGXo9pyuBKAtV6 Kv+VRu54AL+A/UBYu/eB3Dtvzcnut+1Zq6KaP++kUwPwINLIk04OBDwN0zRNTiqMAFYYyz2v ZHBB6E1th/l//ZC5b9Dk0ZpFI1bYdL9ymnrZe1MqbGPnDCToQxu00T/pZCm6Z92YrZQYuNwl Message-ID: <decf9fc2-f1df-f9db-106e-6127a9b6ecdc@FreeBSD.org> Date: Mon, 5 Nov 2018 11:47:44 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20181105083006.7crw6vhyq3vimxlm@ivaldir.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="XRGozPUPENPau5akUouLkj0yfNOa5ASa4" X-Rspamd-Queue-Id: C1EAA7589A X-Spamd-Result: default: False [-8.14 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[messagingengine.com]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[messagingengine.com:+]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-3.64)[ip: (-9.81), ipnet: 66.111.0.0/20(-4.88), asn: 11403(-3.45), country: US(-0.06)]; ASN(0.00)[asn:11403, ipnet:66.111.0.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[27.4.111.66.list.dnswl.org : 127.0.5.1] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 08:48:05 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --XRGozPUPENPau5akUouLkj0yfNOa5ASa4 Content-Type: multipart/mixed; boundary="KKkxzg7pxoKvzM8ASeUGqTCfQcCzD54fe"; protected-headers="v1" From: Yuri Pankov <yuripv@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <decf9fc2-f1df-f9db-106e-6127a9b6ecdc@FreeBSD.org> Subject: Re: svn commit: r340144 - in head: lib/libc/locale share/ctypedef tools/tools/locale tools/tools/locale/tools References: <201811042213.wA4MDMdQ003695@repo.freebsd.org> <20181105083006.7crw6vhyq3vimxlm@ivaldir.net> In-Reply-To: <20181105083006.7crw6vhyq3vimxlm@ivaldir.net> --KKkxzg7pxoKvzM8ASeUGqTCfQcCzD54fe Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Baptiste Daroussin wrote: > On Sun, Nov 04, 2018 at 10:13:22PM +0000, Yuri Pankov wrote: >> Author: yuripv >> Date: Sun Nov 4 22:13:22 2018 >> New Revision: 340144 >> URL: https://svnweb.freebsd.org/changeset/base/340144 >> >> Log: >> Add hybrid C.UTF-8 locale being identical to default C locale except= >> that it uses the same ctype maps and functions as other UTF-8 locale= s. >> =20 >> Reviewed by: bapt, cem, eadler >> Approved by: kib (mentor, implicit) >> Differential Revision: https://reviews.freebsd.org/D17833 >> > Excellent, do you plan to MFC that so freebsd 12.1 and freebsd 11.3 can= benefit > it? Yes, will do along with CLDR 34 data (MFC period specified as 1 month there). --KKkxzg7pxoKvzM8ASeUGqTCfQcCzD54fe-- --XRGozPUPENPau5akUouLkj0yfNOa5ASa4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEE+Gq3PsPeLT4tL/9wk4vgf7Eq4WwFAlvgA7AACgkQk4vgf7Eq 4Wx/rggAsMRsWSmx61US7UZNDOTRJEOLIV7PpSLbZFpZX2a/tq4uRTrcTePOiCzt 5Xr+SOauUwBzDmXCjqop4cKID+UdYBXu8ATyVbapeqJX2JYwcirAEJPqMYgrKUAJ UR1kTwS4yfKDINOgkAL0Wvh30GFQWfNKTQ9E/8gIPAv6PC5ZHEnSJSDNPHL84VgI S1hyovz1FLm/Mvh7kkLMX6ADfF5ZUDtg8BtCAwXi5qx620DS04a99m/OP4kaNbCQ c+qlABxCh+3lfq8cdnB2Ep6FzmV/S1LsVP6sZYBU2vTErH/PctPVL64grS0vThRh LdgUynfSqYel4FGrPWf7rAjUMsdbsg== =nZOa -----END PGP SIGNATURE----- --XRGozPUPENPau5akUouLkj0yfNOa5ASa4-- From owner-svn-src-head@freebsd.org Mon Nov 5 08:54:51 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4FD2510FCBAF; Mon, 5 Nov 2018 08:54:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CBD8375D6C; Mon, 5 Nov 2018 08:54:50 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ivaldir.etoilebsd.net (etoilebsd.net [178.32.217.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 8C2FD17285; Mon, 5 Nov 2018 08:54:50 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by ivaldir.etoilebsd.net (Postfix, from userid 1001) id 9F09C978FE; Mon, 5 Nov 2018 09:54:49 +0100 (CET) Date: Mon, 5 Nov 2018 09:54:49 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Yuri Pankov <yuripv@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340144 - in head: lib/libc/locale share/ctypedef tools/tools/locale tools/tools/locale/tools Message-ID: <20181105085449.5e74qifsj45ds6ga@ivaldir.net> References: <201811042213.wA4MDMdQ003695@repo.freebsd.org> <20181105083006.7crw6vhyq3vimxlm@ivaldir.net> <decf9fc2-f1df-f9db-106e-6127a9b6ecdc@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="girjxno7q46xxgve" Content-Disposition: inline In-Reply-To: <decf9fc2-f1df-f9db-106e-6127a9b6ecdc@FreeBSD.org> User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: CBD8375D6C X-Spamd-Result: default: False [-5.98 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,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.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; IP_SCORE(-1.77)[ip: (-1.04), ipnet: 96.47.64.0/20(-4.31), asn: 11403(-3.45), country: US(-0.06)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 08:54:51 -0000 --girjxno7q46xxgve Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 05, 2018 at 11:47:44AM +0300, Yuri Pankov wrote: > Baptiste Daroussin wrote: > > On Sun, Nov 04, 2018 at 10:13:22PM +0000, Yuri Pankov wrote: > >> Author: yuripv > >> Date: Sun Nov 4 22:13:22 2018 > >> New Revision: 340144 > >> URL: https://svnweb.freebsd.org/changeset/base/340144 > >> > >> Log: > >> Add hybrid C.UTF-8 locale being identical to default C locale except > >> that it uses the same ctype maps and functions as other UTF-8 locale= s. > >> =20 > >> Reviewed by: bapt, cem, eadler > >> Approved by: kib (mentor, implicit) > >> Differential Revision: https://reviews.freebsd.org/D17833 > >> > > Excellent, do you plan to MFC that so freebsd 12.1 and freebsd 11.3 can= benefit > > it? >=20 > Yes, will do along with CLDR 34 data (MFC period specified as 1 month > there). >=20 Wonderful thanks! Bapt --girjxno7q46xxgve Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlvgBVcACgkQY4mL3PG3 Plr7Xg//XKpq7diriFY7mD1WhKBgNRBzXxwivi+o0eXBN7ESOkDzxy4QVQNEQjuk czsFD/1uJh9IK+VWWyz2pOQLXiJlu5Qhm+HAO1MmU9KQCMIWQ8niXPRMDbkcFV/H KWOS4trm9nxpbQ8DiLXkPRjjNsFndEXbCsYWRdd/5PXuLEiKzdjxY+hgtaVv9Sqs bVNKTbzGogS0iveRqjT0eQlcndAtvmsw8YxnHRPb8+nCksXrpQUSJxIW8cl9LHBn U6dJpGXRBpq6xpCAuHgO/AOQhnK0Km19XH0xybDuo31EiIo+XgQg3rrXqIOGhmj6 FyxKtzgGVcTVkAhIAv1ljVXbnnT+5X8QX6amBQFuHABCop9g2YhDXyyzu6PyGEYv LjAORB9krd1oDietV/aJO/kmCFuhzb+7t9xeE3b4ReDvSReBbNHxRtkk938iThNg go/IGD/Zcd8Wbq2bkqPEZNba2uLLTe++Uzu+kWH6VGJ+7b9zZYXG8P9bK3aiNh2j 1NbKjJyRyOJ26LB60h51/kPzlhjmlBiTObtSPW6i1C0m7R9Wo4zZOULy9OCXjR9N 3k2mgwkqFGwPFpfjFpN4d2XLBlnthKrPNTMviZEjHKKh+Bdc/OZdMczx3sv2HKo1 bSO2XsISELktO41z2jiZq6omvaurP/NgoXNmQOQ37//2dfyFSLo= =f4Pu -----END PGP SIGNATURE----- --girjxno7q46xxgve-- From owner-svn-src-head@freebsd.org Mon Nov 5 15:22:42 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5FDB711044A2; Mon, 5 Nov 2018 15:22:42 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E5C64834C8; Mon, 5 Nov 2018 15:22:41 +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 C7E9E19653; Mon, 5 Nov 2018 15:22:41 +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 wA5FMfQ3052583; Mon, 5 Nov 2018 15:22:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5FMf97052582; Mon, 5 Nov 2018 15:22:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811051522.wA5FMf97052582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Mon, 5 Nov 2018 15:22:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340150 - head/tools/build/options X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/tools/build/options X-SVN-Commit-Revision: 340150 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E5C64834C8 X-Spamd-Result: default: False [-0.32 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.28)[-0.282,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.07)[0.074,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 15:22:42 -0000 Author: emaste Date: Mon Nov 5 15:22:41 2018 New Revision: 340150 URL: https://svnweb.freebsd.org/changeset/base/340150 Log: Expand WITH_LLD_BOOTSTRAP description Reported by: bz Modified: head/tools/build/options/WITH_LLD_BOOTSTRAP Modified: head/tools/build/options/WITH_LLD_BOOTSTRAP ============================================================================== --- head/tools/build/options/WITH_LLD_BOOTSTRAP Mon Nov 5 08:11:16 2018 (r340149) +++ head/tools/build/options/WITH_LLD_BOOTSTRAP Mon Nov 5 15:22:41 2018 (r340150) @@ -1,2 +1,3 @@ .\" $FreeBSD$ -Set to build the LLD linker during the bootstrap phase of the build. +Set to build the LLD linker during the bootstrap phase of the build, +and use it during buildworld and buildkernel. From owner-svn-src-head@freebsd.org Mon Nov 5 15:30:14 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 9E09F11046D6; Mon, 5 Nov 2018 15:30:14 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 144F183854; Mon, 5 Nov 2018 15:30:14 +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 E052019658; Mon, 5 Nov 2018 15:30:13 +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 wA5FUDaV052945; Mon, 5 Nov 2018 15:30:13 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5FUDsB052944; Mon, 5 Nov 2018 15:30:13 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811051530.wA5FUDsB052944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Mon, 5 Nov 2018 15:30:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340151 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 340151 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 144F183854 X-Spamd-Result: default: False [-0.28 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.24)[-0.244,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.08)[0.075,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 15:30:14 -0000 Author: emaste Date: Mon Nov 5 15:30:13 2018 New Revision: 340151 URL: https://svnweb.freebsd.org/changeset/base/340151 Log: Regen src.conf.5 after r340150 Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Mon Nov 5 15:22:41 2018 (r340150) +++ head/share/man/man5/src.conf.5 Mon Nov 5 15:30:13 2018 (r340151) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd November 3, 2018 +.Dd November 5, 2018 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1014,7 +1014,8 @@ enabled unless an alternate linker is provided via XLD This is a default setting on arm/arm, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe, riscv/riscv64 and sparc64/sparc64. .It Va WITH_LLD_BOOTSTRAP -Set to build the LLD linker during the bootstrap phase of the build. +Set to build the LLD linker during the bootstrap phase of the build, +and use it during buildworld and buildkernel. .Pp This is a default setting on amd64/amd64, arm/armv7, arm64/aarch64 and i386/i386. From owner-svn-src-head@freebsd.org Mon Nov 5 16:20:08 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 672E01105733; Mon, 5 Nov 2018 16:20:08 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E6C9B85174; Mon, 5 Nov 2018 16:20:07 +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 C7EB819E44; Mon, 5 Nov 2018 16:20:07 +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 wA5GK7sO078678; Mon, 5 Nov 2018 16:20:07 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5GK74Z078677; Mon, 5 Nov 2018 16:20:07 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811051620.wA5GK74Z078677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans <kevans@FreeBSD.org> Date: Mon, 5 Nov 2018 16:20:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340152 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 340152 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E6C9B85174 X-Spamd-Result: default: False [-1.18 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.74)[-0.744,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.33)[-0.329,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 16:20:08 -0000 Author: kevans Date: Mon Nov 5 16:20:07 2018 New Revision: 340152 URL: https://svnweb.freebsd.org/changeset/base/340152 Log: lualoader: Add chainload menu entry MFC after: 4 days Modified: head/stand/lua/menu.lua Modified: head/stand/lua/menu.lua ============================================================================== --- head/stand/lua/menu.lua Mon Nov 5 15:30:13 2018 (r340151) +++ head/stand/lua/menu.lua Mon Nov 5 16:20:07 2018 (r340152) @@ -337,6 +337,22 @@ menu.welcome = { submenu = menu.boot_environments, alias = {"e", "E"}, }, + -- chainload + { + entry_type = core.MENU_ENTRY, + name = function() + return 'Chain' .. color.highlight("L") .. + "oad " .. loader.getenv('chain_disk') + end, + func = function() + loader.perform("chain " .. + loader.getenv('chain_disk')) + end, + visible = function() + return loader.getenv('chain_disk') ~= nil + end, + alias = {"l", "L"}, + }, }, } From owner-svn-src-head@freebsd.org Mon Nov 5 17:52:05 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E9EC91107684 for <svn-src-head@mailman.ysv.freebsd.org>; Mon, 5 Nov 2018 17:52:04 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 575EF6B122 for <svn-src-head@freebsd.org>; Mon, 5 Nov 2018 17:52:04 +0000 (UTC) (envelope-from ricera10@gmail.com) Received: by mail-ed1-f66.google.com with SMTP id w19-v6so8275688eds.1 for <svn-src-head@freebsd.org>; Mon, 05 Nov 2018 09:52:04 -0800 (PST) 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=qbOoQasst1CQ/sxxGUQ5pljlltYJxAvp2tnLneUogIs=; b=OdIQpOLtcJB8pfgXJlwX/DJJWMWPjQ+p3/wdnDfN+QdI/gL70ezeGaQesBRGgsp39D PX6l8gf26Se1iM05eefwgo6Tag2e12esSnMCzvfZLWrTyuAyBSLCCMwvaIL8dtw1RDAf /Aa3VyOyzWQXT2VWIle5WJPfNYKB5yuzSK/iTw9uFnncwLQG74FMrhox9kwbM/cJftzt fmziowvwSp5btpDYN6EpzzqJ+2PDhK3utNWUxl9Jz20EjrcB9YkmLZqpq9kViDLsrjgo JUOPlNNRrx7f+Zq1A6BmOkINYfdXrRx73GvLjUXUWWVseUzV5+MBNqvfrFyZLY1Yf9sY GXnQ== X-Gm-Message-State: AGRZ1gIKhLcLdpui8BwQ1CxiVVKq6DlxikTTtNexJx7tf6299I+Pm9qo SLnlQsZ2b8jvbSlrB3vPcIIrBdUeiHI= X-Google-Smtp-Source: AJdET5dNIEdZaQeDavtBDBDDFjmimgljyT+rSD4mzB60CQ4Rbxk2/eOr/fy4sDsTLJbEhEHYiiIqeA== X-Received: by 2002:a50:b4e9:: with SMTP id x38-v6mr19185715edd.220.1541439997149; Mon, 05 Nov 2018 09:46:37 -0800 (PST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com. [209.85.221.49]) by smtp.gmail.com with ESMTPSA id w6-v6sm5041997eds.54.2018.11.05.09.46.35 for <svn-src-head@freebsd.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 09:46:36 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id z16-v6so10521190wrv.2 for <svn-src-head@freebsd.org>; Mon, 05 Nov 2018 09:46:35 -0800 (PST) X-Received: by 2002:a05:6000:1091:: with SMTP id y17mr20039767wrw.226.1541439995317; Mon, 05 Nov 2018 09:46:35 -0800 (PST) MIME-Version: 1.0 References: <201810122240.w9CMesr3018070@repo.freebsd.org> <ACCD4674-8D24-43BB-AEB3-8650E53CC36D@lists.zabbadoz.net> In-Reply-To: <ACCD4674-8D24-43BB-AEB3-8650E53CC36D@lists.zabbadoz.net> From: Eric Joyner <erj@freebsd.org> Date: Mon, 5 Nov 2018 09:46:23 -0800 X-Gmail-Original-Message-ID: <CAKdFRZgTsBegApwapqi=3in1eZHxUAkghGuO_UxFcZDsd1xn5w@mail.gmail.com> Message-ID: <CAKdFRZgTsBegApwapqi=3in1eZHxUAkghGuO_UxFcZDsd1xn5w@mail.gmail.com> Subject: Re: svn commit: r339338 - in head/sys: amd64/conf conf dev/ixl modules modules/iavf modules/ixl modules/ixlv net To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 575EF6B122 X-Spamd-Result: default: False [-3.09 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; RCVD_IN_DNSWL_NONE(0.00)[66.208.85.209.list.dnswl.org : 127.0.5.0]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER(0.30)[erj@freebsd.org,ricera10@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.208.85.209.rep.mailspike.net : 127.0.0.17]; 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)[erj@freebsd.org,ricera10@gmail.com]; IP_SCORE(-1.11)[ipnet: 209.85.128.0/17(-4.06), asn: 15169(-1.44), country: US(-0.06)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 17:52:05 -0000 I think this should be fixed as of several days ago. - Eric On Wed, Oct 24, 2018, 7:10 AM Bjoern A. Zeeb <bzeeb-lists@lists.zabbadoz.net wrote: > On 12 Oct 2018, at 22:40, Eric Joyner wrote: > > > Author: erj > > Date: Fri Oct 12 22:40:54 2018 > > New Revision: 339338 > > URL: https://svnweb.freebsd.org/changeset/base/339338 > > > > Log: > > ixl/iavf(4): Change ixlv to iavf and update it to use iflib(9) > > > > Finishes the conversion of the 40Gb Intel Ethernet drivers to > > iflib(9) for > > FreeBSD 12.0, and fixes numerous bugs in both ixl(4) and iavf(4). > > > > This commit also re-adds the VF driver to GENERIC since it now > > compiles and > > functions. > > > > The VF driver name was changed from ixlv(4) to iavf(4) because the > > VF driver is > > now intended to be used with future products, not just with > > Fortville/Fort Park > > VFs. > > > > A man page update that documents these drivers is forthcoming in a > > separate > > commit. > > > > Reviewed by: sbruno@, kbowling@ > > Tested by: jeffrey.e.pieper@intel.com > > > Trying to compile a kernel with RSS enabled (as universe does): > > 10 -------------------------------------------------------------- > 11 >>> stage 3.1: building everything > 12 -------------------------------------------------------------- > 13 /tank/users/bz/head.svn/sys/dev/ixl/if_iavf.c:1952:26: error: > no member named 'num_queues' in 'struct ixl_vsi' > 14 que_id = que_id % vsi->num_queues; > 15 ~~~ ^ > 16 1 error generated. > 17 --- if_iavf.o --- > 18 *** [if_iavf.o] Error code 1 > From owner-svn-src-head@freebsd.org Mon Nov 5 18:44:25 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 050CF1108AB4; Mon, 5 Nov 2018 18:44:25 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B0AA6D208; Mon, 5 Nov 2018 18:44:23 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA5IROre092160; Mon, 5 Nov 2018 10:27:24 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA5IRO5G092159; Mon, 5 Nov 2018 10:27:24 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811051827.wA5IRO5G092159@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340152 - head/stand/lua In-Reply-To: <201811051620.wA5GK74Z078677@repo.freebsd.org> To: Kyle Evans <kevans@freebsd.org> Date: Mon, 5 Nov 2018 10:27:24 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 5B0AA6D208 X-Spamd-Result: default: False [1.45 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.44)[0.441,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_MEDIUM(0.13)[0.133,0]; AUTH_NA(1.00)[]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.01)[country: US(-0.06)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 18:44:25 -0000 > Author: kevans > Date: Mon Nov 5 16:20:07 2018 > New Revision: 340152 > URL: https://svnweb.freebsd.org/changeset/base/340152 > > Log: > lualoader: Add chainload menu entry > > MFC after: 4 days Please do this a bit sooner so that it makes the next build on stable/12 which starts in ~72 hours. So maybe MFC: 2 days? Thanks, Rod <RE > Modified: > head/stand/lua/menu.lua > > Modified: head/stand/lua/menu.lua > ============================================================================== > --- head/stand/lua/menu.lua Mon Nov 5 15:30:13 2018 (r340151) > +++ head/stand/lua/menu.lua Mon Nov 5 16:20:07 2018 (r340152) > @@ -337,6 +337,22 @@ menu.welcome = { > submenu = menu.boot_environments, > alias = {"e", "E"}, > }, > + -- chainload > + { > + entry_type = core.MENU_ENTRY, > + name = function() > + return 'Chain' .. color.highlight("L") .. > + "oad " .. loader.getenv('chain_disk') > + end, > + func = function() > + loader.perform("chain " .. > + loader.getenv('chain_disk')) > + end, > + visible = function() > + return loader.getenv('chain_disk') ~= nil > + end, > + alias = {"l", "L"}, > + }, > }, > } > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Mon Nov 5 18:47:19 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 029AF1108BEF; Mon, 5 Nov 2018 18:47:19 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 67DE46D441; Mon, 5 Nov 2018 18:47:18 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 06A481AE4B; Mon, 5 Nov 2018 18:47:18 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lj1-f177.google.com with SMTP id j4-v6so9009793ljc.12; Mon, 05 Nov 2018 10:47:17 -0800 (PST) X-Gm-Message-State: AGRZ1gLcQO/l8lWpvSvirv+0eFrGyA/ZzJi7E8cUvGVLTp0yFbKnCsSk EvpWcDzd82VdZyzF4Rzx5rzw4uxaECC05YliZzs= X-Google-Smtp-Source: AJdET5ej0Rb8dA7vXM3UYOE2RNt9CaNU1tzWHSdIz4KAeiuyQS9+oYjWfS0d2k5MX2unkkPvuyo3BxZkHfZ1X+P/oEI= X-Received: by 2002:a2e:58b:: with SMTP id 133-v6mr16120545ljf.127.1541443636383; Mon, 05 Nov 2018 10:47:16 -0800 (PST) MIME-Version: 1.0 References: <201811051620.wA5GK74Z078677@repo.freebsd.org> <201811051827.wA5IRO5G092159@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811051827.wA5IRO5G092159@pdx.rh.CN85.dnsmgr.net> From: Kyle Evans <kevans@freebsd.org> Date: Mon, 5 Nov 2018 12:47:04 -0600 X-Gmail-Original-Message-ID: <CACNAnaFhV+Dukn3QyKPe7OHRF2ZXf6Y0UmdUGcv1T9uUZ-DD7A@mail.gmail.com> Message-ID: <CACNAnaFhV+Dukn3QyKPe7OHRF2ZXf6Y0UmdUGcv1T9uUZ-DD7A@mail.gmail.com> Subject: Re: svn commit: r340152 - head/stand/lua To: "Rodney W. Grimes" <rgrimes@freebsd.org> Cc: src-committers <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: 67DE46D441 X-Spamd-Result: default: False [-1.75 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-0.92)[-0.915,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)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-0.73)[-0.729,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 18:47:19 -0000 On Mon, Nov 5, 2018 at 12:44 PM Rodney W. Grimes <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > Author: kevans > > Date: Mon Nov 5 16:20:07 2018 > > New Revision: 340152 > > URL: https://svnweb.freebsd.org/changeset/base/340152 > > > > Log: > > lualoader: Add chainload menu entry > > > > MFC after: 4 days > > Please do this a bit sooner so that it makes the next > build on stable/12 which starts in ~72 hours. So maybe > MFC: 2 days? > Will do, since it's a fairly trivial change... I'll plan to put in a request for this and the boot-conf addition Wednesday night or Thursday morning (in GMT-6, for reference). Thanks, Kyle Evans From owner-svn-src-head@freebsd.org Mon Nov 5 18:47:32 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 BC1851108C1E; Mon, 5 Nov 2018 18:47:32 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3087F6D544; Mon, 5 Nov 2018 18:47:32 +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 7EABF1B6CC; Mon, 5 Nov 2018 18:47:30 +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 wA5IlU1d056117; Mon, 5 Nov 2018 18:47:30 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5IlUdA056116; Mon, 5 Nov 2018 18:47:30 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201811051847.wA5IlUdA056116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh <imp@FreeBSD.org> Date: Mon, 5 Nov 2018 18:47:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340155 - head/sys/cam/scsi X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/scsi X-SVN-Commit-Revision: 340155 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3087F6D544 X-Spamd-Result: default: False [-1.54 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.66)[-0.663,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.77)[-0.767,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 18:47:33 -0000 Author: imp Date: Mon Nov 5 18:47:29 2018 New Revision: 340155 URL: https://svnweb.freebsd.org/changeset/base/340155 Log: Only assert locked for many async events. Many async events that we see are called for this specific path. When calling an async callback for a targetted device, XTP will lock that specific device's path lock (same as what cam_periph_lock does). For those AC_ events, assert we have the lock rather than trying to recusrively take it (which causes panics since it's not recursive). Add annotations about this and about the fact that AC_SCSI_AEN events are generated now only in the ata stack (which cannot have a scsi_da attachment). Leave it in place in case I've overlooked something as the code is harmless. This is fallout from my attempts to "fix" locking for softc->flags in r330796 that's not been triggered often enough to get my attention until now. Sponsored by: Netflix MFC After: 3 days Differential Revision: https://reviews.freebsd.org/D17837 Modified: head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Mon Nov 5 18:12:41 2018 (r340154) +++ head/sys/cam/scsi/scsi_da.c Mon Nov 5 18:47:29 2018 (r340155) @@ -2005,7 +2005,7 @@ daasync(void *callback_arg, u_int32_t code, periph = (struct cam_periph *)callback_arg; switch (code) { - case AC_FOUND_DEVICE: + case AC_FOUND_DEVICE: /* callback to create periph, no locking yet */ { struct ccb_getdev *cgd; cam_status status; @@ -2041,7 +2041,7 @@ daasync(void *callback_arg, u_int32_t code, "due to status 0x%x\n", status); return; } - case AC_ADVINFO_CHANGED: + case AC_ADVINFO_CHANGED: /* Doesn't touch periph */ { uintptr_t buftype; @@ -2064,8 +2064,10 @@ daasync(void *callback_arg, u_int32_t code, ccb = (union ccb *)arg; /* - * Handle all UNIT ATTENTIONs except our own, - * as they will be handled by daerror(). + * Handle all UNIT ATTENTIONs except our own, as they will be + * handled by daerror(). Since this comes from a different periph, + * that periph's lock is held, not ours, so we have to take it ours + * out to touch softc flags. */ if (xpt_path_periph(ccb->ccb_h.path) != periph && scsi_extract_sense_ccb(ccb, @@ -2093,9 +2095,13 @@ daasync(void *callback_arg, u_int32_t code, } break; } - case AC_SCSI_AEN: + case AC_SCSI_AEN: /* Called for this path: periph locked */ + /* + * Appears to be currently unused for SCSI devices, only ata SIMs + * generate this. + */ + cam_periph_assert(periph, MA_OWNED); softc = (struct da_softc *)periph->softc; - cam_periph_lock(periph); if (!cam_iosched_has_work_flags(softc->cam_iosched, DA_WORK_TUR) && (softc->flags & DA_FLAG_TUR_PENDING) == 0) { if (da_periph_acquire(periph, DA_REF_TUR) == 0) { @@ -2103,31 +2109,28 @@ daasync(void *callback_arg, u_int32_t code, daschedule(periph); } } - cam_periph_unlock(periph); /* FALLTHROUGH */ - case AC_SENT_BDR: - case AC_BUS_RESET: + case AC_SENT_BDR: /* Called for this path: periph locked */ + case AC_BUS_RESET: /* Called for this path: periph locked */ { struct ccb_hdr *ccbh; + cam_periph_assert(periph, MA_OWNED); softc = (struct da_softc *)periph->softc; /* * Don't fail on the expected unit attention * that will occur. */ - cam_periph_lock(periph); softc->flags |= DA_FLAG_RETRY_UA; LIST_FOREACH(ccbh, &softc->pending_ccbs, periph_links.le) ccbh->ccb_state |= DA_CCB_RETRY_UA; - cam_periph_unlock(periph); break; } - case AC_INQ_CHANGED: - cam_periph_lock(periph); + case AC_INQ_CHANGED: /* Called for this path: periph locked */ + cam_periph_assert(periph, MA_OWNED); softc = (struct da_softc *)periph->softc; softc->flags &= ~DA_FLAG_PROBED; dareprobe(periph); - cam_periph_unlock(periph); break; default: break; From owner-svn-src-head@freebsd.org Mon Nov 5 18:49:18 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 147601108CE0 for <svn-src-head@mailman.ysv.freebsd.org>; Mon, 5 Nov 2018 18:49:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6ADAD6D71F for <svn-src-head@freebsd.org>; Mon, 5 Nov 2018 18:49:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io1-xd30.google.com with SMTP id h19-v6so7284283iog.9 for <svn-src-head@freebsd.org>; Mon, 05 Nov 2018 10:49:17 -0800 (PST) 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=TjOHkAXYjg6qqVumAv4ow3SQJSlGysvWW2VNEAC+jyk=; b=08LiTPhUDV0Vb9rDRdsM+GlCPHNaPRYy1ZhpBE9ykfbof8UN+EP6QZx41unzxCQ64F rpCCsrF4WP4ySmH0IbPwf3aKCDObCXMTLUuztilvWdMDf2Ykx6xOlV649azcJ3D/YiH2 +NjFqMCKskuwO+Dv7xuDy7lW6I5wYYSx9EJPEYnEFm+3vbyoefAjyUm8byc0baD9Agjt J4+siutx9sNoo7EtH5DV+Nh+T4zQs1+wKQI2rrUOAqN4ccYiMg0B6fvrGbkDcAJRiCpF u+WkdnRKc7XFmiSUmD7i+T6Nnr2IRKqvePeaXap5fzFihLi7moA7oA/wfGCXWi7LXCTa 3r4A== 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=TjOHkAXYjg6qqVumAv4ow3SQJSlGysvWW2VNEAC+jyk=; b=g3tKJuuMSUTqBtYnCV/JJOosq6oFHfTs+R+3JKtQt77YMifV/+KB+tav+G468+psMM WGwyJHe0clLl5uNZlbTu/dPO+YLVLPFXc4unjh0LGAiz5Xf/1fVndSWjrnK96kUh1Aza G1oPPXXUFLzWxk5eFOWcrpqr2K4ZhDb/ueikP2Nl3ISSc8DELJPZORdAJbWWFVRdvm3Q HIT8nqKWQpP69j5OZaEhuHr3z/5qPqzclzq6zT3JajffvLIUBOJ2vKmbuUkE6bR4VNqM LvztNx44kP4xwceSdhlqSDJXqFeWlzlAAvA9F8Zh1zKNCodnbWPL5B3iTLgeYK3Pf1bY dTbw== X-Gm-Message-State: AGRZ1gInPAB0QtPunuaQDfGqIz1ZZa/M8drefr7s9jcmR4YcOCm1Ecr2 L4/U5XdEsJLTvGuokw9t0tiAKqPI4qpUW2EJilC0s4wX X-Google-Smtp-Source: AJdET5eYgYCNZu/008HzqfZNV6z4fYnzFUlqOx5Xc01C7XlN9fsm9FUf0xYubH0vFJmDxlBqY1nxLJa+Fsrs+Mb6New= X-Received: by 2002:a6b:7809:: with SMTP id j9-v6mr11776434iom.299.1541443756681; Mon, 05 Nov 2018 10:49:16 -0800 (PST) MIME-Version: 1.0 References: <201811051620.wA5GK74Z078677@repo.freebsd.org> <201811051827.wA5IRO5G092159@pdx.rh.CN85.dnsmgr.net> <CACNAnaFhV+Dukn3QyKPe7OHRF2ZXf6Y0UmdUGcv1T9uUZ-DD7A@mail.gmail.com> In-Reply-To: <CACNAnaFhV+Dukn3QyKPe7OHRF2ZXf6Y0UmdUGcv1T9uUZ-DD7A@mail.gmail.com> From: Warner Losh <imp@bsdimp.com> Date: Mon, 5 Nov 2018 11:49:05 -0700 Message-ID: <CANCZdfqqTZvHuUtqg3pKH4U1R0ZmkqdoE42JrVm0ydqq8WWRpQ@mail.gmail.com> Subject: Re: svn commit: r340152 - head/stand/lua To: Kyle Evans <kevans@freebsd.org> Cc: "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 6ADAD6D71F X-Spamd-Result: default: False [-2.25 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.960,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT1.aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[0.3.d.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.86)[-0.860,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.42)[ipnet: 2607:f8b0::/32(-0.61), asn: 15169(-1.42), country: US(-0.06)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 18:49:18 -0000 On Mon, Nov 5, 2018 at 11:47 AM Kyle Evans <kevans@freebsd.org> wrote: > On Mon, Nov 5, 2018 at 12:44 PM Rodney W. Grimes > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > > Author: kevans > > > Date: Mon Nov 5 16:20:07 2018 > > > New Revision: 340152 > > > URL: https://svnweb.freebsd.org/changeset/base/340152 > > > > > > Log: > > > lualoader: Add chainload menu entry > > > > > > MFC after: 4 days > > > > Please do this a bit sooner so that it makes the next > > build on stable/12 which starts in ~72 hours. So maybe > > MFC: 2 days? > > > > Will do, since it's a fairly trivial change... I'll plan to put in a > request for this and the boot-conf addition Wednesday night or > Thursday morning (in GMT-6, for reference). > Hmmm, I just committed something that should definitely be in the next build... didn't know we were doing builds early this week... I had a 3 day MFC on it... Warner From owner-svn-src-head@freebsd.org Mon Nov 5 18:57:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4B59D1108F92; Mon, 5 Nov 2018 18:57:59 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9BC706DD68; Mon, 5 Nov 2018 18:57:58 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA5IvvOd092295; Mon, 5 Nov 2018 10:57:57 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA5IvvwO092294; Mon, 5 Nov 2018 10:57:57 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811051857.wA5IvvwO092294@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340152 - head/stand/lua In-Reply-To: <CACNAnaFhV+Dukn3QyKPe7OHRF2ZXf6Y0UmdUGcv1T9uUZ-DD7A@mail.gmail.com> To: Kyle Evans <kevans@freebsd.org> Date: Mon, 5 Nov 2018 10:57:57 -0800 (PST) CC: "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <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: 9BC706DD68 X-Spamd-Result: default: False [0.79 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.01)[country: US(-0.06)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_HAM_SHORT(-0.12)[-0.123,0]; NEURAL_SPAM_MEDIUM(0.04)[0.039,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 18:57:59 -0000 > On Mon, Nov 5, 2018 at 12:44 PM Rodney W. Grimes > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > > Author: kevans > > > Date: Mon Nov 5 16:20:07 2018 > > > New Revision: 340152 > > > URL: https://svnweb.freebsd.org/changeset/base/340152 > > > > > > Log: > > > lualoader: Add chainload menu entry > > > > > > MFC after: 4 days > > > > Please do this a bit sooner so that it makes the next > > build on stable/12 which starts in ~72 hours. So maybe > > MFC: 2 days? > > > > Will do, since it's a fairly trivial change... I'll plan to put in a > request for this and the boot-conf addition Wednesday night or > Thursday morning (in GMT-6, for reference). Ok, sounds good. Thanks, again. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Mon Nov 5 19:00:34 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3703911091DD; Mon, 5 Nov 2018 19:00:34 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95F6A6DFFA; Mon, 5 Nov 2018 19:00:33 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA5J0U30092337; Mon, 5 Nov 2018 11:00:30 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA5J0UTC092336; Mon, 5 Nov 2018 11:00:30 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811051900.wA5J0UTC092336@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340152 - head/stand/lua In-Reply-To: <CANCZdfqqTZvHuUtqg3pKH4U1R0ZmkqdoE42JrVm0ydqq8WWRpQ@mail.gmail.com> To: Warner Losh <imp@bsdimp.com> Date: Mon, 5 Nov 2018 11:00:30 -0800 (PST) CC: Kyle Evans <kevans@freebsd.org>, "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <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: 95F6A6DFFA X-Spamd-Result: default: False [0.70 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; NEURAL_HAM_MEDIUM(-0.01)[-0.007,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_HAM_SHORT(-0.17)[-0.170,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[]; IP_SCORE(-0.01)[country: US(-0.06)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 19:00:34 -0000 [ Charset UTF-8 unsupported, converting... ] > On Mon, Nov 5, 2018 at 11:47 AM Kyle Evans <kevans@freebsd.org> wrote: > > > On Mon, Nov 5, 2018 at 12:44 PM Rodney W. Grimes > > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > > > > Author: kevans > > > > Date: Mon Nov 5 16:20:07 2018 > > > > New Revision: 340152 > > > > URL: https://svnweb.freebsd.org/changeset/base/340152 > > > > > > > > Log: > > > > lualoader: Add chainload menu entry > > > > > > > > MFC after: 4 days > > > > > > Please do this a bit sooner so that it makes the next > > > build on stable/12 which starts in ~72 hours. So maybe > > > MFC: 2 days? > > > > > > > Will do, since it's a fairly trivial change... I'll plan to put in a > > request for this and the boot-conf addition Wednesday night or > > Thursday morning (in GMT-6, for reference). > > > > Hmmm, I just committed something that should definitely be in the next > build... didn't know we were doing builds early this week... I had a 3 day > MFC on it... We are not doing them early. Today is Monday, builds start on thursday, a 3 day mfc today is thursday. Kyle had marked this 4 days, that would of certainly missed the build. Your 3 day may or may not depending on when you commit on thursday. Regards, -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Mon Nov 5 19:04:29 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 870A21109393; Mon, 5 Nov 2018 19:04:29 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C28A16E4ED; Mon, 5 Nov 2018 19:04:28 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA5J4Qkg092359; Mon, 5 Nov 2018 11:04:26 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA5J4QMV092358; Mon, 5 Nov 2018 11:04:26 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811051904.wA5J4QMV092358@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340152 - head/stand/lua In-Reply-To: <CANCZdfqqTZvHuUtqg3pKH4U1R0ZmkqdoE42JrVm0ydqq8WWRpQ@mail.gmail.com> To: Warner Losh <imp@bsdimp.com> Date: Mon, 5 Nov 2018 11:04:26 -0800 (PST) CC: Kyle Evans <kevans@freebsd.org>, "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <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: C28A16E4ED X-Spamd-Result: default: False [0.70 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; NEURAL_HAM_MEDIUM(-0.00)[-0.005,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_HAM_SHORT(-0.17)[-0.169,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[]; IP_SCORE(-0.01)[country: US(-0.06)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 19:04:29 -0000 [ Charset UTF-8 unsupported, converting... ] > On Mon, Nov 5, 2018 at 11:47 AM Kyle Evans <kevans@freebsd.org> wrote: > > > On Mon, Nov 5, 2018 at 12:44 PM Rodney W. Grimes > > <freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > > > > Author: kevans > > > > Date: Mon Nov 5 16:20:07 2018 > > > > New Revision: 340152 > > > > URL: https://svnweb.freebsd.org/changeset/base/340152 > > > > > > > > Log: > > > > lualoader: Add chainload menu entry > > > > > > > > MFC after: 4 days > > > > > > Please do this a bit sooner so that it makes the next > > > build on stable/12 which starts in ~72 hours. So maybe > > > MFC: 2 days? > > > > > > > Will do, since it's a fairly trivial change... I'll plan to put in a > > request for this and the boot-conf addition Wednesday night or > > Thursday morning (in GMT-6, for reference). > > > > Hmmm, I just committed something that should definitely be in the next > build... didn't know we were doing builds early this week... I had a 3 day > MFC on it... Another data point is you may notice gjb commits marked: MFC after: 3 days MFC after: Before 12.0BETA3 That does inform RE@ that you want this in the next build... though I do not think there is any prompting system that makes sure this happens, it does make it clear the intent. We may wish to add some automagic that we can do a search for these to see if there are any pending. Thoughs? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Mon Nov 5 19:25:58 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 893EE1109B07; Mon, 5 Nov 2018 19:25:58 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC6176F097; Mon, 5 Nov 2018 19:25: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 CD7681BD51; Mon, 5 Nov 2018 19:25:57 +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 wA5JPvZ2076589; Mon, 5 Nov 2018 19:25:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5JPvSX076588; Mon, 5 Nov 2018 19:25:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811051925.wA5JPvSX076588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Mon, 5 Nov 2018 19:25:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340156 - in head: . sys/sys X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: . sys/sys X-SVN-Commit-Revision: 340156 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EC6176F097 X-Spamd-Result: default: False [-1.67 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.75)[-0.751,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.80)[-0.805,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 19:25:58 -0000 Author: emaste Date: Mon Nov 5 19:25:57 2018 New Revision: 340156 URL: https://svnweb.freebsd.org/changeset/base/340156 Log: Remove backwards-compatibility sys/capability.h In r263232 sys/capability.h was renamed to sys/capsicum.h, to avoid conflicts with a capability.h header found on other operating systems. Sufficient time has now passed, so remove the old header at the beginning of FreeBSD 13. Discussed with: oshogbo Sponsored by: The FreeBSD Foundation Deleted: head/sys/sys/capability.h Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Nov 5 18:47:29 2018 (r340155) +++ head/ObsoleteFiles.inc Mon Nov 5 19:25:57 2018 (r340156) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20181105: backwards-compatibility capability.h header removed +OLD_FILES+=usr/include/sys/capability.h # 20181030: malloc_domain(9) KPI change OLD_FILES+=share/man/man9/malloc_domain.9.gz # 20181026: joy(4) removal From owner-svn-src-head@freebsd.org Mon Nov 5 19:51:12 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 89A76110A189; Mon, 5 Nov 2018 19:51:12 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E3066FEF1; Mon, 5 Nov 2018 19:51:12 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E35D51C0CC; Mon, 5 Nov 2018 19:51:11 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5JpBNP088145; Mon, 5 Nov 2018 19:51:11 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5JpB5q088141; Mon, 5 Nov 2018 19:51:11 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811051951.wA5JpB5q088141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Mon, 5 Nov 2018 19:51:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340157 - in head: . tools/build tools/tools/nanobsd/embedded X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head: . tools/build tools/tools/nanobsd/embedded X-SVN-Commit-Revision: 340157 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0E3066FEF1 X-Spamd-Result: default: False [-1.48 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.68)[-0.679,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.69)[-0.691,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 19:51:12 -0000 Author: arichardson Date: Mon Nov 5 19:51:10 2018 New Revision: 340157 URL: https://svnweb.freebsd.org/changeset/base/340157 Log: Allow building world without inheriting $PATH Inheriting $PATH during the build phase can cause the build to fail when compiling on a different system due to missing build tools or incompatible versions somewhere in $PATH. This has cause build failures for us before due to the jenkins slaves still running FreeBSD 10. Listing the tools we depend on explicitly instead of just using whatever happens to be in $PATH allows us to check that we don't accidentally add a new build dependency. All tools that do no need to be bootstrapped will now be symlinked to ${WORLDTMP}/legacy/bin and during the build phase $PATH will only contain ${WORLDTMP}. There is also a new variable "BOOTSTRAP_ALL_TOOLS" which can be set to force compiling almost all bootstrap tools instead of symlinking them. This will not bootstrap tools such as cp,mv, etc. since they may be used during the build and for those we should really only be using POSIX compatible options. Furthermore, this change is required in order to be able to build on non-FreeBSD hosts. While the same binaries may exist on Linux/MacOS they often accept different flags or produce incompatible output. Approved By: brooks (mentor) Differential Revision: https://reviews.freebsd.org/D16815 Modified: head/Makefile head/Makefile.inc1 head/tools/build/Makefile head/tools/tools/nanobsd/embedded/common Modified: head/Makefile ============================================================================== --- head/Makefile Mon Nov 5 19:25:57 2018 (r340156) +++ head/Makefile Mon Nov 5 19:51:10 2018 (r340157) @@ -610,10 +610,13 @@ _need_lld_${target}_${target_arch} != \ # XXX: Passing HOST_OBJTOP into the PATH would allow skipping legacy, # bootstrap-tools, and cross-tools. Need to ensure each tool actually # supports all TARGETS though. +# For now we only pass UNIVERSE_TOOLCHAIN_PATH which will be added at the end +# of STRICTTMPPATH to ensure that the target-specific binaries come first. MAKE_PARAMS_${target}+= \ XCC="${HOST_OBJTOP}/tmp/usr/bin/cc" \ XCXX="${HOST_OBJTOP}/tmp/usr/bin/c++" \ - XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" + XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" \ + UNIVERSE_TOOLCHAIN_PATH=${HOST_OBJTOP}/tmp/usr/bin .endif .if defined(_need_lld_${target}_${target_arch}) && \ ${_need_lld_${target}_${target_arch}} == "yes" Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Nov 5 19:25:57 2018 (r340156) +++ head/Makefile.inc1 Mon Nov 5 19:51:10 2018 (r340157) @@ -580,8 +580,21 @@ BUILD_ARCH!= uname -p WORLDTMP?= ${OBJTOP}/tmp BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin -STRICTTMPPATH= ${BPATH}:${XPATH} + +# When building we want to find the cross tools before the host tools in ${BPATH}. +# We also need to add UNIVERSE_TOOLCHAIN_PATH so that we can find the shared +# toolchain files (clang, lld, etc.) during make universe/tinderbox +STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_PATH} +# We should not be using tools from /usr/bin accidentally since this could cause +# the build to break on other systems that don't have that tool. For now we +# still allow using the old behaviour (inheriting $PATH) if +# BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed. +BUILD_WITH_STRICT_TMPPATH?=1 +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 +TMPPATH= ${STRICTTMPPATH} +.else TMPPATH= ${STRICTTMPPATH}:${PATH} +.endif # # Avoid running mktemp(1) unless actually needed. @@ -589,8 +602,16 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} # when in the middle of installing over this system. # .if make(distributeworld) || make(installworld) || make(stageworld) -INSTALLTMP!= mktemp -d -u -t install +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 +MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp +.if !exists(${MKTEMP}) +.error "mktemp binary doesn't exist in expected location: ${MKTEMP}" .endif +.else +MKTEMP=mktemp +.endif +INSTALLTMP!= ${MKTEMP} -d -u -t install +.endif .if make(stagekernel) || make(distributekernel) TAGS+= kernel @@ -647,6 +668,8 @@ CROSSENV+= BUILD_TOOLS_META=.NOMETA CROSSENV+= ${TARGET_CFLAGS} .endif +BOOTSTRAPPING_OSRELDATE?=${OSRELDATE} + # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ @@ -658,7 +681,7 @@ BSARGS= DESTDIR= \ OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ - BOOTSTRAPPING=${OSRELDATE} \ + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ SSP_CFLAGS= \ MK_HTML=no NO_LINT=yes MK_MAN=no \ @@ -680,7 +703,7 @@ TMAKE= \ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ - BOOTSTRAPPING=${OSRELDATE} \ + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ SSP_CFLAGS= \ -DNO_LINT \ @@ -705,7 +728,7 @@ KTMAKE= \ OBJTOP='${WORLDTMP}/obj-kernel-tools' \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ - BOOTSTRAPPING=${OSRELDATE} \ + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ SSP_CFLAGS= \ MK_HTML=no -DNO_LINT MK_MAN=no \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \ @@ -874,6 +897,9 @@ WORLDTMP_MTREEFLAGS= -deUW DESTDIR_MTREEFLAGS+= -W .endif MTREE?= mtree +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 +MTREE= ${WORLDTMP}/legacy/usr/sbin/mtree +.endif WORLDTMP_MTREE= ${MTREE} ${WORLDTMP_MTREEFLAGS} DESTDIR_MTREE= ${MTREE} ${DESTDIR_MTREEFLAGS} @@ -948,10 +974,15 @@ _worldtmp: .PHONY .if !defined(NO_CLEAN) rm -rf ${WORLDTMP} .else +# Note: for delete-old we need to set $PATH to also include the host $PATH +# since otherwise a partial build with missing symlinks in ${WORLDTMP}/legacy/ +# will fail to run due to missing binaries. $WMAKE sets PATH to only ${TMPPATH} +# so we remove that assingnment from $WMAKE and prepend the new $PATH ${_+_}@if [ -e "${WORLDTMP}" ]; then \ echo ">>> Deleting stale files in build tree..."; \ - cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES _NO_INCLUDE_COMPILERMK=t \ - delete-old delete-old-libs >/dev/null; \ + cd ${.CURDIR}; env PATH=${TMPPATH}:${PATH} ${WMAKE:NPATH=*} \ + _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \ + delete-old-libs >/dev/null; \ fi rm -rf ${WORLDTMP}/legacy/usr/include .if ${USING_SYSTEM_COMPILER} == "yes" @@ -972,6 +1003,11 @@ _worldtmp: .PHONY # available on the target system (this happens e.g. when building on non-FreeBSD) cd ${.CURDIR}/tools/build; \ ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy installdirs +# In order to build without inheriting $PATH we need to add symlinks to the host +# tools in $WORLDTMP for the tools that we don't build during bootstrap-tools + cd ${.CURDIR}/tools/build; \ + ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy host-symlinks + _legacy: @echo @echo "--------------------------------------------------------------" @@ -1969,6 +2005,29 @@ legacy: .PHONY # _bt= _bootstrap-tools +# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't +# accidentally run tools that are incompatible but happen to be in $PATH. +# This is especially important when building on Linux/MacOS where many of the +# programs used during the build accept different flags or generate different +# output. On those platforms we only symlink the tools known to be compatible +# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others +# from the FreeBSD sources during the bootstrap-tools stage. +# We want to build without the user's $PATH starting in the bootstrap-tools +# phase so the tools used in that phase (ln, cp, etc) must have already been +# linked to $WORLDTMP. The tools are listed in the _host_tools_to_symlink +# variable in tools/build/Makefile and are linked during the legacy phase. +# Since they could be Linux or MacOS binaries, too we must only use flags that +# are portable across operating systems. + +# If BOOTSTRAP_ALL_TOOLS is set we will build all the required tools from the +# current source tree. Otherwise we create a symlink to the version found in +# $PATH during the bootstrap-tools stage. +.if defined(BOOTSTRAP_ALL_TOOLS) +# BOOTSTRAPPING will be set on the command line so we can't override it here. +# Instead set BOOTSTRAPPING_OSRELDATE so that the value 0 is set ${BSARGS} +BOOTSTRAPPING_OSRELDATE:= 0 +.endif + .if ${MK_GAMES} != "no" _strfile= usr.bin/fortune/strfile .endif @@ -1981,12 +2040,21 @@ _gperf= gnu/usr.bin/gperf _vtfontcvt= usr.bin/vtfontcvt .endif +# If we are not building the bootstrap because BOOTSTRAPPING is sufficient +# we symlink the host version to $WORLDTMP instead. By doing this we can also +# detect when a bootstrap tool is being used without the required MK_FOO. +# If you add a new bootstrap tool where we could also use the host version, +# please ensure that you also add a .else case where you add the tool to the +# _bootstrap_tools_links variable. .if ${BOOTSTRAPPING} < 1000033 _m4= usr.bin/m4 _lex= usr.bin/lex - -${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd -${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 +# Note: lex needs m4 to build but m4 also depends on lex. However, lex can be +# bootstrapped so we build lex first. +${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc ${_bt}-${_lex} +_bt_lex_depend=${_bt}-usr.bin/lex ${_bt}-usr.bin/m4 +.else +_bootstrap_tools_links+=m4 lex .endif # r245440 mtree -N support added @@ -1998,17 +2066,23 @@ _nmtree= lib/libmd \ ${_bt}-lib/libnetbsd: ${_bt}-lib/libmd ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd +.else +_bootstrap_tools_links+=mtree .endif # r246097: log addition login.conf.db, passwd, pwd.db, and spwd.db with cat -l .if ${BOOTSTRAPPING} < 1000027 _cat= bin/cat +.else +_bootstrap_tools_links+=cat .endif # r277259 crunchide: Correct 64-bit section header offset # r281674 crunchide: always include both 32- and 64-bit ELF support .if ${BOOTSTRAPPING} < 1100078 _crunchide= usr.sbin/crunch/crunchide +.else +_bootstrap_tools_links+=crunchide .endif # r285986 crunchen: use STRIPBIN rather than STRIP @@ -2018,12 +2092,16 @@ _crunchide= usr.sbin/crunch/crunchide (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \ (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006) _crunchgen= usr.sbin/crunch/crunchgen +.else +_bootstrap_tools_links+=crunchgen .endif # r296926 -P keymap search path, MFC to stable/10 in r298297 .if ${BOOTSTRAPPING} < 1003501 || \ (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) _kbdcontrol= usr.sbin/kbdcontrol +.else +_bootstrap_tools_links+=kbdcontrol .endif _yacc= lib/liby \ @@ -2059,6 +2137,10 @@ _dtc= usr.bin/dtc _dtc= gnu/usr.bin/dtc .endif +.if ${MK_LOCALES} != "no" +_localedef= usr.bin/localedef +.endif + .if ${MK_KERBEROS} != "no" _kerberos5_bootstrap_tools= \ kerberos5/tools/make-roken \ @@ -2069,12 +2151,108 @@ _kerberos5_bootstrap_tools= \ usr.bin/compile_et .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} +.for _tool in ${_kerberos5_bootstrap_tools} +${_bt}-${_tool}: ${_bt}-usr.bin/yacc ${_bt_lex_depend} +.endfor .endif ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd -bootstrap-tools: .PHONY +# The tools listed in _basic_bootstrap_tools will generally not be +# bootstrapped unless BOOTSTRAP_ALL_TOOL is set. However, when building on a +# Linux or MacOS host the host versions are incompatible so we need to build +# them from the source tree. Usually the link name will be the same as the subdir, +# but some directories such as grep or test install multiple binaries. In that +# case we use the _basic_bootstrap_tools_multilink variable which is a list of +# subdirectory and comma-separated list of files. +_basic_bootstrap_tools_multilink=usr.bin/grep grep,egrep,fgrep +_basic_bootstrap_tools_multilink+=bin/test test,[ +# bootstrap tools needed by buildworld: +_basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \ + usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \ + usr.bin/truncate usr.bin/tsort +# elf2aout is required for sparc64 build +_basic_bootstrap_tools+=usr.bin/elf2aout +# file2c is required for building usr.sbin/config: +_basic_bootstrap_tools+=usr.bin/file2c +# uuencode/uudecode required for share/tabset +_basic_bootstrap_tools+=usr.bin/uuencode usr.bin/uudecode +# xargs is required by mkioctls +_basic_bootstrap_tools+=usr.bin/xargs +# cap_mkdb is required for share/termcap: +_basic_bootstrap_tools+=usr.bin/cap_mkdb +# ldd is required for installcheck (TODO: just always use /usr/bin/ldd instead?) +_basic_bootstrap_tools+=usr.bin/ldd +# services_mkdb/pwd_mkdb are required for installworld: +_basic_bootstrap_tools+=usr.sbin/services_mkdb usr.sbin/pwd_mkdb +# sysctl/chflags are required for installkernel: +_basic_bootstrap_tools+=sbin/sysctl bin/chflags +.if ${MK_AMD} != "no" +# unifdef is only used by usr.sbin/amd/libamu/Makefile +_basic_bootstrap_tools+=usr.bin/unifdef +.endif + +.if ${MK_BOOT} != "no" +_basic_bootstrap_tools+=usr.sbin/btxld +_basic_bootstrap_tools+=bin/dd +# xz/unxz is used by EFI +_basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz +# md5 is used by boot/beri (and possibly others) +_basic_bootstrap_tools+=sbin/md5 +.if defined(BOOTSTRAP_ALL_TOOLS) +${_bt}-sbin/md5: ${_bt}-lib/libmd +.endif +.endif + +.if ${MK_ZONEINFO} != "no" +_basic_bootstrap_tools+=usr.sbin/zic usr.sbin/tzsetup +.endif + +.if defined(BOOTSTRAP_ALL_TOOLS) +_other_bootstrap_tools+=${_basic_bootstrap_tools} +.for _subdir _links in ${_basic_bootstrap_tools_multilink} +_other_bootstrap_tools+=${_subdir} +.endfor +${_bt}-usr.bin/awk: ${_bt_lex_depend} ${_bt}-usr.bin/yacc +${_bt}-bin/expr: ${_bt_lex_depend} ${_bt}-usr.bin/yacc +# If we are bootstrapping file2c, we have to build it before config: +${_bt}-usr.sbin/config: ${_bt}-usr.bin/file2c ${_bt_lex_depend} +# Note: no symlink to make/bmake in the !BOOTSTRAP_ALL_TOOLS case here since +# the links to make/bmake make links will have already have been created in the +# `make legacy` step. Not adding a link to make is important on non-FreeBSD +# since "make" will usually point to GNU make there. +_other_bootstrap_tools+=usr.bin/bmake +.else +# All tools in _basic_bootstrap_tools have the same name as the subdirectory +# so we can use :T to get the name of the symlinks that we need to create. +_bootstrap_tools_links+=${_basic_bootstrap_tools:T} +.for _subdir _links in ${_basic_bootstrap_tools_multilink} +_bootstrap_tools_links+=${_links:S/,/ /g} +.endfor +.endif # defined(BOOTSTRAP_ALL_TOOLS) + +# Link the tools that we need for building but don't need to bootstrap because +# the host version is known to be compatible into ${WORLDTMP}/legacy +# We do this before building any of the bootstrap tools in case they depend on +# the presence of any of the links (e.g. as m4/lex/awk) +${_bt}-links: .PHONY + +.for _tool in ${_bootstrap_tools_links} +${_bt}-link-${_tool}: .PHONY .MAKE + @if [ ! -e "${WORLDTMP}/legacy/bin/${_tool}" ]; then \ + source_path=`which ${_tool}`; \ + if [ ! -e "$${source_path}" ] ; then \ + echo "Cannot find host tool '${_tool}'"; false; \ + fi; \ + ln -sfnv "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}"; \ + fi +${_bt}-links: ${_bt}-link-${_tool} +.endfor + + +bootstrap-tools: ${_bt}-links .PHONY + # Please document (add comment) why something is in 'bootstrap-tools'. # Try to bound the building of the bootstrap-tool to just the # FreeBSD versions that need the tool built at this stage of the build. @@ -2093,6 +2271,7 @@ bootstrap-tools: .PHONY ${_yacc} \ ${_m4} \ ${_lex} \ + ${_other_bootstrap_tools} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -2101,10 +2280,13 @@ bootstrap-tools: .PHONY ${_nmtree} \ ${_vtfontcvt} \ ${_localedef} -${_bt}-${_tool}: .PHONY .MAKE +${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ + if [ "${_tool}" = "usr.bin/lex" ]; then \ + ${MAKE} DIRPRFX=${_tool}/ bootstrap; \ + fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install @@ -2235,9 +2417,14 @@ _gcc= gnu/usr.bin/cc _usb_tools= stand/usb/tools .endif +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 || defined(BOOTSTRAP_ALL_TOOLS) +_ar=usr.bin/ar +.endif + cross-tools: .MAKE .PHONY .for _tool in \ ${LOCAL_XTOOL_DIRS} \ + ${_ar} \ ${_clang_libs} \ ${_clang} \ ${_lld} \ Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Mon Nov 5 19:25:57 2018 (r340156) +++ head/tools/build/Makefile Mon Nov 5 19:51:10 2018 (r340157) @@ -59,15 +59,64 @@ SUBDIR= cross-build # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h +# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't +# accidentally run tools that are incompatible but happen to be in $PATH. +# This is especially important when building on Linux/MacOS where many of the +# programs used during the build accept different flags or generate different +# output. On those platforms we only symlink the tools known to be compatible +# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others +# from the FreeBSD sources during the bootstrap-tools stage. +# basic commands: It is fine to use the host version for all of these even on +# Linux/MacOS since we only use flags that are supported by all of them. +_host_tools_to_symlink= basename bzip2 bunzip2 chmod chown cmp comm cp date \ + dirname echo env false find fmt gzip gunzip head hostname id ln ls \ + mkdir mv nice patch rm realpath sh sleep stat tee touch tr true uname \ + uniq wc which + +# We also need a symlink to the absolute path to the make binary used for +# the toplevel makefile. This is not necessarily the same as `which make` +# since e.g. on Linux and MacOS that will be GNU make. +_make_abs!= which "${MAKE}" +_host_abs_tools_to_symlink= ${_make_abs}:make ${_make_abs}:bmake + +host-symlinks: + @echo "Linking host tools into ${DESTDIR}/bin" +.for _tool in ${_host_tools_to_symlink} + @if [ ! -e "${DESTDIR}/bin/${_tool}" ]; then \ + source_path=`which ${_tool}`; \ + if [ ! -e "$${source_path}" ] ; then \ + echo "Cannot find host tool '${_tool}'"; false; \ + fi; \ + ln -sfnv "$${source_path}" "${DESTDIR}/bin/${_tool}"; \ + fi +.endfor +.for _tool in ${_host_abs_tools_to_symlink} + @source_path="${_tool:S/:/ /:[1]}"; \ + target_path="${DESTDIR}/bin/${_tool:S/:/ /:[2]}"; \ + if [ ! -e "$${target_path}" ] ; then \ + if [ ! -e "$${source_path}" ] ; then \ + echo "Host tool '${src_path}' is missing"; false; \ + fi; \ + ln -sfnv "$${source_path}" "$${target_path}"; \ + fi +.endfor + # Create all the directories that are needed during the legacy, bootstrap-tools # and cross-tools stages. We do this here using mkdir since mtree may not exist # yet (this happens if we are crossbuilding from Linux/Mac). installdirs: -.for _dir in bin sbin usr/bin usr/sbin usr/lib usr/include lib/geom lib/casper +.for _dir in bin usr/lib usr/include lib/geom lib/casper mkdir -p "${DESTDIR}/${_dir}" .endfor - +# Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a +# bootstrap tool was added to WORLTMP with a symlink or by building it in the +# bootstrap-tools phase. We could also overrride BINDIR when building bootstrap +# tools but adding the symlinks is easier and means all tools are also +# in the directory that they are installed to normally. + ln -sf bin ${DESTDIR}/sbin + ln -sf ../bin ${DESTDIR}/usr/bin + ln -sf ../bin ${DESTDIR}/usr/sbin .for _group in ${INCSGROUPS:NINCS} mkdir -p "${DESTDIR}/${${_group}DIR}" .endfor Modified: head/tools/tools/nanobsd/embedded/common ============================================================================== --- head/tools/tools/nanobsd/embedded/common Mon Nov 5 19:25:57 2018 (r340156) +++ head/tools/tools/nanobsd/embedded/common Mon Nov 5 19:51:10 2018 (r340157) @@ -671,4 +671,4 @@ create_diskimage ( ) ( # Set the path to the same path we use for buldworld to use latest mkimg NANO_TARGET=$(cd ${NANO_SRC}; ${NANO_MAKE} TARGET_ARCH=${NANO_ARCH} -V _TARGET) NANO_TMPPATH=$(cd ${NANO_SRC}; ${NANO_MAKE} MK_AUTO_OBJ=no TARGET=${NANO_TARGET} TARGET_ARCH=${NANO_ARCH} -f Makefile.inc1 buildenv -V TMPPATH) -export PATH="${NANO_TMPPATH}" +export PATH="${NANO_TMPPATH}:${PATH}" From owner-svn-src-head@freebsd.org Mon Nov 5 19:51:18 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6EF7F110A1A8; Mon, 5 Nov 2018 19:51:18 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E29996FF38; Mon, 5 Nov 2018 19:51:17 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5328C1C0D4; Mon, 5 Nov 2018 19:51:17 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5JpHTX088199; Mon, 5 Nov 2018 19:51:17 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5JpHl8088198; Mon, 5 Nov 2018 19:51:17 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811051951.wA5JpHl8088198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Mon, 5 Nov 2018 19:51:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340158 - head X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340158 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E29996FF38 X-Spamd-Result: default: False [-1.46 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.67)[-0.666,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.68)[-0.683,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 19:51:18 -0000 Author: arichardson Date: Mon Nov 5 19:51:16 2018 New Revision: 340158 URL: https://svnweb.freebsd.org/changeset/base/340158 Log: Build the elftoolchain libraries as part of bootstrap-tools It is not necessary to build libelf and libdwarf this early. Furthermore, when building on Linux/MacOS, m4 will only be built during the bootstrap tools phase and not be available in $PATH before. Reviewed By: emaste Approved By: brooks (mentor) Differential Revision: https://reviews.freebsd.org/D17800 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Nov 5 19:51:10 2018 (r340157) +++ head/Makefile.inc1 Mon Nov 5 19:51:16 2018 (r340158) @@ -1967,15 +1967,6 @@ update: .PHONY # build-tools or cross-tools. # -# ELF Tool Chain libraries are needed for ELF tools and dtrace tools. -# r296685 fix cross-endian objcopy -# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2. -# r334881 added libdwarf constants used by ctfconvert. -# r338478 fixed a crash in objcopy for mips64el objects -# r339083 libelf: correct mips64el test to use ELF header -.if ${BOOTSTRAPPING} < 1200085 -_elftoolchain_libs= lib/libelf lib/libdwarf -.endif # libnv and libl are both requirements for config(8), which is an unconditional # bootstrap-tool. @@ -1987,7 +1978,7 @@ legacy: .PHONY false .endif -.for _tool in tools/build ${_elftoolchain_libs} ${_config_deps} +.for _tool in tools/build ${_config_deps} ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,all,install)"; \ cd ${.CURDIR}/${_tool}; \ if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ @@ -2001,7 +1992,8 @@ legacy: .PHONY # bootstrap-tools: Build tools needed for compatibility. These are binaries that # are built to build other binaries in the system. However, the focus of these # binaries is usually quite narrow. Bootstrap tools use the host's compiler and -# libraries, augmented by -legacy. +# libraries, augmented by -legacy, in addition to the libraries built during +# bootstrap-tools. # _bt= _bootstrap-tools @@ -2052,11 +2044,24 @@ _lex= usr.bin/lex # Note: lex needs m4 to build but m4 also depends on lex. However, lex can be # bootstrapped so we build lex first. ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc ${_bt}-${_lex} -_bt_lex_depend=${_bt}-usr.bin/lex ${_bt}-usr.bin/m4 +_bt_m4_depend=${_bt}-${_m4} +_bt_lex_depend=${_bt}-${_lex} ${_bt_m4_depend} .else _bootstrap_tools_links+=m4 lex .endif +# ELF Tool Chain libraries are needed for ELF tools and dtrace tools. +# r296685 fix cross-endian objcopy +# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2. +# r334881 added libdwarf constants used by ctfconvert. +# r338478 fixed a crash in objcopy for mips64el objects +# r339083 libelf: correct mips64el test to use ELF header +.if ${BOOTSTRAPPING} < 1200085 +_elftoolchain_libs= lib/libelf lib/libdwarf +${_bt}-lib/libelf: ${_bt_m4_depend} +${_bt}-lib/libdwarf: ${_bt_m4_depend} +.endif + # r245440 mtree -N support added # r313404 requires sha384.h for libnetbsd, added to libmd in r292782 .if ${BOOTSTRAPPING} < 1100093 @@ -2264,6 +2269,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_dtc} \ ${_cat} \ ${_kbdcontrol} \ + ${_elftoolchain_libs} \ usr.bin/lorder \ lib/libopenbsd \ usr.bin/mandoc \ From owner-svn-src-head@freebsd.org Mon Nov 5 20:00:37 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4FA58110A59A; Mon, 5 Nov 2018 20:00:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D206970766; Mon, 5 Nov 2018 20:00:36 +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 B309E1C234; Mon, 5 Nov 2018 20:00:36 +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 wA5K0aKH093002; Mon, 5 Nov 2018 20:00:36 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5K0aKq093001; Mon, 5 Nov 2018 20:00:36 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811052000.wA5K0aKq093001@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Mon, 5 Nov 2018 20:00:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340159 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 340159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D206970766 X-Spamd-Result: default: False [-1.49 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.76)[-0.756,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.62)[-0.620,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 20:00:37 -0000 Author: jhb Date: Mon Nov 5 20:00:36 2018 New Revision: 340159 URL: https://svnweb.freebsd.org/changeset/base/340159 Log: Rework setting PTE_D for kernel mappings. Rather than unconditionally setting PTE_D for all writeable kernel mappings, set PTE_D for writable mappings of unmanaged pages (whether user or kernel). This matches what amd64 does and also matches what the RISC-V spec suggests (preset the A and D bits on mappings where the OS doesn't care about the state). Suggested by: alc Reviewed by: alc, markj Sponsored by: DARPA Modified: head/sys/riscv/riscv/pmap.c Modified: head/sys/riscv/riscv/pmap.c ============================================================================== --- head/sys/riscv/riscv/pmap.c Mon Nov 5 19:51:16 2018 (r340158) +++ head/sys/riscv/riscv/pmap.c Mon Nov 5 20:00:36 2018 (r340159) @@ -2098,13 +2098,20 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v new_l3 |= PTE_W; if ((va >> 63) == 0) new_l3 |= PTE_U; - else if (prot & VM_PROT_WRITE) - new_l3 |= PTE_D; new_l3 |= (pn << PTE_PPN0_S); if ((flags & PMAP_ENTER_WIRED) != 0) new_l3 |= PTE_SW_WIRED; - if ((m->oflags & VPO_UNMANAGED) == 0) + + /* + * Set modified bit gratuitously for writeable mappings if + * the page is unmanaged. We do not want to take a fault + * to do the dirty bit accounting for these mappings. + */ + if ((m->oflags & VPO_UNMANAGED) != 0) { + if (prot & VM_PROT_WRITE) + new_l3 |= PTE_D; + } else new_l3 |= PTE_SW_MANAGED; CTR2(KTR_PMAP, "pmap_enter: %.16lx -> %.16lx", va, pa); From owner-svn-src-head@freebsd.org Mon Nov 5 21:01:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4DACE110B9EB; Mon, 5 Nov 2018 21:01:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB28C72AB6; Mon, 5 Nov 2018 21:01:45 +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 AC7571CC2E; Mon, 5 Nov 2018 21:01:45 +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 wA5L1j3k028237; Mon, 5 Nov 2018 21:01:45 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5L1jIO028236; Mon, 5 Nov 2018 21:01:45 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811052101.wA5L1jIO028236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Mon, 5 Nov 2018 21:01:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340160 - head/lib/libcasper/libcasper X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/lib/libcasper/libcasper X-SVN-Commit-Revision: 340160 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CB28C72AB6 X-Spamd-Result: default: False [-1.67 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.75)[-0.749,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.81)[-0.810,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 21:01:46 -0000 Author: markj Date: Mon Nov 5 21:01:45 2018 New Revision: 340160 URL: https://svnweb.freebsd.org/changeset/base/340160 Log: Document the fact that cap_limit_set() always frees the input nvlist. MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/lib/libcasper/libcasper/libcasper.3 Modified: head/lib/libcasper/libcasper/libcasper.3 ============================================================================== --- head/lib/libcasper/libcasper/libcasper.3 Mon Nov 5 20:00:36 2018 (r340159) +++ head/lib/libcasper/libcasper/libcasper.3 Mon Nov 5 21:01:45 2018 (r340160) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 6, 2018 +.Dd November 5, 2018 .Dt LIBCASPER 3 .Os .Sh NAME @@ -161,9 +161,11 @@ it means there are no limits set. The .Fn cap_limit_set function sets limits for the given capability. -The limits are provided as +The limits are provided as a .Xr nvlist 9 . The exact format depends on the service the capability represents. +.Fn cap_limit_set +frees the limits regardless of whether the operation succeeds or fails. .Pp The .Fn cap_send_nvlist From owner-svn-src-head@freebsd.org Mon Nov 5 21:30:01 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 360B3110C4A9; Mon, 5 Nov 2018 21:30:01 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ADDCD73D18; Mon, 5 Nov 2018 21:30:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 905401D0B9; Mon, 5 Nov 2018 21:30:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5LU04n039981; Mon, 5 Nov 2018 21:30:00 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5LU0X3039980; Mon, 5 Nov 2018 21:30:00 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811052130.wA5LU0X3039980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Mon, 5 Nov 2018 21:30:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340162 - head/tools/build X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/tools/build X-SVN-Commit-Revision: 340162 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ADDCD73D18 X-Spamd-Result: default: False [-101.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.79)[-0.786,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.89)[-0.895,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 21:30:01 -0000 Author: arichardson Date: Mon Nov 5 21:30:00 2018 New Revision: 340162 URL: https://svnweb.freebsd.org/changeset/base/340162 Log: Fix -DNO_CLEAN build after r340157 Approved By: jhb (mentor) Modified: head/tools/build/Makefile Modified: head/tools/build/Makefile ============================================================================== --- head/tools/build/Makefile Mon Nov 5 21:28:32 2018 (r340161) +++ head/tools/build/Makefile Mon Nov 5 21:30:00 2018 (r340162) @@ -114,9 +114,17 @@ installdirs: # bootstrap-tools phase. We could also overrride BINDIR when building bootstrap # tools but adding the symlinks is easier and means all tools are also # in the directory that they are installed to normally. - ln -sf bin ${DESTDIR}/sbin - ln -sf ../bin ${DESTDIR}/usr/bin - ln -sf ../bin ${DESTDIR}/usr/sbin + +.for _dir in sbin usr/sbin usr/bin +# delete existing directories from before r340157 + @if [ ! -L ${DESTDIR}/${_dir} ]; then \ + echo "removing old non-symlink ${DESTDIR}/${_dir}"; \ + rm -rf "${DESTDIR}/${_dir}"; \ + fi +.endfor + ln -sfn bin ${DESTDIR}/sbin + ln -sfn ../bin ${DESTDIR}/usr/bin + ln -sfn ../bin ${DESTDIR}/usr/sbin .for _group in ${INCSGROUPS:NINCS} mkdir -p "${DESTDIR}/${${_group}DIR}" .endfor From owner-svn-src-head@freebsd.org Mon Nov 5 21:34:20 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6262E110C731; Mon, 5 Nov 2018 21:34:20 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9602742C1; Mon, 5 Nov 2018 21:34:19 +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 BA1F71D248; Mon, 5 Nov 2018 21:34:19 +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 wA5LYJkF044917; Mon, 5 Nov 2018 21:34:19 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5LYISI044908; Mon, 5 Nov 2018 21:34:18 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811052134.wA5LYISI044908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Mon, 5 Nov 2018 21:34:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340164 - in head/sys: amd64/include arm/include arm64/include i386/include kern mips/include powerpc/include riscv/include sparc64/include X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys: amd64/include arm/include arm64/include i386/include kern mips/include powerpc/include riscv/include sparc64/include X-SVN-Commit-Revision: 340164 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D9602742C1 X-Spamd-Result: default: False [-101.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.78)[-0.781,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.90)[-0.898,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 21:34:20 -0000 Author: jhb Date: Mon Nov 5 21:34:17 2018 New Revision: 340164 URL: https://svnweb.freebsd.org/changeset/base/340164 Log: Add a KPI for the delay while spinning on a spin lock. Replace a call to DELAY(1) with a new cpu_lock_delay() KPI. Currently cpu_lock_delay() is defined to DELAY(1) on all platforms. However, platforms with a DELAY() implementation that uses spin locks should implement a custom cpu_lock_delay() doesn't use locks. Reviewed by: kib MFC after: 3 days Modified: head/sys/amd64/include/cpu.h head/sys/arm/include/cpu.h head/sys/arm64/include/cpu.h head/sys/i386/include/cpu.h head/sys/kern/kern_mutex.c head/sys/mips/include/cpu.h head/sys/powerpc/include/cpu.h head/sys/riscv/include/cpu.h head/sys/sparc64/include/cpu.h Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/amd64/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -50,6 +50,7 @@ #define cpu_getstack(td) ((td)->td_frame->tf_rsp) #define cpu_setstack(td, ap) ((td)->td_frame->tf_rsp = (ap)) #define cpu_spinwait() ia32_pause() +#define cpu_lock_delay() DELAY(1) #define TRAPF_USERMODE(framep) \ (ISPL((framep)->tf_cs) == SEL_UPL) Modified: head/sys/arm/include/cpu.h ============================================================================== --- head/sys/arm/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/arm/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -61,6 +61,7 @@ get_cyclecount(void) #define cpu_getstack(td) ((td)->td_frame->tf_usr_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_usr_sp = (sp)) #define cpu_spinwait() /* nothing */ +#define cpu_lock_delay() DELAY(1) #define ARM_NVEC 8 #define ARM_VEC_ALL 0xffffffff Modified: head/sys/arm64/include/cpu.h ============================================================================== --- head/sys/arm64/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/arm64/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -51,6 +51,7 @@ #define cpu_getstack(td) ((td)->td_frame->tf_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) #define cpu_spinwait() __asm __volatile("yield" ::: "memory") +#define cpu_lock_delay() DELAY(1) /* Extract CPU affinity levels 0-3 */ #define CPU_AFF0(mpidr) (u_int)(((mpidr) >> 0) & 0xff) Modified: head/sys/i386/include/cpu.h ============================================================================== --- head/sys/i386/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/i386/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -50,6 +50,7 @@ #define cpu_getstack(td) ((td)->td_frame->tf_esp) #define cpu_setstack(td, ap) ((td)->td_frame->tf_esp = (ap)) #define cpu_spinwait() ia32_pause() +#define cpu_lock_delay() DELAY(1) #define TRAPF_USERMODE(framep) \ ((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM)) Modified: head/sys/kern/kern_mutex.c ============================================================================== --- head/sys/kern/kern_mutex.c Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/kern/kern_mutex.c Mon Nov 5 21:34:17 2018 (r340164) @@ -1206,7 +1206,7 @@ _mtx_lock_indefinite_check(struct mtx *m, struct lock_ ldap->spin_cnt++; if (ldap->spin_cnt < 60000000 || kdb_active || panicstr != NULL) - DELAY(1); + cpu_lock_delay(); else { td = mtx_owner(m); Modified: head/sys/mips/include/cpu.h ============================================================================== --- head/sys/mips/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/mips/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -71,6 +71,7 @@ #define cpu_getstack(td) ((td)->td_frame->sp) #define cpu_setstack(td, nsp) ((td)->td_frame->sp = (nsp)) #define cpu_spinwait() /* nothing */ +#define cpu_lock_delay() DELAY(1) /* * A machine-independent interface to the CPU's counter. Modified: head/sys/powerpc/include/cpu.h ============================================================================== --- head/sys/powerpc/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/powerpc/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -128,6 +128,7 @@ get_cyclecount(void) #define cpu_getstack(td) ((td)->td_frame->fixreg[1]) #define cpu_spinwait() __asm __volatile("or 27,27,27") /* yield */ +#define cpu_lock_delay() DELAY(1) extern char btext[]; extern char etext[]; Modified: head/sys/riscv/include/cpu.h ============================================================================== --- head/sys/riscv/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/riscv/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -46,6 +46,7 @@ #define cpu_getstack(td) ((td)->td_frame->tf_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) #define cpu_spinwait() /* nothing */ +#define cpu_lock_delay() DELAY(1) #ifdef _KERNEL Modified: head/sys/sparc64/include/cpu.h ============================================================================== --- head/sys/sparc64/include/cpu.h Mon Nov 5 21:32:41 2018 (r340163) +++ head/sys/sparc64/include/cpu.h Mon Nov 5 21:34:17 2018 (r340164) @@ -48,6 +48,7 @@ #define cpu_getstack(td) ((td)->td_frame->tf_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) #define cpu_spinwait() /* nothing */ +#define cpu_lock_delay() DELAY(1) #ifdef _KERNEL From owner-svn-src-head@freebsd.org Mon Nov 5 21:53:56 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 04D25110D394; Mon, 5 Nov 2018 21:53:56 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-it1-f194.google.com (mail-it1-f194.google.com [209.85.166.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6553776538; Mon, 5 Nov 2018 21:53:55 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-it1-f194.google.com with SMTP id t190-v6so9346048itb.2; Mon, 05 Nov 2018 13:53:55 -0800 (PST) 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=d80of/MOuvT5M1fp17Km7MzP9H3Nr3SJnl/mkAdyvFk=; b=uZP0YdiFnmlEqv5kuaaEBt0+AfBsMrlvr0oo7OEnkuyc1Y6Otxz0OOSLWGmm2817Nx /jIvA8gh9ePVe1KTqax+ovl+Yq+xmFZhYLrQHN71pCgYkAkbmA9BdhVwhEbm/HnbyJjS rd6HXp+0hbwKN2+CtPvVOXWqTEFbGF/oHO7dSl5kAN+PtU9I+dAg1aUzLJoux/LiQ3mB mWXp/YQh4Mm+nKbiQEsQOj80RDOd8de+VnQJbJEN+1bT3tcIXemJCaAUVqk6XtBIxGVt TFzc6quOTFLhAc4qAtWqG/w5sU858n8GoDR+5GocOKE+rE1LRyugxrxdLsDN6A49XYKe mC/g== X-Gm-Message-State: AGRZ1gKflOjptWKOu9tGXwGvYyp4yejqE0WC29g2p8Oaqleil+ISLV5O LQEBwWcP8qXEnVrC+6I5h91HgXrzAKvy4aTk24+4lRRZ X-Google-Smtp-Source: AJdET5eAw1bmGPstSJu2/Kcl8iKUF2JsEqX5tBukHqJXyeIoQeqPDhHfe2T8djTMz4PuJoS1ZLPT4i1XKCjOUHr+ZDg= X-Received: by 2002:a24:9790:: with SMTP id k138-v6mr7985090ite.69.1541450604496; Mon, 05 Nov 2018 12:43:24 -0800 (PST) MIME-Version: 1.0 References: <201811051925.wA5JPvSX076588@repo.freebsd.org> In-Reply-To: <201811051925.wA5JPvSX076588@repo.freebsd.org> From: Antoine Brodin <antoine@freebsd.org> Date: Mon, 5 Nov 2018 21:43:11 +0100 Message-ID: <CAALwa8n0JMA3Cboiy7WS_rD_g2qdVyrSy7u1fNs9Pz+wnAYNZA@mail.gmail.com> Subject: Re: svn commit: r340156 - in head: . sys/sys To: Ed Maste <emaste@freebsd.org> Cc: src-committers <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: 6553776538 X-Spamd-Result: default: False [-3.94 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; IP_SCORE(-1.04)[ipnet: 209.85.128.0/17(-3.85), asn: 15169(-1.30), country: US(-0.06)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.89)[-0.891,0]; RCVD_IN_DNSWL_NONE(0.00)[194.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[194.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 21:53:56 -0000 On Mon, Nov 5, 2018 at 8:26 PM Ed Maste <emaste@freebsd.org> wrote: > > Author: emaste > Date: Mon Nov 5 19:25:57 2018 > New Revision: 340156 > URL: https://svnweb.freebsd.org/changeset/base/340156 > > Log: > Remove backwards-compatibility sys/capability.h > > In r263232 sys/capability.h was renamed to sys/capsicum.h, to avoid > conflicts with a capability.h header found on other operating systems. > > Sufficient time has now passed, so remove the old header at the > beginning of FreeBSD 13. > > Discussed with: oshogbo > Sponsored by: The FreeBSD Foundation > > Deleted: > head/sys/sys/capability.h > Modified: > head/ObsoleteFiles.inc Hi, Please revert, after this change, most ports converted to capsicum are no longer sandboxed (including pkg, tcpdump). Antoine From owner-svn-src-head@freebsd.org Mon Nov 5 22:36:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 CDBAB110E058; Mon, 5 Nov 2018 22:36:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0235E77E06; Mon, 5 Nov 2018 22:36:46 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D3F901DC0C; Mon, 5 Nov 2018 22:36:45 +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 wA5MajKO079208; Mon, 5 Nov 2018 22:36:45 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5MajwH079204; Mon, 5 Nov 2018 22:36:45 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811052236.wA5MajwH079204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Mon, 5 Nov 2018 22:36:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340166 - in head: . sys/sys X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: . sys/sys X-SVN-Commit-Revision: 340166 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0235E77E06 X-Spamd-Result: default: False [-102.90 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.80)[-0.800,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 22:36:47 -0000 Author: emaste Date: Mon Nov 5 22:36:45 2018 New Revision: 340166 URL: https://svnweb.freebsd.org/changeset/base/340166 Log: revert r340156, restoring sys/sys/capability.h More time is still needed for ports to accommodate the migration to capsicum.h. The header was renamed in 2014 due to concerns about conflicts with with a draft POSIX.1e capability.h header on other systems and there is (now) no need for complex autoconf tests for both capability.h and capsicum.h. Any supported Capsicum-capable system has capsicum.h. Reported by: antoine Sponsored by: The FreeBSD Foundation Added: head/sys/sys/capability.h - copied unchanged from r340155, head/sys/sys/capability.h Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Nov 5 22:26:57 2018 (r340165) +++ head/ObsoleteFiles.inc Mon Nov 5 22:36:45 2018 (r340166) @@ -38,8 +38,6 @@ # xargs -n1 | sort | uniq -d; # done -# 20181105: backwards-compatibility capability.h header removed -OLD_FILES+=usr/include/sys/capability.h # 20181030: malloc_domain(9) KPI change OLD_FILES+=share/man/man9/malloc_domain.9.gz # 20181026: joy(4) removal Copied: head/sys/sys/capability.h (from r340155, head/sys/sys/capability.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/sys/capability.h Mon Nov 5 22:36:45 2018 (r340166, copy of r340155, head/sys/sys/capability.h) @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2014 Robert N. M. Watson + * All rights reserved. + * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * + * 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$ + */ + +/* + * Historically, the key userspace and kernel Capsicum definitions were found + * in this file. However, it conflicted with POSIX.1e's capability.h, so has + * been renamed capsicum.h. The file remains for backwards compatibility + * reasons as a nested include. + */ +#ifndef _SYS_CAPABILITY_H_ +#define _SYS_CAPABILITY_H_ + +#warning this file includes <sys/capability.h> which is deprecated +#include <sys/capsicum.h> + +#endif /* !_SYS_CAPABILITY_H_ */ From owner-svn-src-head@freebsd.org Mon Nov 5 22:51:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 473B5110E52D; Mon, 5 Nov 2018 22:51:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BD9937857C; Mon, 5 Nov 2018 22:51:45 +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 9E7AF1DF18; Mon, 5 Nov 2018 22:51:45 +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 wA5MpjDg085986; Mon, 5 Nov 2018 22:51:45 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5Mpjn5085985; Mon, 5 Nov 2018 22:51:45 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811052251.wA5Mpjn5085985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Mon, 5 Nov 2018 22:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340168 - head/sys/x86/x86 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/x86/x86 X-SVN-Commit-Revision: 340168 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BD9937857C X-Spamd-Result: default: False [-102.78 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.68)[-0.682,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.990,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 22:51:46 -0000 Author: jhb Date: Mon Nov 5 22:51:45 2018 New Revision: 340168 URL: https://svnweb.freebsd.org/changeset/base/340168 Log: Add a delay_tsc() static function for when DELAY() uses the TSC. This uses slightly simpler logic than the existing code by using the full 64-bit counter and thus not having to worry about counter overflow. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D17850 Modified: head/sys/x86/x86/delay.c Modified: head/sys/x86/x86/delay.c ============================================================================== --- head/sys/x86/x86/delay.c Mon Nov 5 22:51:44 2018 (r340167) +++ head/sys/x86/x86/delay.c Mon Nov 5 22:51:45 2018 (r340168) @@ -51,11 +51,23 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <x86/init.h> -static u_int -get_tsc(__unused struct timecounter *tc) +static void +delay_tsc(int n) { + uint64_t end, now; - return (rdtsc32()); + /* + * Pin the current thread ensure correct behavior if the TSCs + * on different CPUs are not in sync. + */ + sched_pin(); + now = rdtsc(); + end = now + tsc_freq * n / 1000000; + do { + cpu_spinwait(); + now = rdtsc(); + } while (now < end); + sched_unpin(); } static int @@ -66,22 +78,24 @@ delay_tc(int n) uint64_t end, freq, now; u_int last, mask, u; - tc = timecounter; - freq = atomic_load_acq_64(&tsc_freq); - if (tsc_is_invariant && freq != 0) { - func = get_tsc; - mask = ~0u; - } else { - if (tc->tc_quality <= 0) - return (0); - func = tc->tc_get_timecount; - mask = tc->tc_counter_mask; - freq = tc->tc_frequency; + /* + * Only use the TSC if it is P-state invariant. If the TSC is + * not P-state invariant and the CPU is not running at the + * "full" P-state, then the TSC will increment at some rate + * less than tsc_freq and delay_tsc() will wait too long. + */ + if (tsc_is_invariant && tsc_freq != 0) { + delay_tsc(n); + return (1); } + tc = timecounter; + if (tc->tc_quality <= 0) + return (0); + func = tc->tc_get_timecount; + mask = tc->tc_counter_mask; + freq = tc->tc_frequency; now = 0; end = freq * n / 1000000; - if (func == get_tsc) - sched_pin(); last = func(tc) & mask; do { cpu_spinwait(); @@ -92,8 +106,6 @@ delay_tc(int n) now += u - last; last = u; } while (now < end); - if (func == get_tsc) - sched_unpin(); return (1); } From owner-svn-src-head@freebsd.org Mon Nov 5 22:51:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 56ED5110E528; Mon, 5 Nov 2018 22:51:45 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DC5A67857B; Mon, 5 Nov 2018 22:51:44 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD9EE1DF17; Mon, 5 Nov 2018 22:51:44 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5MpijW085941; Mon, 5 Nov 2018 22:51:44 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5Mpiod085940; Mon, 5 Nov 2018 22:51:44 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811052251.wA5Mpiod085940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Mon, 5 Nov 2018 22:51:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340167 - head X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340167 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DC5A67857B X-Spamd-Result: default: False [-102.90 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.80)[-0.799,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 22:51:45 -0000 Author: arichardson Date: Mon Nov 5 22:51:44 2018 New Revision: 340167 URL: https://svnweb.freebsd.org/changeset/base/340167 Log: Keep inheriting $PATH when using system linker/compiler I missed this case when testing r340157. For now just keep $PATH when we aren't bootstrapping a compiler so that the build can find cc/c++/ld without an absolute path. Reported by: yuripv Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Nov 5 22:36:45 2018 (r340166) +++ head/Makefile.inc1 Mon Nov 5 22:51:44 2018 (r340167) @@ -589,7 +589,12 @@ STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_ # the build to break on other systems that don't have that tool. For now we # still allow using the old behaviour (inheriting $PATH) if # BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed. +.if ${USING_SYSTEM_LINKER} != "no" || ${USING_SYSTEM_COMPILER} != "no" +# strict $PATH does not work yet with USING_SYSTEM_LINKER/USING_SYSTEM_COMPILER +BUILD_WITH_STRICT_TMPPATH?=0 +.else BUILD_WITH_STRICT_TMPPATH?=1 +.endif .if ${BUILD_WITH_STRICT_TMPPATH} != 0 TMPPATH= ${STRICTTMPPATH} .else From owner-svn-src-head@freebsd.org Mon Nov 5 22:53:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E31A0110E730; Mon, 5 Nov 2018 22:53:51 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6D4B078D78; Mon, 5 Nov 2018 22:53:51 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E0D61DF55; Mon, 5 Nov 2018 22:53:51 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA5MrpCX089227; Mon, 5 Nov 2018 22:53:51 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5MroSf089225; Mon, 5 Nov 2018 22:53:50 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811052253.wA5MroSf089225@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Mon, 5 Nov 2018 22:53:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340169 - head/usr.bin/elfdump X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/usr.bin/elfdump X-SVN-Commit-Revision: 340169 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6D4B078D78 X-Spamd-Result: default: False [-102.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.70)[-0.695,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 22:53:52 -0000 Author: brooks Date: Mon Nov 5 22:53:50 2018 New Revision: 340169 URL: https://svnweb.freebsd.org/changeset/base/340169 Log: elfdump: Add -E to test if a file is an ELF binary. This is intended to replace potentially unreliable checks like: file -b $1 | grep -q '^ELF ..-bit .SB executable' Reviewed by: emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D15971 Modified: head/usr.bin/elfdump/elfdump.1 head/usr.bin/elfdump/elfdump.c Modified: head/usr.bin/elfdump/elfdump.1 ============================================================================== --- head/usr.bin/elfdump/elfdump.1 Mon Nov 5 22:51:45 2018 (r340168) +++ head/usr.bin/elfdump/elfdump.1 Mon Nov 5 22:53:50 2018 (r340169) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 15, 2003 +.Dd November 5, 2018 .Dt ELFDUMP 1 .Os .Sh NAME @@ -34,7 +34,7 @@ files .Sh SYNOPSIS .Nm -.Fl a | cdeGhinprs +.Fl a | E | cdeGhinprs .Op Fl w Ar file .Ar file .Sh DESCRIPTION @@ -55,6 +55,11 @@ Dump section headers. Dump dynamic symbols. .It Fl e Dump ELF header. +.It Fl E +Return success if +.Ar file +is an ELF file and failure if it is not. +This option is exclusive with other options. .It Fl G Dump the GOT. .It Fl h Modified: head/usr.bin/elfdump/elfdump.c ============================================================================== --- head/usr.bin/elfdump/elfdump.c Mon Nov 5 22:51:45 2018 (r340168) +++ head/usr.bin/elfdump/elfdump.c Mon Nov 5 22:53:50 2018 (r340169) @@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$"); #define ED_SHDR (1<<8) #define ED_SYMTAB (1<<9) #define ED_ALL ((1<<10)-1) +#define ED_IS_ELF (1<<10) /* Exclusive with other flags */ #define elf_get_addr elf_get_quad #define elf_get_off elf_get_quad @@ -518,7 +519,7 @@ main(int ac, char **av) out = stdout; flags = 0; - while ((ch = getopt(ac, av, "acdeiGhnprsw:")) != -1) + while ((ch = getopt(ac, av, "acdEeiGhnprsw:")) != -1) switch (ch) { case 'a': flags = ED_ALL; @@ -529,6 +530,9 @@ main(int ac, char **av) case 'd': flags |= ED_DYN; break; + case 'E': + flags = ED_IS_ELF; + break; case 'e': flags |= ED_EHDR; break; @@ -566,7 +570,8 @@ main(int ac, char **av) } ac -= optind; av += optind; - if (ac == 0 || flags == 0) + if (ac == 0 || flags == 0 || ((flags & ED_IS_ELF) && + (ac != 1 || (flags & ~ED_IS_ELF) || out != stdout))) usage(); if ((fd = open(*av, O_RDONLY)) < 0 || fstat(fd, &sb) < 0) @@ -584,8 +589,12 @@ main(int ac, char **av) e = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); if (e == MAP_FAILED) err(1, NULL); - if (!IS_ELF(*(Elf32_Ehdr *)e)) + if (!IS_ELF(*(Elf32_Ehdr *)e)) { + if (flags & ED_IS_ELF) + exit(1); errx(1, "not an elf file"); + } else if (flags & ED_IS_ELF) + exit (0); phoff = elf_get_off(e, e, E_PHOFF); shoff = elf_get_off(e, e, E_SHOFF); phentsize = elf_get_quarter(e, e, E_PHENTSIZE); @@ -1254,6 +1263,7 @@ elf_get_quad(Elf32_Ehdr *e, void *base, elf_member_t m static void usage(void) { - fprintf(stderr, "usage: elfdump -a | -cdeGhinprs [-w file] file\n"); + fprintf(stderr, + "usage: elfdump -a | -E | -cdeGhinprs [-w file] file\n"); exit(1); } From owner-svn-src-head@freebsd.org Mon Nov 5 22:54:05 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 A066B110E75A; Mon, 5 Nov 2018 22:54:05 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D6D878E71; Mon, 5 Nov 2018 22:54:05 +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 93CBC1DF56; Mon, 5 Nov 2018 22:54:04 +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 wA5Ms48C089291; Mon, 5 Nov 2018 22:54:04 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA5Ms3ts089287; Mon, 5 Nov 2018 22:54:03 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811052254.wA5Ms3ts089287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Mon, 5 Nov 2018 22:54:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340170 - in head/sys: amd64/include i386/include x86/x86 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys: amd64/include i386/include x86/x86 X-SVN-Commit-Revision: 340170 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1D6D878E71 X-Spamd-Result: default: False [-102.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.70)[-0.696,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 22:54:06 -0000 Author: jhb Date: Mon Nov 5 22:54:03 2018 New Revision: 340170 URL: https://svnweb.freebsd.org/changeset/base/340170 Log: Add a custom implementation of cpu_lock_delay() for x86. Avoid using DELAY() since it can try to use spin locks on CPUs without a P-state invariant TSC. For cpu_lock_delay(), always use the TSC if it exists (even if it is not P-state invariant) to delay for a microsecond. If the TSC does not exist, read from I/O port 0x84 to delay instead. PR: 228768 Reported by: Roger Hammerstein <cheeky.m@live.com> Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D17851 Modified: head/sys/amd64/include/cpu.h head/sys/i386/include/cpu.h head/sys/x86/x86/delay.c Modified: head/sys/amd64/include/cpu.h ============================================================================== --- head/sys/amd64/include/cpu.h Mon Nov 5 22:53:50 2018 (r340169) +++ head/sys/amd64/include/cpu.h Mon Nov 5 22:54:03 2018 (r340170) @@ -50,7 +50,6 @@ #define cpu_getstack(td) ((td)->td_frame->tf_rsp) #define cpu_setstack(td, ap) ((td)->td_frame->tf_rsp = (ap)) #define cpu_spinwait() ia32_pause() -#define cpu_lock_delay() DELAY(1) #define TRAPF_USERMODE(framep) \ (ISPL((framep)->tf_cs) == SEL_UPL) @@ -78,6 +77,7 @@ extern char etext[]; extern void (*vmm_resume_p)(void); void cpu_halt(void); +void cpu_lock_delay(void); void cpu_reset(void); void fork_trampoline(void); void swi_vm(void *); Modified: head/sys/i386/include/cpu.h ============================================================================== --- head/sys/i386/include/cpu.h Mon Nov 5 22:53:50 2018 (r340169) +++ head/sys/i386/include/cpu.h Mon Nov 5 22:54:03 2018 (r340170) @@ -50,7 +50,6 @@ #define cpu_getstack(td) ((td)->td_frame->tf_esp) #define cpu_setstack(td, ap) ((td)->td_frame->tf_esp = (ap)) #define cpu_spinwait() ia32_pause() -#define cpu_lock_delay() DELAY(1) #define TRAPF_USERMODE(framep) \ ((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM)) @@ -73,6 +72,7 @@ extern char btext[]; extern char etext[]; void cpu_halt(void); +void cpu_lock_delay(void); void cpu_reset(void); void fork_trampoline(void); void swi_vm(void *); Modified: head/sys/x86/x86/delay.c ============================================================================== --- head/sys/x86/x86/delay.c Mon Nov 5 22:53:50 2018 (r340169) +++ head/sys/x86/x86/delay.c Mon Nov 5 22:54:03 2018 (r340170) @@ -122,3 +122,22 @@ DELAY(int n) init_ops.early_delay(n); TSEXIT(); } + +void +cpu_lock_delay(void) +{ + + /* + * Use TSC to wait for a usec if present, otherwise fall back + * to reading from port 0x84. We can't call into timecounters + * for this delay since timecounters might use spin locks. + * + * Note that unlike delay_tc(), this uses the TSC even if it + * is not P-state invariant. For this function it is ok to + * wait even a few usecs. + */ + if (tsc_freq != 0) + delay_tsc(1); + else + inb(0x84); +} From owner-svn-src-head@freebsd.org Mon Nov 5 22:59:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 58C18110E869; Mon, 5 Nov 2018 22:59:52 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A17D979126; Mon, 5 Nov 2018 22:59:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 451B38BF4; Mon, 5 Nov 2018 22:59:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 06BE7717F; Mon, 5 Nov 2018 22:59:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id s4s63bMXZDM0; Mon, 5 Nov 2018 22:59:46 +0000 (UTC) Subject: Re: svn commit: r339946 - in head: . share/mk DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 29E427172 To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201810311045.w9VAjSs7012968@repo.freebsd.org> From: Bryan Drewery <bdrewery@FreeBSD.org> Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: <eeb3cd76-d260-50d1-d676-5ebdb3c1c74d@FreeBSD.org> Date: Mon, 5 Nov 2018 14:59:37 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201810311045.w9VAjSs7012968@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ZRrTLhiJrfL8Vck9rWCuzU38xbiOQzbL3" X-Rspamd-Queue-Id: A17D979126 X-Spamd-Result: default: False [-105.19 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.982,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 22:59:52 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ZRrTLhiJrfL8Vck9rWCuzU38xbiOQzbL3 Content-Type: multipart/mixed; boundary="nqD73xBNXUFRFdR3XrkvgvZSgfmmsiQtz"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <eeb3cd76-d260-50d1-d676-5ebdb3c1c74d@FreeBSD.org> Subject: Re: svn commit: r339946 - in head: . share/mk References: <201810311045.w9VAjSs7012968@repo.freebsd.org> In-Reply-To: <201810311045.w9VAjSs7012968@repo.freebsd.org> --nqD73xBNXUFRFdR3XrkvgvZSgfmmsiQtz Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/31/2018 3:45 AM, Alex Richardson wrote: > Author: arichardson > Date: Wed Oct 31 10:45:28 2018 > New Revision: 339946 > URL: https://svnweb.freebsd.org/changeset/base/339946 >=20 > Log: > Don't run cc --version during cleandir/obj stages > =20 I haven't had a chance to look at this fully or r339636 but I don't think this change, r339946, is complete. There's far more tree-walks than these named ones that should not be running cc. > This will no work when there is no cc in $PATH (which is the case bef= ore the > cross-tools stage once we no longer inherit $PATH in $WMAKE). > The variables set by bsd.compiler.mk/bsd.linker.mk are not needed in = these > stages so this avoids a little bit of makefile parsing. > =20 > Reviewed By: emaste > Approved By: jhb (mentor) > Differential Revision: https://reviews.freebsd.org/D16814 >=20 > Modified: > head/Makefile.inc1 > head/share/mk/bsd.compiler.mk >=20 > Modified: head/Makefile.inc1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/Makefile.inc1 Wed Oct 31 10:30:19 2018 (r339945) > +++ head/Makefile.inc1 Wed Oct 31 10:45:28 2018 (r339946) > @@ -950,7 +950,7 @@ _worldtmp: .PHONY > .else > ${_+_}@if [ -e "${WORLDTMP}" ]; then \ > echo ">>> Deleting stale files in build tree..."; \ > - cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \ > + cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES _NO_INCLUDE_COMPILE= RMK=3Dt \ > delete-old delete-old-libs >/dev/null; \ > fi > rm -rf ${WORLDTMP}/legacy/usr/include > @@ -1003,19 +1003,21 @@ _cleanobj: > @echo "--------------------------------------------------------------= " > @echo ">>> stage 2.1: cleaning up the object tree" > @echo "--------------------------------------------------------------= " > - ${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR} > + # Avoid including bsd.compiler.mk in clean and obj with _NO_INCLUDE_C= OMPILERMK > + # since the restricted $PATH might not contain a valid cc binary > + ${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=3Dt ${CLEANDIR} > .if defined(LIBCOMPAT) > - ${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR} > + ${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} _NO_INCLUDE_COMPILERMK=3Dt -f = Makefile.inc1 ${CLEANDIR} > .endif > .else > - ${_+_}cd ${.CURDIR}; ${WMAKE} _cleanobj_fast_depend_hack > + ${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=3Dt _cleanobj_fa= st_depend_hack > .endif # !defined(NO_CLEAN) > _obj: > @echo > @echo "--------------------------------------------------------------= " > @echo ">>> stage 2.2: rebuilding the object tree" > @echo "--------------------------------------------------------------= " > - ${_+_}cd ${.CURDIR}; ${WMAKE} obj > + ${_+_}cd ${.CURDIR}; ${WMAKE} _NO_INCLUDE_COMPILERMK=3Dt obj > _build-tools: > @echo > @echo "--------------------------------------------------------------= " >=20 > Modified: head/share/mk/bsd.compiler.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/mk/bsd.compiler.mk Wed Oct 31 10:30:19 2018 (r339945) > +++ head/share/mk/bsd.compiler.mk Wed Oct 31 10:45:28 2018 (r339946) > @@ -33,6 +33,16 @@ __<bsd.compiler.mk>__: > =20 > .include <bsd.opts.mk> > =20 > +.if defined(_NO_INCLUDE_COMPILERMK) > +# If _NO_INCLUDE_COMPILERMK is set we are doing a make obj/cleandir/cl= eanobj > +# and might not have a valid compiler in $PATH yet. In this case just = set the > +# variables that are expected by the other .mk files and return > +COMPILER_TYPE=3Dnone > +X_COMPILER_TYPE=3Dnone > +COMPILER_VERSION=3D0 > +X_COMPILER_VERSION=3D0 > +COMPILER_FEATURES=3Dnone > +.else > # command =3D /usr/local/bin/ccache cc ... > # wrapper =3D /usr/local/libexec/ccache/cc ... > CCACHE_BUILD_TYPE?=3D command > @@ -220,4 +230,5 @@ ${var}.${${X_}_cc_hash}:=3D ${${var}} > .if !defined(_NO_INCLUDE_LINKERMK) > .include <bsd.linker.mk> > .endif > +.endif # defined(_NO_INCLUDE_COMPILERMK) > .endif # !target(__<bsd.compiler.mk>__) >=20 --=20 Regards, Bryan Drewery --nqD73xBNXUFRFdR3XrkvgvZSgfmmsiQtz-- --ZRrTLhiJrfL8Vck9rWCuzU38xbiOQzbL3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAlvgy2BfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l8+Vnwf7Bqney9zSO+iglspjREMi2j8er1a22qF2HjwglNTdKrmmyEtFr/9bJepD DBEAu0OjK8l6cmiW4CWAeO1h/7V3y9IN9hr+a5418n/lao6kJkrV1deEGoxcC4jv VywLhcX9yWCInb+5TpjlEuRJyWzn0dzKZrEw70dweioCItPMSdTs38X0A/TldcOb dpeFq3Jlj7praOU0qfCi/mzkmLdxHIAFiXxujPIoEGckBAjBqbUDlTCg7NW/e1qB tr1bmb0UARUwrUwFt2zFH7by68HXjFi3KAPdbgBU4U06BtuQc3SaGbmnb7Dfbc/4 GvMbXJuXS/dASAEdqKkaRRc22DvvjA== =V264 -----END PGP SIGNATURE----- --ZRrTLhiJrfL8Vck9rWCuzU38xbiOQzbL3-- From owner-svn-src-head@freebsd.org Mon Nov 5 23:00:43 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 095D8110E8D7; Mon, 5 Nov 2018 23:00:43 +0000 (UTC) (envelope-from bdrewery@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)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 894D179294; Mon, 5 Nov 2018 23:00:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 4B5AA8D2B; Mon, 5 Nov 2018 23:00:42 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 8D3267196; Mon, 5 Nov 2018 23:00:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id slcF7EmWJo8y; Mon, 5 Nov 2018 23:00:38 +0000 (UTC) Subject: Re: svn commit: r339636 - in head: . share/mk DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 6A8057189 To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201810230631.w9N6VPR4008554@repo.freebsd.org> From: Bryan Drewery <bdrewery@FreeBSD.org> Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> Date: Mon, 5 Nov 2018 15:00:37 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201810230631.w9N6VPR4008554@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="hBqK5Vdxe07UnxEP7yEVJYemQEKdP1PPy" X-Rspamd-Queue-Id: 894D179294 X-Spamd-Result: default: False [-108.50 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-3.29)[ip: (-8.63), ipnet: 96.47.64.0/20(-4.31), asn: 11403(-3.45), country: US(-0.06)]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 23:00:43 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --hBqK5Vdxe07UnxEP7yEVJYemQEKdP1PPy Content-Type: multipart/mixed; boundary="eiYBUoqmRiQcvYiHd4IkzCmmkYhJJEZuZ"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> Subject: Re: svn commit: r339636 - in head: . share/mk References: <201810230631.w9N6VPR4008554@repo.freebsd.org> In-Reply-To: <201810230631.w9N6VPR4008554@repo.freebsd.org> --eiYBUoqmRiQcvYiHd4IkzCmmkYhJJEZuZ Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/22/2018 11:31 PM, Alex Richardson wrote: > Author: arichardson > Date: Tue Oct 23 06:31:25 2018 > New Revision: 339636 > URL: https://svnweb.freebsd.org/changeset/base/339636 >=20 > Log: > Only compute the X_COMPILER_*/X_LINKER_* variables when needed > =20 > When building CheriBSD we have to set XLD/XCC/XCFLAGS on the command = line. > This triggers the $XCC !=3D $CC case in bsd.compiler.mk (and the same= for LD > in bsd.linker.mk) which causes it to call ${XCC} --version and > ${XLD} --version (plus various awk+sed+echo calls) in every subdirect= ory. > For incremental builds and stages that only walk the source tree this= is > often the majority of the time spent in that directory. > =20 =2E.. > By only computing the value of the X_COMPILER_*/X_LINKER_* variables = if > _WANT_TOOLCHAIN_CROSS_VARS is set we can reduce the number of cc/ld c= alls > to once per build stage instead of once per recursive make. This sounds wrong. bsd.compiler.mk *already* handles that kind of thing by exporting its computations. Adding a second hack for a similar problem isn't the right solution. > =20 > With this change (and no changes to the sources) the `make includes` = stage > now takes 28 seconds at -j1 instead of 86 seconds. > =20 > Approved By: brooks (mentor) > Differential Revision: https://reviews.freebsd.org/D17046 --=20 Regards, Bryan Drewery --eiYBUoqmRiQcvYiHd4IkzCmmkYhJJEZuZ-- --hBqK5Vdxe07UnxEP7yEVJYemQEKdP1PPy Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAlvgy5ZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l89MOQf/S6gcHKeuiQl6tEJq1vLpA4oN+8HKOTWYXsQs26hCzQ0DVfHo4jbHS9R6 WWUDjULTrKLbZIvs4Y5ql3s6jRX/Okz14nvPPJPeMOL2s8MrrMmuTOuz4OQMLwAw TT+P7fWRC9VjHi47SO12DSgg7lm7XAcdlVar0fGJUwvhKQ8CImqjedMIZNItm+O6 6GnTLM/UvPtR4C6XKutn+MTVrgUh/sXJYUJ2g0RjSOp//FhGFH7f8Q1yIRj3DhxQ FVMze6SN7cNKJ2a6ncZZG3Fsb8HSQVOIQqmg9JwQSNvztrWXzcaFr66JX+/bvYKk rRGVCjoOnKKvmigimQsL0dJHnSKGlg== =dyED -----END PGP SIGNATURE----- --hBqK5Vdxe07UnxEP7yEVJYemQEKdP1PPy-- From owner-svn-src-head@freebsd.org Mon Nov 5 23:03:04 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 14D60110EA8E; Mon, 5 Nov 2018 23:03:04 +0000 (UTC) (envelope-from bdrewery@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)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 953D17964E; Mon, 5 Nov 2018 23:03:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 4D1F78E74; Mon, 5 Nov 2018 23:03:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 83A5171CA; Mon, 5 Nov 2018 23:03:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id SgMGMie8465z; Mon, 5 Nov 2018 23:02:59 +0000 (UTC) Subject: Re: svn commit: r338268 - head DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 75E1A71C0 To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201808231819.w7NIJAq5071940@repo.freebsd.org> From: Bryan Drewery <bdrewery@FreeBSD.org> Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: <a7768d1a-a59f-6a82-7085-48e8d62db1f9@FreeBSD.org> Date: Mon, 5 Nov 2018 15:02:58 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201808231819.w7NIJAq5071940@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="caoOR4wLovCOd87Yn5mrKAyTOgkKrVOgn" X-Rspamd-Queue-Id: 953D17964E X-Spamd-Result: default: False [-108.50 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-3.29)[ip: (-8.64), ipnet: 96.47.64.0/20(-4.31), asn: 11403(-3.45), country: US(-0.06)]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 23:03:04 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --caoOR4wLovCOd87Yn5mrKAyTOgkKrVOgn Content-Type: multipart/mixed; boundary="t4jvYhXgQulKPLPgIe0Bij5G1TH8XAaW2"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <a7768d1a-a59f-6a82-7085-48e8d62db1f9@FreeBSD.org> Subject: Re: svn commit: r338268 - head References: <201808231819.w7NIJAq5071940@repo.freebsd.org> In-Reply-To: <201808231819.w7NIJAq5071940@repo.freebsd.org> --t4jvYhXgQulKPLPgIe0Bij5G1TH8XAaW2 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 8/23/2018 11:19 AM, Alex Richardson wrote: > Author: arichardson > Date: Thu Aug 23 18:19:10 2018 > New Revision: 338268 > URL: https://svnweb.freebsd.org/changeset/base/338268 >=20 > Log: > Fix non-FreeBSD host lib32 build for TARGET=3Damd64 > =20 > When building on non-FreeBSD systems we need to pass an explicit targ= et > triple to clang otherwise it will attempt to build with the host trip= le. > This also has advantages when building on a FreeBSD host: we now tell= > clang that we are targeting at least FreeBSD 12.0 instead of an older= > version so it can enable newer features. > =20 > Reviewed By: brooks (mentor) > Approved By: jhb (mentor) > Differential Revision: https://reviews.freebsd.org/D16842 >=20 > Modified: > head/Makefile.libcompat >=20 > Modified: head/Makefile.libcompat > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=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/Makefile.libcompat Thu Aug 23 18:19:01 2018 (r338267) > +++ head/Makefile.libcompat Thu Aug 23 18:19:10 2018 (r338268) > @@ -14,6 +14,11 @@ LIB32CPUFLAGS=3D -march=3Di686 -mmmx -msse -msse2 > .else > LIB32CPUFLAGS=3D -march=3D${TARGET_CPUTYPE} > .endif > +.if ${WANT_COMPILER_TYPE} =3D=3D gcc || \ > + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} =3D=3D gcc) > +.else > +LIB32CPUFLAGS+=3D -target x86_64-unknown-freebsd12.0 This can be ${TARGET_TRIPLE}, no? It also seems like it should be in the LIBSOFT flags too; via LIBCOMPATCFLAGS. > +.endif > LIB32CPUFLAGS+=3D -m32 > LIB32WMAKEENV=3D MACHINE=3Di386 MACHINE_ARCH=3Di386 \ > MACHINE_CPU=3D"i686 mmx sse sse2" >=20 --=20 Regards, Bryan Drewery --t4jvYhXgQulKPLPgIe0Bij5G1TH8XAaW2-- --caoOR4wLovCOd87Yn5mrKAyTOgkKrVOgn Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAlvgzCNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l8/VyggAy7z51q/IhG2qV628pNnNQGvcvi08JXgL2tUL99q2QpH47Xt6dg85kR6B eVY2RvsBlXs8XVf6WPvAzYTZgEoECvU4GWVgy15vcpzBPfY2hERKQb6Go1L7Rmvn idgkFPDXpnc7hvrJShE2SsFKtKG+wk3SUV6yxbWfFn4rW4nD7xudm1VKqy+2Hqe2 vuXs7DrwiYzgEgi7Cy26kj/RGIAiCF51AGfAc0xqFtv5//o0rEbWdCnYRph+urkR 7fDZ2X1siutiYyzjmv1AU6wej+DcY2FteRHoUpznFjE9Geq4miKn6WyVtVdUzQrt So/adKc5VegmO3JskzKQZ2pwRooMzw== =sMbA -----END PGP SIGNATURE----- --caoOR4wLovCOd87Yn5mrKAyTOgkKrVOgn-- From owner-svn-src-head@freebsd.org Mon Nov 5 23:11:07 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 25F93110EC3C; Mon, 5 Nov 2018 23:11:07 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-yb1-f194.google.com (mail-yb1-f194.google.com [209.85.219.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F26379892; Mon, 5 Nov 2018 23:11:06 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-yb1-f194.google.com with SMTP id p144-v6so4551020yba.11; Mon, 05 Nov 2018 15:11:06 -0800 (PST) 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=NGrxXg0Anvg53pzLtnskP714IMUqT0nxGP/nbj9eoCM=; b=tN2LNL41sySd38A0r1VuycGeyzjNsN6q1eer/PmTN2y+eMrAwOmYDSBHl71PuWlqO1 1P7E/R5QDn3D/Zn9HHASxh9+b4WIyBZbV16f6LxW8uVzcqrPOmO6XPGkvc37E0FyRXsn T5JX3zzL5b7zaimPgnIF61dxx0SH6vKSnF7DFRU0+ROE6ppKdliVPeWeHjeqN6EOcCK4 KOYqmCEnW9Js+Jdq+foNSN2aaI8QXqi7m91CDjIWl94WxWMgn36orAyCa8v1K37zMJLj guxKSySbJ3loUim1SzqUv3Ss/jV6d89XJU2I2Y7c6BvGloh/iKkVTWHZJRRsql3X+Woz OS1w== X-Gm-Message-State: AGRZ1gL+wGkImhpuKt28REv9VYFoGweScx+g/Q8VazPTPgmpr7f0CEat myKyty8LlEz41cHLgbY+M+8AfWSOdQSC8A== X-Google-Smtp-Source: AJdET5fMzhPfa3o7HAKLOM6zqJpxcbgqP2bpO3lGOwSAd0Qe154vwfko2G7B3Il/iYc79me/yVLrnw== X-Received: by 2002:a25:e6d3:: with SMTP id d202-v6mr23587676ybh.466.1541459460215; Mon, 05 Nov 2018 15:11:00 -0800 (PST) Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com. [209.85.219.182]) by smtp.gmail.com with ESMTPSA id r18-v6sm22278875ywa.16.2018.11.05.15.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 15:11:00 -0800 (PST) Received: by mail-yb1-f182.google.com with SMTP id i78-v6so4574986ybg.0; Mon, 05 Nov 2018 15:10:59 -0800 (PST) X-Received: by 2002:a25:6d44:: with SMTP id i65-v6mr22958668ybc.454.1541459459598; Mon, 05 Nov 2018 15:10:59 -0800 (PST) MIME-Version: 1.0 References: <201810230631.w9N6VPR4008554@repo.freebsd.org> <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> In-Reply-To: <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> From: Alexander Richardson <arichardson@freebsd.org> Date: Mon, 5 Nov 2018 23:10:48 +0000 X-Gmail-Original-Message-ID: <CA+Z_v8rcRXR86xnQs32Vgm5q+8DcjJJNHJRZOOuHUQrWSB19zQ@mail.gmail.com> Message-ID: <CA+Z_v8rcRXR86xnQs32Vgm5q+8DcjJJNHJRZOOuHUQrWSB19zQ@mail.gmail.com> Subject: Re: svn commit: r339636 - in head: . share/mk To: bdrewery@freebsd.org Cc: src-committers <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: 7F26379892 X-Spamd-Result: default: False [-3.91 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-1.01)[ipnet: 209.85.128.0/17(-3.68), asn: 15169(-1.33), country: US(-0.06)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.88)[-0.884,0]; RCVD_IN_DNSWL_NONE(0.00)[194.219.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[arichardson@freebsd.org,arichardsonkde@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[194.219.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[arichardson@freebsd.org,arichardsonkde@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 23:11:07 -0000 On Mon, 5 Nov 2018 at 23:00, Bryan Drewery <bdrewery@freebsd.org> wrote: > > On 10/22/2018 11:31 PM, Alex Richardson wrote: > > Author: arichardson > > Date: Tue Oct 23 06:31:25 2018 > > New Revision: 339636 > > URL: https://svnweb.freebsd.org/changeset/base/339636 > > > > Log: > > Only compute the X_COMPILER_*/X_LINKER_* variables when needed > > > > When building CheriBSD we have to set XLD/XCC/XCFLAGS on the command line. > > This triggers the $XCC != $CC case in bsd.compiler.mk (and the same for LD > > in bsd.linker.mk) which causes it to call ${XCC} --version and > > ${XLD} --version (plus various awk+sed+echo calls) in every subdirectory. > > For incremental builds and stages that only walk the source tree this is > > often the majority of the time spent in that directory. > > > ... > > > By only computing the value of the X_COMPILER_*/X_LINKER_* variables if > > _WANT_TOOLCHAIN_CROSS_VARS is set we can reduce the number of cc/ld calls > > to once per build stage instead of once per recursive make. > > This sounds wrong. bsd.compiler.mk *already* handles that kind of thing > by exporting its computations. Adding a second hack for a similar > problem isn't the right solution. > I added debug .info statements for every time bsd.compiler.mk was running cc --version and it was always running it for $XCC during make buildworld. As far as I can tell this happens because $CC and $XCC no longer match. I believe the problem is that the toplevel makefile runs the cross stages with CC="${XCC} ${XCFLAGS}" so if you have XCFLAGS set in your environment $CC will never be equal to $XCC. This also means there is not cached variable for $XCC since it was computed for "${XCC} ${XCFLAGS}" rather than $XCC . This patch massively reduced the incremental build time for CheriBSD but if you can suggest I better fix that would be great. Alex From owner-svn-src-head@freebsd.org Mon Nov 5 23:32:51 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 19A1D110F3F6; Mon, 5 Nov 2018 23:32:51 +0000 (UTC) (envelope-from bdrewery@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)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 856F37ABDE; Mon, 5 Nov 2018 23:32:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 4FEFB9A96; Mon, 5 Nov 2018 23:32:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 7886E7287; Mon, 5 Nov 2018 23:32:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id tz2IsRiVv8ov; Mon, 5 Nov 2018 23:32:47 +0000 (UTC) Subject: Re: svn commit: r340157 - in head: . tools/build tools/tools/nanobsd/embedded DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com B1C74727D To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201811051951.wA5JpB5q088141@repo.freebsd.org> From: Bryan Drewery <bdrewery@FreeBSD.org> Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: <6aa3fcb9-2199-4d80-a006-f72c59f499c3@FreeBSD.org> Date: Mon, 5 Nov 2018 15:32:45 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201811051951.wA5JpB5q088141@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KbRNb82SV5ghDPCksaLL4PUEke0MB4C14" X-Rspamd-Queue-Id: 856F37ABDE X-Spamd-Result: default: False [-108.51 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-3.30)[ip: (-8.67), ipnet: 96.47.64.0/20(-4.32), asn: 11403(-3.46), country: US(-0.06)]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 23:32:51 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --KbRNb82SV5ghDPCksaLL4PUEke0MB4C14 Content-Type: multipart/mixed; boundary="2QoSYzgBqAr3MCIHmJPbTWaDHruCFtsxJ"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <6aa3fcb9-2199-4d80-a006-f72c59f499c3@FreeBSD.org> Subject: Re: svn commit: r340157 - in head: . tools/build tools/tools/nanobsd/embedded References: <201811051951.wA5JpB5q088141@repo.freebsd.org> In-Reply-To: <201811051951.wA5JpB5q088141@repo.freebsd.org> --2QoSYzgBqAr3MCIHmJPbTWaDHruCFtsxJ Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/5/2018 11:51 AM, Alex Richardson wrote: > Author: arichardson > Date: Mon Nov 5 19:51:10 2018 > New Revision: 340157 > URL: https://svnweb.freebsd.org/changeset/base/340157 >=20 > Log: > Allow building world without inheriting $PATH > =20 This change has a summary that doesn't seem to match its change (to build host tools for cross-os builds). Does $PATH go into the build still or not? SYSTEM_COMPILER relies on $PATH inheriting into the build. --=20 Regards, Bryan Drewery --2QoSYzgBqAr3MCIHmJPbTWaDHruCFtsxJ-- --KbRNb82SV5ghDPCksaLL4PUEke0MB4C14 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAlvg0x5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l8/7qggA0i/E8IljMxG9UZ+TKms4XLZg2fRJlHBfoz/pAam13BHjfRN/BMWUpKEH CbFn3Pswd6JbaZDW8aKzqT+SbRvvrhn5nvnQSCpsNXX8mWaEO1rY2iuDZbAghtMM fF+jStzZaNSw1J1kOhSnb0L44Cd+RKgbGoFnk3DYLOkMe46qYgv4uRJH8UP156Re Gf1gE7PMMwyQvTdbnkM+Xz7KvUYQ7Nr14qDsPBPFBDEeFoU4bFG7q/QbaeUvBxoq 8UeyOQYCIkiVIlDX9VoZanflXBR+WAzzSx/EJHJDtID/6fzjtcizdTlt7WR/QVa0 FogT5rfiwRbGe/SChY+2HIWDtSRCog== =GwRd -----END PGP SIGNATURE----- --KbRNb82SV5ghDPCksaLL4PUEke0MB4C14-- From owner-svn-src-head@freebsd.org Mon Nov 5 23:45:48 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 42B2D110F830; Mon, 5 Nov 2018 23:45:48 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-yw1-f48.google.com (mail-yw1-f48.google.com [209.85.161.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9CF427B42B; Mon, 5 Nov 2018 23:45:47 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-yw1-f48.google.com with SMTP id d126-v6so4429579ywa.5; Mon, 05 Nov 2018 15:45:47 -0800 (PST) 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=xolsq+ezWhP3m1J+ER6U2/qFiRD2cWEK79aR7Ft3eQQ=; b=SClWuNDZG5dGxQ7jwOkU93rWND2aXPzuxlhUtBbllIvsRCyf+5nVBLJAwNtjSnhMN3 4TSotviZR8wxHr3eCglX5hgeDeq5x6LFAGo7pni7m0YPV3xK3oP4OqvWl7rsvIFuqgNd Yr/Q8V6Pfp6Z84vK4TwUT+NHEgvp0QsbTedrOz8NbgB5PMXj9gBjJCZV8EOh5XNYfKHJ yE8XGzE+75pVNG54rh2lVFa++e+M5qEsareUeEB2+3W5jpYfnyXRFo4lhisunUWXOrfd jSEmt/RGvWsJ65WRCzOwp8zvFiCIOo9qgxrQhnyXH4v+A05xJz5WFyDcg4CFka7eotyN hF0A== X-Gm-Message-State: AGRZ1gKO98fNNb2iktaz9o3uZN52tutENwczxo3XAO44Fmc/Q9XXfwsM CRR0J7ACUoQdTgqbJXIPI00Lmoyh7feMUw== X-Google-Smtp-Source: AJdET5ccYQEEvpJ6MpSVTS0DrRtzZ+mtxwMO0Gn3U/tGg6KjHSwix8qArCUkWgHC3uNJ9PhRudTq3g== X-Received: by 2002:a81:3404:: with SMTP id b4-v6mr23503398ywa.410.1541459653608; Mon, 05 Nov 2018 15:14:13 -0800 (PST) Received: from mail-yw1-f49.google.com (mail-yw1-f49.google.com. [209.85.161.49]) by smtp.gmail.com with ESMTPSA id i189-v6sm9639364ywb.23.2018.11.05.15.14.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 15:14:13 -0800 (PST) Received: by mail-yw1-f49.google.com with SMTP id v77-v6so4404713ywc.4; Mon, 05 Nov 2018 15:14:13 -0800 (PST) X-Received: by 2002:a81:417:: with SMTP id 23-v6mr21877960ywe.203.1541459653106; Mon, 05 Nov 2018 15:14:13 -0800 (PST) MIME-Version: 1.0 References: <201808231819.w7NIJAq5071940@repo.freebsd.org> <a7768d1a-a59f-6a82-7085-48e8d62db1f9@FreeBSD.org> In-Reply-To: <a7768d1a-a59f-6a82-7085-48e8d62db1f9@FreeBSD.org> From: Alexander Richardson <arichardson@freebsd.org> Date: Mon, 5 Nov 2018 23:14:01 +0000 X-Gmail-Original-Message-ID: <CA+Z_v8psoyk9stb91-PMOn4Pq4yoqu6=mOd+20b70V3cuv8VzA@mail.gmail.com> Message-ID: <CA+Z_v8psoyk9stb91-PMOn4Pq4yoqu6=mOd+20b70V3cuv8VzA@mail.gmail.com> Subject: Re: svn commit: r338268 - head To: bdrewery@freebsd.org Cc: src-committers <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: 9CF427B42B X-Spamd-Result: default: False [-3.98 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; RCVD_COUNT_THREE(0.00)[4]; RWL_MAILSPIKE_GOOD(0.00)[48.161.85.209.rep.mailspike.net : 127.0.0.18]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; RCVD_IN_DNSWL_NONE(0.00)[48.161.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.00)[ipnet: 209.85.128.0/17(-3.61), asn: 15169(-1.35), country: US(-0.07)]; FORGED_SENDER(0.30)[arichardson@freebsd.org,arichardsonkde@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]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[arichardson@freebsd.org,arichardsonkde@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 05 Nov 2018 23:45:48 -0000 On Mon, 5 Nov 2018 at 23:03, Bryan Drewery <bdrewery@freebsd.org> wrote: > > On 8/23/2018 11:19 AM, Alex Richardson wrote: > > Author: arichardson > > Date: Thu Aug 23 18:19:10 2018 > > New Revision: 338268 > > URL: https://svnweb.freebsd.org/changeset/base/338268 > > > > Log: > > Fix non-FreeBSD host lib32 build for TARGET=amd64 > > > > When building on non-FreeBSD systems we need to pass an explicit target > > triple to clang otherwise it will attempt to build with the host triple. > > This also has advantages when building on a FreeBSD host: we now tell > > clang that we are targeting at least FreeBSD 12.0 instead of an older > > version so it can enable newer features. > > > > Reviewed By: brooks (mentor) > > Approved By: jhb (mentor) > > Differential Revision: https://reviews.freebsd.org/D16842 > > > > Modified: > > head/Makefile.libcompat > > > > Modified: head/Makefile.libcompat > > ============================================================================== > > --- head/Makefile.libcompat Thu Aug 23 18:19:01 2018 (r338267) > > +++ head/Makefile.libcompat Thu Aug 23 18:19:10 2018 (r338268) > > @@ -14,6 +14,11 @@ LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2 > > .else > > LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} > > .endif > > +.if ${WANT_COMPILER_TYPE} == gcc || \ > > + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) > > +.else > > +LIB32CPUFLAGS+= -target x86_64-unknown-freebsd12.0 > > This can be ${TARGET_TRIPLE}, no? > It also seems like it should be in the LIBSOFT flags too; via > LIBCOMPATCFLAGS. Yes, that would be better. I didn't see that we already had a variable with the target triple when I wrote this patch. I can fix this tomorrow morning. Alex > > > +.endif > > LIB32CPUFLAGS+= -m32 > > LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ > > MACHINE_CPU="i686 mmx sse sse2" > > > > > -- > Regards, > Bryan Drewery > From owner-svn-src-head@freebsd.org Tue Nov 6 00:05:19 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 F3A50111067A; Tue, 6 Nov 2018 00:05:18 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 85CFA7C564; Tue, 6 Nov 2018 00:05:18 +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 60B3F1EAB5; Tue, 6 Nov 2018 00:05:18 +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 wA605Ium026313; Tue, 6 Nov 2018 00:05:18 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA605Ig8026311; Tue, 6 Nov 2018 00:05:18 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811060005.wA605Ig8026311@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Tue, 6 Nov 2018 00:05:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340171 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 340171 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 85CFA7C564 X-Spamd-Result: default: False [-102.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.78)[-0.780,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 00:05:19 -0000 Author: emaste Date: Tue Nov 6 00:05:17 2018 New Revision: 340171 URL: https://svnweb.freebsd.org/changeset/base/340171 Log: capability.h: add comment about planned removal timeline PR: 233007 MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/sys/sys/capability.h Modified: head/sys/sys/capability.h ============================================================================== --- head/sys/sys/capability.h Mon Nov 5 22:54:03 2018 (r340170) +++ head/sys/sys/capability.h Tue Nov 6 00:05:17 2018 (r340171) @@ -35,7 +35,8 @@ * Historically, the key userspace and kernel Capsicum definitions were found * in this file. However, it conflicted with POSIX.1e's capability.h, so has * been renamed capsicum.h. The file remains for backwards compatibility - * reasons as a nested include. + * reasons as a nested include. It is expected to be removed before + * FreeBSD 13. */ #ifndef _SYS_CAPABILITY_H_ #define _SYS_CAPABILITY_H_ From owner-svn-src-head@freebsd.org Tue Nov 6 00:09:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 40F3111107DD; Tue, 6 Nov 2018 00:09:45 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A45357C757; Tue, 6 Nov 2018 00:09:44 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 799271EAB7; Tue, 6 Nov 2018 00:09:44 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA609iW3026549; Tue, 6 Nov 2018 00:09:44 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA609iAn026548; Tue, 6 Nov 2018 00:09:44 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811060009.wA609iAn026548@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Tue, 6 Nov 2018 00:09:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340172 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340172 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A45357C757 X-Spamd-Result: default: False [-102.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.78)[-0.776,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 00:09:45 -0000 Author: brooks Date: Tue Nov 6 00:09:43 2018 New Revision: 340172 URL: https://svnweb.freebsd.org/changeset/base/340172 Log: Fix a couple indentation errors in r339958. Modified: head/sys/kern/syscalls.master Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Tue Nov 6 00:05:17 2018 (r340171) +++ head/sys/kern/syscalls.master Tue Nov 6 00:09:43 2018 (r340172) @@ -761,8 +761,8 @@ 120 AUE_READV STD { int readv( int fd, - _Inout_updates_(iovcnt) struct iovec *iovp, - u_int iovcnt + _Inout_updates_(iovcnt) struct iovec *iovp, + u_int iovcnt ); } 121 AUE_WRITEV STD { @@ -848,7 +848,7 @@ int s, _In_reads_bytes_(len) caddr_t buf, size_t len, - int flags, + int flags, _In_reads_bytes_opt_(tolen) caddr_t to, int tolen ); From owner-svn-src-head@freebsd.org Tue Nov 6 00:11:38 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 EFE23111096C; Tue, 6 Nov 2018 00:11:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7D0F87CA7D; Tue, 6 Nov 2018 00:11:37 +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 5E29B1EC0C; Tue, 6 Nov 2018 00:11:37 +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 wA60Bb2V029632; Tue, 6 Nov 2018 00:11:37 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA60Baio029629; Tue, 6 Nov 2018 00:11:36 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811060011.wA60Baio029629@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Tue, 6 Nov 2018 00:11:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340173 - head/sys/dev/cxgbe X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/cxgbe X-SVN-Commit-Revision: 340173 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7D0F87CA7D X-Spamd-Result: default: False [-102.79 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.69)[-0.694,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 00:11:38 -0000 Author: jhb Date: Tue Nov 6 00:11:36 2018 New Revision: 340173 URL: https://svnweb.freebsd.org/changeset/base/340173 Log: Add a facility for transmitting "raw" work requests on regular NIC queues. - Use PH_loc.eight[1] as a general 'cflags' (Chelsio flags) field to describe properties of a queued packet. The MC_RAW_WR flag indicates an mbuf holding a raw work request. mbuf_cflags() returns the current flags. - Raw work request mbufs are allocated via alloc_wr_mbuf() which will allocate a single contiguous range to hold the mbuf data. The consumer can use mtod() to obtain the start of the work request and write the required work request in the buffer. The mbuf can then be enqueued directly to the txq via mp_ring_enqueue(). - Since raw work requests might potentially send arbitrary work requests, only set the EQUIQ and EQUEQ bits on work requests that support them such as the normal tunneled Ethernet packet work requests. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D17811 Modified: head/sys/dev/cxgbe/adapter.h head/sys/dev/cxgbe/t4_main.c head/sys/dev/cxgbe/t4_sge.c Modified: head/sys/dev/cxgbe/adapter.h ============================================================================== --- head/sys/dev/cxgbe/adapter.h Tue Nov 6 00:09:43 2018 (r340172) +++ head/sys/dev/cxgbe/adapter.h Tue Nov 6 00:11:36 2018 (r340173) @@ -574,6 +574,7 @@ struct sge_txq { uint64_t txpkts1_wrs; /* # of type1 coalesced tx work requests */ uint64_t txpkts0_pkts; /* # of frames in type0 coalesced tx WRs */ uint64_t txpkts1_pkts; /* # of frames in type1 coalesced tx WRs */ + uint64_t raw_wrs; /* # of raw work requests (alloc_wr_mbuf) */ /* stats for not-that-common events */ } __aligned(CACHE_LINE_SIZE); @@ -1170,6 +1171,7 @@ void t4_intr_err(void *); void t4_intr_evt(void *); void t4_wrq_tx_locked(struct adapter *, struct sge_wrq *, struct wrqe *); void t4_update_fl_bufsize(struct ifnet *); +struct mbuf *alloc_wr_mbuf(int, int); int parse_pkt(struct adapter *, struct mbuf **); void *start_wrq_wr(struct sge_wrq *, int, struct wrq_cookie *); void commit_wrq_wr(struct sge_wrq *, void *, struct wrq_cookie *); Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Tue Nov 6 00:09:43 2018 (r340172) +++ head/sys/dev/cxgbe/t4_main.c Tue Nov 6 00:11:36 2018 (r340173) @@ -9804,6 +9804,7 @@ t4_ioctl(struct cdev *dev, unsigned long cmd, caddr_t txq->txpkts1_wrs = 0; txq->txpkts0_pkts = 0; txq->txpkts1_pkts = 0; + txq->raw_wrs = 0; mp_ring_reset_stats(txq->r); } Modified: head/sys/dev/cxgbe/t4_sge.c ============================================================================== --- head/sys/dev/cxgbe/t4_sge.c Tue Nov 6 00:09:43 2018 (r340172) +++ head/sys/dev/cxgbe/t4_sge.c Tue Nov 6 00:11:36 2018 (r340173) @@ -82,6 +82,9 @@ __FBSDID("$FreeBSD$"); #define RX_COPY_THRESHOLD MINCLSIZE #endif +/* Internal mbuf flags stored in PH_loc.eight[1]. */ +#define MC_RAW_WR 0x02 + /* * Ethernet frames are DMA'd at this byte offset into the freelist buffer. * 0-7 are valid values. @@ -270,6 +273,7 @@ static inline u_int txpkt_len16(u_int, u_int); static inline u_int txpkt_vm_len16(u_int, u_int); static inline u_int txpkts0_len16(u_int); static inline u_int txpkts1_len16(void); +static u_int write_raw_wr(struct sge_txq *, void *, struct mbuf *, u_int); static u_int write_txpkt_wr(struct sge_txq *, struct fw_eth_tx_pkt_wr *, struct mbuf *, u_int); static u_int write_txpkt_vm_wr(struct adapter *, struct sge_txq *, @@ -2196,6 +2200,22 @@ set_mbuf_nsegs(struct mbuf *m, uint8_t nsegs) } static inline int +mbuf_cflags(struct mbuf *m) +{ + + M_ASSERTPKTHDR(m); + return (m->m_pkthdr.PH_loc.eight[4]); +} + +static inline void +set_mbuf_cflags(struct mbuf *m, uint8_t flags) +{ + + M_ASSERTPKTHDR(m); + m->m_pkthdr.PH_loc.eight[4] = flags; +} + +static inline int mbuf_len16(struct mbuf *m) { int n; @@ -2276,6 +2296,31 @@ needs_eo(struct mbuf *m) } #endif +/* + * Try to allocate an mbuf to contain a raw work request. To make it + * easy to construct the work request, don't allocate a chain but a + * single mbuf. + */ +struct mbuf * +alloc_wr_mbuf(int len, int how) +{ + struct mbuf *m; + + if (len <= MHLEN) + m = m_gethdr(how, MT_DATA); + else if (len <= MCLBYTES) + m = m_getcl(how, MT_DATA, M_PKTHDR); + else + m = NULL; + if (m == NULL) + return (NULL); + m->m_pkthdr.len = len; + m->m_len = len; + set_mbuf_cflags(m, MC_RAW_WR); + set_mbuf_len16(m, howmany(len, 16)); + return (m); +} + static inline int needs_tso(struct mbuf *m) { @@ -2449,6 +2494,7 @@ restart: goto restart; } set_mbuf_nsegs(m0, nsegs); + set_mbuf_cflags(m0, 0); if (sc->flags & IS_VF) set_mbuf_len16(m0, txpkt_vm_len16(nsegs, needs_tso(m0))); else @@ -2691,7 +2737,7 @@ cannot_use_txpkts(struct mbuf *m) { /* maybe put a GL limit too, to avoid silliness? */ - return (needs_tso(m)); + return (needs_tso(m) || (mbuf_cflags(m) & MC_RAW_WR) != 0); } static inline int @@ -2701,6 +2747,21 @@ discard_tx(struct sge_eq *eq) return ((eq->flags & (EQ_ENABLED | EQ_QFLUSH)) != EQ_ENABLED); } +static inline int +wr_can_update_eq(struct fw_eth_tx_pkts_wr *wr) +{ + + switch (G_FW_WR_OP(be32toh(wr->op_pkd))) { + case FW_ULPTX_WR: + case FW_ETH_TX_PKT_WR: + case FW_ETH_TX_PKTS_WR: + case FW_ETH_TX_PKT_VM_WR: + return (1); + default: + return (0); + } +} + /* * r->items[cidx] to r->items[pidx], with a wraparound at r->size, are ready to * be consumed. Return the actual number consumed. 0 indicates a stall. @@ -2796,6 +2857,10 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx) n = write_txpkts_wr(txq, wr, m0, &txp, available); total += txp.npkt; remaining -= txp.npkt; + } else if (mbuf_cflags(m0) & MC_RAW_WR) { + total++; + remaining--; + n = write_raw_wr(txq, (void *)wr, m0, available); } else { total++; remaining--; @@ -2808,14 +2873,17 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx) dbdiff += n; IDXINCR(eq->pidx, n, eq->sidx); - if (total_available_tx_desc(eq) < eq->sidx / 4 && - atomic_cmpset_int(&eq->equiq, 0, 1)) { - wr->equiq_to_len16 |= htobe32(F_FW_WR_EQUIQ | - F_FW_WR_EQUEQ); - eq->equeqidx = eq->pidx; - } else if (IDXDIFF(eq->pidx, eq->equeqidx, eq->sidx) >= 32) { - wr->equiq_to_len16 |= htobe32(F_FW_WR_EQUEQ); - eq->equeqidx = eq->pidx; + if (wr_can_update_eq(wr)) { + if (total_available_tx_desc(eq) < eq->sidx / 4 && + atomic_cmpset_int(&eq->equiq, 0, 1)) { + wr->equiq_to_len16 |= htobe32(F_FW_WR_EQUIQ | + F_FW_WR_EQUEQ); + eq->equeqidx = eq->pidx; + } else if (IDXDIFF(eq->pidx, eq->equeqidx, eq->sidx) >= + 32) { + wr->equiq_to_len16 |= htobe32(F_FW_WR_EQUEQ); + eq->equeqidx = eq->pidx; + } } if (dbdiff >= 16 && remaining >= 4) { @@ -4010,6 +4078,8 @@ alloc_txq(struct vi_info *vi, struct sge_txq *txq, int SYSCTL_ADD_UQUAD(&vi->ctx, children, OID_AUTO, "txpkts1_pkts", CTLFLAG_RD, &txq->txpkts1_pkts, "# of frames tx'd using type1 txpkts work requests"); + SYSCTL_ADD_UQUAD(&vi->ctx, children, OID_AUTO, "raw_wrs", CTLFLAG_RD, + &txq->raw_wrs, "# of raw work requests (non-packets)"); SYSCTL_ADD_COUNTER_U64(&vi->ctx, children, OID_AUTO, "r_enqueues", CTLFLAG_RD, &txq->r->enqueues, @@ -4548,6 +4618,39 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq * txq->sgl_wrs++; txq->txpkt_wrs++; + + txsd = &txq->sdesc[eq->pidx]; + txsd->m = m0; + txsd->desc_used = ndesc; + + return (ndesc); +} + +/* + * Write a raw WR to the hardware descriptors, update the software + * descriptor, and advance the pidx. It is guaranteed that enough + * descriptors are available. + * + * The return value is the # of hardware descriptors used. + */ +static u_int +write_raw_wr(struct sge_txq *txq, void *wr, struct mbuf *m0, u_int available) +{ + struct sge_eq *eq = &txq->eq; + struct tx_sdesc *txsd; + struct mbuf *m; + caddr_t dst; + int len16, ndesc; + + len16 = mbuf_len16(m0); + ndesc = howmany(len16, EQ_ESIZE / 16); + MPASS(ndesc <= available); + + dst = wr; + for (m = m0; m != NULL; m = m->m_next) + copy_to_txd(eq, mtod(m, caddr_t), &dst, m->m_len); + + txq->raw_wrs++; txsd = &txq->sdesc[eq->pidx]; txsd->m = m0; From owner-svn-src-head@freebsd.org Tue Nov 6 00:14:23 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 14FB51110AE0; Tue, 6 Nov 2018 00:14:23 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E1557CD24; Tue, 6 Nov 2018 00:14:22 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-yb1-f175.google.com with SMTP id t13-v6so4610837ybb.8; Mon, 05 Nov 2018 16:14:22 -0800 (PST) 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=ZZRVyheQ3qWQB7tIOkYAJGVLmZLcAVR6Urv7ajGBCXs=; b=BAX7auw2kKn0ArWvA4rulpYOn3S44/4hJT9vIv8/qlO3nRscVdkIquQ5gnE4rEnq/w Qn2AKunXhE8ul/B9D8N7PtntuhEybHYsyUZvJA7isQhfrtA6L/g4qwqCKejYQsD2PaQ7 yhMGwUi4054N8D08oDEpTDShCouWpIDwodQinq4h/zYix4qPBXrQoxq7zIFHke+xYwCk ZQuD9vWWtoxJPfE8VfsywErj0lYL5RlhRXg25dI7lywyN07pYIhVkGSqMPTqU4jGJHa+ HCviuYH6ElU970/CJcfzrLqPfZuOS1dztu2MgMVR6o868ekhYGfsVTaiT2/pSSc4gBm4 DiUQ== X-Gm-Message-State: AGRZ1gIVdo33kvhTJ8PgOU38nolE/1EW42ZtirPR4J+TbnqiLcTqvf2q 9/C9yx+UxzIo1g4AACe7ScYCdssS8CfzgA== X-Google-Smtp-Source: AJdET5eS0PwnBJ2Z1IL+aCiZO+dPXo6kVsJocvH31jKk34ZlMKWO+PL9YneWhsV8yRiFPokIL2krTg== X-Received: by 2002:a25:bcc2:: with SMTP id l2-v6mr22996076ybm.448.1541462946577; Mon, 05 Nov 2018 16:09:06 -0800 (PST) Received: from mail-yw1-f45.google.com (mail-yw1-f45.google.com. [209.85.161.45]) by smtp.gmail.com with ESMTPSA id m68-v6sm11877055ywf.95.2018.11.05.16.09.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 16:09:06 -0800 (PST) Received: by mail-yw1-f45.google.com with SMTP id j75-v6so4440831ywj.10; Mon, 05 Nov 2018 16:09:05 -0800 (PST) X-Received: by 2002:a81:ae1a:: with SMTP id m26-v6mr24163975ywh.14.1541462945648; Mon, 05 Nov 2018 16:09:05 -0800 (PST) MIME-Version: 1.0 References: <201811051951.wA5JpB5q088141@repo.freebsd.org> <6aa3fcb9-2199-4d80-a006-f72c59f499c3@FreeBSD.org> In-Reply-To: <6aa3fcb9-2199-4d80-a006-f72c59f499c3@FreeBSD.org> From: Alexander Richardson <arichardson@freebsd.org> Date: Tue, 6 Nov 2018 00:08:53 +0000 X-Gmail-Original-Message-ID: <CA+Z_v8ohQAYMt+ZeQsE+cgydt-20ud317xWZ0+F9tFgLexrhJg@mail.gmail.com> Message-ID: <CA+Z_v8ohQAYMt+ZeQsE+cgydt-20ud317xWZ0+F9tFgLexrhJg@mail.gmail.com> Subject: Re: svn commit: r340157 - in head: . tools/build tools/tools/nanobsd/embedded To: Bryan Drewery <bdrewery@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 7E1557CD24 X-Spamd-Result: default: False [-3.99 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-0.99)[ipnet: 209.85.128.0/17(-3.57), asn: 15169(-1.33), country: US(-0.07)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; RCVD_IN_DNSWL_NONE(0.00)[175.219.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[arichardson@freebsd.org,arichardsonkde@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]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[arichardson@freebsd.org,arichardsonkde@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 00:14:23 -0000 On Mon, 5 Nov 2018, 23:32 Bryan Drewery <bdrewery@freebsd.org wrote: > On 11/5/2018 11:51 AM, Alex Richardson wrote: > > Author: arichardson > > Date: Mon Nov 5 19:51:10 2018 > > New Revision: 340157 > > URL: https://svnweb.freebsd.org/changeset/base/340157 > > > > Log: > > Allow building world without inheriting $PATH > > > > This change has a summary that doesn't seem to match its change (to > build host tools for cross-os builds). > Does $PATH go into the build still or not? SYSTEM_COMPILER relies on > $PATH inheriting into the build. Bootstrapping of host tools does not change unless BOOTSTRAP_ALL_TOOLS is set on the make command line (this will be the default for cross-os builds but that still requires more changes). This patch only ensures that the required tools are symlinked into worldtmp. $PATH should only be inherited for the bootstrap-tools phase. I thought I had tested all variations of universe builds but it looks like I forgot to test on a SYSTEM_COMPILER machine so didn't notice it is needed there. This should be fixed in r340167. $PATH will now be inherited when using the system compiler or linker but otherwise the strict path will be used. In case I missed more cases: the new strict path behaviour can be disabled by setting BUILD_WITH_STRICT_TMPPATH=0. Sorry about any breakage. Alex From owner-svn-src-head@freebsd.org Tue Nov 6 01:33:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 67F201125900; Tue, 6 Nov 2018 01:33:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C1B5E825A0; Tue, 6 Nov 2018 01:33:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f52.google.com with SMTP id p83-v6so8049789iod.12; Mon, 05 Nov 2018 17:33:09 -0800 (PST) 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; bh=B6MlwplehTy5ucNxlplAJ5pJXaSJuM4v0pOedq1upDc=; b=TMAI9U8D8suZJjc+rsxj/O9S0VjnvCe6yYJ9LFOr90hy3CKb62cvnf+IdFBMP3NG+o bNKB8LYEnoM8QU2KzOj3G03JKS5d7TSVIbwYlKGrRiqW//Cq6OVe0S0KovLXGZBEW2DL Ut/54W2DkctbxN1eewCn0WGduHnrq+Mfkcf/cd24WafEOUt72nVvvfLk4cDEy0uiXJkX Nx8kqdRx3IKLnPtXScuwyGmM0xESLgIeHnaL+xzrM/Xv6fOJuenUvLuXXBn2gYfiCxAA 1xL/WGKTHXqKWrVJZWdHKsRuSb3sBiEkyOOhMALFTnCllPNML2ybrXSZbadQj/evuY0W XY5Q== X-Gm-Message-State: AGRZ1gJE5BGgvgtjKe1LooyPFCRB/Ts++sAJp4Lj3vQicpsbXLjyoYLR tXUVYtYG21g/mhBzu6YbAyA2nE6lKQOYomwqRymFtx6a X-Google-Smtp-Source: AJdET5fT1kVuIs9rLegEqBewO6vkKvc8uzyII8PnlyumSyNFB9AQXlOeCMNBk8Jte2PZwUFcskJ4kOVW24TC3AV+Axs= X-Received: by 2002:a6b:fe11:: with SMTP id x17-v6mr10131678ioh.294.1541467982102; Mon, 05 Nov 2018 17:33:02 -0800 (PST) MIME-Version: 1.0 References: <201811060005.wA605Ig8026311@repo.freebsd.org> In-Reply-To: <201811060005.wA605Ig8026311@repo.freebsd.org> From: Ed Maste <emaste@freebsd.org> Date: Mon, 5 Nov 2018 20:32:48 -0500 Message-ID: <CAPyFy2B+aBZmUFcadwu0BZcWsapd_EC8ODL_VtOeJAzSVV32Qw@mail.gmail.com> Subject: Re: svn commit: r340171 - head/sys/sys To: src-committers <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: C1B5E825A0 X-Spamd-Result: default: False [-3.94 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; IP_SCORE(-0.99)[ipnet: 209.85.128.0/17(-3.53), asn: 15169(-1.37), country: US(-0.07)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; RCVD_IN_DNSWL_NONE(0.00)[52.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[52.166.85.209.rep.mailspike.net : 127.0.0.17]; 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)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 01:33:10 -0000 On Mon, 5 Nov 2018 at 19:05, Ed Maste <emaste@freebsd.org> wrote: > > Author: emaste > Date: Tue Nov 6 00:05:17 2018 > New Revision: 340171 > URL: https://svnweb.freebsd.org/changeset/base/340171 > > Log: > capability.h: add comment about planned removal timeline > > PR: 233007 Oops, this was meant to reference PR 228878, the exp-run. From owner-svn-src-head@freebsd.org Tue Nov 6 02:10:32 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 975E0112954C; Tue, 6 Nov 2018 02:10:32 +0000 (UTC) (envelope-from ml@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 8351D850F2; Tue, 6 Nov 2018 02:10:31 +0000 (UTC) (envelope-from ml@vishwin.info) Received: from varun.vishwin.info (fd35:9eae:7575::2 [IPv6:fd35:9eae:7575::2]) by varun.vishwin.info (OpenSMTPD) with ESMTP id 4f724a59; Mon, 5 Nov 2018 21:10:21 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=vishwin.info; h=from :subject:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; s=fuccboi12; bh=ycnvyKd1fNM3yIs1N0qLM KoRjo0dISJUo3mtCBgsiWk=; b=tQMJdNucCxuIZf677vgKRfwVS4GwZuozEpBNa F3Cx/NZB4jbkH0GXoVW0oBxfeZS/cEgRTVFBufFGs9FAU2WVnFGGV0U1Fxdg8Te9 cF0ETCaTgH3rnLro71OfaXwAOhcuz/FlG4WbxyxAKtxFny8DlqqJzYZIT3fvHOFN NXk4Yse1v4ySKfA9X/+yH/SelP+w/vngdWO4Wg1Ji5ar/5BWjy16/T8fXy/Dy/bt dHD16WCyRyivNjiwBGmhtZhF+MUzzT6n97w64WSYrjMikVNYjlfvsVUvwyq6a748 7uef9wnCLfpjGFUxuQFy0uDMTRPqGfQLS0szFMehm5lngA8AQ== 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 05864f12 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO; Mon, 5 Nov 2018 21:10:19 -0500 (EST) From: Charlie Li <ml@vishwin.info> Subject: svn commit: r339898 - head/lib/libc/amd64/sys To: Konstantin Belousov <kostikbel@gmail.com> Cc: Brooks Davis <brooks@freebsd.org>, svn-src-head@freebsd.org, toolchain@freebsd.org, current@freebsd.org References: <201810300011.w9U0BUui038857@repo.freebsd.org> <a2d14762-d6f9-4c3e-b3d3-efb7dcb2640f@vishwin.info> <20181101160406.GA60233__23941.7825396687$1541088368$gmane$org@spindle.one-eyed-alien.net> <ae15161f-0728-d208-12a2-08a22fcbc50b@vishwin.info> <fdda06af-d189-b9b0-d2d5-26bcf2c6395a@vishwin.info> <20181103152936.GQ5335@kib.kiev.ua> <f8be07cd-f5eb-989c-44f1-ddcd60841411@vishwin.info> <20181103234551.GX5335@kib.kiev.ua> Openpgp: preference=signencrypt Autocrypt: addr=ml@vishwin.info; keydata= xsFNBFt7iHUBEADCorTixbMGuHd9WYSKCELlv/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/8Fxd1NWPZ6n4X8npQn6iyQARAQABzSFDaGFybGllIExp IDx2aXNod2luQHZpc2h3aW4uaW5mbz7CwZEEEwEIADsCGyMFCwkIBwIGFQoJCAsCBBYCAwEC HgECF4AWIQT/f8Kqvlr7jU9sRv6OcHje8gOrbAUCW3uI+wIZAQAKCRCOcHje8gOrbNX8EACT HGo3AsShFj+AaUgD9V6wTMaR2w7ubIqbkn2ZqZZ1xWj3gM6VYRKHflj9LiYqFRO4wBteAq30 Snz6F93IG+u5B1uwlC58HDwCQaROaU5cHQ8UvGPSEv0XXCcYTaC3d5NMoIh/LdutVZz56LTx hWs5NHUCaG6FfGV9QplECRteQr2rMxHZxZ3ppSY9oev/wY3U3VRUGnhM2ZwGrpmjksC1HTBH Fw2XbYdVNCOYjQrTIulaYb3y0ssgsOhvSk9bPHSTsWSCQGJk0uFNXTvIq68GhkhOwAet6//w R2y1whg47r554pBManttODaQnmWmIWBM0bZMJrlNT8T/oXlG9nA0jrjA8LvTThrCAvMSMB0F 2FhStd/I2/Fs7T6Uk1BUpgCvFiDtE8Jt1W2yq2GLtPysGrJXyDaat8IuVUthnNVhoyZb9tZu sI/FFhfh9MkPmZDwCoTUJN2yU8QhxS1iJXfMZ1f06r1TYY9rwb8E/WCBJFbMzJs3VLj/TnHL N09J2zNZgTs7gewLn/2lEV1kOL/FxIDgN7ailcf3kcNdVUxr/pLbx3NZcDkXniPO0dzQpuRw q841wBT3uqdPFJwIl4pf1EYhLj89r2vOGnM2RChl1/t+wSqHhBji3R3uylzE0qbr8O/cgx/5 wlvZJiUhyu0hJ/JoJkF8WEFkesJrTZORGc7BTQRbe4h1ARAA12Xtgcbwk7IdsRi/7sTFKs73 qoFFq+DUWwMbSuIOaWw5J9nZ+ovr9gkXlax+xf335hJ0iItB8LhA7D9wD4wjrmmBjhwK7jYv tghb8BH6MHWEWD5D9xt47CO4o8Vi1m/F4OlKxoDqIhH6n63gNeSNaXzqDpZoUsL62KX+sKKU Udj/X/oz3XwXWCb/rEIgAMMW7QFcuQBJzkHgu69oUSIki4j1mhAMiBbGexfS1dcTfpLAr9eu jDNHOw5r7aI4cA8q7us8YfDLby87hPlSrtTKcxkbawrdFNs6KNrEvggkXhYxGqm4Z0FInixa avloimBf1q7kvVM0AAgsmkdeeS/6Tzbn71WBuEW0VgEcSSBS1dv7DfgmeQeiSmv0Dvx2lZv5 P6M4Q/plSAz7hVXL6EIKltwJUjY8Re7zDbPf7jJlbEgWbLxRhlGh5MwrNXbMt6KygDRcDyOP njxg0+ICXbQyPKiq7jZY2/Q/x8P08xNx8sUKPY+XE6G5QVohQfe3LT9s15KM+1Ur4v3Hhbft HtTW1iT60HkyU9qRCJJC11OgH7wrfiucG3/eQKgBgvsfKDD36rJmsQpkO0/kkp6R+CzLby3X PrrFYJTCr08e5QWKKPdyNvAhuyQj27Lb7EhNxe3hmpV+llx0aaN9t1M+QZ88famMOgIlp7Nh 1uFr/c5WGZUAEQEAAcLBdgQYAQgAIBYhBP9/wqq+WvuNT2xG/o5weN7yA6tsBQJbe4h1AhsM AAoJEI5weN7yA6tsTGcP/2rBIvgeKismZQQn7kJOHwgmqXg/N5ArwPH3eCJmzmNZWUIlOZyl A2KtYhkzZ5G3rsL/BMmMuYRUbPJJUukaJSqFep1E6AWYPC8Seakhu1ZbK8ayBI4KZmP+3PQY S0tKyMlxX+Qt9+S/tcQqS31mMgmcVhVhKi8MrWjY+g7pF+LkBYccHuNiGNIcm8mMPHTIKU72 ARiG3DtHrRg4sf5wqgOi72277jBHdDBGw0Y7rCvMsaGm3G4GsMwj4e47H6PAFOWK7O69muvL o50oMN2rkPi+9AKPi8WcrinstleEGyEIyguRagDQjZP5gX9Xk5vkS6+xMgKt7+k7+D3jWKlW R6G9U0CyKmVJoeNqwHUdLoFD3lywjwT9vo+cqb4gQKnZsA1ss/WOvEp4EaNSR7JHFOY5X8AN QgiPxLhrbI7FPGXKw3Y7nCpcIlzFph6UL9jhNRwvoQ3GfZ0sF0JgpASdrS4N3Fmnt9L6lc3q rIrxDPpDjYwcDEUBl0sp/prjh3gdC3qs9xZ0RNWWdUqcmvRv2SDkrVDw3iQ9WhMZWuQYBmGa MViypa6WrjjlVTjqZftZyqytnHwuo1PA/qLcF/vUUn0QHFPIDx8/yTSqiw/xTwPuOFxznHjJ VbxEEG0H5rmreh1Z0WeMwsSbjC3EEf+ZI39QpFwVIG8pDwXFOClfhjFz Message-ID: <4907b3f9-d1c6-4368-5597-ce3d6be19461@vishwin.info> Date: Mon, 5 Nov 2018 21:10:13 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20181103234551.GX5335@kib.kiev.ua> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="dSTQZO6Iv0RuDNl64DlwKsKfsJ7ZgIKDH" X-Rspamd-Queue-Id: 8351D850F2 X-Spamd-Result: default: False [-1.72 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[vishwin.info]; NEURAL_HAM_MEDIUM(-0.35)[-0.348,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-0.27)[-0.268,0]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; DMARC_NA(0.00)[vishwin.info]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.78)[0.779,0]; DKIM_TRACE(0.00)[vishwin.info:+]; MX_GOOD(-0.01)[varun.vishwin.info]; SIGNED_PGP(-2.00)[]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(0.72)[asn: 14061(3.69), country: US(-0.07)]; ASN(0.00)[asn:14061, ipnet:46.101.80.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 02:10:32 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --dSTQZO6Iv0RuDNl64DlwKsKfsJ7ZgIKDH Content-Type: multipart/mixed; boundary="u0fGacMRl73mJcOe10cqYQwU7Cn5MR41u"; protected-headers="v1" From: Charlie Li <ml@vishwin.info> To: Konstantin Belousov <kostikbel@gmail.com> Cc: Brooks Davis <brooks@freebsd.org>, svn-src-head@freebsd.org, toolchain@freebsd.org, current@freebsd.org Message-ID: <4907b3f9-d1c6-4368-5597-ce3d6be19461@vishwin.info> Subject: svn commit: r339898 - head/lib/libc/amd64/sys References: <201810300011.w9U0BUui038857@repo.freebsd.org> <a2d14762-d6f9-4c3e-b3d3-efb7dcb2640f@vishwin.info> <20181101160406.GA60233__23941.7825396687$1541088368$gmane$org@spindle.one-eyed-alien.net> <ae15161f-0728-d208-12a2-08a22fcbc50b@vishwin.info> <fdda06af-d189-b9b0-d2d5-26bcf2c6395a@vishwin.info> <20181103152936.GQ5335@kib.kiev.ua> <f8be07cd-f5eb-989c-44f1-ddcd60841411@vishwin.info> <20181103234551.GX5335@kib.kiev.ua> In-Reply-To: <20181103234551.GX5335@kib.kiev.ua> --u0fGacMRl73mJcOe10cqYQwU7Cn5MR41u Content-Type: text/plain; charset=utf-8 Content-Language: en-GB-large Content-Transfer-Encoding: quoted-printable On 03/11/2018 19:45, Konstantin Belousov wrote: > Or rather, it is a middle of the valid instruction. > Next frame looks like it is process_irelocs(), if trusting the line > numbers. So most likely it is something related to calling wrong > relocator function, if anything. >=20 > Perhaps you could try to trace the things manually, doing > single-stepping of the startup code in debugger. There should be very > modest amount of the irelocs, perhaps only one, and see where things go= > off the way. >=20 After a few more complete buildworlds, including one with all bootstrapping enabled, this doesn't look compiler-specific. Static binaries built with the in-tree base LLVM (6.0.1) also crash. I stepped through bmake with base lldb, comparing the working copy in my system from circa r339990 with r340173 built with bootstrapped toolchain. Only the differing parts are shown for conciseness. Circa r339990: Process 82271 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x000000000024ab06 make`_init_tls at tls.c:471 468 } 469 tls =3D _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_AL= IGN); 470 -> 471 _set_tp(tls); 472 #endif 473 } (lldb) n Process 82271 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x0000000000255e60 make`_set_tp(tp=3D0x00000008002f7830) at= _set_tp.c:38 35 36 void 37 _set_tp(void *tp) -> 38 { 39 40 amd64_set_fsbase(tp); 41 } (lldb) s Process 82271 stopped * thread #1, name =3D 'make', stop reason =3D step in frame #0: 0x0000000000255e64 make`_set_tp(tp=3D0x00000008002f7830) at= _set_tp.c:40 37 _set_tp(void *tp) 38 { 39 -> 40 amd64_set_fsbase(tp); 41 } (lldb) s Process 82271 stopped * thread #1, name =3D 'make', stop reason =3D step in frame #0: 0x0000000000256580 make`amd64_set_fsbase(addr=3D0x00000008002f7830) at amd64_set_fsbase.c:43= 40 #include <machine/specialreg.h> 41 #include <machine/sysarch.h> 42 #include <x86/ifunc.h> -> 43 #include "libc_private.h" 44 45 static int 46 amd64_set_fsbase_cpu(void *addr) (lldb) r340173: Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x0000000000247c96 make`_init_tls at tls.c:471 468 } 469 tls =3D _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_AL= IGN); 470 -> 471 _set_tp(tls); 472 #endif 473 } (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x0000000000252eb0 make`_set_tp(tp=3D0x00000008002ed830) at= _set_tp.c:38 35 36 void 37 _set_tp(void *tp) -> 38 { 39 40 amd64_set_fsbase(tp); 41 } (lldb) s Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step in frame #0: 0x0000000000252eb4 make`_set_tp(tp=3D0x00000008002ed830) at= _set_tp.c:40 37 _set_tp(void *tp) 38 { 39 -> 40 amd64_set_fsbase(tp); 41 } (lldb) s Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step in frame #0: 0x0000000000252eb5 make`_set_tp(tp=3D0x00000008002ed830) at= _set_tp.c:40 37 _set_tp(void *tp) 38 { 39 -> 40 amd64_set_fsbase(tp); 41 } (lldb) s Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step in frame #0: 0x00000000002ebdb0 make -> 0x2ebdb0: movq 0x3ce9(%rip), %r11 0x2ebdb7: callq 0x2ebda0 ; _fini 0x2ebdbc: jmp 0x2ebd92 ; _init + 6 0x2ebdc1: pushq $0x0 (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D instruction step over frame #0: 0x00000000002ebdb7 make -> 0x2ebdb7: callq 0x2ebda0 ; _fini 0x2ebdbc: jmp 0x2ebd92 ; _init + 6 0x2ebdc1: pushq $0x0 0x2ebdc6: jmp 0x2ebd80 ; __do_global_ctors_aux + = 48 (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D instruction step over frame #0: 0x00000000002ebda0 make`_fini at crti.S:41 38 .globl _fini 39 .type _fini,@function 40 _fini: -> 41 subq $8,%rsp 42 43 .section .note.GNU-stack,"",%progbits (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x00000000002ebda4 make`_fini + 4 make`_fini: -> 0x2ebda4 <+4>: callq 0x226310 ; __do_global_dtors_= aux 0x2ebda9 <+9>: addq $0x8, %rsp 0x2ebdad <+13>: retq 0x2ebdae: addb %al, (%rax) (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D instruction step over frame #0: 0x00000000002ebda9 make`_fini at crtn.S:34 31 ret 32 33 .section .fini,"ax",@progbits -> 34 addq $8,%rsp 35 ret 36 37 .section .note.GNU-stack,"",%progbits (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x00000000002ebdad make`_fini at crtn.S:35 32 33 .section .fini,"ax",@progbits 34 addq $8,%rsp -> 35 ret 36 37 .section .note.GNU-stack,"",%progbits (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D step over frame #0: 0x00000000002ebdbc make -> 0x2ebdbc: jmp 0x2ebd92 ; _init + 6 0x2ebdc1: pushq $0x0 0x2ebdc6: jmp 0x2ebd80 ; __do_global_ctors_aux + = 48 0x2ebdcb: int3 (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D instruction step over frame #0: 0x00000000002ebd92 make`_init + 6 make`_init: -> 0x2ebd92 <+6>: movsl (%rsi), %es:(%rdi) (lldb) n Process 22663 stopped * thread #1, name =3D 'make', stop reason =3D signal SIGSEGV: invalid address (fault address: 0x0) frame #0: 0x00000000002ebd92 make`_init + 6 make`_init: -> 0x2ebd92 <+6>: movsl (%rsi), %es:(%rdi) (lldb) n Process 22663 exited with status =3D -1 (0xffffffff) (lldb) --=20 Charlie Li Can't think of a witty .sigline today=E2=80=A6 (This email address is for mailing list use only; replace local-part with vishwin for off-list communication) --u0fGacMRl73mJcOe10cqYQwU7Cn5MR41u-- --dSTQZO6Iv0RuDNl64DlwKsKfsJ7ZgIKDH 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+jnB43vIDq2wFAlvg+AoACgkQjnB43vID q2wNKw//QAnkScAsIvGCUcFKwd2HM1sRRCCiO0yFR5POy/TDqT2I8LiK+sz+6HnT RAtTq+yhQV6py+XYsRJW8oJE/89ppabxYXjX7i5VFuOBwAGE6uWVu5thvQnCR8fZ McfficSQJdb/1DTwZQCQOxCnWILEb8ztpOmJOHXYLHoOdJ+Tr/MlMiuKH6pNjlHG +DGXc6rUpf40t4UPc6+SPZgCW1lFqa4nE0xbTJVprhfJNbP/iO/LtEe2gpQ6c+fa UaZns+xkN9WV5XtVKJA+iF/m0r+EUYDbdVwNCdEhXPc4tTk3JNGsdJERZphWrA8m cylFEacNCFHfZCyqRo30HSGAMcUQdCp178bkbAaSvRHPKxsMiv+jh030l/UO0j+P Qv5WIBWhd35Rc6wn+rGXzZbscqplUv8OQHhPD6iI6XM82n78YRJm5WH7e3CNEzfH D8hYvI4TlkkIsmDawtOgbm6RCH+cTpiweVxLEIM0xZEG1orpjUVkz5VJ/3a2reMe 2DT05u2p1YEI9bVmGPFBnIgo0BJ1lzZj/EMHYyejpmC00ORmcHV0jJlYKjtWsXEX JA3dIYkOxyAVTxSj+sCDYtaXVyZDEWrwDNx2NVmuWo6hZ2/cMS8LfmzbVvB2xOpU Z8Oht3+M2rCjIXzSKJxgRsEnTVFdnaXltgHk+hCadTbZ9EpbotE= =cwRr -----END PGP SIGNATURE----- --dSTQZO6Iv0RuDNl64DlwKsKfsJ7ZgIKDH-- From owner-svn-src-head@freebsd.org Tue Nov 6 02:52:11 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7F9E2112BDEC; Tue, 6 Nov 2018 02:52: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 DE3D787294; Tue, 6 Nov 2018 02:52:10 +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 wA62q0M2072867 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 6 Nov 2018 04:52:03 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua wA62q0M2072867 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id wA62pxXi072866; Tue, 6 Nov 2018 04:51:59 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 6 Nov 2018 04:51:59 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: Charlie Li <ml@vishwin.info> Cc: Brooks Davis <brooks@freebsd.org>, svn-src-head@freebsd.org, toolchain@freebsd.org, current@freebsd.org Subject: Re: svn commit: r339898 - head/lib/libc/amd64/sys Message-ID: <20181106025159.GU5335@kib.kiev.ua> References: <201810300011.w9U0BUui038857@repo.freebsd.org> <a2d14762-d6f9-4c3e-b3d3-efb7dcb2640f@vishwin.info> <20181101160406.GA60233__23941.7825396687$1541088368$gmane$org@spindle.one-eyed-alien.net> <ae15161f-0728-d208-12a2-08a22fcbc50b@vishwin.info> <fdda06af-d189-b9b0-d2d5-26bcf2c6395a@vishwin.info> <20181103152936.GQ5335@kib.kiev.ua> <f8be07cd-f5eb-989c-44f1-ddcd60841411@vishwin.info> <20181103234551.GX5335@kib.kiev.ua> <4907b3f9-d1c6-4368-5597-ce3d6be19461@vishwin.info> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4907b3f9-d1c6-4368-5597-ce3d6be19461@vishwin.info> User-Agent: Mutt/1.10.1 (2018-07-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-Rspamd-Queue-Id: DE3D787294 X-Spamd-Result: default: False [-4.93 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.94)[-0.937,0]; IP_SCORE(-1.99)[ip: (-2.50), ipnet: 2001:470::/32(-4.10), asn: 6939(-3.27), country: US(-0.07)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_TLS_LAST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 02:52:11 -0000 On Mon, Nov 05, 2018 at 09:10:13PM -0500, Charlie Li wrote: > On 03/11/2018 19:45, Konstantin Belousov wrote: > > Or rather, it is a middle of the valid instruction. > > Next frame looks like it is process_irelocs(), if trusting the line > > numbers. So most likely it is something related to calling wrong > > relocator function, if anything. > > > > Perhaps you could try to trace the things manually, doing > > single-stepping of the startup code in debugger. There should be very > > modest amount of the irelocs, perhaps only one, and see where things go > > off the way. > > > After a few more complete buildworlds, including one with all > bootstrapping enabled, this doesn't look compiler-specific. Static > binaries built with the in-tree base LLVM (6.0.1) also crash. For you, but not for me. > > I stepped through bmake with base lldb, comparing the working copy in my > system from circa r339990 with r340173 built with bootstrapped > toolchain. Only the differing parts are shown for conciseness. > > Circa r339990: > Process 82271 stopped > * thread #1, name = 'make', stop reason = step over > frame #0: 0x000000000024ab06 make`_init_tls at tls.c:471 > 468 } > 469 tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); > 470 > -> 471 _set_tp(tls); > 472 #endif > 473 } > (lldb) n > Process 82271 stopped > * thread #1, name = 'make', stop reason = step over > frame #0: 0x0000000000255e60 make`_set_tp(tp=0x00000008002f7830) at > _set_tp.c:38 > 35 > 36 void > 37 _set_tp(void *tp) > -> 38 { > 39 > 40 amd64_set_fsbase(tp); > 41 } > (lldb) s > Process 82271 stopped > * thread #1, name = 'make', stop reason = step in > frame #0: 0x0000000000255e64 make`_set_tp(tp=0x00000008002f7830) at > _set_tp.c:40 > 37 _set_tp(void *tp) > 38 { > 39 > -> 40 amd64_set_fsbase(tp); > 41 } > (lldb) s > Process 82271 stopped > * thread #1, name = 'make', stop reason = step in > frame #0: 0x0000000000256580 > make`amd64_set_fsbase(addr=0x00000008002f7830) at amd64_set_fsbase.c:43 > 40 #include <machine/specialreg.h> > 41 #include <machine/sysarch.h> > 42 #include <x86/ifunc.h> > -> 43 #include "libc_private.h" > 44 > 45 static int > 46 amd64_set_fsbase_cpu(void *addr) > (lldb) > > r340173: > Process 22663 stopped > * thread #1, name = 'make', stop reason = step over > frame #0: 0x0000000000247c96 make`_init_tls at tls.c:471 > 468 } > 469 tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN); > 470 > -> 471 _set_tp(tls); > 472 #endif > 473 } > (lldb) n > Process 22663 stopped > * thread #1, name = 'make', stop reason = step over > frame #0: 0x0000000000252eb0 make`_set_tp(tp=0x00000008002ed830) at > _set_tp.c:38 > 35 > 36 void > 37 _set_tp(void *tp) > -> 38 { > 39 > 40 amd64_set_fsbase(tp); > 41 } > (lldb) s > Process 22663 stopped > * thread #1, name = 'make', stop reason = step in > frame #0: 0x0000000000252eb4 make`_set_tp(tp=0x00000008002ed830) at > _set_tp.c:40 > 37 _set_tp(void *tp) > 38 { > 39 > -> 40 amd64_set_fsbase(tp); > 41 } > (lldb) s > Process 22663 stopped > * thread #1, name = 'make', stop reason = step in > frame #0: 0x0000000000252eb5 make`_set_tp(tp=0x00000008002ed830) at > _set_tp.c:40 > 37 _set_tp(void *tp) > 38 { > 39 > -> 40 amd64_set_fsbase(tp); > 41 } > (lldb) s > Process 22663 stopped > * thread #1, name = 'make', stop reason = step in > frame #0: 0x00000000002ebdb0 make > -> 0x2ebdb0: movq 0x3ce9(%rip), %r11 > 0x2ebdb7: callq 0x2ebda0 ; _fini > 0x2ebdbc: jmp 0x2ebd92 ; _init + 6 > 0x2ebdc1: pushq $0x0 > (lldb) n > Process 22663 stopped > * thread #1, name = 'make', stop reason = instruction step over > frame #0: 0x00000000002ebdb7 make > -> 0x2ebdb7: callq 0x2ebda0 ; _fini I guess this is where things go off for you, but I may be wrong. After ifuncification, 'amd64_set_fsbase()' line should be represented by the asm as either call <somewhere in plt> and the place in plt is just jmp *(rip-based offset to GOT)(%rip) In fact the call to amd64_set_fsbase() in the tail-call position, so the first call is jmp. For me, everything works. If for you it does not you should look at the instructions and see which values went off. You completely omitted that details from your trace, so I cannot even guess which part was corrupted. Again, for me it works with the in-tree toolchain, so I am quite sure that you have trouble with the toolchain. From owner-svn-src-head@freebsd.org Tue Nov 6 02:52:55 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C1242112BE99; Tue, 6 Nov 2018 02:52:55 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5420E8747D; Tue, 6 Nov 2018 02:52:55 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 351C020AE4; Tue, 6 Nov 2018 02:52:55 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA62qstf017852; Tue, 6 Nov 2018 02:52:54 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA62qsXr017851; Tue, 6 Nov 2018 02:52:54 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811060252.wA62qsXr017851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Tue, 6 Nov 2018 02:52:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340174 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 340174 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5420E8747D X-Spamd-Result: default: False [-102.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.77)[-0.772,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 02:52:55 -0000 Author: markj Date: Tue Nov 6 02:52:54 2018 New Revision: 340174 URL: https://svnweb.freebsd.org/changeset/base/340174 Log: Initialize last_target in the laundry thread control loop. In practice it is always initialized because nfreed must be positive in order to trigger background laundering, but this isn't obvious. CID: 1387997 MFC after: 1 week Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c ============================================================================== --- head/sys/vm/vm_pageout.c Tue Nov 6 00:11:36 2018 (r340173) +++ head/sys/vm/vm_pageout.c Tue Nov 6 02:52:54 2018 (r340174) @@ -973,7 +973,7 @@ vm_pageout_laundry_worker(void *arg) shortfall = 0; in_shortfall = false; shortfall_cycle = 0; - target = 0; + last_target = target = 0; nfreed = 0; /* From owner-svn-src-head@freebsd.org Tue Nov 6 07:10:39 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D6CF611071F2; Tue, 6 Nov 2018 07:10:38 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 123DA8FE25; Tue, 6 Nov 2018 07:10:38 +0000 (UTC) (envelope-from melounmichal@gmail.com) Received: by mail-wm1-x32f.google.com with SMTP id b203-v6so10357271wme.5; Mon, 05 Nov 2018 23:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:reply-to:subject:to:references:openpgp:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=DbYy6GRWpnK99uuUsMV1pXUdHFeZboNvwwK4jSTTnec=; b=AkWpb2xrr2NDq2ovLADCNDnftMD6UOc+67hTEF7YdkwCNLk+ZWXJ1ytn0/svhKgqd8 G1LZ5Qrtj74nl70ejScLRKjwgJQ8xuFnl5SpcXC3x+CwRaXHwZybkqkyFVUo4/PKOH41 ULnA7vEuGRQ1N3M0dWAGJ30HriVBTBGr0gvI32DHPLaCRgzA2O+wWTq6xJVmPpZryE2E cE2u5eahk6/uSOL4EbR2CTzIC6nxcq6xDKPxVHZ+8eapy7QP1Tg53t84gc5YaJfKKtUU dyqxsIiACn6xMvYR0cokwYx3fubuP9+d/lFYMoh9D4GVWSLiEgCpiOsd2NFxAhd9LXUU OnLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:reply-to:subject:to:references:openpgp :autocrypt:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=DbYy6GRWpnK99uuUsMV1pXUdHFeZboNvwwK4jSTTnec=; b=FewXH8KUP4kt1OzrnUGwJqCQ9w5zwBflkauZ7geCjZl/WUgRYTo5Da4IS04sRZuk28 y5UpbVLkoDKFleaSyNJCV7hvHPu4k/bA41sLohdZpzjpXEbcquCUAq8IjHayS6EeWB4S 0H4dwy3BnEtm7Pn7HvVj8xGiZ/wyCRrN8d4e51Q2iJx0soNWk9NySo7Z+bH/vMlACPmQ UEHronAZix9OkcvXNDay4gyrFjTBndZwYqkEUNo+LiiXapWc608gb3DHutOhbvBwPzng lZLRJFjLq0a+VZxH+fSfHg2tBmyRN8sx6VGWAtNKtItc+qRCgQ/46kU7Ppb+sFgJvLhg 6ohQ== X-Gm-Message-State: AGRZ1gKYyNBZjUOa00F7MUtOqVLfS9Us5FDxMyyqZ8NOFLDiDM71L1El Z2r59gt0Sd+BP6TLz1PyczivoCNF X-Google-Smtp-Source: AJdET5f1p67Ovt2whlnbDYBTAIuCFRFewnYSzA1s4Rxy9UUzsA/hDZxcsMVR1ylCVAy0eVeC1ZbX/Q== X-Received: by 2002:a1c:27c5:: with SMTP id n188-v6mr897668wmn.88.1541488236562; Mon, 05 Nov 2018 23:10:36 -0800 (PST) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id h9-v6sm4483878wrw.90.2018.11.05.23.10.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 23:10:35 -0800 (PST) From: Michal Meloun <melounmichal@gmail.com> X-Google-Original-From: Michal Meloun <mmel@freebsd.org> Reply-To: mmel@freebsd.org Subject: Re: svn commit: r340157 - in head: . tools/build tools/tools/nanobsd/embedded To: Alex Richardson <arichardson@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201811051951.wA5JpB5q088141@repo.freebsd.org> Openpgp: preference=signencrypt Autocrypt: addr=mmel@freebsd.org; prefer-encrypt=mutual; keydata= xsBNBFYuVRkBCADZiwLCCne3wG9b9k+R2Neo5zVo2bLaZRfNNY/v9kg283i0sb1Da4EdEiNT 15El5UyozhphUIbIR/zrVpxF1TvvFdoCyzx6a68bNY2d9dBrDcNDZC+XnyDdHQoobN87DWT1 mRVkmbg9LHZ/SVUOkGYuWyE+8UYeDAcUizuXwSK5zFWmeTyIoWNa68ifrWLfQe0p4x5jC/AI VURCi17p360vU4fhgwoMvEEhrRBWCr4DYHToFjIt2WdBy3GR1qoO0+Xkd6G+OoBULo+XDfgu L2WdPvh0K69F9/LgHkMmG5Il7SCe62QGpG2vaCgRV7BQhLX+kxlvM+WrdRatWRml4Y/3ABEB AAHNIE1pY2hhbCBNZWxvdW4gPG1tZWxAZnJlZWJzZC5vcmc+wsCABBMBCgAqAhsDBQsJCAcD BRUKCQgLBRYDAgEAAh4BAheAAhkBBQJZjBHDBQkHICOqAAoJEGkesmtexaqqIKMIAJ9xTp1w ge86ns2ZYOac5++mAgpFatohSlxYUR3gwud3Y3Ej0eumavpv/C26N6dsLnspwRenKdLbIPKe 0N8lI7CcDBIJGiFyY3c4H79QjIkYpRgbWFyCM85zEyVJpB+U7BhsgXE2uwVjE9RNhEP0KBoj sp357uqq1B1+VUO4GJ+RjdmYSOcNrjR8tTfy02456qovGjJ4JcJBlhyK6GzBKvnZSoA0s+QP OMn3gd8gdomMLEJdS3kTsfhLh2rQPZa9EmzafIyjXrirWq4+4fVFgd8SiMZyyTM+Kz30ZSUe 6SmfaQTQ/WLRIl5jku2uYQWlrRIKT9xaQzRWtZO9UgtXFRHOwE0EVi5VGQEIALqgRkfS21D/ OqWE9mXfh2bIjrp9uC8T0MCuimbsrAdLKNNorGu2nE+rebgX8n5nYM377HOnalPGyOuXvCbQ 8MFVRdWOHxenJjXJialNdBsOf2wLva3vSSVsdoPzibWDIcJqhBOQ3EuhsILyWSPvYYKEiy95 mfhrDtuTTOAYVR9aNQBOENztB2TDJyMx/qZmtGroGV3N0Hqde/znHPtQO8RG5/FQGMfHMI5G FMuycr1ceHnLo/ovrqAl4TYV+UHSHJ+FDE9dt9wXHclWbWbC0yNugchZq6rho5Jjfv4a2v7P pyn3HoDinh1lWP7hYA0ZNExGHekLnXWVqO/lzGS6bMEAEQEAAcLAZQQYAQoADwIbDAUCWYwR wwUJByAjqgAKCRBpHrJrXsWqqrsrB/4g4ESK5TLxUxi8pLWcLPyvwtN4Fmf7VsCVefkhakaG rDPmfvfnG+OFwN60Xqoni7GBeakl01xwT4RINfvVfShDy6cHpLS7QL/M8pzfulVX38MkVkOD yGZhwjE+jyT/kZNA1Olaw3N3IefHq3brskQ7G4d9oPep2DDbw7C4Q76uOBjxy34JVB0WOsB6 NyMQB9h6LGljQtdEddyUqwnRZzzHiGvp0hPtdYQHQZlqbj4FV9lTRK7a8Ega+y7MgmeMiztG zeXyjNP02r3PRHCPagwa57bPxH2aAh4Q7UzBBZ0GTMm7DLKNtCP58WDxblrrhZ+7kHqGK8Fs bdeUpDdEYLVd Message-ID: <cdbb87cb-1535-781c-5be4-1a65d47a2817@freebsd.org> Date: Tue, 6 Nov 2018 08:10:34 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201811051951.wA5JpB5q088141@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 123DA8FE25 X-Spamd-Result: default: False [-3.67 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_REPLYTO(0.00)[mmel@freebsd.org]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; IP_SCORE(-0.70)[ipnet: 2a00:1450::/32(-1.96), asn: 15169(-1.48), country: US(-0.08)]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; MID_RHS_MATCH_TO(1.00)[]; RCVD_IN_DNSWL_NONE(0.00)[f.2.3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 07:10:39 -0000 On 05.11.2018 20:51, Alex Richardson wrote: > Author: arichardson > Date: Mon Nov 5 19:51:10 2018 > New Revision: 340157 > URL: https://svnweb.freebsd.org/changeset/base/340157 > > Log: > Allow building world without inheriting $PATH > > Inheriting $PATH during the build phase can cause the build to fail when > compiling on a different system due to missing build tools or incompatible > versions somewhere in $PATH. This has cause build failures for us before > due to the jenkins slaves still running FreeBSD 10. > Listing the tools we depend on explicitly instead of just using whatever > happens to be in $PATH allows us to check that we don't accidentally add a > new build dependency. > > All tools that do no need to be bootstrapped will now be symlinked to > ${WORLDTMP}/legacy/bin and during the build phase $PATH will only contain > ${WORLDTMP}. There is also a new variable "BOOTSTRAP_ALL_TOOLS" which can > be set to force compiling almost all bootstrap tools instead of symlinking > them. This will not bootstrap tools such as cp,mv, etc. since they may be > used during the build and for those we should really only be using POSIX > compatible options. > > Furthermore, this change is required in order to be able to build on > non-FreeBSD hosts. While the same binaries may exist on Linux/MacOS they > often accept different flags or produce incompatible output. > > Approved By: brooks (mentor) > Differential Revision: https://reviews.freebsd.org/D16815 > > Modified: > head/Makefile > head/Makefile.inc1 > head/tools/build/Makefile > head/tools/tools/nanobsd/embedded/common > > Modified: head/Makefile > ============================================================================== > --- head/Makefile Mon Nov 5 19:25:57 2018 (r340156) > +++ head/Makefile Mon Nov 5 19:51:10 2018 (r340157) > @@ -610,10 +610,13 @@ _need_lld_${target}_${target_arch} != \ > # XXX: Passing HOST_OBJTOP into the PATH would allow skipping legacy, > # bootstrap-tools, and cross-tools. Need to ensure each tool actually > # supports all TARGETS though. > +# For now we only pass UNIVERSE_TOOLCHAIN_PATH which will be added at the end > +# of STRICTTMPPATH to ensure that the target-specific binaries come first. > MAKE_PARAMS_${target}+= \ > XCC="${HOST_OBJTOP}/tmp/usr/bin/cc" \ > XCXX="${HOST_OBJTOP}/tmp/usr/bin/c++" \ > - XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" > + XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" \ > + UNIVERSE_TOOLCHAIN_PATH=${HOST_OBJTOP}/tmp/usr/bin > .endif > .if defined(_need_lld_${target}_${target_arch}) && \ > ${_need_lld_${target}_${target_arch}} == "yes" > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Mon Nov 5 19:25:57 2018 (r340156) > +++ head/Makefile.inc1 Mon Nov 5 19:51:10 2018 (r340157) > @@ -580,8 +580,21 @@ BUILD_ARCH!= uname -p > WORLDTMP?= ${OBJTOP}/tmp > BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin > XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin > -STRICTTMPPATH= ${BPATH}:${XPATH} > + > +# When building we want to find the cross tools before the host tools in ${BPATH}. > +# We also need to add UNIVERSE_TOOLCHAIN_PATH so that we can find the shared > +# toolchain files (clang, lld, etc.) during make universe/tinderbox > +STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_PATH} > +# We should not be using tools from /usr/bin accidentally since this could cause > +# the build to break on other systems that don't have that tool. For now we > +# still allow using the old behaviour (inheriting $PATH) if > +# BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed. > +BUILD_WITH_STRICT_TMPPATH?=1 > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 > +TMPPATH= ${STRICTTMPPATH} > +.else > TMPPATH= ${STRICTTMPPATH}:${PATH} > +.endif > > # > # Avoid running mktemp(1) unless actually needed. > @@ -589,8 +602,16 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} > # when in the middle of installing over this system. > # > .if make(distributeworld) || make(installworld) || make(stageworld) > -INSTALLTMP!= mktemp -d -u -t install > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 > +MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp > +.if !exists(${MKTEMP}) > +.error "mktemp binary doesn't exist in expected location: ${MKTEMP}" > .endif > +.else > +MKTEMP=mktemp > +.endif > +INSTALLTMP!= ${MKTEMP} -d -u -t install > +.endif > > .if make(stagekernel) || make(distributekernel) > TAGS+= kernel > @@ -647,6 +668,8 @@ CROSSENV+= BUILD_TOOLS_META=.NOMETA > CROSSENV+= ${TARGET_CFLAGS} > .endif > > +BOOTSTRAPPING_OSRELDATE?=${OSRELDATE} > + > # bootstrap-tools stage > BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ > TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ > @@ -658,7 +681,7 @@ BSARGS= DESTDIR= \ > OBJTOP='${WORLDTMP}/obj-tools' \ > OBJROOT='$${OBJTOP}/' \ > MAKEOBJDIRPREFIX= \ > - BOOTSTRAPPING=${OSRELDATE} \ > + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ > BWPHASE=${.TARGET:C,^_,,} \ > SSP_CFLAGS= \ > MK_HTML=no NO_LINT=yes MK_MAN=no \ > @@ -680,7 +703,7 @@ TMAKE= \ > ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ > TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ > DESTDIR= \ > - BOOTSTRAPPING=${OSRELDATE} \ > + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ > BWPHASE=${.TARGET:C,^_,,} \ > SSP_CFLAGS= \ > -DNO_LINT \ > @@ -705,7 +728,7 @@ KTMAKE= \ > OBJTOP='${WORLDTMP}/obj-kernel-tools' \ > OBJROOT='$${OBJTOP}/' \ > MAKEOBJDIRPREFIX= \ > - BOOTSTRAPPING=${OSRELDATE} \ > + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ > SSP_CFLAGS= \ > MK_HTML=no -DNO_LINT MK_MAN=no \ > -DNO_PIC MK_PROFILE=no -DNO_SHARED \ > @@ -874,6 +897,9 @@ WORLDTMP_MTREEFLAGS= -deUW > DESTDIR_MTREEFLAGS+= -W > .endif > MTREE?= mtree > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 > +MTREE= ${WORLDTMP}/legacy/usr/sbin/mtree > +.endif > WORLDTMP_MTREE= ${MTREE} ${WORLDTMP_MTREEFLAGS} > DESTDIR_MTREE= ${MTREE} ${DESTDIR_MTREEFLAGS} > > @@ -948,10 +974,15 @@ _worldtmp: .PHONY > .if !defined(NO_CLEAN) > rm -rf ${WORLDTMP} > .else > +# Note: for delete-old we need to set $PATH to also include the host $PATH > +# since otherwise a partial build with missing symlinks in ${WORLDTMP}/legacy/ > +# will fail to run due to missing binaries. $WMAKE sets PATH to only ${TMPPATH} > +# so we remove that assingnment from $WMAKE and prepend the new $PATH > ${_+_}@if [ -e "${WORLDTMP}" ]; then \ > echo ">>> Deleting stale files in build tree..."; \ > - cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES _NO_INCLUDE_COMPILERMK=t \ > - delete-old delete-old-libs >/dev/null; \ > + cd ${.CURDIR}; env PATH=${TMPPATH}:${PATH} ${WMAKE:NPATH=*} \ > + _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \ > + delete-old-libs >/dev/null; \ > fi > rm -rf ${WORLDTMP}/legacy/usr/include > .if ${USING_SYSTEM_COMPILER} == "yes" > @@ -972,6 +1003,11 @@ _worldtmp: .PHONY > # available on the target system (this happens e.g. when building on non-FreeBSD) > cd ${.CURDIR}/tools/build; \ > ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy installdirs > +# In order to build without inheriting $PATH we need to add symlinks to the host > +# tools in $WORLDTMP for the tools that we don't build during bootstrap-tools > + cd ${.CURDIR}/tools/build; \ > + ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy host-symlinks > + > _legacy: > @echo > @echo "--------------------------------------------------------------" > @@ -1969,6 +2005,29 @@ legacy: .PHONY > # > _bt= _bootstrap-tools > > +# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't > +# accidentally run tools that are incompatible but happen to be in $PATH. > +# This is especially important when building on Linux/MacOS where many of the > +# programs used during the build accept different flags or generate different > +# output. On those platforms we only symlink the tools known to be compatible > +# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others > +# from the FreeBSD sources during the bootstrap-tools stage. > +# We want to build without the user's $PATH starting in the bootstrap-tools > +# phase so the tools used in that phase (ln, cp, etc) must have already been > +# linked to $WORLDTMP. The tools are listed in the _host_tools_to_symlink > +# variable in tools/build/Makefile and are linked during the legacy phase. > +# Since they could be Linux or MacOS binaries, too we must only use flags that > +# are portable across operating systems. > + > +# If BOOTSTRAP_ALL_TOOLS is set we will build all the required tools from the > +# current source tree. Otherwise we create a symlink to the version found in > +# $PATH during the bootstrap-tools stage. > +.if defined(BOOTSTRAP_ALL_TOOLS) > +# BOOTSTRAPPING will be set on the command line so we can't override it here. > +# Instead set BOOTSTRAPPING_OSRELDATE so that the value 0 is set ${BSARGS} > +BOOTSTRAPPING_OSRELDATE:= 0 > +.endif > + > .if ${MK_GAMES} != "no" > _strfile= usr.bin/fortune/strfile > .endif > @@ -1981,12 +2040,21 @@ _gperf= gnu/usr.bin/gperf > _vtfontcvt= usr.bin/vtfontcvt > .endif > > +# If we are not building the bootstrap because BOOTSTRAPPING is sufficient > +# we symlink the host version to $WORLDTMP instead. By doing this we can also > +# detect when a bootstrap tool is being used without the required MK_FOO. > +# If you add a new bootstrap tool where we could also use the host version, > +# please ensure that you also add a .else case where you add the tool to the > +# _bootstrap_tools_links variable. > .if ${BOOTSTRAPPING} < 1000033 > _m4= usr.bin/m4 > _lex= usr.bin/lex > - > -${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd > -${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 > +# Note: lex needs m4 to build but m4 also depends on lex. However, lex can be > +# bootstrapped so we build lex first. > +${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc ${_bt}-${_lex} > +_bt_lex_depend=${_bt}-usr.bin/lex ${_bt}-usr.bin/m4 > +.else > +_bootstrap_tools_links+=m4 lex > .endif > > # r245440 mtree -N support added > @@ -1998,17 +2066,23 @@ _nmtree= lib/libmd \ > > ${_bt}-lib/libnetbsd: ${_bt}-lib/libmd > ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd > +.else > +_bootstrap_tools_links+=mtree > .endif > > # r246097: log addition login.conf.db, passwd, pwd.db, and spwd.db with cat -l > .if ${BOOTSTRAPPING} < 1000027 > _cat= bin/cat > +.else > +_bootstrap_tools_links+=cat > .endif > > # r277259 crunchide: Correct 64-bit section header offset > # r281674 crunchide: always include both 32- and 64-bit ELF support > .if ${BOOTSTRAPPING} < 1100078 > _crunchide= usr.sbin/crunch/crunchide > +.else > +_bootstrap_tools_links+=crunchide > .endif > > # r285986 crunchen: use STRIPBIN rather than STRIP > @@ -2018,12 +2092,16 @@ _crunchide= usr.sbin/crunch/crunchide > (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \ > (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006) > _crunchgen= usr.sbin/crunch/crunchgen > +.else > +_bootstrap_tools_links+=crunchgen > .endif > > # r296926 -P keymap search path, MFC to stable/10 in r298297 > .if ${BOOTSTRAPPING} < 1003501 || \ > (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) > _kbdcontrol= usr.sbin/kbdcontrol > +.else > +_bootstrap_tools_links+=kbdcontrol > .endif > > _yacc= lib/liby \ > @@ -2059,6 +2137,10 @@ _dtc= usr.bin/dtc > _dtc= gnu/usr.bin/dtc > .endif > > +.if ${MK_LOCALES} != "no" > +_localedef= usr.bin/localedef > +.endif > + > .if ${MK_KERBEROS} != "no" > _kerberos5_bootstrap_tools= \ > kerberos5/tools/make-roken \ > @@ -2069,12 +2151,108 @@ _kerberos5_bootstrap_tools= \ > usr.bin/compile_et > > .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} > +.for _tool in ${_kerberos5_bootstrap_tools} > +${_bt}-${_tool}: ${_bt}-usr.bin/yacc ${_bt_lex_depend} > +.endfor > .endif > > ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd > > -bootstrap-tools: .PHONY > +# The tools listed in _basic_bootstrap_tools will generally not be > +# bootstrapped unless BOOTSTRAP_ALL_TOOL is set. However, when building on a > +# Linux or MacOS host the host versions are incompatible so we need to build > +# them from the source tree. Usually the link name will be the same as the subdir, > +# but some directories such as grep or test install multiple binaries. In that > +# case we use the _basic_bootstrap_tools_multilink variable which is a list of > +# subdirectory and comma-separated list of files. > +_basic_bootstrap_tools_multilink=usr.bin/grep grep,egrep,fgrep > +_basic_bootstrap_tools_multilink+=bin/test test,[ > +# bootstrap tools needed by buildworld: > +_basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \ > + usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \ > + usr.bin/truncate usr.bin/tsort > +# elf2aout is required for sparc64 build > +_basic_bootstrap_tools+=usr.bin/elf2aout > +# file2c is required for building usr.sbin/config: > +_basic_bootstrap_tools+=usr.bin/file2c > +# uuencode/uudecode required for share/tabset > +_basic_bootstrap_tools+=usr.bin/uuencode usr.bin/uudecode > +# xargs is required by mkioctls > +_basic_bootstrap_tools+=usr.bin/xargs > +# cap_mkdb is required for share/termcap: > +_basic_bootstrap_tools+=usr.bin/cap_mkdb > +# ldd is required for installcheck (TODO: just always use /usr/bin/ldd instead?) > +_basic_bootstrap_tools+=usr.bin/ldd > +# services_mkdb/pwd_mkdb are required for installworld: > +_basic_bootstrap_tools+=usr.sbin/services_mkdb usr.sbin/pwd_mkdb > +# sysctl/chflags are required for installkernel: > +_basic_bootstrap_tools+=sbin/sysctl bin/chflags > > +.if ${MK_AMD} != "no" > +# unifdef is only used by usr.sbin/amd/libamu/Makefile > +_basic_bootstrap_tools+=usr.bin/unifdef > +.endif > + > +.if ${MK_BOOT} != "no" > +_basic_bootstrap_tools+=usr.sbin/btxld btxld exist only on amd64/i386, so this commit breaks native buildworld for all other architectures. See: -------------------------------------------------------------- >>> stage 1.2: bootstrap tools -------------------------------------------------------------- cd /usr/src; INSTALL="sh /usr/src/tools/install.sh" TOOLS_PREFIX=/usr/obj/usr/src/arm.armv7/tmp PATH=/usr/obj/usr/src/arm.armv7/tmp/legacy/usr/sbin:/usr/obj/usr/src/arm.armv7/tmp/legacy/usr/bin:/usr/obj/usr/src/arm.armv7/tmp/legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin WORLDTMP=/usr/obj/usr/src/arm.armv7/tmp MAKEFLAGS="-m /usr/src/tools/build/mk -m /usr/src/share/mk" make -f Makefile.inc1 DESTDIR= OBJTOP='/usr/obj/usr/src/arm.armv7/tmp/obj-tools' OBJROOT='${OBJTOP}/' MAKEOBJDIRPREFIX= BOOTSTRAPPING=1300002 BWPHASE=bootstrap-tools SSP_CFLAGS= MK_HTML=no NO_LINT=yes MK_MAN=no -DNO_PIC MK_PROFILE=no -DNO_SHARED -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no MK_CLANG_EXTRAS=no MK_CLANG_FULL=no MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no MK_INCLUDES=yes MK_LLVM_TARGET_ALL=no bootstrap-tools /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/m4 -> /usr/bin/m4 /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/lex -> /usr/bin/lex /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/mtree -> /usr/sbin/mtree /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/cat -> /bin/cat /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/crunchide -> /usr/bin/crunchide /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/crunchgen -> /usr/bin/crunchgen /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/kbdcontrol -> /usr/sbin/kbdcontrol /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/awk -> /usr/bin/awk /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/cut -> /usr/bin/cut /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/expr -> /bin/expr /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/gencat -> /usr/bin/gencat /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/join -> /usr/bin/join /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/mktemp -> /usr/bin/mktemp /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/rmdir -> /bin/rmdir /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/sed -> /usr/bin/sed /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/sort -> /usr/bin/sort /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/truncate -> /usr/bin/truncate /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/tsort -> /usr/bin/tsort /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/elf2aout -> /usr/bin/elf2aout /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/file2c -> /usr/bin/file2c /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/uuencode -> /usr/bin/uuencode /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/uudecode -> /usr/bin/uudecode /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/xargs -> /usr/bin/xargs /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/cap_mkdb -> /usr/bin/cap_mkdb /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/ldd -> /usr/bin/ldd /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/services_mkdb -> /usr/sbin/services_mkdb /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/pwd_mkdb -> /usr/sbin/pwd_mkdb /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/sysctl -> /sbin/sysctl /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/chflags -> /bin/chflags /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/unifdef -> /usr/bin/unifdef *** Error code 1 Stop. make[2]: stopped in /usr/src *** Error code 1 Stop. make[1]: stopped in /usr/src *** Error code 1 Stop. > +_basic_bootstrap_tools+=bin/dd > +# xz/unxz is used by EFI > +_basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz > +# md5 is used by boot/beri (and possibly others) > +_basic_bootstrap_tools+=sbin/md5 > +.if defined(BOOTSTRAP_ALL_TOOLS) > +${_bt}-sbin/md5: ${_bt}-lib/libmd > +.endif > +.endif > + > +.if ${MK_ZONEINFO} != "no" > +_basic_bootstrap_tools+=usr.sbin/zic usr.sbin/tzsetup > +.endif > + > +.if defined(BOOTSTRAP_ALL_TOOLS) > +_other_bootstrap_tools+=${_basic_bootstrap_tools} > +.for _subdir _links in ${_basic_bootstrap_tools_multilink} > +_other_bootstrap_tools+=${_subdir} > +.endfor > +${_bt}-usr.bin/awk: ${_bt_lex_depend} ${_bt}-usr.bin/yacc > +${_bt}-bin/expr: ${_bt_lex_depend} ${_bt}-usr.bin/yacc > +# If we are bootstrapping file2c, we have to build it before config: > +${_bt}-usr.sbin/config: ${_bt}-usr.bin/file2c ${_bt_lex_depend} > +# Note: no symlink to make/bmake in the !BOOTSTRAP_ALL_TOOLS case here since > +# the links to make/bmake make links will have already have been created in the > +# `make legacy` step. Not adding a link to make is important on non-FreeBSD > +# since "make" will usually point to GNU make there. > +_other_bootstrap_tools+=usr.bin/bmake > +.else > +# All tools in _basic_bootstrap_tools have the same name as the subdirectory > +# so we can use :T to get the name of the symlinks that we need to create. > +_bootstrap_tools_links+=${_basic_bootstrap_tools:T} > +.for _subdir _links in ${_basic_bootstrap_tools_multilink} > +_bootstrap_tools_links+=${_links:S/,/ /g} > +.endfor > +.endif # defined(BOOTSTRAP_ALL_TOOLS) > + > +# Link the tools that we need for building but don't need to bootstrap because > +# the host version is known to be compatible into ${WORLDTMP}/legacy > +# We do this before building any of the bootstrap tools in case they depend on > +# the presence of any of the links (e.g. as m4/lex/awk) > +${_bt}-links: .PHONY > + > +.for _tool in ${_bootstrap_tools_links} > +${_bt}-link-${_tool}: .PHONY .MAKE > + @if [ ! -e "${WORLDTMP}/legacy/bin/${_tool}" ]; then \ > + source_path=`which ${_tool}`; \ > + if [ ! -e "$${source_path}" ] ; then \ > + echo "Cannot find host tool '${_tool}'"; false; \ > + fi; \ > + ln -sfnv "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}"; \ > + fi > +${_bt}-links: ${_bt}-link-${_tool} > +.endfor > + > + > +bootstrap-tools: ${_bt}-links .PHONY > + > # Please document (add comment) why something is in 'bootstrap-tools'. > # Try to bound the building of the bootstrap-tool to just the > # FreeBSD versions that need the tool built at this stage of the build. > @@ -2093,6 +2271,7 @@ bootstrap-tools: .PHONY > ${_yacc} \ > ${_m4} \ > ${_lex} \ > + ${_other_bootstrap_tools} \ > usr.bin/xinstall \ > ${_gensnmptree} \ > usr.sbin/config \ > @@ -2101,10 +2280,13 @@ bootstrap-tools: .PHONY > ${_nmtree} \ > ${_vtfontcvt} \ > ${_localedef} > -${_bt}-${_tool}: .PHONY .MAKE > +${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE > ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ > cd ${.CURDIR}/${_tool}; \ > if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ > + if [ "${_tool}" = "usr.bin/lex" ]; then \ > + ${MAKE} DIRPRFX=${_tool}/ bootstrap; \ > + fi; \ > ${MAKE} DIRPRFX=${_tool}/ all; \ > ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install > > @@ -2235,9 +2417,14 @@ _gcc= gnu/usr.bin/cc > _usb_tools= stand/usb/tools > .endif > > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 || defined(BOOTSTRAP_ALL_TOOLS) > +_ar=usr.bin/ar > +.endif > + > cross-tools: .MAKE .PHONY > .for _tool in \ > ${LOCAL_XTOOL_DIRS} \ > + ${_ar} \ > ${_clang_libs} \ > ${_clang} \ > ${_lld} \ > > Modified: head/tools/build/Makefile > ============================================================================== > --- head/tools/build/Makefile Mon Nov 5 19:25:57 2018 (r340156) > +++ head/tools/build/Makefile Mon Nov 5 19:51:10 2018 (r340157) > @@ -59,15 +59,64 @@ SUBDIR= cross-build > # Needed to build config (since it uses libnv) > SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h > > +# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't > +# accidentally run tools that are incompatible but happen to be in $PATH. > +# This is especially important when building on Linux/MacOS where many of the > +# programs used during the build accept different flags or generate different > +# output. On those platforms we only symlink the tools known to be compatible > +# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others > +# from the FreeBSD sources during the bootstrap-tools stage. > > +# basic commands: It is fine to use the host version for all of these even on > +# Linux/MacOS since we only use flags that are supported by all of them. > +_host_tools_to_symlink= basename bzip2 bunzip2 chmod chown cmp comm cp date \ > + dirname echo env false find fmt gzip gunzip head hostname id ln ls \ > + mkdir mv nice patch rm realpath sh sleep stat tee touch tr true uname \ > + uniq wc which > + > +# We also need a symlink to the absolute path to the make binary used for > +# the toplevel makefile. This is not necessarily the same as `which make` > +# since e.g. on Linux and MacOS that will be GNU make. > +_make_abs!= which "${MAKE}" > +_host_abs_tools_to_symlink= ${_make_abs}:make ${_make_abs}:bmake > + > +host-symlinks: > + @echo "Linking host tools into ${DESTDIR}/bin" > +.for _tool in ${_host_tools_to_symlink} > + @if [ ! -e "${DESTDIR}/bin/${_tool}" ]; then \ > + source_path=`which ${_tool}`; \ > + if [ ! -e "$${source_path}" ] ; then \ > + echo "Cannot find host tool '${_tool}'"; false; \ > + fi; \ > + ln -sfnv "$${source_path}" "${DESTDIR}/bin/${_tool}"; \ > + fi > +.endfor > +.for _tool in ${_host_abs_tools_to_symlink} > + @source_path="${_tool:S/:/ /:[1]}"; \ > + target_path="${DESTDIR}/bin/${_tool:S/:/ /:[2]}"; \ > + if [ ! -e "$${target_path}" ] ; then \ > + if [ ! -e "$${source_path}" ] ; then \ > + echo "Host tool '${src_path}' is missing"; false; \ > + fi; \ > + ln -sfnv "$${source_path}" "$${target_path}"; \ > + fi > +.endfor > + > # Create all the directories that are needed during the legacy, bootstrap-tools > # and cross-tools stages. We do this here using mkdir since mtree may not exist > # yet (this happens if we are crossbuilding from Linux/Mac). > installdirs: > -.for _dir in bin sbin usr/bin usr/sbin usr/lib usr/include lib/geom lib/casper > +.for _dir in bin usr/lib usr/include lib/geom lib/casper > mkdir -p "${DESTDIR}/${_dir}" > .endfor > - > +# Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a > +# bootstrap tool was added to WORLTMP with a symlink or by building it in the > +# bootstrap-tools phase. We could also overrride BINDIR when building bootstrap > +# tools but adding the symlinks is easier and means all tools are also > +# in the directory that they are installed to normally. > + ln -sf bin ${DESTDIR}/sbin > + ln -sf ../bin ${DESTDIR}/usr/bin > + ln -sf ../bin ${DESTDIR}/usr/sbin > .for _group in ${INCSGROUPS:NINCS} > mkdir -p "${DESTDIR}/${${_group}DIR}" > .endfor > > Modified: head/tools/tools/nanobsd/embedded/common > ============================================================================== > --- head/tools/tools/nanobsd/embedded/common Mon Nov 5 19:25:57 2018 (r340156) > +++ head/tools/tools/nanobsd/embedded/common Mon Nov 5 19:51:10 2018 (r340157) > @@ -671,4 +671,4 @@ create_diskimage ( ) ( > # Set the path to the same path we use for buldworld to use latest mkimg > NANO_TARGET=$(cd ${NANO_SRC}; ${NANO_MAKE} TARGET_ARCH=${NANO_ARCH} -V _TARGET) > NANO_TMPPATH=$(cd ${NANO_SRC}; ${NANO_MAKE} MK_AUTO_OBJ=no TARGET=${NANO_TARGET} TARGET_ARCH=${NANO_ARCH} -f Makefile.inc1 buildenv -V TMPPATH) > -export PATH="${NANO_TMPPATH}" > +export PATH="${NANO_TMPPATH}:${PATH}" > From owner-svn-src-head@freebsd.org Tue Nov 6 07:41:33 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 74F2D1109B97; Tue, 6 Nov 2018 07:41:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06EF26AED6; Tue, 6 Nov 2018 07:41:33 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC162239FA; Tue, 6 Nov 2018 07:41:32 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA67fWHk062434; Tue, 6 Nov 2018 07:41:32 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA67fWiL062421; Tue, 6 Nov 2018 07:41:32 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201811060741.wA67fWiL062421@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" <ae@FreeBSD.org> Date: Tue, 6 Nov 2018 07:41:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340175 - head/sbin/ipfw X-SVN-Group: head X-SVN-Commit-Author: ae X-SVN-Commit-Paths: head/sbin/ipfw X-SVN-Commit-Revision: 340175 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 06EF26AED6 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 07:41:33 -0000 Author: ae Date: Tue Nov 6 07:41:32 2018 New Revision: 340175 URL: https://svnweb.freebsd.org/changeset/base/340175 Log: Do not print "ip6" keyword in print_icmp6types() for O_ICMP6TYPE opcode. It produces incompatibility when rules listing is used again to restore saved ruleset, because "ip6" keyword produces separate opcode. The kernel already has the check and only IPv6 packets will be checked for matching. PR: 232939 MFC after: 3 days Modified: head/sbin/ipfw/ipv6.c Modified: head/sbin/ipfw/ipv6.c ============================================================================== --- head/sbin/ipfw/ipv6.c Tue Nov 6 02:52:54 2018 (r340174) +++ head/sbin/ipfw/ipv6.c Tue Nov 6 07:41:32 2018 (r340175) @@ -169,7 +169,7 @@ print_icmp6types(struct buf_pr *bp, ipfw_insn_u32 *cmd int i, j; char sep= ' '; - bprintf(bp, " ip6 icmp6types"); + bprintf(bp, " icmp6types"); for (i = 0; i < 7; i++) for (j=0; j < 32; ++j) { if ( (cmd->d[i] & (1 << (j))) == 0) From owner-svn-src-head@freebsd.org Tue Nov 6 09:37:00 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 A400C110D69D; Tue, 6 Nov 2018 09:37:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 237B66EB78; Tue, 6 Nov 2018 09:37:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 03F2624DEB; Tue, 6 Nov 2018 09:37:00 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA69ax2S021854; Tue, 6 Nov 2018 09:36:59 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA69axn1021853; Tue, 6 Nov 2018 09:36:59 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811060936.wA69axn1021853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Tue, 6 Nov 2018 09:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340176 - head X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340176 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 237B66EB78 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.992,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 09:37:00 -0000 Author: arichardson Date: Tue Nov 6 09:36:59 2018 New Revision: 340176 URL: https://svnweb.freebsd.org/changeset/base/340176 Log: Remove btxld from symlinked host tools It is only present on amd64/i386 systems which breaks buildworld on other hosts. In fact there is no need to add it to the bootstrap tools list since it is already included in the cross-tools phase. However, for cross-tools it was only built if the host and target architecture didn't match. After this change it is also built when we are builtin with a strict $PATH. Reported By: mmel Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Nov 6 07:41:32 2018 (r340175) +++ head/Makefile.inc1 Tue Nov 6 09:36:59 2018 (r340176) @@ -2204,7 +2204,6 @@ _basic_bootstrap_tools+=usr.bin/unifdef .endif .if ${MK_BOOT} != "no" -_basic_bootstrap_tools+=usr.sbin/btxld _basic_bootstrap_tools+=bin/dd # xz/unxz is used by EFI _basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz @@ -2375,7 +2374,7 @@ kernel-tools: .PHONY # we get done with the earlier stages. It is the last set of tools needed # to begin building the target binaries. # -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BUILD_WITH_STRICT_TMPPATH} != 0 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif From owner-svn-src-head@freebsd.org Tue Nov 6 09:44:47 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D90F7110DA3D; Tue, 6 Nov 2018 09:44:46 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42B306F147; Tue, 6 Nov 2018 09:44:46 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-yb1-f179.google.com with SMTP id f15-v6so5028782ybq.13; Tue, 06 Nov 2018 01:44:46 -0800 (PST) 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=oQqYpMYKjg3zytRFgSH2N28/vuSbgvsCRTPiBuCv+SA=; b=F376hmNrRUxTzHQjSw0qP5NzyH67N/1tjhmFoCRbXqd/V38+vNZ2sqMCpDd5zfFUHc zuC2WoZYmXQcQrn0nS53UyG/gO2Y3j1FYSX+O7AdHwoa49xnhHtRQNzST/20tz17fPgP JV0+SCfK/RtOaR9aAu67kqpqRCnuvtUxcE9ALtuAgY7A2I6UwaKLrRCptKnMAWjiZAfj oCjEra3D+1I7OA0X0slT1q93EoV+oQkz6sD7Ad3mRPjKDb7se2h4EZ3/B/AncAckFoiN OrNXokkmqoW5/bXqqH3naE2NDN1RnEt20/sZaz/I5OwdIkgCZ2o55O9FNFVCYhPhiRDY NuDQ== X-Gm-Message-State: AGRZ1gKiJVe6Mg3TQbhVy0QfbgXWsaxO1w9V6spH9+6s9xU6Dj6m4eC3 MDVbwevztf3lsn5P4c0THJwSs1sP8t1Fgg== X-Google-Smtp-Source: AJdET5cFfh8GOIy3cChSYCC9tXcS5xHby4IIEzUII63pnaJwPHIXpNRgUWNEoNKkUWO9jNGdba3DSw== X-Received: by 2002:a5b:51:: with SMTP id e17-v6mr24281508ybp.496.1541497080375; Tue, 06 Nov 2018 01:38:00 -0800 (PST) Received: from mail-yw1-f52.google.com (mail-yw1-f52.google.com. [209.85.161.52]) by smtp.gmail.com with ESMTPSA id 15-v6sm12061461ywo.6.2018.11.06.01.37.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 01:37:59 -0800 (PST) Received: by mail-yw1-f52.google.com with SMTP id w135-v6so4891004ywd.2; Tue, 06 Nov 2018 01:37:59 -0800 (PST) X-Received: by 2002:a0d:ecc8:: with SMTP id v191-v6mr24013703ywe.44.1541497079397; Tue, 06 Nov 2018 01:37:59 -0800 (PST) MIME-Version: 1.0 References: <201811051951.wA5JpB5q088141@repo.freebsd.org> <cdbb87cb-1535-781c-5be4-1a65d47a2817@freebsd.org> In-Reply-To: <cdbb87cb-1535-781c-5be4-1a65d47a2817@freebsd.org> From: Alexander Richardson <arichardson@freebsd.org> Date: Tue, 6 Nov 2018 09:37:48 +0000 X-Gmail-Original-Message-ID: <CA+Z_v8o_jcrfiYVXUbs9px0OiYkNLANwe+nyPJd18zTw2methg@mail.gmail.com> Message-ID: <CA+Z_v8o_jcrfiYVXUbs9px0OiYkNLANwe+nyPJd18zTw2methg@mail.gmail.com> Subject: Re: svn commit: r340157 - in head: . tools/build tools/tools/nanobsd/embedded To: mmel@freebsd.org Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: multipart/mixed; boundary="000000000000d727780579fbc157" X-Rspamd-Queue-Id: 42B306F147 X-Spamd-Result: default: False [-4.09 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; RCVD_IN_DNSWL_NONE(0.00)[179.219.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.10)[ipnet: 209.85.128.0/17(-3.94), asn: 15169(-1.48), country: US(-0.08)]; FORGED_SENDER(0.30)[arichardson@freebsd.org,arichardsonkde@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[179.219.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[arichardson@freebsd.org,arichardsonkde@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 09:44:47 -0000 --000000000000d727780579fbc157 Content-Type: text/plain; charset="UTF-8" On Tue, 6 Nov 2018 at 07:10, Michal Meloun <melounmichal@gmail.com> wrote: > > > > On 05.11.2018 20:51, Alex Richardson wrote: > > Author: arichardson > > Date: Mon Nov 5 19:51:10 2018 > > New Revision: 340157 > > URL: https://svnweb.freebsd.org/changeset/base/340157 > > > > Log: > > Allow building world without inheriting $PATH > > > > Inheriting $PATH during the build phase can cause the build to fail when > > compiling on a different system due to missing build tools or incompatible > > versions somewhere in $PATH. This has cause build failures for us before > > due to the jenkins slaves still running FreeBSD 10. > > Listing the tools we depend on explicitly instead of just using whatever > > happens to be in $PATH allows us to check that we don't accidentally add a > > new build dependency. > > > > All tools that do no need to be bootstrapped will now be symlinked to > > ${WORLDTMP}/legacy/bin and during the build phase $PATH will only contain > > ${WORLDTMP}. There is also a new variable "BOOTSTRAP_ALL_TOOLS" which can > > be set to force compiling almost all bootstrap tools instead of symlinking > > them. This will not bootstrap tools such as cp,mv, etc. since they may be > > used during the build and for those we should really only be using POSIX > > compatible options. > > > > Furthermore, this change is required in order to be able to build on > > non-FreeBSD hosts. While the same binaries may exist on Linux/MacOS they > > often accept different flags or produce incompatible output. > > > > Approved By: brooks (mentor) > > Differential Revision: https://reviews.freebsd.org/D16815 > > > > Modified: > > head/Makefile > > head/Makefile.inc1 > > head/tools/build/Makefile > > head/tools/tools/nanobsd/embedded/common > > > > Modified: head/Makefile > > ============================================================================== > > --- head/Makefile Mon Nov 5 19:25:57 2018 (r340156) > > +++ head/Makefile Mon Nov 5 19:51:10 2018 (r340157) > > @@ -610,10 +610,13 @@ _need_lld_${target}_${target_arch} != \ > > # XXX: Passing HOST_OBJTOP into the PATH would allow skipping legacy, > > # bootstrap-tools, and cross-tools. Need to ensure each tool actually > > # supports all TARGETS though. > > +# For now we only pass UNIVERSE_TOOLCHAIN_PATH which will be added at the end > > +# of STRICTTMPPATH to ensure that the target-specific binaries come first. > > MAKE_PARAMS_${target}+= \ > > XCC="${HOST_OBJTOP}/tmp/usr/bin/cc" \ > > XCXX="${HOST_OBJTOP}/tmp/usr/bin/c++" \ > > - XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" > > + XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" \ > > + UNIVERSE_TOOLCHAIN_PATH=${HOST_OBJTOP}/tmp/usr/bin > > .endif > > .if defined(_need_lld_${target}_${target_arch}) && \ > > ${_need_lld_${target}_${target_arch}} == "yes" > > > > Modified: head/Makefile.inc1 > > ============================================================================== > > --- head/Makefile.inc1 Mon Nov 5 19:25:57 2018 (r340156) > > +++ head/Makefile.inc1 Mon Nov 5 19:51:10 2018 (r340157) > > @@ -580,8 +580,21 @@ BUILD_ARCH!= uname -p > > WORLDTMP?= ${OBJTOP}/tmp > > BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin > > XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin > > -STRICTTMPPATH= ${BPATH}:${XPATH} > > + > > +# When building we want to find the cross tools before the host tools in ${BPATH}. > > +# We also need to add UNIVERSE_TOOLCHAIN_PATH so that we can find the shared > > +# toolchain files (clang, lld, etc.) during make universe/tinderbox > > +STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_PATH} > > +# We should not be using tools from /usr/bin accidentally since this could cause > > +# the build to break on other systems that don't have that tool. For now we > > +# still allow using the old behaviour (inheriting $PATH) if > > +# BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed. > > +BUILD_WITH_STRICT_TMPPATH?=1 > > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 > > +TMPPATH= ${STRICTTMPPATH} > > +.else > > TMPPATH= ${STRICTTMPPATH}:${PATH} > > +.endif > > > > # > > # Avoid running mktemp(1) unless actually needed. > > @@ -589,8 +602,16 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} > > # when in the middle of installing over this system. > > # > > .if make(distributeworld) || make(installworld) || make(stageworld) > > -INSTALLTMP!= mktemp -d -u -t install > > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 > > +MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp > > +.if !exists(${MKTEMP}) > > +.error "mktemp binary doesn't exist in expected location: ${MKTEMP}" > > .endif > > +.else > > +MKTEMP=mktemp > > +.endif > > +INSTALLTMP!= ${MKTEMP} -d -u -t install > > +.endif > > > > .if make(stagekernel) || make(distributekernel) > > TAGS+= kernel > > @@ -647,6 +668,8 @@ CROSSENV+= BUILD_TOOLS_META=.NOMETA > > CROSSENV+= ${TARGET_CFLAGS} > > .endif > > > > +BOOTSTRAPPING_OSRELDATE?=${OSRELDATE} > > + > > # bootstrap-tools stage > > BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ > > TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ > > @@ -658,7 +681,7 @@ BSARGS= DESTDIR= \ > > OBJTOP='${WORLDTMP}/obj-tools' \ > > OBJROOT='$${OBJTOP}/' \ > > MAKEOBJDIRPREFIX= \ > > - BOOTSTRAPPING=${OSRELDATE} \ > > + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ > > BWPHASE=${.TARGET:C,^_,,} \ > > SSP_CFLAGS= \ > > MK_HTML=no NO_LINT=yes MK_MAN=no \ > > @@ -680,7 +703,7 @@ TMAKE= \ > > ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ > > TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ > > DESTDIR= \ > > - BOOTSTRAPPING=${OSRELDATE} \ > > + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ > > BWPHASE=${.TARGET:C,^_,,} \ > > SSP_CFLAGS= \ > > -DNO_LINT \ > > @@ -705,7 +728,7 @@ KTMAKE= \ > > OBJTOP='${WORLDTMP}/obj-kernel-tools' \ > > OBJROOT='$${OBJTOP}/' \ > > MAKEOBJDIRPREFIX= \ > > - BOOTSTRAPPING=${OSRELDATE} \ > > + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ > > SSP_CFLAGS= \ > > MK_HTML=no -DNO_LINT MK_MAN=no \ > > -DNO_PIC MK_PROFILE=no -DNO_SHARED \ > > @@ -874,6 +897,9 @@ WORLDTMP_MTREEFLAGS= -deUW > > DESTDIR_MTREEFLAGS+= -W > > .endif > > MTREE?= mtree > > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 > > +MTREE= ${WORLDTMP}/legacy/usr/sbin/mtree > > +.endif > > WORLDTMP_MTREE= ${MTREE} ${WORLDTMP_MTREEFLAGS} > > DESTDIR_MTREE= ${MTREE} ${DESTDIR_MTREEFLAGS} > > > > @@ -948,10 +974,15 @@ _worldtmp: .PHONY > > .if !defined(NO_CLEAN) > > rm -rf ${WORLDTMP} > > .else > > +# Note: for delete-old we need to set $PATH to also include the host $PATH > > +# since otherwise a partial build with missing symlinks in ${WORLDTMP}/legacy/ > > +# will fail to run due to missing binaries. $WMAKE sets PATH to only ${TMPPATH} > > +# so we remove that assingnment from $WMAKE and prepend the new $PATH > > ${_+_}@if [ -e "${WORLDTMP}" ]; then \ > > echo ">>> Deleting stale files in build tree..."; \ > > - cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES _NO_INCLUDE_COMPILERMK=t \ > > - delete-old delete-old-libs >/dev/null; \ > > + cd ${.CURDIR}; env PATH=${TMPPATH}:${PATH} ${WMAKE:NPATH=*} \ > > + _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \ > > + delete-old-libs >/dev/null; \ > > fi > > rm -rf ${WORLDTMP}/legacy/usr/include > > .if ${USING_SYSTEM_COMPILER} == "yes" > > @@ -972,6 +1003,11 @@ _worldtmp: .PHONY > > # available on the target system (this happens e.g. when building on non-FreeBSD) > > cd ${.CURDIR}/tools/build; \ > > ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy installdirs > > +# In order to build without inheriting $PATH we need to add symlinks to the host > > +# tools in $WORLDTMP for the tools that we don't build during bootstrap-tools > > + cd ${.CURDIR}/tools/build; \ > > + ${MAKE} DIRPRFX=tools/build/ DESTDIR=${WORLDTMP}/legacy host-symlinks > > + > > _legacy: > > @echo > > @echo "--------------------------------------------------------------" > > @@ -1969,6 +2005,29 @@ legacy: .PHONY > > # > > _bt= _bootstrap-tools > > > > +# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't > > +# accidentally run tools that are incompatible but happen to be in $PATH. > > +# This is especially important when building on Linux/MacOS where many of the > > +# programs used during the build accept different flags or generate different > > +# output. On those platforms we only symlink the tools known to be compatible > > +# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others > > +# from the FreeBSD sources during the bootstrap-tools stage. > > +# We want to build without the user's $PATH starting in the bootstrap-tools > > +# phase so the tools used in that phase (ln, cp, etc) must have already been > > +# linked to $WORLDTMP. The tools are listed in the _host_tools_to_symlink > > +# variable in tools/build/Makefile and are linked during the legacy phase. > > +# Since they could be Linux or MacOS binaries, too we must only use flags that > > +# are portable across operating systems. > > + > > +# If BOOTSTRAP_ALL_TOOLS is set we will build all the required tools from the > > +# current source tree. Otherwise we create a symlink to the version found in > > +# $PATH during the bootstrap-tools stage. > > +.if defined(BOOTSTRAP_ALL_TOOLS) > > +# BOOTSTRAPPING will be set on the command line so we can't override it here. > > +# Instead set BOOTSTRAPPING_OSRELDATE so that the value 0 is set ${BSARGS} > > +BOOTSTRAPPING_OSRELDATE:= 0 > > +.endif > > + > > .if ${MK_GAMES} != "no" > > _strfile= usr.bin/fortune/strfile > > .endif > > @@ -1981,12 +2040,21 @@ _gperf= gnu/usr.bin/gperf > > _vtfontcvt= usr.bin/vtfontcvt > > .endif > > > > +# If we are not building the bootstrap because BOOTSTRAPPING is sufficient > > +# we symlink the host version to $WORLDTMP instead. By doing this we can also > > +# detect when a bootstrap tool is being used without the required MK_FOO. > > +# If you add a new bootstrap tool where we could also use the host version, > > +# please ensure that you also add a .else case where you add the tool to the > > +# _bootstrap_tools_links variable. > > .if ${BOOTSTRAPPING} < 1000033 > > _m4= usr.bin/m4 > > _lex= usr.bin/lex > > - > > -${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd > > -${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 > > +# Note: lex needs m4 to build but m4 also depends on lex. However, lex can be > > +# bootstrapped so we build lex first. > > +${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/yacc ${_bt}-${_lex} > > +_bt_lex_depend=${_bt}-usr.bin/lex ${_bt}-usr.bin/m4 > > +.else > > +_bootstrap_tools_links+=m4 lex > > .endif > > > > # r245440 mtree -N support added > > @@ -1998,17 +2066,23 @@ _nmtree= lib/libmd \ > > > > ${_bt}-lib/libnetbsd: ${_bt}-lib/libmd > > ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd > > +.else > > +_bootstrap_tools_links+=mtree > > .endif > > > > # r246097: log addition login.conf.db, passwd, pwd.db, and spwd.db with cat -l > > .if ${BOOTSTRAPPING} < 1000027 > > _cat= bin/cat > > +.else > > +_bootstrap_tools_links+=cat > > .endif > > > > # r277259 crunchide: Correct 64-bit section header offset > > # r281674 crunchide: always include both 32- and 64-bit ELF support > > .if ${BOOTSTRAPPING} < 1100078 > > _crunchide= usr.sbin/crunch/crunchide > > +.else > > +_bootstrap_tools_links+=crunchide > > .endif > > > > # r285986 crunchen: use STRIPBIN rather than STRIP > > @@ -2018,12 +2092,16 @@ _crunchide= usr.sbin/crunch/crunchide > > (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \ > > (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006) > > _crunchgen= usr.sbin/crunch/crunchgen > > +.else > > +_bootstrap_tools_links+=crunchgen > > .endif > > > > # r296926 -P keymap search path, MFC to stable/10 in r298297 > > .if ${BOOTSTRAPPING} < 1003501 || \ > > (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) > > _kbdcontrol= usr.sbin/kbdcontrol > > +.else > > +_bootstrap_tools_links+=kbdcontrol > > .endif > > > > _yacc= lib/liby \ > > @@ -2059,6 +2137,10 @@ _dtc= usr.bin/dtc > > _dtc= gnu/usr.bin/dtc > > .endif > > > > +.if ${MK_LOCALES} != "no" > > +_localedef= usr.bin/localedef > > +.endif > > + > > .if ${MK_KERBEROS} != "no" > > _kerberos5_bootstrap_tools= \ > > kerberos5/tools/make-roken \ > > @@ -2069,12 +2151,108 @@ _kerberos5_bootstrap_tools= \ > > usr.bin/compile_et > > > > .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} > > +.for _tool in ${_kerberos5_bootstrap_tools} > > +${_bt}-${_tool}: ${_bt}-usr.bin/yacc ${_bt_lex_depend} > > +.endfor > > .endif > > > > ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd > > > > -bootstrap-tools: .PHONY > > +# The tools listed in _basic_bootstrap_tools will generally not be > > +# bootstrapped unless BOOTSTRAP_ALL_TOOL is set. However, when building on a > > +# Linux or MacOS host the host versions are incompatible so we need to build > > +# them from the source tree. Usually the link name will be the same as the subdir, > > +# but some directories such as grep or test install multiple binaries. In that > > +# case we use the _basic_bootstrap_tools_multilink variable which is a list of > > +# subdirectory and comma-separated list of files. > > +_basic_bootstrap_tools_multilink=usr.bin/grep grep,egrep,fgrep > > +_basic_bootstrap_tools_multilink+=bin/test test,[ > > +# bootstrap tools needed by buildworld: > > +_basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \ > > + usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \ > > + usr.bin/truncate usr.bin/tsort > > +# elf2aout is required for sparc64 build > > +_basic_bootstrap_tools+=usr.bin/elf2aout > > +# file2c is required for building usr.sbin/config: > > +_basic_bootstrap_tools+=usr.bin/file2c > > +# uuencode/uudecode required for share/tabset > > +_basic_bootstrap_tools+=usr.bin/uuencode usr.bin/uudecode > > +# xargs is required by mkioctls > > +_basic_bootstrap_tools+=usr.bin/xargs > > +# cap_mkdb is required for share/termcap: > > +_basic_bootstrap_tools+=usr.bin/cap_mkdb > > +# ldd is required for installcheck (TODO: just always use /usr/bin/ldd instead?) > > +_basic_bootstrap_tools+=usr.bin/ldd > > +# services_mkdb/pwd_mkdb are required for installworld: > > +_basic_bootstrap_tools+=usr.sbin/services_mkdb usr.sbin/pwd_mkdb > > +# sysctl/chflags are required for installkernel: > > +_basic_bootstrap_tools+=sbin/sysctl bin/chflags > > > > +.if ${MK_AMD} != "no" > > +# unifdef is only used by usr.sbin/amd/libamu/Makefile > > +_basic_bootstrap_tools+=usr.bin/unifdef > > +.endif > > + > > +.if ${MK_BOOT} != "no" > > +_basic_bootstrap_tools+=usr.sbin/btxld > > btxld exist only on amd64/i386, so this commit breaks native buildworld > for all other architectures. > > See: > -------------------------------------------------------------- > >>> stage 1.2: bootstrap tools > -------------------------------------------------------------- > cd /usr/src; INSTALL="sh /usr/src/tools/install.sh" > TOOLS_PREFIX=/usr/obj/usr/src/arm.armv7/tmp > PATH=/usr/obj/usr/src/arm.armv7/tmp/legacy/usr/sbin:/usr/obj/usr/src/arm.armv7/tmp/legacy/usr/bin:/usr/obj/usr/src/arm.armv7/tmp/legacy/bin:/sbin:/bin:/usr/sbin:/usr/bin > WORLDTMP=/usr/obj/usr/src/arm.armv7/tmp MAKEFLAGS="-m > /usr/src/tools/build/mk -m /usr/src/share/mk" make -f Makefile.inc1 > DESTDIR= OBJTOP='/usr/obj/usr/src/arm.armv7/tmp/obj-tools' > OBJROOT='${OBJTOP}/' MAKEOBJDIRPREFIX= BOOTSTRAPPING=1300002 > BWPHASE=bootstrap-tools SSP_CFLAGS= MK_HTML=no NO_LINT=yes MK_MAN=no > -DNO_PIC MK_PROFILE=no -DNO_SHARED -DNO_CPU_CFLAGS MK_WARNS=no > MK_CTF=no MK_CLANG_EXTRAS=no MK_CLANG_FULL=no MK_LLDB=no > MK_RETPOLINE=no MK_TESTS=no MK_INCLUDES=yes MK_LLVM_TARGET_ALL=no > bootstrap-tools > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/m4 -> /usr/bin/m4 > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/lex -> /usr/bin/lex > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/mtree -> /usr/sbin/mtree > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/cat -> /bin/cat > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/crunchide -> /usr/bin/crunchide > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/crunchgen -> /usr/bin/crunchgen > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/kbdcontrol -> /usr/sbin/kbdcontrol > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/awk -> /usr/bin/awk > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/cut -> /usr/bin/cut > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/expr -> /bin/expr > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/gencat -> /usr/bin/gencat > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/join -> /usr/bin/join > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/mktemp -> /usr/bin/mktemp > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/rmdir -> /bin/rmdir > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/sed -> /usr/bin/sed > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/sort -> /usr/bin/sort > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/truncate -> /usr/bin/truncate > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/tsort -> /usr/bin/tsort > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/elf2aout -> /usr/bin/elf2aout > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/file2c -> /usr/bin/file2c > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/uuencode -> /usr/bin/uuencode > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/uudecode -> /usr/bin/uudecode > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/xargs -> /usr/bin/xargs > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/cap_mkdb -> /usr/bin/cap_mkdb > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/ldd -> /usr/bin/ldd > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/services_mkdb -> > /usr/sbin/services_mkdb > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/pwd_mkdb -> /usr/sbin/pwd_mkdb > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/sysctl -> /sbin/sysctl > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/chflags -> /bin/chflags > /usr/obj/usr/src/arm.armv7/tmp/legacy/bin/unifdef -> /usr/bin/unifdef > *** Error code 1 > > Stop. > make[2]: stopped in /usr/src > *** Error code 1 > > Stop. > make[1]: stopped in /usr/src > *** Error code 1 > > Stop. > > This should be fixed in r340176. Sorry! Alex > > +_basic_bootstrap_tools+=bin/dd > > +# xz/unxz is used by EFI > > +_basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz > > +# md5 is used by boot/beri (and possibly others) > > +_basic_bootstrap_tools+=sbin/md5 > > +.if defined(BOOTSTRAP_ALL_TOOLS) > > +${_bt}-sbin/md5: ${_bt}-lib/libmd > > +.endif > > +.endif > > + > > +.if ${MK_ZONEINFO} != "no" > > +_basic_bootstrap_tools+=usr.sbin/zic usr.sbin/tzsetup > > +.endif > > + > > +.if defined(BOOTSTRAP_ALL_TOOLS) > > +_other_bootstrap_tools+=${_basic_bootstrap_tools} > > +.for _subdir _links in ${_basic_bootstrap_tools_multilink} > > +_other_bootstrap_tools+=${_subdir} > > +.endfor > > +${_bt}-usr.bin/awk: ${_bt_lex_depend} ${_bt}-usr.bin/yacc > > +${_bt}-bin/expr: ${_bt_lex_depend} ${_bt}-usr.bin/yacc > > +# If we are bootstrapping file2c, we have to build it before config: > > +${_bt}-usr.sbin/config: ${_bt}-usr.bin/file2c ${_bt_lex_depend} > > +# Note: no symlink to make/bmake in the !BOOTSTRAP_ALL_TOOLS case here since > > +# the links to make/bmake make links will have already have been created in the > > +# `make legacy` step. Not adding a link to make is important on non-FreeBSD > > +# since "make" will usually point to GNU make there. > > +_other_bootstrap_tools+=usr.bin/bmake > > +.else > > +# All tools in _basic_bootstrap_tools have the same name as the subdirectory > > +# so we can use :T to get the name of the symlinks that we need to create. > > +_bootstrap_tools_links+=${_basic_bootstrap_tools:T} > > +.for _subdir _links in ${_basic_bootstrap_tools_multilink} > > +_bootstrap_tools_links+=${_links:S/,/ /g} > > +.endfor > > +.endif # defined(BOOTSTRAP_ALL_TOOLS) > > + > > +# Link the tools that we need for building but don't need to bootstrap because > > +# the host version is known to be compatible into ${WORLDTMP}/legacy > > +# We do this before building any of the bootstrap tools in case they depend on > > +# the presence of any of the links (e.g. as m4/lex/awk) > > +${_bt}-links: .PHONY > > + > > +.for _tool in ${_bootstrap_tools_links} > > +${_bt}-link-${_tool}: .PHONY .MAKE > > + @if [ ! -e "${WORLDTMP}/legacy/bin/${_tool}" ]; then \ > > + source_path=`which ${_tool}`; \ > > + if [ ! -e "$${source_path}" ] ; then \ > > + echo "Cannot find host tool '${_tool}'"; false; \ > > + fi; \ > > + ln -sfnv "$${source_path}" "${WORLDTMP}/legacy/bin/${_tool}"; \ > > + fi > > +${_bt}-links: ${_bt}-link-${_tool} > > +.endfor > > + > > + > > +bootstrap-tools: ${_bt}-links .PHONY > > + > > # Please document (add comment) why something is in 'bootstrap-tools'. > > # Try to bound the building of the bootstrap-tool to just the > > # FreeBSD versions that need the tool built at this stage of the build. > > @@ -2093,6 +2271,7 @@ bootstrap-tools: .PHONY > > ${_yacc} \ > > ${_m4} \ > > ${_lex} \ > > + ${_other_bootstrap_tools} \ > > usr.bin/xinstall \ > > ${_gensnmptree} \ > > usr.sbin/config \ > > @@ -2101,10 +2280,13 @@ bootstrap-tools: .PHONY > > ${_nmtree} \ > > ${_vtfontcvt} \ > > ${_localedef} > > -${_bt}-${_tool}: .PHONY .MAKE > > +${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE > > ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ > > cd ${.CURDIR}/${_tool}; \ > > if [ -z "${NO_OBJWALK}" ]; then ${MAKE} DIRPRFX=${_tool}/ obj; fi; \ > > + if [ "${_tool}" = "usr.bin/lex" ]; then \ > > + ${MAKE} DIRPRFX=${_tool}/ bootstrap; \ > > + fi; \ > > ${MAKE} DIRPRFX=${_tool}/ all; \ > > ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install > > > > @@ -2235,9 +2417,14 @@ _gcc= gnu/usr.bin/cc > > _usb_tools= stand/usb/tools > > .endif > > > > +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 || defined(BOOTSTRAP_ALL_TOOLS) > > +_ar=usr.bin/ar > > +.endif > > + > > cross-tools: .MAKE .PHONY > > .for _tool in \ > > ${LOCAL_XTOOL_DIRS} \ > > + ${_ar} \ > > ${_clang_libs} \ > > ${_clang} \ > > ${_lld} \ > > > > Modified: head/tools/build/Makefile > > ============================================================================== > > --- head/tools/build/Makefile Mon Nov 5 19:25:57 2018 (r340156) > > +++ head/tools/build/Makefile Mon Nov 5 19:51:10 2018 (r340157) > > @@ -59,15 +59,64 @@ SUBDIR= cross-build > > # Needed to build config (since it uses libnv) > > SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h > > > > +# We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't > > +# accidentally run tools that are incompatible but happen to be in $PATH. > > +# This is especially important when building on Linux/MacOS where many of the > > +# programs used during the build accept different flags or generate different > > +# output. On those platforms we only symlink the tools known to be compatible > > +# (e.g. basic utilities such as mkdir) into ${WORLDTMP} and build all others > > +# from the FreeBSD sources during the bootstrap-tools stage. > > > > +# basic commands: It is fine to use the host version for all of these even on > > +# Linux/MacOS since we only use flags that are supported by all of them. > > +_host_tools_to_symlink= basename bzip2 bunzip2 chmod chown cmp comm cp date \ > > + dirname echo env false find fmt gzip gunzip head hostname id ln ls \ > > + mkdir mv nice patch rm realpath sh sleep stat tee touch tr true uname \ > > + uniq wc which > > + > > +# We also need a symlink to the absolute path to the make binary used for > > +# the toplevel makefile. This is not necessarily the same as `which make` > > +# since e.g. on Linux and MacOS that will be GNU make. > > +_make_abs!= which "${MAKE}" > > +_host_abs_tools_to_symlink= ${_make_abs}:make ${_make_abs}:bmake > > + > > +host-symlinks: > > + @echo "Linking host tools into ${DESTDIR}/bin" > > +.for _tool in ${_host_tools_to_symlink} > > + @if [ ! -e "${DESTDIR}/bin/${_tool}" ]; then \ > > + source_path=`which ${_tool}`; \ > > + if [ ! -e "$${source_path}" ] ; then \ > > + echo "Cannot find host tool '${_tool}'"; false; \ > > + fi; \ > > + ln -sfnv "$${source_path}" "${DESTDIR}/bin/${_tool}"; \ > > + fi > > +.endfor > > +.for _tool in ${_host_abs_tools_to_symlink} > > + @source_path="${_tool:S/:/ /:[1]}"; \ > > + target_path="${DESTDIR}/bin/${_tool:S/:/ /:[2]}"; \ > > + if [ ! -e "$${target_path}" ] ; then \ > > + if [ ! -e "$${source_path}" ] ; then \ > > + echo "Host tool '${src_path}' is missing"; false; \ > > + fi; \ > > + ln -sfnv "$${source_path}" "$${target_path}"; \ > > + fi > > +.endfor > > + > > # Create all the directories that are needed during the legacy, bootstrap-tools > > # and cross-tools stages. We do this here using mkdir since mtree may not exist > > # yet (this happens if we are crossbuilding from Linux/Mac). > > installdirs: > > -.for _dir in bin sbin usr/bin usr/sbin usr/lib usr/include lib/geom lib/casper > > +.for _dir in bin usr/lib usr/include lib/geom lib/casper > > mkdir -p "${DESTDIR}/${_dir}" > > .endfor > > - > > +# Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a > > +# bootstrap tool was added to WORLTMP with a symlink or by building it in the > > +# bootstrap-tools phase. We could also overrride BINDIR when building bootstrap > > +# tools but adding the symlinks is easier and means all tools are also > > +# in the directory that they are installed to normally. > > + ln -sf bin ${DESTDIR}/sbin > > + ln -sf ../bin ${DESTDIR}/usr/bin > > + ln -sf ../bin ${DESTDIR}/usr/sbin > > .for _group in ${INCSGROUPS:NINCS} > > mkdir -p "${DESTDIR}/${${_group}DIR}" > > .endfor > > > > Modified: head/tools/tools/nanobsd/embedded/common > > ============================================================================== > > --- head/tools/tools/nanobsd/embedded/common Mon Nov 5 19:25:57 2018 (r340156) > > +++ head/tools/tools/nanobsd/embedded/common Mon Nov 5 19:51:10 2018 (r340157) > > @@ -671,4 +671,4 @@ create_diskimage ( ) ( > > # Set the path to the same path we use for buldworld to use latest mkimg > > NANO_TARGET=$(cd ${NANO_SRC}; ${NANO_MAKE} TARGET_ARCH=${NANO_ARCH} -V _TARGET) > > NANO_TMPPATH=$(cd ${NANO_SRC}; ${NANO_MAKE} MK_AUTO_OBJ=no TARGET=${NANO_TARGET} TARGET_ARCH=${NANO_ARCH} -f Makefile.inc1 buildenv -V TMPPATH) > > -export PATH="${NANO_TMPPATH}" > > +export PATH="${NANO_TMPPATH}:${PATH}" > > --000000000000d727780579fbc157 Content-Type: application/octet-stream; name="fix.patch" Content-Disposition: attachment; filename="fix.patch" Content-Transfer-Encoding: base64 Content-ID: <f_jo5jg3ub0> X-Attachment-Id: f_jo5jg3ub0 Y29tbWl0IDRmOWU1OTRkODgyZmRiMmU4MjJjMDZmYjYyYzllMzQzMDUyYjRhOTUKQXV0aG9yOiBB bGV4IFJpY2hhcmRzb24gPEFsZXhhbmRlci5SaWNoYXJkc29uQGNsLmNhbS5hYy51az4KRGF0ZTog ICBUdWUgTm92IDYgMDk6MDg6MjMgMjAxOCArMDAwMAoKICAgIFJlbW92ZSBidHhsZCBmcm9tIHN5 bWxpbmtlZCBob3N0IHRvb2xzCiAgICAKICAgIEl0IGlzIG9ubHkgcHJlc2VudCBvbiBhbWQ2NC9p Mzg2IHN5c3RlbXMgd2hpY2ggYnJlYWtzIGJ1aWxkd29ybGQgb24KICAgIG90aGVyIGhvc3RzLiBJ biBmYWN0IHRoZXJlIGlzIG5vIG5lZWQgdG8gYWRkIGl0IHRvIHRoZSBib290c3RyYXAgdG9vbHMK ICAgIGxpc3Qgc2luY2UgaXQgaXMgYWxyZWFkeSBpbmNsdWRlZCBpbiB0aGUgY3Jvc3MtdG9vbHMg cGhhc2UuCiAgICBIb3dldmVyLCBmb3IgY3Jvc3MtdG9vbHMgaXQgd2FzIG9ubHkgYnVpbHQgaWYg dGhlIGhvc3QgYW5kIHRhcmdldAogICAgYXJjaGl0ZWN0dXJlIGRpZG4ndCBtYXRjaC4gQWZ0ZXIg dGhpcyBjaGFuZ2UgaXQgaXMgYWxzbyBidWlsdCB3aGVuIHdlCiAgICBhcmUgYnVpbHRpbiB3aXRo IGEgc3RyaWN0ICRQQVRILgogICAgCiAgICBSZXBvcnRlZCBCeTogICAgbW1lbAoKZGlmZiAtLWdp dCBhL01ha2VmaWxlLmluYzEgYi9NYWtlZmlsZS5pbmMxCmluZGV4IGYyMWYzMDVkYjIwLi5iYzBj MDk0YzljNCAxMDA2NDQKLS0tIGEvTWFrZWZpbGUuaW5jMQorKysgYi9NYWtlZmlsZS5pbmMxCkBA IC0yMjA0LDcgKzIyMDQsNiBAQCBfYmFzaWNfYm9vdHN0cmFwX3Rvb2xzKz11c3IuYmluL3VuaWZk ZWYKIC5lbmRpZgogCiAuaWYgJHtNS19CT09UfSAhPSAibm8iCi1fYmFzaWNfYm9vdHN0cmFwX3Rv b2xzKz11c3Iuc2Jpbi9idHhsZAogX2Jhc2ljX2Jvb3RzdHJhcF90b29scys9YmluL2RkCiAjIHh6 L3VueHogaXMgdXNlZCBieSBFRkkKIF9iYXNpY19ib290c3RyYXBfdG9vbHNfbXVsdGlsaW5rKz11 c3IuYmluL3h6IHh6LHVueHoKQEAgLTIzNzUsNyArMjM3NCw3IEBAIGtlcm5lbC10b29sczogLlBI T05ZCiAjIHdlIGdldCBkb25lIHdpdGggdGhlIGVhcmxpZXIgc3RhZ2VzLiBJdCBpcyB0aGUgbGFz dCBzZXQgb2YgdG9vbHMgbmVlZGVkCiAjIHRvIGJlZ2luIGJ1aWxkaW5nIHRoZSB0YXJnZXQgYmlu YXJpZXMuCiAjCi0uaWYgJHtUQVJHRVRfQVJDSH0gIT0gJHtNQUNISU5FX0FSQ0h9CisuaWYgJHtU QVJHRVRfQVJDSH0gIT0gJHtNQUNISU5FX0FSQ0h9IHx8ICR7QlVJTERfV0lUSF9TVFJJQ1RfVE1Q UEFUSH0gIT0gMAogLmlmICR7VEFSR0VUX0FSQ0h9ID09ICJhbWQ2NCIgfHwgJHtUQVJHRVRfQVJD SH0gPT0gImkzODYiCiBfYnR4bGQ9CQl1c3Iuc2Jpbi9idHhsZAogLmVuZGlmCg== --000000000000d727780579fbc157-- From owner-svn-src-head@freebsd.org Tue Nov 6 12:05:47 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 89BAA112184D; Tue, 6 Nov 2018 12:05:47 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 041CF739C0; Tue, 6 Nov 2018 12:05:47 +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 DA8B6266B3; Tue, 6 Nov 2018 12:05:46 +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 wA6C5k5o097740; Tue, 6 Nov 2018 12:05:46 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6C5kFQ097739; Tue, 6 Nov 2018 12:05:46 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201811061205.wA6C5kFQ097739@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala <trasz@FreeBSD.org> Date: Tue, 6 Nov 2018 12:05:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340177 - head/contrib/jemalloc/src X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/contrib/jemalloc/src X-SVN-Commit-Revision: 340177 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 041CF739C0 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.992,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 12:05:47 -0000 Author: trasz Date: Tue Nov 6 12:05:46 2018 New Revision: 340177 URL: https://svnweb.freebsd.org/changeset/base/340177 Log: Pick 50b473c8839f5408df179bdf6f2b3fd2cf5c3b2f from upstream: Set commit properly for FreeBSD w/ overcommit. When overcommit is enabled, commit needs to be set when doing mmap(). The regression was introduced in f80c97e. This fixes 'retain:true'. Discussed with: jasone Obtained from: Qi Wang <interwq at gwu dot edu> MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/contrib/jemalloc/src/pages.c Modified: head/contrib/jemalloc/src/pages.c ============================================================================== --- head/contrib/jemalloc/src/pages.c Tue Nov 6 09:36:59 2018 (r340176) +++ head/contrib/jemalloc/src/pages.c Tue Nov 6 12:05:46 2018 (r340177) @@ -186,6 +186,10 @@ pages_map(void *addr, size_t size, size_t alignment, b * touching existing mappings, and to mmap with specific alignment. */ { + if (os_overcommits) { + *commit = true; + } + int prot = *commit ? PAGES_PROT_COMMIT : PAGES_PROT_DECOMMIT; int flags = mmap_flags; From owner-svn-src-head@freebsd.org Tue Nov 6 12:55:04 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 BAB761122E88; Tue, 6 Nov 2018 12:55:04 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4A2F675566; Tue, 6 Nov 2018 12:55:04 +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 2CBC226EBC; Tue, 6 Nov 2018 12:55:04 +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 wA6Ct4Ld023619; Tue, 6 Nov 2018 12:55:04 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6Ct4nm023618; Tue, 6 Nov 2018 12:55:04 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201811061255.wA6Ct4nm023618@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen <tuexen@FreeBSD.org> Date: Tue, 6 Nov 2018 12:55:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340179 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 340179 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4A2F675566 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 12:55:04 -0000 Author: tuexen Date: Tue Nov 6 12:55:03 2018 New Revision: 340179 URL: https://svnweb.freebsd.org/changeset/base/340179 Log: Don't use a function when neither INET nor INET6 are defined. This is a valid case for the userland stack, where this fixes two set-but-not-used warnings in this case. Thanks to Christian Wright for reporting the issue. Modified: head/sys/netinet/sctp_output.c Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Tue Nov 6 12:52:58 2018 (r340178) +++ head/sys/netinet/sctp_output.c Tue Nov 6 12:55:03 2018 (r340179) @@ -3733,6 +3733,7 @@ sctp_process_cmsgs_for_init(struct sctp_tcb *stcb, str return (0); } +#if defined(INET) || defined(INET6) static struct sctp_tcb * sctp_findassociation_cmsgs(struct sctp_inpcb **inp_p, uint16_t port, @@ -3822,6 +3823,7 @@ sctp_findassociation_cmsgs(struct sctp_inpcb **inp_p, } return (NULL); } +#endif static struct mbuf * sctp_add_cookie(struct mbuf *init, int init_offset, @@ -12699,9 +12701,11 @@ sctp_lower_sosend(struct socket *so, SCTP_INP_WUNLOCK(inp); /* With the lock applied look again */ stcb = sctp_findassociation_ep_addr(&t_inp, addr, &net, NULL, NULL); +#if defined(INET) || defined(INET6) if ((stcb == NULL) && (control != NULL) && (port > 0)) { stcb = sctp_findassociation_cmsgs(&t_inp, port, control, &net, &error); } +#endif if (stcb == NULL) { SCTP_INP_WLOCK(inp); SCTP_INP_DECR_REF(inp); From owner-svn-src-head@freebsd.org Tue Nov 6 13:51:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 73E651124331; Tue, 6 Nov 2018 13:51:10 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0DDE7723C; Tue, 6 Nov 2018 13:51:09 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 D37F827702; Tue, 6 Nov 2018 13:51:09 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6Dp9ws052992; Tue, 6 Nov 2018 13:51:09 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6Dp9c5052988; Tue, 6 Nov 2018 13:51:09 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201811061351.wA6Dp9c5052988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans <tijl@FreeBSD.org> Date: Tue, 6 Nov 2018 13:51:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340181 - in head/sys: amd64/linux32 compat/linux X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/sys: amd64/linux32 compat/linux X-SVN-Commit-Revision: 340181 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F0DDE7723C X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 13:51:10 -0000 Author: tijl Date: Tue Nov 6 13:51:08 2018 New Revision: 340181 URL: https://svnweb.freebsd.org/changeset/base/340181 Log: On amd64 both Linux compat modules, linux.ko and linux64.ko, provide linux_ioctl_(un)register_handler that allows other driver modules to register ioctl handlers. The ioctl syscall implementation in each Linux compat module iterates over the list of handlers and forwards the call to the appropriate driver. Because the registration functions have the same name in each module it is not possible for a driver to support both 32 and 64 bit linux compatibility. Move the list of ioctl handlers to linux_common.ko so it is shared by both Linux modules and all drivers receive both 32 and 64 bit ioctl calls with one registration. These ioctl handlers normally forward the call to the FreeBSD ioctl handler which can handle both 32 and 64 bit. Keep the special COMPAT_LINUX32 ioctl handlers in linux.ko in a separate list for now and let the ioctl syscall iterate over that list first. Later, COMPAT_LINUX32 support can be added to the 64 bit ioctl handlers via a runtime check for ILP32 like is done for COMPAT_FREEBSD32 and then this separate list would disappear again. That is a much bigger effort however and this commit is meant to be MFCable. This enables linux64 support in x11/nvidia-driver*. PR: 206711 Reviewed by: kib MFC after: 3 days Modified: head/sys/amd64/linux32/linux32_sysvec.c head/sys/compat/linux/linux_common.c head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_ioctl.h Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Tue Nov 6 12:57:38 2018 (r340180) +++ head/sys/amd64/linux32/linux32_sysvec.c Tue Nov 6 13:51:08 2018 (r340181) @@ -1071,7 +1071,7 @@ linux_elf_modevent(module_t mod, int type, void *data) error = EINVAL; if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) - linux_ioctl_register_handler(*lihp); + linux32_ioctl_register_handler(*lihp); LIST_INIT(&futex_list); mtx_init(&futex_mtx, "ftllk", NULL, MTX_DEF); stclohz = (stathz ? stathz : hz); @@ -1093,7 +1093,7 @@ linux_elf_modevent(module_t mod, int type, void *data) } if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) - linux_ioctl_unregister_handler(*lihp); + linux32_ioctl_unregister_handler(*lihp); mtx_destroy(&futex_mtx); if (bootverbose) printf("Linux ELF exec handler removed\n"); Modified: head/sys/compat/linux/linux_common.c ============================================================================== --- head/sys/compat/linux/linux_common.c Tue Nov 6 12:57:38 2018 (r340180) +++ head/sys/compat/linux/linux_common.c Tue Nov 6 13:51:08 2018 (r340181) @@ -35,9 +35,11 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/eventhandler.h> +#include <sys/sx.h> #include <sys/sysctl.h> #include <compat/linux/linux_emul.h> +#include <compat/linux/linux_ioctl.h> #include <compat/linux/linux_mib.h> #include <compat/linux/linux_util.h> @@ -47,6 +49,11 @@ FEATURE(linuxulator_v4l2, "V4L2 ioctl wrapper support MODULE_VERSION(linux_common, 1); SET_DECLARE(linux_device_handler_set, struct linux_device_handler); + +TAILQ_HEAD(, linux_ioctl_handler_element) linux_ioctl_handlers = + TAILQ_HEAD_INITIALIZER(linux_ioctl_handlers); +struct sx linux_ioctl_sx; +SX_SYSINIT(linux_ioctl, &linux_ioctl_sx, "Linux ioctl handlers"); static eventhandler_tag linux_exec_tag; static eventhandler_tag linux_thread_dtor_tag; Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Tue Nov 6 12:57:38 2018 (r340180) +++ head/sys/compat/linux/linux_ioctl.c Tue Nov 6 13:51:08 2018 (r340181) @@ -161,17 +161,19 @@ DATA_SET(linux_ioctl_handler_set, video2_handler); DATA_SET(linux_ioctl_handler_set, fbsd_usb); DATA_SET(linux_ioctl_handler_set, evdev_handler); -struct handler_element -{ - TAILQ_ENTRY(handler_element) list; - int (*func)(struct thread *, struct linux_ioctl_args *); - int low, high, span; -}; - -static TAILQ_HEAD(, handler_element) handlers = - TAILQ_HEAD_INITIALIZER(handlers); +#ifdef __i386__ +static TAILQ_HEAD(, linux_ioctl_handler_element) linux_ioctl_handlers = + TAILQ_HEAD_INITIALIZER(linux_ioctl_handlers); static struct sx linux_ioctl_sx; SX_SYSINIT(linux_ioctl, &linux_ioctl_sx, "Linux ioctl handlers"); +#else +extern TAILQ_HEAD(, linux_ioctl_handler_element) linux_ioctl_handlers; +extern struct sx linux_ioctl_sx; +#endif +#ifdef COMPAT_LINUX32 +static TAILQ_HEAD(, linux_ioctl_handler_element) linux32_ioctl_handlers = + TAILQ_HEAD_INITIALIZER(linux32_ioctl_handlers); +#endif /* * hdio related ioctls for VMWare support @@ -3684,7 +3686,7 @@ int linux_ioctl(struct thread *td, struct linux_ioctl_args *args) { struct file *fp; - struct handler_element *he; + struct linux_ioctl_handler_element *he; int error, cmd; #ifdef DEBUG @@ -3705,7 +3707,8 @@ linux_ioctl(struct thread *td, struct linux_ioctl_args cmd = args->cmd & 0xffff; sx_slock(&linux_ioctl_sx); mtx_lock(&Giant); - TAILQ_FOREACH(he, &handlers, list) { +#ifdef COMPAT_LINUX32 + TAILQ_FOREACH(he, &linux32_ioctl_handlers, list) { if (cmd >= he->low && cmd <= he->high) { error = (*he->func)(td, args); if (error != ENOIOCTL) { @@ -3716,6 +3719,18 @@ linux_ioctl(struct thread *td, struct linux_ioctl_args } } } +#endif + TAILQ_FOREACH(he, &linux_ioctl_handlers, list) { + if (cmd >= he->low && cmd <= he->high) { + error = (*he->func)(td, args); + if (error != ENOIOCTL) { + mtx_unlock(&Giant); + sx_sunlock(&linux_ioctl_sx); + fdrop(fp, td); + return (error); + } + } + } mtx_unlock(&Giant); sx_sunlock(&linux_ioctl_sx); fdrop(fp, td); @@ -3737,7 +3752,7 @@ linux_ioctl(struct thread *td, struct linux_ioctl_args int linux_ioctl_register_handler(struct linux_ioctl_handler *h) { - struct handler_element *he, *cur; + struct linux_ioctl_handler_element *he, *cur; if (h == NULL || h->func == NULL) return (EINVAL); @@ -3747,7 +3762,7 @@ linux_ioctl_register_handler(struct linux_ioctl_handle * create a new element. */ sx_xlock(&linux_ioctl_sx); - TAILQ_FOREACH(he, &handlers, list) { + TAILQ_FOREACH(he, &linux_ioctl_handlers, list) { if (he->func == h->func) break; } @@ -3756,7 +3771,7 @@ linux_ioctl_register_handler(struct linux_ioctl_handle M_LINUX, M_WAITOK); he->func = h->func; } else - TAILQ_REMOVE(&handlers, he, list); + TAILQ_REMOVE(&linux_ioctl_handlers, he, list); /* Initialize range information. */ he->low = h->low; @@ -3764,14 +3779,14 @@ linux_ioctl_register_handler(struct linux_ioctl_handle he->span = h->high - h->low + 1; /* Add the element to the list, sorted on span. */ - TAILQ_FOREACH(cur, &handlers, list) { + TAILQ_FOREACH(cur, &linux_ioctl_handlers, list) { if (cur->span > he->span) { TAILQ_INSERT_BEFORE(cur, he, list); sx_xunlock(&linux_ioctl_sx); return (0); } } - TAILQ_INSERT_TAIL(&handlers, he, list); + TAILQ_INSERT_TAIL(&linux_ioctl_handlers, he, list); sx_xunlock(&linux_ioctl_sx); return (0); @@ -3780,15 +3795,15 @@ linux_ioctl_register_handler(struct linux_ioctl_handle int linux_ioctl_unregister_handler(struct linux_ioctl_handler *h) { - struct handler_element *he; + struct linux_ioctl_handler_element *he; if (h == NULL || h->func == NULL) return (EINVAL); sx_xlock(&linux_ioctl_sx); - TAILQ_FOREACH(he, &handlers, list) { + TAILQ_FOREACH(he, &linux_ioctl_handlers, list) { if (he->func == h->func) { - TAILQ_REMOVE(&handlers, he, list); + TAILQ_REMOVE(&linux_ioctl_handlers, he, list); sx_xunlock(&linux_ioctl_sx); free(he, M_LINUX); return (0); @@ -3798,3 +3813,69 @@ linux_ioctl_unregister_handler(struct linux_ioctl_hand return (EINVAL); } + +#ifdef COMPAT_LINUX32 +int +linux32_ioctl_register_handler(struct linux_ioctl_handler *h) +{ + struct linux_ioctl_handler_element *he, *cur; + + if (h == NULL || h->func == NULL) + return (EINVAL); + + /* + * Reuse the element if the handler is already on the list, otherwise + * create a new element. + */ + sx_xlock(&linux_ioctl_sx); + TAILQ_FOREACH(he, &linux32_ioctl_handlers, list) { + if (he->func == h->func) + break; + } + if (he == NULL) { + he = malloc(sizeof(*he), M_LINUX, M_WAITOK); + he->func = h->func; + } else + TAILQ_REMOVE(&linux32_ioctl_handlers, he, list); + + /* Initialize range information. */ + he->low = h->low; + he->high = h->high; + he->span = h->high - h->low + 1; + + /* Add the element to the list, sorted on span. */ + TAILQ_FOREACH(cur, &linux32_ioctl_handlers, list) { + if (cur->span > he->span) { + TAILQ_INSERT_BEFORE(cur, he, list); + sx_xunlock(&linux_ioctl_sx); + return (0); + } + } + TAILQ_INSERT_TAIL(&linux32_ioctl_handlers, he, list); + sx_xunlock(&linux_ioctl_sx); + + return (0); +} + +int +linux32_ioctl_unregister_handler(struct linux_ioctl_handler *h) +{ + struct linux_ioctl_handler_element *he; + + if (h == NULL || h->func == NULL) + return (EINVAL); + + sx_xlock(&linux_ioctl_sx); + TAILQ_FOREACH(he, &linux32_ioctl_handlers, list) { + if (he->func == h->func) { + TAILQ_REMOVE(&linux32_ioctl_handlers, he, list); + sx_xunlock(&linux_ioctl_sx); + free(he, M_LINUX); + return (0); + } + } + sx_xunlock(&linux_ioctl_sx); + + return (EINVAL); +} +#endif Modified: head/sys/compat/linux/linux_ioctl.h ============================================================================== --- head/sys/compat/linux/linux_ioctl.h Tue Nov 6 12:57:38 2018 (r340180) +++ head/sys/compat/linux/linux_ioctl.h Tue Nov 6 13:51:08 2018 (r340181) @@ -770,7 +770,18 @@ struct linux_ioctl_handler { int low, high; }; +struct linux_ioctl_handler_element +{ + TAILQ_ENTRY(linux_ioctl_handler_element) list; + int (*func)(struct thread *, struct linux_ioctl_args *); + int low, high, span; +}; + int linux_ioctl_register_handler(struct linux_ioctl_handler *h); int linux_ioctl_unregister_handler(struct linux_ioctl_handler *h); +#ifdef COMPAT_LINUX32 +int linux32_ioctl_register_handler(struct linux_ioctl_handler *h); +int linux32_ioctl_unregister_handler(struct linux_ioctl_handler *h); +#endif #endif /* !_LINUX_IOCTL_H_ */ From owner-svn-src-head@freebsd.org Tue Nov 6 15:18:18 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5EDA5112740A; Tue, 6 Nov 2018 15:18:18 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (using TLSv1.2 with cipher DHE-RSA-CAMELLIA128-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 209E27B98B; Tue, 6 Nov 2018 15:18:14 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from [192.168.1.32] (unknown [192.168.1.32]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: Alexander@Leidinger.net) by outgoing.leidinger.net (Postfix) with ESMTPSA id E44B84423; Tue, 6 Nov 2018 16:17:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=leidinger.net; s=outgoing-alex; t=1541517467; bh=CGr2hywsR7D+m/knnPfAhgy8ovC62MDwYW4KUkgItMk=; h=Date:Subject:From:To:Cc; b=c5KyQkcsu6V4tgVVBsVvWFRC/OPBu2qZ8jSFX+f5zrYk7G7mpUX/OPvKTbMKMc2b7 aQ4RXOxxPOlcCdY3gDx8V9K6hq09NlRn7KeSjO/TULTTI7PNgJZ9yInCBDKuf8FKNr ZIZJ9EruuYFFeG3y1AKPY5OUfWsVULE/TmSXeRt8i1gNc+ShEF0McJbn61dGMSHiJw Rx0yhAQMXHugdrsIZQaGnSA8jU1UaPNZFeKoe31cbgDO4T+zzwnGxvZCFSOvaXolxq BQgaQ3HP1+h/dgyG9EJwoArLaFyqsPLZ059DX/138MDyK1UTFM9MrfujD6pWATXArF OLs40ZrmxfG2Q== Date: Tue, 06 Nov 2018 16:17:23 +0100 Subject: Re: svn commit: r340181 - in head/sys: amd64/linux32 compat/linux From: Alexander Leidinger <Alexander@Leidinger.net> To: Tijl Coosemans <tijl@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Leidinger-net-MailScanner-Information: Please contact the ISP for more information X-Leidinger-net-MailScanner-ID: 21B73FF7F.AEC42 X-Leidinger-net-MailScanner: Found to be clean X-Leidinger-net-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.149, required 6, ALL_TRUSTED -1.00, BAYES_00 -1.90, DKIM_SIGNED 0.10, DKIM_VALID -0.10, DKIM_VALID_AU -0.10, J_CHICKENPOX_42 0.60, J_CHICKENPOX_52 0.60, MISSING_MID 0.50, TW_OH 0.08, TW_SV 0.08) X-Leidinger-net-MailScanner-From: alexander@leidinger.net X-Leidinger-net-MailScanner-Watermark: 1542122273.71768@1P+8jSDq528jmCMpEYtMVg X-Leidinger-net-Spam-Status: No X-Rspamd-Queue-Id: 209E27B98B X-Spamd-Result: default: False [3.14 / 200.00]; ARC_NA(0.00)[]; FAKE_REPLY(1.00)[]; R_DKIM_ALLOW(-0.20)[leidinger.net]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+mx]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_MEDIUM(0.69)[0.695,0]; MISSING_MID(2.50)[]; DKIM_TRACE(0.00)[leidinger.net:+]; MIME_BASE64_TEXT(0.10)[]; DMARC_POLICY_ALLOW(-0.50)[Leidinger.net,none]; MX_GOOD(-0.01)[mailgate.leidinger.net]; NEURAL_SPAM_LONG(0.41)[0.407,0]; NEURAL_HAM_SHORT(-0.55)[-0.545,0]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(-0.00)[country: DE(-0.01)]; ASN(0.00)[asn:34240, ipnet:89.238.64.0/18, country:DE]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 15:18:18 -0000 VGFyZ2V0ZWQgZm9yIDEyLjAtcmVsZWFzZT8KUmVsbm90ZXMgeWVzIChsaW51eDY0IHN1cHBvcnQg Zm9yIE5WaWRpYSBkcml2ZXIpPwoKLS0KU2VuZCBmcm9tIGEgbW9iaWxlIGRldmljZSwgcGxlYXNl IGZvcmdpdmUgYnJldml0eSBhbmQgbWlzc3BlbGxpbmdzLgpBbSAwNi4xMS4yMDE4IDI6NTEgbmFj aG0uIHNjaHJpZWIgVGlqbCBDb29zZW1hbnMgPHRpamxARnJlZUJTRC5vcmc+Ogo+Cj4gQXV0aG9y OiB0aWpsIAo+IERhdGU6IFR1ZSBOb3bCoCA2IDEzOjUxOjA4IDIwMTggCj4gTmV3IFJldmlzaW9u OiAzNDAxODEgCj4gVVJMOiBodHRwczovL3N2bndlYi5mcmVlYnNkLm9yZy9jaGFuZ2VzZXQvYmFz ZS8zNDAxODEgCj4KPiBMb2c6IAo+IMKgIE9uIGFtZDY0IGJvdGggTGludXggY29tcGF0IG1vZHVs ZXMsIGxpbnV4LmtvIGFuZCBsaW51eDY0LmtvLCBwcm92aWRlIAo+IMKgIGxpbnV4X2lvY3RsXyh1 bilyZWdpc3Rlcl9oYW5kbGVyIHRoYXQgYWxsb3dzIG90aGVyIGRyaXZlciBtb2R1bGVzIHRvIAo+ IMKgIHJlZ2lzdGVyIGlvY3RsIGhhbmRsZXJzLsKgIFRoZSBpb2N0bCBzeXNjYWxsIGltcGxlbWVu dGF0aW9uIGluIGVhY2ggTGludXggCj4gwqAgY29tcGF0IG1vZHVsZSBpdGVyYXRlcyBvdmVyIHRo ZSBsaXN0IG9mIGhhbmRsZXJzIGFuZCBmb3J3YXJkcyB0aGUgY2FsbCB0byAKPiDCoCB0aGUgYXBw cm9wcmlhdGUgZHJpdmVyLsKgIEJlY2F1c2UgdGhlIHJlZ2lzdHJhdGlvbiBmdW5jdGlvbnMgaGF2 ZSB0aGUgc2FtZSAKPiDCoCBuYW1lIGluIGVhY2ggbW9kdWxlIGl0IGlzIG5vdCBwb3NzaWJsZSBm b3IgYSBkcml2ZXIgdG8gc3VwcG9ydCBib3RoIDMyIGFuZCAKPiDCoCA2NCBiaXQgbGludXggY29t cGF0aWJpbGl0eS4gCj4gwqAgCj4gwqAgTW92ZSB0aGUgbGlzdCBvZiBpb2N0bCBoYW5kbGVycyB0 byBsaW51eF9jb21tb24ua28gc28gaXQgaXMgc2hhcmVkIGJ5IAo+IMKgIGJvdGggTGludXggbW9k dWxlcyBhbmQgYWxsIGRyaXZlcnMgcmVjZWl2ZSBib3RoIDMyIGFuZCA2NCBiaXQgaW9jdGwgY2Fs bHMgCj4gwqAgd2l0aCBvbmUgcmVnaXN0cmF0aW9uLsKgIFRoZXNlIGlvY3RsIGhhbmRsZXJzIG5v cm1hbGx5IGZvcndhcmQgdGhlIGNhbGwgCj4gwqAgdG8gdGhlIEZyZWVCU0QgaW9jdGwgaGFuZGxl ciB3aGljaCBjYW4gaGFuZGxlIGJvdGggMzIgYW5kIDY0IGJpdC4gCj4gwqAgCj4gwqAgS2VlcCB0 aGUgc3BlY2lhbCBDT01QQVRfTElOVVgzMiBpb2N0bCBoYW5kbGVycyBpbiBsaW51eC5rbyBpbiBh IHNlcGFyYXRlIAo+IMKgIGxpc3QgZm9yIG5vdyBhbmQgbGV0IHRoZSBpb2N0bCBzeXNjYWxsIGl0 ZXJhdGUgb3ZlciB0aGF0IGxpc3QgZmlyc3QuIAo+IMKgIExhdGVyLCBDT01QQVRfTElOVVgzMiBz dXBwb3J0IGNhbiBiZSBhZGRlZCB0byB0aGUgNjQgYml0IGlvY3RsIGhhbmRsZXJzIAo+IMKgIHZp YSBhIHJ1bnRpbWUgY2hlY2sgZm9yIElMUDMyIGxpa2UgaXMgZG9uZSBmb3IgQ09NUEFUX0ZSRUVC U0QzMiBhbmQgdGhlbiAKPiDCoCB0aGlzIHNlcGFyYXRlIGxpc3Qgd291bGQgZGlzYXBwZWFyIGFn YWluLsKgIFRoYXQgaXMgYSBtdWNoIGJpZ2dlciBlZmZvcnQgCj4gwqAgaG93ZXZlciBhbmQgdGhp cyBjb21taXQgaXMgbWVhbnQgdG8gYmUgTUZDYWJsZS4gCj4gwqAgCj4gwqAgVGhpcyBlbmFibGVz IGxpbnV4NjQgc3VwcG9ydCBpbiB4MTEvbnZpZGlhLWRyaXZlciouIAo+IMKgIAo+IMKgIFBSOiAy MDY3MTHCoCBodHRwOi8vd3d3LkZyZWVCU0Qub3JnL2NnaS9xdWVyeS1wci5jZ2k/cHI9MjA2NzEx IAo+IMKgIFJldmlld2VkIGJ5OiBraWIgCj4gwqAgTUZDIGFmdGVyOiAzIGRheXMgCj4KPiBNb2Rp ZmllZDogCj4gwqAgaGVhZC9zeXMvYW1kNjQvbGludXgzMi9saW51eDMyX3N5c3ZlYy5jIGh0dHBz Oi8vc3Zud2ViLkZyZWVCU0Qub3JnL2Jhc2UvaGVhZC9zeXMvYW1kNjQvbGludXgzMi9saW51eDMy X3N5c3ZlYyAKPiDCoCBoZWFkL3N5cy9jb21wYXQvbGludXgvbGludXhfY29tbW9uLmMgaHR0cHM6 Ly9zdm53ZWIuRnJlZUJTRC5vcmcvYmFzZS9oZWFkL3N5cy9jb21wYXQvbGludXgvbGludXhfY29t bW9uIAo+IMKgIGhlYWQvc3lzL2NvbXBhdC9saW51eC9saW51eF9pb2N0bC5jIGh0dHBzOi8vc3Zu d2ViLkZyZWVCU0Qub3JnL2Jhc2UvaGVhZC9zeXMvY29tcGF0L2xpbnV4L2xpbnV4X2lvY3RsIAo+ IMKgIGhlYWQvc3lzL2NvbXBhdC9saW51eC9saW51eF9pb2N0bC5oIGh0dHBzOi8vc3Zud2ViLkZy ZWVCU0Qub3JnL2Jhc2UvaGVhZC9zeXMvY29tcGF0L2xpbnV4L2xpbnV4X2lvY3RsIAo+Cj4gTW9k aWZpZWQ6IGhlYWQvc3lzL2FtZDY0L2xpbnV4MzIvbGludXgzMl9zeXN2ZWMuYyAKPiA9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0gCj4gLS0tIGhlYWQvc3lzL2FtZDY0L2xpbnV4MzIvbGludXgzMl9zeXN2 ZWMuYyBUdWUgTm92wqAgNiAxMjo1NzozOCAyMDE4IChyMzQwMTgwKSAKPiArKysgaGVhZC9zeXMv YW1kNjQvbGludXgzMi9saW51eDMyX3N5c3ZlYy5jIFR1ZSBOb3bCoCA2IDEzOjUxOjA4IDIwMTgg KHIzNDAxODEpIAo+IEBAIC0xMDcxLDcgKzEwNzEsNyBAQCBsaW51eF9lbGZfbW9kZXZlbnQobW9k dWxlX3QgbW9kLCBpbnQgdHlwZSwgdm9pZCAqZGF0YSkgCj4gZXJyb3IgPSBFSU5WQUw7IAo+IGlm IChlcnJvciA9PSAwKSB7IAo+IFNFVF9GT1JFQUNIKGxpaHAsIGxpbnV4X2lvY3RsX2hhbmRsZXJf c2V0KSAKPiAtIGxpbnV4X2lvY3RsX3JlZ2lzdGVyX2hhbmRsZXIoKmxpaHApOyAKPiArIGxpbnV4 MzJfaW9jdGxfcmVnaXN0ZXJfaGFuZGxlcigqbGlocCk7IAo+IExJU1RfSU5JVCgmZnV0ZXhfbGlz dCk7IAo+IG10eF9pbml0KCZmdXRleF9tdHgsICJmdGxsayIsIE5VTEwsIE1UWF9ERUYpOyAKPiBz dGNsb2h6ID0gKHN0YXRoeiA/IHN0YXRoeiA6IGh6KTsgCj4gQEAgLTEwOTMsNyArMTA5Myw3IEBA IGxpbnV4X2VsZl9tb2RldmVudChtb2R1bGVfdCBtb2QsIGludCB0eXBlLCB2b2lkICpkYXRhKSAK PiB9IAo+IGlmIChlcnJvciA9PSAwKSB7IAo+IFNFVF9GT1JFQUNIKGxpaHAsIGxpbnV4X2lvY3Rs X2hhbmRsZXJfc2V0KSAKPiAtIGxpbnV4X2lvY3RsX3VucmVnaXN0ZXJfaGFuZGxlcigqbGlocCk7 IAo+ICsgbGludXgzMl9pb2N0bF91bnJlZ2lzdGVyX2hhbmRsZXIoKmxpaHApOyAKPiBtdHhfZGVz dHJveSgmZnV0ZXhfbXR4KTsgCj4gaWYgKGJvb3R2ZXJib3NlKSAKPiBwcmludGYoIkxpbnV4IEVM RiBleGVjIGhhbmRsZXIgcmVtb3ZlZFxuIik7IAo+Cj4gTW9kaWZpZWQ6IGhlYWQvc3lzL2NvbXBh dC9saW51eC9saW51eF9jb21tb24uYyAKPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0gCj4gLS0tIGhl YWQvc3lzL2NvbXBhdC9saW51eC9saW51eF9jb21tb24uYyBUdWUgTm92wqAgNiAxMjo1NzozOCAy MDE4IChyMzQwMTgwKSAKPiArKysgaGVhZC9zeXMvY29tcGF0L2xpbnV4L2xpbnV4X2NvbW1vbi5j IFR1ZSBOb3bCoCA2IDEzOjUxOjA4IDIwMTggKHIzNDAxODEpIAo+IEBAIC0zNSw5ICszNSwxMSBA QCBfX0ZCU0RJRCgiJEZyZWVCU0QkIik7IAo+ICNpbmNsdWRlIDxzeXMva2VybmVsLmg+IAo+ICNp bmNsdWRlIDxzeXMvbWFsbG9jLmg+IAo+ICNpbmNsdWRlIDxzeXMvZXZlbnRoYW5kbGVyLmg+IAo+ ICsjaW5jbHVkZSA8c3lzL3N4Lmg+IAo+ICNpbmNsdWRlIDxzeXMvc3lzY3RsLmg+IAo+Cj4gI2lu Y2x1ZGUgPGNvbXBhdC9saW51eC9saW51eF9lbXVsLmg+IAo+ICsjaW5jbHVkZSA8Y29tcGF0L2xp bnV4L2xpbnV4X2lvY3RsLmg+IAo+ICNpbmNsdWRlIDxjb21wYXQvbGludXgvbGludXhfbWliLmg+ IAo+ICNpbmNsdWRlIDxjb21wYXQvbGludXgvbGludXhfdXRpbC5oPiAKPgo+IEBAIC00Nyw2ICs0 OSwxMSBAQCBGRUFUVVJFKGxpbnV4dWxhdG9yX3Y0bDIsICJWNEwyIGlvY3RsIHdyYXBwZXIgc3Vw cG9ydCAKPiBNT0RVTEVfVkVSU0lPTihsaW51eF9jb21tb24sIDEpOyAKPgo+IFNFVF9ERUNMQVJF KGxpbnV4X2RldmljZV9oYW5kbGVyX3NldCwgc3RydWN0IGxpbnV4X2RldmljZV9oYW5kbGVyKTsg Cj4gKyAKPiArVEFJTFFfSEVBRCgsIGxpbnV4X2lvY3RsX2hhbmRsZXJfZWxlbWVudCkgbGludXhf aW9jdGxfaGFuZGxlcnMgPSAKPiArwqDCoMKgIFRBSUxRX0hFQURfSU5JVElBTElaRVIobGludXhf aW9jdGxfaGFuZGxlcnMpOyAKPiArc3RydWN0IHN4IGxpbnV4X2lvY3RsX3N4OyAKPiArU1hfU1lT SU5JVChsaW51eF9pb2N0bCwgJmxpbnV4X2lvY3RsX3N4LCAiTGludXggaW9jdGwgaGFuZGxlcnMi KTsgCj4KPiBzdGF0aWMgZXZlbnRoYW5kbGVyX3RhZyBsaW51eF9leGVjX3RhZzsgCj4gc3RhdGlj IGV2ZW50aGFuZGxlcl90YWcgbGludXhfdGhyZWFkX2R0b3JfdGFnOyAKPgo+IE1vZGlmaWVkOiBo ZWFkL3N5cy9jb21wYXQvbGludXgvbGludXhfaW9jdGwuYyAKPiA9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0gCj4gLS0tIGhlYWQvc3lzL2NvbXBhdC9saW51eC9saW51eF9pb2N0bC5jIFR1ZSBOb3bCoCA2 IDEyOjU3OjM4IDIwMTggKHIzNDAxODApIAo+ICsrKyBoZWFkL3N5cy9jb21wYXQvbGludXgvbGlu dXhfaW9jdGwuYyBUdWUgTm92wqAgNiAxMzo1MTowOCAyMDE4IChyMzQwMTgxKSAKPiBAQCAtMTYx LDE3ICsxNjEsMTkgQEAgREFUQV9TRVQobGludXhfaW9jdGxfaGFuZGxlcl9zZXQsIHZpZGVvMl9o YW5kbGVyKTsgCj4gREFUQV9TRVQobGludXhfaW9jdGxfaGFuZGxlcl9zZXQsIGZic2RfdXNiKTsg Cj4gREFUQV9TRVQobGludXhfaW9jdGxfaGFuZGxlcl9zZXQsIGV2ZGV2X2hhbmRsZXIpOyAKPgo+ IC1zdHJ1Y3QgaGFuZGxlcl9lbGVtZW50IAo+IC17IAo+IC0gVEFJTFFfRU5UUlkoaGFuZGxlcl9l bGVtZW50KSBsaXN0OyAKPiAtIGludCAoKmZ1bmMpKHN0cnVjdCB0aHJlYWQgKiwgc3RydWN0IGxp bnV4X2lvY3RsX2FyZ3MgKik7IAo+IC0gaW50IGxvdywgaGlnaCwgc3BhbjsgCj4gLX07IAo+IC0g Cj4gLXN0YXRpYyBUQUlMUV9IRUFEKCwgaGFuZGxlcl9lbGVtZW50KSBoYW5kbGVycyA9IAo+IC3C oMKgwqAgVEFJTFFfSEVBRF9JTklUSUFMSVpFUihoYW5kbGVycyk7IAo+ICsjaWZkZWYgX19pMzg2 X18gCj4gK3N0YXRpYyBUQUlMUV9IRUFEKCwgbGludXhfaW9jdGxfaGFuZGxlcl9lbGVtZW50KSBs aW51eF9pb2N0bF9oYW5kbGVycyA9IAo+ICvCoMKgwqAgVEFJTFFfSEVBRF9JTklUSUFMSVpFUihs aW51eF9pb2N0bF9oYW5kbGVycyk7IAo+IHN0YXRpYyBzdHJ1Y3Qgc3ggbGludXhfaW9jdGxfc3g7 IAo+IFNYX1NZU0lOSVQobGludXhfaW9jdGwsICZsaW51eF9pb2N0bF9zeCwgIkxpbnV4IGlvY3Rs IGhhbmRsZXJzIik7IAo+ICsjZWxzZSAKPiArZXh0ZXJuIFRBSUxRX0hFQUQoLCBsaW51eF9pb2N0 bF9oYW5kbGVyX2VsZW1lbnQpIGxpbnV4X2lvY3RsX2hhbmRsZXJzOyAKPiArZXh0ZXJuIHN0cnVj dCBzeCBsaW51eF9pb2N0bF9zeDsgCj4gKyNlbmRpZiAKPiArI2lmZGVmIENPTVBBVF9MSU5VWDMy IAo+ICtzdGF0aWMgVEFJTFFfSEVBRCgsIGxpbnV4X2lvY3RsX2hhbmRsZXJfZWxlbWVudCkgbGlu dXgzMl9pb2N0bF9oYW5kbGVycyA9IAo+ICvCoMKgwqAgVEFJTFFfSEVBRF9JTklUSUFMSVpFUihs aW51eDMyX2lvY3RsX2hhbmRsZXJzKTsgCj4gKyNlbmRpZiAKPgo+IC8qIAo+IMKgICogaGRpbyBy ZWxhdGVkIGlvY3RscyBmb3IgVk1XYXJlIHN1cHBvcnQgCj4gQEAgLTM2ODQsNyArMzY4Niw3IEBA IGludCAKPiBsaW51eF9pb2N0bChzdHJ1Y3QgdGhyZWFkICp0ZCwgc3RydWN0IGxpbnV4X2lvY3Rs X2FyZ3MgKmFyZ3MpIAo+IHsgCj4gc3RydWN0IGZpbGUgKmZwOyAKPiAtIHN0cnVjdCBoYW5kbGVy X2VsZW1lbnQgKmhlOyAKPiArIHN0cnVjdCBsaW51eF9pb2N0bF9oYW5kbGVyX2VsZW1lbnQgKmhl OyAKPiBpbnQgZXJyb3IsIGNtZDsgCj4KPiAjaWZkZWYgREVCVUcgCj4gQEAgLTM3MDUsNyArMzcw Nyw4IEBAIGxpbnV4X2lvY3RsKHN0cnVjdCB0aHJlYWQgKnRkLCBzdHJ1Y3QgbGludXhfaW9jdGxf YXJncyAKPiBjbWQgPSBhcmdzLT5jbWQgJiAweGZmZmY7IAo+IHN4X3Nsb2NrKCZsaW51eF9pb2N0 bF9zeCk7IAo+IG10eF9sb2NrKCZHaWFudCk7IAo+IC0gVEFJTFFfRk9SRUFDSChoZSwgJmhhbmRs ZXJzLCBsaXN0KSB7IAo+ICsjaWZkZWYgQ09NUEFUX0xJTlVYMzIgCj4gKyBUQUlMUV9GT1JFQUNI KGhlLCAmbGludXgzMl9pb2N0bF9oYW5kbGVycywgbGlzdCkgeyAKPiBpZiAoY21kID49IGhlLT5s b3cgJiYgY21kIDw9IGhlLT5oaWdoKSB7IAo+IGVycm9yID0gKCpoZS0+ZnVuYykodGQsIGFyZ3Mp OyAKPiBpZiAoZXJyb3IgIT0gRU5PSU9DVEwpIHsgCj4gQEAgLTM3MTYsNiArMzcxOSwxOCBAQCBs aW51eF9pb2N0bChzdHJ1Y3QgdGhyZWFkICp0ZCwgc3RydWN0IGxpbnV4X2lvY3RsX2FyZ3MgCj4g fSAKPiB9IAo+IH0gCj4gKyNlbmRpZiAKPiArIFRBSUxRX0ZPUkVBQ0goaGUsICZsaW51eF9pb2N0 bF9oYW5kbGVycywgbGlzdCkgeyAKPiArIGlmIChjbWQgPj0gaGUtPmxvdyAmJiBjbWQgPD0gaGUt PmhpZ2gpIHsgCj4gKyBlcnJvciA9ICgqaGUtPmZ1bmMpKHRkLCBhcmdzKTsgCj4gKyBpZiAoZXJy b3IgIT0gRU5PSU9DVEwpIHsgCj4gKyBtdHhfdW5sb2NrKCZHaWFudCk7IAo+ICsgc3hfc3VubG9j aygmbGludXhfaW9jdGxfc3gpOyAKPiArIGZkcm9wKGZwLCB0ZCk7IAo+ICsgcmV0dXJuIChlcnJv cik7IAo+ICsgfSAKPiArIH0gCj4gKyB9IAo+IG10eF91bmxvY2soJkdpYW50KTsgCj4gc3hfc3Vu bG9jaygmbGludXhfaW9jdGxfc3gpOyAKPiBmZHJvcChmcCwgdGQpOyAKPiBAQCAtMzczNyw3ICsz NzUyLDcgQEAgbGludXhfaW9jdGwoc3RydWN0IHRocmVhZCAqdGQsIHN0cnVjdCBsaW51eF9pb2N0 bF9hcmdzIAo+IGludCAKPiBsaW51eF9pb2N0bF9yZWdpc3Rlcl9oYW5kbGVyKHN0cnVjdCBsaW51 eF9pb2N0bF9oYW5kbGVyICpoKSAKPiB7IAo+IC0gc3RydWN0IGhhbmRsZXJfZWxlbWVudCAqaGUs ICpjdXI7IAo+ICsgc3RydWN0IGxpbnV4X2lvY3RsX2hhbmRsZXJfZWxlbWVudCAqaGUsICpjdXI7 IAo+Cj4gaWYgKGggPT0gTlVMTCB8fCBoLT5mdW5jID09IE5VTEwpIAo+IHJldHVybiAoRUlOVkFM KTsgCj4gQEAgLTM3NDcsNyArMzc2Miw3IEBAIGxpbnV4X2lvY3RsX3JlZ2lzdGVyX2hhbmRsZXIo c3RydWN0IGxpbnV4X2lvY3RsX2hhbmRsZSAKPiAqIGNyZWF0ZSBhIG5ldyBlbGVtZW50LiAKPiAq LyAKPiBzeF94bG9jaygmbGludXhfaW9jdGxfc3gpOyAKPiAtIFRBSUxRX0ZPUkVBQ0goaGUsICZo YW5kbGVycywgbGlzdCkgeyAKPiArIFRBSUxRX0ZPUkVBQ0goaGUsICZsaW51eF9pb2N0bF9oYW5k bGVycywgbGlzdCkgeyAKPiBpZiAoaGUtPmZ1bmMgPT0gaC0+ZnVuYykgCj4gYnJlYWs7IAo+IH0g Cj4gQEAgLTM3NTYsNyArMzc3MSw3IEBAIGxpbnV4X2lvY3RsX3JlZ2lzdGVyX2hhbmRsZXIoc3Ry dWN0IGxpbnV4X2lvY3RsX2hhbmRsZSAKPiDCoMKgwqAgTV9MSU5VWCwgTV9XQUlUT0spOyAKPiBo ZS0+ZnVuYyA9IGgtPmZ1bmM7IAo+IH0gZWxzZSAKPiAtIFRBSUxRX1JFTU9WRSgmaGFuZGxlcnMs IGhlLCBsaXN0KTsgCj4gKyBUQUlMUV9SRU1PVkUoJmxpbnV4X2lvY3RsX2hhbmRsZXJzLCBoZSwg bGlzdCk7IAo+Cj4gLyogSW5pdGlhbGl6ZSByYW5nZSBpbmZvcm1hdGlvbi4gKi8gCj4gaGUtPmxv dyA9IGgtPmxvdzsgCj4gQEAgLTM3NjQsMTQgKzM3NzksMTQgQEAgbGludXhfaW9jdGxfcmVnaXN0 ZXJfaGFuZGxlcihzdHJ1Y3QgbGludXhfaW9jdGxfaGFuZGxlIAo+IGhlLT5zcGFuID0gaC0+aGln aCAtIGgtPmxvdyArIDE7IAo+Cj4gLyogQWRkIHRoZSBlbGVtZW50IHRvIHRoZSBsaXN0LCBzb3J0 ZWQgb24gc3Bhbi4gKi8gCj4gLSBUQUlMUV9GT1JFQUNIKGN1ciwgJmhhbmRsZXJzLCBsaXN0KSB7 IAo+ICsgVEFJTFFfRk9SRUFDSChjdXIsICZsaW51eF9pb2N0bF9oYW5kbGVycywgbGlzdCkgeyAK PiBpZiAoY3VyLT5zcGFuID4gaGUtPnNwYW4pIHsgCj4gVEFJTFFfSU5TRVJUX0JFRk9SRShjdXIs IGhlLCBsaXN0KTsgCj4gc3hfeHVubG9jaygmbGludXhfaW9jdGxfc3gpOyAKPiByZXR1cm4gKDAp OyAKPiB9IAo+IH0gCj4gLSBUQUlMUV9JTlNFUlRfVEFJTCgmaGFuZGxlcnMsIGhlLCBsaXN0KTsg Cj4gKyBUQUlMUV9JTlNFUlRfVEFJTCgmbGludXhfaW9jdGxfaGFuZGxlcnMsIGhlLCBsaXN0KTsg Cj4gc3hfeHVubG9jaygmbGludXhfaW9jdGxfc3gpOyAKPgo+IHJldHVybiAoMCk7IAo+IEBAIC0z NzgwLDE1ICszNzk1LDE1IEBAIGxpbnV4X2lvY3RsX3JlZ2lzdGVyX2hhbmRsZXIoc3RydWN0IGxp bnV4X2lvY3RsX2hhbmRsZSAKPiBpbnQgCj4gbGludXhfaW9jdGxfdW5yZWdpc3Rlcl9oYW5kbGVy KHN0cnVjdCBsaW51eF9pb2N0bF9oYW5kbGVyICpoKSAKPiB7IAo+IC0gc3RydWN0IGhhbmRsZXJf ZWxlbWVudCAqaGU7IAo+ICsgc3RydWN0IGxpbnV4X2lvY3RsX2hhbmRsZXJfZWxlbWVudCAqaGU7 IAo+Cj4gaWYgKGggPT0gTlVMTCB8fCBoLT5mdW5jID09IE5VTEwpIAo+IHJldHVybiAoRUlOVkFM KTsgCj4KPiBzeF94bG9jaygmbGludXhfaW9jdGxfc3gpOyAKPiAtIFRBSUxRX0ZPUkVBQ0goaGUs ICZoYW5kbGVycywgbGlzdCkgeyAKPiArIFRBSUxRX0ZPUkVBQ0goaGUsICZsaW51eF9pb2N0bF9o YW5kbGVycywgbGlzdCkgeyAKPiBpZiAoaGUtPmZ1bmMgPT0gaC0+ZnVuYykgeyAKPiAtIFRBSUxR X1JFTU9WRSgmaGFuZGxlcnMsIGhlLCBsaXN0KTsgCj4gKyBUQUlMUV9SRU1PVkUoJmxpbnV4X2lv Y3RsX2hhbmRsZXJzLCBoZSwgbGlzdCk7IAo+IHN4X3h1bmxvY2soJmxpbnV4X2lvY3RsX3N4KTsg Cj4gZnJlZShoZSwgTV9MSU5VWCk7IAo+IHJldHVybiAoMCk7IAo+IEBAIC0zNzk4LDMgKzM4MTMs NjkgQEAgbGludXhfaW9jdGxfdW5yZWdpc3Rlcl9oYW5kbGVyKHN0cnVjdCBsaW51eF9pb2N0bF9o YW5kIAo+Cj4gcmV0dXJuIChFSU5WQUwpOyAKPiB9IAo+ICsgCj4gKyNpZmRlZiBDT01QQVRfTElO VVgzMiAKPiAraW50IAo+ICtsaW51eDMyX2lvY3RsX3JlZ2lzdGVyX2hhbmRsZXIoc3RydWN0IGxp bnV4X2lvY3RsX2hhbmRsZXIgKmgpIAo+ICt7IAo+ICsgc3RydWN0IGxpbnV4X2lvY3RsX2hhbmRs ZXJfZWxlbWVudCAqaGUsICpjdXI7IAo+ICsgCj4gKyBpZiAoaCA9PSBOVUxMIHx8IGgtPmZ1bmMg PT0gTlVMTCkgCj4gKyByZXR1cm4gKEVJTlZBTCk7IAo+ICsgCj4gKyAvKiAKPiArICogUmV1c2Ug dGhlIGVsZW1lbnQgaWYgdGhlIGhhbmRsZXIgaXMgYWxyZWFkeSBvbiB0aGUgbGlzdCwgb3RoZXJ3 aXNlIAo+ICsgKiBjcmVhdGUgYSBuZXcgZWxlbWVudC4gCj4gKyAqLyAKPiArIHN4X3hsb2NrKCZs aW51eF9pb2N0bF9zeCk7IAo+ICsgVEFJTFFfRk9SRUFDSChoZSwgJmxpbnV4MzJfaW9jdGxfaGFu ZGxlcnMsIGxpc3QpIHsgCj4gKyBpZiAoaGUtPmZ1bmMgPT0gaC0+ZnVuYykgCj4gKyBicmVhazsg Cj4gKyB9IAo+ICsgaWYgKGhlID09IE5VTEwpIHsgCj4gKyBoZSA9IG1hbGxvYyhzaXplb2YoKmhl KSwgTV9MSU5VWCwgTV9XQUlUT0spOyAKPiArIGhlLT5mdW5jID0gaC0+ZnVuYzsgCj4gKyB9IGVs c2UgCj4gKyBUQUlMUV9SRU1PVkUoJmxpbnV4MzJfaW9jdGxfaGFuZGxlcnMsIGhlLCBsaXN0KTsg Cj4gKyAKPiArIC8qIEluaXRpYWxpemUgcmFuZ2UgaW5mb3JtYXRpb24uICovIAo+ICsgaGUtPmxv dyA9IGgtPmxvdzsgCj4gKyBoZS0+aGlnaCA9IGgtPmhpZ2g7IAo+ICsgaGUtPnNwYW4gPSBoLT5o aWdoIC0gaC0+bG93ICsgMTsgCj4gKyAKPiArIC8qIEFkZCB0aGUgZWxlbWVudCB0byB0aGUgbGlz dCwgc29ydGVkIG9uIHNwYW4uICovIAo+ICsgVEFJTFFfRk9SRUFDSChjdXIsICZsaW51eDMyX2lv Y3RsX2hhbmRsZXJzLCBsaXN0KSB7IAo+ICsgaWYgKGN1ci0+c3BhbiA+IGhlLT5zcGFuKSB7IAo+ ICsgVEFJTFFfSU5TRVJUX0JFRk9SRShjdXIsIGhlLCBsaXN0KTsgCj4gKyBzeF94dW5sb2NrKCZs aW51eF9pb2N0bF9zeCk7IAo+ICsgcmV0dXJuICgwKTsgCj4gKyB9IAo+ICsgfSAKPiArIFRBSUxR X0lOU0VSVF9UQUlMKCZsaW51eDMyX2lvY3RsX2hhbmRsZXJzLCBoZSwgbGlzdCk7IAo+ICsgc3hf eHVubG9jaygmbGludXhfaW9jdGxfc3gpOyAKPiArIAo+ICsgcmV0dXJuICgwKTsgCj4gK30gCj4g KyAKPiAraW50IAo+ICtsaW51eDMyX2lvY3RsX3VucmVnaXN0ZXJfaGFuZGxlcihzdHJ1Y3QgbGlu dXhfaW9jdGxfaGFuZGxlciAqaCkgCj4gK3sgCj4gKyBzdHJ1Y3QgbGludXhfaW9jdGxfaGFuZGxl cl9lbGVtZW50ICpoZTsgCj4gKyAKPiArIGlmIChoID09IE5VTEwgfHwgaC0+ZnVuYyA9PSBOVUxM KSAKPiArIHJldHVybiAoRUlOVkFMKTsgCj4gKyAKPiArIHN4X3hsb2NrKCZsaW51eF9pb2N0bF9z eCk7IAo+ICsgVEFJTFFfRk9SRUFDSChoZSwgJmxpbnV4MzJfaW9jdGxfaGFuZGxlcnMsIGxpc3Qp IHsgCj4gKyBpZiAoaGUtPmZ1bmMgPT0gaC0+ZnVuYykgeyAKPiArIFRBSUxRX1JFTU9WRSgmbGlu dXgzMl9pb2N0bF9oYW5kbGVycywgaGUsIGxpc3QpOyAKPiArIHN4X3h1bmxvY2soJmxpbnV4X2lv Y3RsX3N4KTsgCj4gKyBmcmVlKGhlLCBNX0xJTlVYKTsgCj4gKyByZXR1cm4gKDApOyAKPiArIH0g Cj4gKyB9IAo+ICsgc3hfeHVubG9jaygmbGludXhfaW9jdGxfc3gpOyAKPiArIAo+ICsgcmV0dXJu IChFSU5WQUwpOyAKPiArfSAKPiArI2VuZGlmIAo+Cj4gTW9kaWZpZWQ6IGhlYWQvc3lzL2NvbXBh dC9saW51eC9saW51eF9pb2N0bC5oIAo+ID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSAKPiAtLS0gaGVh ZC9zeXMvY29tcGF0L2xpbnV4L2xpbnV4X2lvY3RsLmggVHVlIE5vdsKgIDYgMTI6NTc6MzggMjAx OCAocjM0MDE4MCkgCj4gKysrIGhlYWQvc3lzL2NvbXBhdC9saW51eC9saW51eF9pb2N0bC5oIFR1 ZSBOb3bCoCA2IDEzOjUxOjA4IDIwMTggKHIzNDAxODEpIAo+IEBAIC03NzAsNyArNzcwLDE4IEBA IHN0cnVjdCBsaW51eF9pb2N0bF9oYW5kbGVyIHsgCj4gaW50IGxvdywgaGlnaDsgCj4gfTsgCj4K PiArc3RydWN0IGxpbnV4X2lvY3RsX2hhbmRsZXJfZWxlbWVudCAKPiAreyAKPiArIFRBSUxRX0VO VFJZKGxpbnV4X2lvY3RsX2hhbmRsZXJfZWxlbWVudCkgbGlzdDsgCj4gKyBpbnQgKCpmdW5jKShz dHJ1Y3QgdGhyZWFkICosIHN0cnVjdCBsaW51eF9pb2N0bF9hcmdzICopOyAKPiArIGludCBsb3cs IGhpZ2gsIHNwYW47IAo+ICt9OyAKPiArIAo+IGludCBsaW51eF9pb2N0bF9yZWdpc3Rlcl9oYW5k bGVyKHN0cnVjdCBsaW51eF9pb2N0bF9oYW5kbGVyICpoKTsgCj4gaW50IGxpbnV4X2lvY3RsX3Vu cmVnaXN0ZXJfaGFuZGxlcihzdHJ1Y3QgbGludXhfaW9jdGxfaGFuZGxlciAqaCk7IAo+ICsjaWZk ZWYgQ09NUEFUX0xJTlVYMzIgCj4gK2ludCBsaW51eDMyX2lvY3RsX3JlZ2lzdGVyX2hhbmRsZXIo c3RydWN0IGxpbnV4X2lvY3RsX2hhbmRsZXIgKmgpOyAKPiAraW50IGxpbnV4MzJfaW9jdGxfdW5y ZWdpc3Rlcl9oYW5kbGVyKHN0cnVjdCBsaW51eF9pb2N0bF9oYW5kbGVyICpoKTsgCj4gKyNlbmRp ZiAKPgo+ICNlbmRpZiAvKiAhX0xJTlVYX0lPQ1RMX0hfICovIAo+Cg== From owner-svn-src-head@freebsd.org Tue Nov 6 15:29:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 58F6111276F6; Tue, 6 Nov 2018 15:29:45 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B551F7BEC7; Tue, 6 Nov 2018 15:29:44 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 88CB8786; Tue, 6 Nov 2018 15:29:44 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6FTiFH002252; Tue, 6 Nov 2018 15:29:44 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6FTihs002251; Tue, 6 Nov 2018 15:29:44 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201811061529.wA6FTihs002251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans <tijl@FreeBSD.org> Date: Tue, 6 Nov 2018 15:29:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340185 - head/sys/amd64/linux32 X-SVN-Group: head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/sys/amd64/linux32 X-SVN-Commit-Revision: 340185 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B551F7BEC7 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 15:29:45 -0000 Author: tijl Date: Tue Nov 6 15:29:44 2018 New Revision: 340185 URL: https://svnweb.freebsd.org/changeset/base/340185 Log: Fix builds with COMPAT_LINUX32 in the kernel config. MFC after: 3 days Modified: head/sys/amd64/linux32/linux32_sysvec.c Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Tue Nov 6 14:22:44 2018 (r340184) +++ head/sys/amd64/linux32/linux32_sysvec.c Tue Nov 6 15:29:44 2018 (r340185) @@ -32,6 +32,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); From owner-svn-src-head@freebsd.org Tue Nov 6 15:31:51 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C597A11278DF for <svn-src-head@mailman.ysv.freebsd.org>; Tue, 6 Nov 2018 15:31:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it1-x132.google.com (mail-it1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 331447C13C for <svn-src-head@freebsd.org>; Tue, 6 Nov 2018 15:31:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it1-x132.google.com with SMTP id h13so18395307itl.1 for <svn-src-head@freebsd.org>; Tue, 06 Nov 2018 07:31:51 -0800 (PST) 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=WnMAcSs2WliyzC16J117mbmLuLmjlOWKjUcDugXxjG4=; b=iohL8uz3tlgazb2+1IJa6XMLMXgPq4GpJIN/6qjo0vAd23v00y8OBG1hsAJUcWRJ2W iVjWzEs/cvtgL+rnLh/Re9+OVyaul8r5YLh7TApsMLYOwOspJQ3lmEbJvkLP7CYYk4yi rhVB+ixpEdhIrhjnet/sIxgzgFvyigkOwfJR4TiFGR9ikx8VagD1hQ/0vLw8RQD+wPrs Fbq8Un65YpHJhgnPaybAlWj+vU2hhN/fnZAqk944fqzd8LI9maqq/TxsX271+xcYoS35 6NlV50fJzk2BT5ZZS4GOmDILhjkKscRh9PxsxxPxVtm3x0/ZSdBP+y5+8hi3qkQ9FuqE butw== 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=WnMAcSs2WliyzC16J117mbmLuLmjlOWKjUcDugXxjG4=; b=cMBTb+3v++Dizbw0imlUx/k68J7w3VOBnNh+1Q7aLbOCrX0q1lV324fYG/aYbNL2SM +9H0ilVTecjL6tozIMZAnfppOPNJZJtCkkB903tZHLVjyFziEitr4hlPIoMtlYWaBMgK xQV296y7zyqYkmh5Uk0M4wUKk2NTBY/dPfH/aVoQusujdMxT598FnkAE4xL9Z9Eq7owI A6522SY4M0nIq7npHrFV4/OiEct6eDiFkCyMHQGxc27OM+czgXJjurAConX/fOKhOabA KNwrJNnavkYzOervk+WG6B4vq2uDBO7U7yqkQXsggTtTSuN4i/e7Hgw01g6zL1qSef2V 9sRw== X-Gm-Message-State: AGRZ1gLvQutDqg7Qw7PFr+ltUY+BEMB0O+kIrrPp7phZePFOu19kokE7 O9dOWh4iD3/CCnnoL2mDpKW77DR7VUbqxm9eIAVoxw== X-Google-Smtp-Source: AJdET5d0O0/5DH6bVMDKsyIBpn3sGwzqCpiVdGLxBteuawTMaKh2/7qxsMEwO7usuJ/oT2S/u8yCZ7vWxhU6yBbW6gs= X-Received: by 2002:a02:31d:: with SMTP id y29-v6mr25148239jad.98.1541518310098; Tue, 06 Nov 2018 07:31:50 -0800 (PST) MIME-Version: 1.0 References: <201811060936.wA69axn1021853@repo.freebsd.org> In-Reply-To: <201811060936.wA69axn1021853@repo.freebsd.org> From: Warner Losh <imp@bsdimp.com> Date: Tue, 6 Nov 2018 08:31:38 -0700 Message-ID: <CANCZdfrLv2zY021eTvgqp_y0pfk-yfVdDFGiG9qzcjxh-bbCvw@mail.gmail.com> Subject: Re: svn commit: r340176 - head To: Alex Richardson <arichardson@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 331447C13C X-Spamd-Result: default: False [-3.30 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.981,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.989,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT1.aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[2.3.1.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.81)[-0.806,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.52)[ipnet: 2607:f8b0::/32(-1.15), asn: 15169(-1.36), country: US(-0.08)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 15:31:52 -0000 On Tue, Nov 6, 2018 at 2:37 AM Alex Richardson <arichardson@freebsd.org> wrote: > Author: arichardson > Date: Tue Nov 6 09:36:59 2018 > New Revision: 340176 > URL: https://svnweb.freebsd.org/changeset/base/340176 > > Log: > Remove btxld from symlinked host tools > > It is only present on amd64/i386 systems which breaks buildworld on > other hosts. In fact there is no need to add it to the bootstrap tools > list since it is already included in the cross-tools phase. > However, for cross-tools it was only built if the host and target > architecture didn't match. After this change it is also built when we > are builtin with a strict $PATH. > > Reported By: mmel > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > > ============================================================================== > --- head/Makefile.inc1 Tue Nov 6 07:41:32 2018 (r340175) > +++ head/Makefile.inc1 Tue Nov 6 09:36:59 2018 (r340176) > @@ -2204,7 +2204,6 @@ _basic_bootstrap_tools+=usr.bin/unifdef > .endif > > .if ${MK_BOOT} != "no" > -_basic_bootstrap_tools+=usr.sbin/btxld > _basic_bootstrap_tools+=bin/dd > # xz/unxz is used by EFI > _basic_bootstrap_tools_multilink+=usr.bin/xz xz,unxz > @@ -2375,7 +2374,7 @@ kernel-tools: .PHONY > # we get done with the earlier stages. It is the last set of tools needed > # to begin building the target binaries. > # > -.if ${TARGET_ARCH} != ${MACHINE_ARCH} > +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BUILD_WITH_STRICT_TMPPATH} != 0 > I've often wondered if we shouldn't just always build this when the target is x86, in which case this line can go away. There's no real savings here in terms of build time, and this special case has always rubbed me the wrong way. Warner > .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" > _btxld= usr.sbin/btxld > .endif > > From owner-svn-src-head@freebsd.org Tue Nov 6 15:52:51 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 BDC2F1128333; Tue, 6 Nov 2018 15:52:51 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3EA7D142; Tue, 6 Nov 2018 15:52:51 +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 29C9FC64; Tue, 6 Nov 2018 15:52:51 +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 wA6FqpC3017593; Tue, 6 Nov 2018 15:52:51 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6FqoCM017589; Tue, 6 Nov 2018 15:52:50 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811061552.wA6FqoCM017589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Tue, 6 Nov 2018 15:52:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340186 - in head: share/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: share/mk tools/build/options X-SVN-Commit-Revision: 340186 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C3EA7D142 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.988,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 15:52:52 -0000 Author: emaste Date: Tue Nov 6 15:52:49 2018 New Revision: 340186 URL: https://svnweb.freebsd.org/changeset/base/340186 Log: Add a WITH_BIND_NOW build knob The linker's -z now flag sets the DF_BIND_NOW flag, which signals to the runtime loader that all relocation processing should be performed at process startup rather than on demand. In combination with lld's default of enabling relro this causes the GOT to be made read-only when the process starts, preventing straightforward GOT overwrite attacks. Shawn Webb discovered a failure on HardenedBSD with BIND_NOW and ifunc use, which resulted in my rtld fix in r340137. Add a BIND_NOW knob as it is trivial to do so and is a useful ELF hardening feature. This change is equivalent to HardenedBSD's but not identical as there are other diffs/conflicts nearby. Note that our ELF Tool Chain readelf does not currently decode the DF_BIND_NOW flag - see PR232983. Reviewed by: brooks MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17846 Added: head/tools/build/options/WITHOUT_BIND_NOW (contents, props changed) head/tools/build/options/WITH_BIND_NOW (contents, props changed) Modified: head/share/mk/bsd.lib.mk head/share/mk/bsd.opts.mk head/share/mk/bsd.prog.mk Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Tue Nov 6 15:29:44 2018 (r340185) +++ head/share/mk/bsd.lib.mk Tue Nov 6 15:52:49 2018 (r340186) @@ -69,6 +69,10 @@ TAGS+= package=${PACKAGE:Uruntime} TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} .endif +# ELF hardening knobs +.if ${MK_BIND_NOW} != "no" +LDFLAGS+= -Wl,-znow +.endif .if ${MK_RETPOLINE} != "no" CFLAGS+= -mretpoline CXXFLAGS+= -mretpoline Modified: head/share/mk/bsd.opts.mk ============================================================================== --- head/share/mk/bsd.opts.mk Tue Nov 6 15:29:44 2018 (r340185) +++ head/share/mk/bsd.opts.mk Tue Nov 6 15:52:49 2018 (r340186) @@ -69,6 +69,7 @@ __DEFAULT_YES_OPTIONS = \ WARNS __DEFAULT_NO_OPTIONS = \ + BIND_NOW \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ Modified: head/share/mk/bsd.prog.mk ============================================================================== --- head/share/mk/bsd.prog.mk Tue Nov 6 15:29:44 2018 (r340185) +++ head/share/mk/bsd.prog.mk Tue Nov 6 15:52:49 2018 (r340186) @@ -34,6 +34,10 @@ PROG= ${PROG_CXX} MK_DEBUG_FILES= no .endif +# ELF hardening knobs +.if ${MK_BIND_NOW} != "no" +LDFLAGS+= -Wl,-znow +.endif .if ${MK_RETPOLINE} != "no" CFLAGS+= -mretpoline CXXFLAGS+= -mretpoline Added: head/tools/build/options/WITHOUT_BIND_NOW ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_BIND_NOW Tue Nov 6 15:52:49 2018 (r340186) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Do not build all binaries with the +.Dv DF_BIND_NOW +flag set. +Run-time relocation processing will be performed on demand. Added: head/tools/build/options/WITH_BIND_NOW ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_BIND_NOW Tue Nov 6 15:52:49 2018 (r340186) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Build all binaries with the +.Dv DF_BIND_NOW +flag set to indicate that the run-time loader should perform all relocation +processing at process startup rather than on demand. From owner-svn-src-head@freebsd.org Tue Nov 6 15:55:42 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B811211283D0; Tue, 6 Nov 2018 15:55:42 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45E577D31C; Tue, 6 Nov 2018 15:55:42 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 22E9FC7C; Tue, 6 Nov 2018 15:55:42 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6FtfMB017784; Tue, 6 Nov 2018 15:55:41 GMT (envelope-from sobomax@FreeBSD.org) Received: (from sobomax@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6FtfiT017783; Tue, 6 Nov 2018 15:55:41 GMT (envelope-from sobomax@FreeBSD.org) Message-Id: <201811061555.wA6FtfiT017783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sobomax set sender to sobomax@FreeBSD.org using -f From: Maxim Sobolev <sobomax@FreeBSD.org> Date: Tue, 6 Nov 2018 15:55:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340187 - head/sys/geom X-SVN-Group: head X-SVN-Commit-Author: sobomax X-SVN-Commit-Paths: head/sys/geom X-SVN-Commit-Revision: 340187 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 45E577D31C X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 15:55:42 -0000 Author: sobomax Date: Tue Nov 6 15:55:41 2018 New Revision: 340187 URL: https://svnweb.freebsd.org/changeset/base/340187 Log: Don't allow BIO_READ, BIO_WRITE or BIO_DELETE requests that are fully beyond the end of providers media. The only exception is made for the zero length transfers which are allowed to be just on the boundary. Previously, any requests starting on the boundary (i.e. next byte after the last one) have been allowed to go through. No response from: freebsd-geom@, phk MFC after: 1 month Modified: head/sys/geom/geom_io.c Modified: head/sys/geom/geom_io.c ============================================================================== --- head/sys/geom/geom_io.c Tue Nov 6 15:52:49 2018 (r340186) +++ head/sys/geom/geom_io.c Tue Nov 6 15:55:41 2018 (r340187) @@ -420,6 +420,8 @@ g_io_check(struct bio *bp) return (EIO); if (bp->bio_offset > pp->mediasize) return (EIO); + if (bp->bio_offset == pp->mediasize && bp->bio_length > 0) + return (EIO); /* Truncate requests to the end of providers media. */ excess = bp->bio_offset + bp->bio_length; From owner-svn-src-head@freebsd.org Tue Nov 6 15:57:19 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 96C251128462; Tue, 6 Nov 2018 15:57: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A5D977D49F; Tue, 6 Nov 2018 15:57:17 +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 86FF3C7E; Tue, 6 Nov 2018 15:57:17 +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 wA6FvHY0017887; Tue, 6 Nov 2018 15:57:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6FvHCD017886; Tue, 6 Nov 2018 15:57:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811061557.wA6FvHCD017886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Tue, 6 Nov 2018 15:57:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340188 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 340188 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A5D977D49F X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 15:57:19 -0000 Author: emaste Date: Tue Nov 6 15:57:17 2018 New Revision: 340188 URL: https://svnweb.freebsd.org/changeset/base/340188 Log: Regen src.conf.5 after r340186 Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Tue Nov 6 15:55:41 2018 (r340187) +++ head/share/man/man5/src.conf.5 Tue Nov 6 15:57:17 2018 (r340188) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd November 5, 2018 +.Dd November 6, 2018 .Dt SRC.CONF 5 .Os .Sh NAME @@ -143,6 +143,11 @@ Set to not build or install associated utilities, and examples. .Pp This option only affects amd64/amd64. +.It Va WITH_BIND_NOW +Build all binaries with the +.Dv DF_BIND_NOW +flag set to indicate that the run-time loader should perform all relocation +processing at process startup rather than on demand. .It Va WITHOUT_BINUTILS Set to not build or install binutils (as, ld, and objdump) as part of the normal system build. From owner-svn-src-head@freebsd.org Tue Nov 6 16:05:09 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B932711287D6; Tue, 6 Nov 2018 16:05:08 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay108.isp.belgacom.be (mailrelay108.isp.belgacom.be [195.238.20.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign Organization Validation CA - SHA256 - G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A020A7DA5A; Tue, 6 Nov 2018 16:05:07 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AlHh03RYrFPOYXyX+hw6UMpf/LSx+4OfEezUN45?= =?us-ascii?q?9isYplN5qZoMS7bnLW6fgltlLVR4KTs6sC17KJ9fi4EUU7or+5+EgYd5JNUx?= =?us-ascii?q?JXwe43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6arXK99yMdFQ?= =?us-ascii?q?viPgRpOOv1BpTSj8Oq3Oyu5pHfeQpFiCa/bL9oMBm6sRjau9ULj4dlNqs/0A?= =?us-ascii?q?bCrGFSe+RRy2NoJFaTkAj568yt4pNt8Dletuw4+cJYXqr0Y6o3TbpDDDQ7KG?= =?us-ascii?q?81/9HktQPCTQSU+HQRVHgdnwdSDAjE6BH6WYrxsjf/u+Fg1iSWIdH6QLYpUj?= =?us-ascii?q?m58axlVAHnhzsGNz4h8WHYlMpwjL5AoBm8oxBz2pPYbJ2JOPZ7eK7WYNEUSn?= =?us-ascii?q?dbXstJWSJPAp2yYZYMAeUDM+ZXoJXyqVQVoBuiBwSgGP/jxiNUinPo26Axzu?= =?us-ascii?q?QvERvB3AwlB98ArnHWrNHoP6oMVuC1y7LIwivGb/xM3zf985XDfxc9ofGNX7?= =?us-ascii?q?JwddHcx0k1FwzbkFqdtJHrMT2P2uQKqWib4PNtWOSygGAkswF8ujuiy8U2ho?= =?us-ascii?q?TIiY8Z0E3I+CF2zYovO9G0VUF2bNi5G5VKrS6aLZF5QsY6TmFtvyY116MJtI?= =?us-ascii?q?agfCgP1JQn3xnfa+Gbc4SQ4hLsSuKRITBgiXJmYr2/gxey8U2+xe3mUcm4yk?= =?us-ascii?q?pKritHktnIrHwCyxvT6s+cSvRj+0euwzCP1xvJ5uFDO0A0mrLXK58nwrEuip?= =?us-ascii?q?oeqUfOEy3slEj3g6KabFgo9+yn5uj9fLnqu5CRO5dxig7kM6QunsK/Af4/Mg?= =?us-ascii?q?gLR2Wb5eW81L/n/UDiTrVKlOM5nbfCv5DBOMsXvKm5AxVa0oo78RawEy+m0M?= =?us-ascii?q?gEnXkANF9IZBaHgJbmOl7UJvD3EOmwg063nTdv2f/GP6DuApTLLnjMjrjhZ6?= =?us-ascii?q?xx60hCxwovnphj4Md9DrwRKfT/V1W5kNHZAh4/PAGui7LODNht34USVHinJq?= =?us-ascii?q?KYPKLUvlKSoOQiP7/fSpUSvWPBzPxtzPnplnI8kFkGNf213JkTQF6iE/lMGG?= =?us-ascii?q?nfZmDj1IRSWVwWtxYzGbS5wGaJViReMjPrB/ox?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2CYAQAWuuFb/9bCQFdkGwEBAQEDAQE?= =?us-ascii?q?BBwMBAQGBZYIEQ3IhEieMbYs4AQGCDDUBiUOPMYRzBAICg1cjOBYBAwEBAgE?= =?us-ascii?q?BAgFsKII2JAGCYAEFOhwjEAsYCSUPKh4GE4UnqVaJJIEOjA+CAIQjilkCjzu?= =?us-ascii?q?PfAmRByOBRwGPHIJvljYhgVVNMAiDJ5BbPgMwjXMBAQ?= X-IPAS-Result: =?us-ascii?q?A2CYAQAWuuFb/9bCQFdkGwEBAQEDAQEBBwMBAQGBZYIEQ?= =?us-ascii?q?3IhEieMbYs4AQGCDDUBiUOPMYRzBAICg1cjOBYBAwEBAgEBAgFsKII2JAGCY?= =?us-ascii?q?AEFOhwjEAsYCSUPKh4GE4UnqVaJJIEOjA+CAIQjilkCjzuPfAmRByOBRwGPH?= =?us-ascii?q?IJvljYhgVVNMAiDJ5BbPgMwjXMBAQ?= Received: from 214.194-64-87.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([87.64.194.214]) by relay.skynet.be with ESMTP; 06 Nov 2018 17:03:56 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id wA6G3uTw000407; Tue, 6 Nov 2018 17:03:56 +0100 (CET) (envelope-from tijl@FreeBSD.org) Date: Tue, 6 Nov 2018 17:03:55 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: Alexander Leidinger <Alexander@Leidinger.net> Cc: src-committers@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r340181 - in head/sys: amd64/linux32 compat/linux Message-ID: <20181106170355.23c10a13@kalimero.tijl.coosemans.org> In-Reply-To: <cmu-lmtpd-1694331-1541517508-8@sloti2d2t05> References: <cmu-lmtpd-1694331-1541517508-8@sloti2d2t05> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: A020A7DA5A X-Spamd-Result: default: False [-103.17 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org]; RECEIVED_SPAMHAUS_PBL(0.00)[214.194.64.87.zen.spamhaus.org : 127.0.0.11]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.98)[-0.980,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE]; IP_SCORE(-0.01)[country: BE(-0.05)]; RCVD_IN_DNSWL_LOW(-0.10)[135.20.238.195.list.dnswl.org : 127.0.5.1] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 16:05:09 -0000 On Tue, 06 Nov 2018 16:17:23 +0100 Alexander Leidinger <Alexander@Leidinger.net> wrote: > Targeted for 12.0-release? > Relnotes yes (linux64 support for NVidia driver)? Yes, if re@ approves it. The ports also need to be modified to install linux64 libraries (PR 217901). From owner-svn-src-head@freebsd.org Tue Nov 6 16:31:00 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 9333E112926C; Tue, 6 Nov 2018 16:31:00 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 015857E802; Tue, 6 Nov 2018 16:30:59 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA6GUwpN096772; Tue, 6 Nov 2018 08:30:58 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA6GUwaK096771; Tue, 6 Nov 2018 08:30:58 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811061630.wA6GUwaK096771@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340187 - head/sys/geom In-Reply-To: <201811061555.wA6FtfiT017783@repo.freebsd.org> To: Maxim Sobolev <sobomax@freebsd.org> Date: Tue, 6 Nov 2018 08:30:58 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 015857E802 X-Spamd-Result: default: False [0.92 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; 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)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.75)[0.746,0]; NEURAL_HAM_LONG(-0.07)[-0.069,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.08)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_HAM_SHORT(-0.63)[-0.627,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 16:31:00 -0000 > Author: sobomax > Date: Tue Nov 6 15:55:41 2018 > New Revision: 340187 > URL: https://svnweb.freebsd.org/changeset/base/340187 > > Log: > Don't allow BIO_READ, BIO_WRITE or BIO_DELETE requests that are > fully beyond the end of providers media. The only exception is made > for the zero length transfers which are allowed to be just on the > boundary. Previously, any requests starting on the boundary (i.e. next > byte after the last one) have been allowed to go through. > > No response from: freebsd-geom@, phk > MFC after: 1 month > > Modified: > head/sys/geom/geom_io.c > > Modified: head/sys/geom/geom_io.c > ============================================================================== > --- head/sys/geom/geom_io.c Tue Nov 6 15:52:49 2018 (r340186) > +++ head/sys/geom/geom_io.c Tue Nov 6 15:55:41 2018 (r340187) > @@ -420,6 +420,8 @@ g_io_check(struct bio *bp) > return (EIO); > if (bp->bio_offset > pp->mediasize) > return (EIO); > + if (bp->bio_offset == pp->mediasize && bp->bio_length > 0) > + return (EIO); Isnt mediasize 0 based, such that any operation at pp->mediasize is technically past the end of the media and should get an EIO no matter how big it is? Who is doing 0 byte operations at pp->mediasize? That code should probably be fixed rather than allowing this special case here. > /* Truncate requests to the end of providers media. */ > excess = bp->bio_offset + bp->bio_length; > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Nov 6 16:56:50 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 868011129E3C; Tue, 6 Nov 2018 16:56:50 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB78D80028; Tue, 6 Nov 2018 16:56:49 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6A361656; Tue, 6 Nov 2018 16:56:49 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6GunXX048500; Tue, 6 Nov 2018 16:56:49 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6GunYW048499; Tue, 6 Nov 2018 16:56:49 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201811061656.wA6GunYW048499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner <andrew@FreeBSD.org> Date: Tue, 6 Nov 2018 16:56:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340189 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340189 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB78D80028 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 16:56:50 -0000 Author: andrew Date: Tue Nov 6 16:56:49 2018 New Revision: 340189 URL: https://svnweb.freebsd.org/changeset/base/340189 Log: Import the NetBSD micro ubsan code for the kernel. This imports revision 1.3 of common/lib/libc/misc/ubsan.c from NetBSD, the micro-ubsan code. It is an implementation of the Undefined Behavior Sanitizer runtime for use with recent clang and gcc. The uubsan code will be used in a later commit to implement kubsan to help find undefined behavior in the kernel. Sponsored by: DARPA, AFRL Added: head/sys/kern/kern_ubsan.c (contents, props changed) Added: head/sys/kern/kern_ubsan.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/kern/kern_ubsan.c Tue Nov 6 16:56:49 2018 (r340189) @@ -0,0 +1,1638 @@ +/* $NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + +/* + * The micro UBSan implementation for the userland (uUBSan) and kernel (kUBSan). + * The uBSSan versions is suitable for inclusion into libc or used standalone + * with ATF tests. + * + * This file due to long symbol names generated by a compiler during the + * instrumentation process does not follow the KNF style with 80-column limit. + */ + +#include <sys/cdefs.h> +#if defined(_KERNEL) +__KERNEL_RCSID(0, "$NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $"); +#else +__RCSID("$NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $"); +#endif + +#if defined(_KERNEL) +#include <sys/param.h> +#include <sys/types.h> +#include <sys/stdarg.h> +#define ASSERT(x) KASSERT(x) +#else +#if defined(_LIBC) +#include "namespace.h" +#endif +#include <sys/param.h> +#include <assert.h> +#include <inttypes.h> +#include <math.h> +#include <signal.h> +#include <stdarg.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <syslog.h> +#include <unistd.h> +#if defined(_LIBC) +#include "extern.h" +#define ubsan_vsyslog vsyslog_ss +#define ASSERT(x) _DIAGASSERT(x) +#else +#define ubsan_vsyslog vsyslog_r +#define ASSERT(x) assert(x) +#endif +/* These macros are available in _KERNEL only */ +#define SET(t, f) ((t) |= (f)) +#define ISSET(t, f) ((t) & (f)) +#define CLR(t, f) ((t) &= ~(f)) +#endif + +#define REINTERPRET_CAST(__dt, __st) ((__dt)(__st)) +#define STATIC_CAST(__dt, __st) ((__dt)(__st)) + +#define ACK_REPORTED __BIT(31) + +#define MUL_STRING "*" +#define PLUS_STRING "+" +#define MINUS_STRING "-" +#define DIVREM_STRING "divrem" + +#define CFI_VCALL 0 +#define CFI_NVCALL 1 +#define CFI_DERIVEDCAST 2 +#define CFI_UNRELATEDCAST 3 +#define CFI_ICALL 4 +#define CFI_NVMFCALL 5 +#define CFI_VMFCALL 6 + +#define NUMBER_MAXLEN 128 +#define LOCATION_MAXLEN (PATH_MAX + 32 /* ':LINE:COLUMN' */) + +#define WIDTH_8 8 +#define WIDTH_16 16 +#define WIDTH_32 32 +#define WIDTH_64 64 +#define WIDTH_80 80 +#define WIDTH_96 96 +#define WIDTH_128 128 + +#define NUMBER_SIGNED_BIT 1U + +#if __SIZEOF_INT128__ +typedef __int128 longest; +typedef unsigned __int128 ulongest; +#else +typedef int64_t longest; +typedef uint64_t ulongest; +#endif + +#ifndef _KERNEL +static int ubsan_flags = -1; +#define UBSAN_ABORT __BIT(0) +#define UBSAN_STDOUT __BIT(1) +#define UBSAN_STDERR __BIT(2) +#define UBSAN_SYSLOG __BIT(3) +#endif + +/* Undefined Behavior specific defines and structures */ + +#define KIND_INTEGER 0 +#define KIND_FLOAT 1 +#define KIND_UNKNOWN UINT16_MAX + +struct CSourceLocation { + char *mFilename; + uint32_t mLine; + uint32_t mColumn; +}; + +struct CTypeDescriptor { + uint16_t mTypeKind; + uint16_t mTypeInfo; + uint8_t mTypeName[1]; +}; + +struct COverflowData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; +}; + +struct CUnreachableData { + struct CSourceLocation mLocation; +}; + +struct CCFICheckFailData { + uint8_t mCheckKind; + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; +}; + +struct CDynamicTypeCacheMissData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; + void *mTypeInfo; + uint8_t mTypeCheckKind; +}; + +struct CFunctionTypeMismatchData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; +}; + +struct CInvalidBuiltinData { + struct CSourceLocation mLocation; + uint8_t mKind; +}; + +struct CInvalidValueData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; +}; + +struct CNonNullArgData { + struct CSourceLocation mLocation; + struct CSourceLocation mAttributeLocation; + int mArgIndex; +}; + +struct CNonNullReturnData { + struct CSourceLocation mAttributeLocation; +}; + +struct COutOfBoundsData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mArrayType; + struct CTypeDescriptor *mIndexType; +}; + +struct CPointerOverflowData { + struct CSourceLocation mLocation; +}; + +struct CShiftOutOfBoundsData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mLHSType; + struct CTypeDescriptor *mRHSType; +}; + +struct CTypeMismatchData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; + unsigned long mLogAlignment; + uint8_t mTypeCheckKind; +}; + +struct CTypeMismatchData_v1 { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; + uint8_t mLogAlignment; + uint8_t mTypeCheckKind; +}; + +struct CVLABoundData { + struct CSourceLocation mLocation; + struct CTypeDescriptor *mType; +}; + +struct CFloatCastOverflowData { + struct CSourceLocation mLocation; /* This field exists in this struct since 2015 August 11th */ + struct CTypeDescriptor *mFromType; + struct CTypeDescriptor *mToType; +}; + +/* Local utility functions */ +static void Report(bool isFatal, const char *pFormat, ...) __printflike(2, 3); +static bool isAlreadyReported(struct CSourceLocation *pLocation); +static size_t zDeserializeTypeWidth(struct CTypeDescriptor *pType); +static void DeserializeLocation(char *pBuffer, size_t zBUfferLength, struct CSourceLocation *pLocation); +#ifdef __SIZEOF_INT128__ +static void DeserializeUINT128(char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, __uint128_t U128); +#endif +static void DeserializeNumberSigned(char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, longest L); +static void DeserializeNumberUnsigned(char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, ulongest L); +#ifndef _KERNEL +static void DeserializeFloatOverPointer(char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, unsigned long *pNumber); +static void DeserializeFloatInlined(char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, unsigned long ulNumber); +#endif +static longest llliGetNumber(char *szLocation, struct CTypeDescriptor *pType, unsigned long ulNumber); +static ulongest llluGetNumber(char *szLocation, struct CTypeDescriptor *pType, unsigned long ulNumber); +#ifndef _KERNEL +static void DeserializeNumberFloat(char *szLocation, char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, unsigned long ulNumber); +#endif +static void DeserializeNumber(char *szLocation, char *pBuffer, size_t zBUfferLength, struct CTypeDescriptor *pType, unsigned long ulNumber); +static const char *DeserializeTypeCheckKind(uint8_t hhuTypeCheckKind); +static const char *DeserializeBuiltinCheckKind(uint8_t hhuBuiltinCheckKind); +static const char *DeserializeCFICheckKind(uint8_t hhuCFICheckKind); +static bool isNegativeNumber(char *szLocation, struct CTypeDescriptor *pType, unsigned long ulNumber); +static bool isShiftExponentTooLarge(char *szLocation, struct CTypeDescriptor *pType, unsigned long ulNumber, size_t zWidth); + +/* Unused in this implementation, emitted by the C++ check dynamic type cast. */ +intptr_t __ubsan_vptr_type_cache[128]; + +/* Public symbols used in the instrumentation of the code generation part */ +void __ubsan_handle_add_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_add_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_builtin_unreachable(struct CUnreachableData *pData); +void __ubsan_handle_cfi_bad_type(struct CCFICheckFailData *pData, unsigned long ulVtable, bool bValidVtable, bool FromUnrecoverableHandler, unsigned long ProgramCounter, unsigned long FramePointer); +void __ubsan_handle_cfi_check_fail(struct CCFICheckFailData *pData, unsigned long ulValue, unsigned long ulValidVtable); +void __ubsan_handle_cfi_check_fail_abort(struct CCFICheckFailData *pData, unsigned long ulValue, unsigned long ulValidVtable); +void __ubsan_handle_divrem_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_divrem_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_dynamic_type_cache_miss(struct CDynamicTypeCacheMissData *pData, unsigned long ulPointer, unsigned long ulHash); +void __ubsan_handle_dynamic_type_cache_miss_abort(struct CDynamicTypeCacheMissData *pData, unsigned long ulPointer, unsigned long ulHash); +void __ubsan_handle_float_cast_overflow(struct CFloatCastOverflowData *pData, unsigned long ulFrom); +void __ubsan_handle_float_cast_overflow_abort(struct CFloatCastOverflowData *pData, unsigned long ulFrom); +void __ubsan_handle_function_type_mismatch(struct CFunctionTypeMismatchData *pData, unsigned long ulFunction); +void __ubsan_handle_function_type_mismatch_abort(struct CFunctionTypeMismatchData *pData, unsigned long ulFunction); +void __ubsan_handle_invalid_builtin(struct CInvalidBuiltinData *pData); +void __ubsan_handle_invalid_builtin_abort(struct CInvalidBuiltinData *pData); +void __ubsan_handle_load_invalid_value(struct CInvalidValueData *pData, unsigned long ulVal); +void __ubsan_handle_load_invalid_value_abort(struct CInvalidValueData *pData, unsigned long ulVal); +void __ubsan_handle_missing_return(struct CUnreachableData *pData); +void __ubsan_handle_mul_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_mul_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_negate_overflow(struct COverflowData *pData, unsigned long ulOldVal); +void __ubsan_handle_negate_overflow_abort(struct COverflowData *pData, unsigned long ulOldVal); +void __ubsan_handle_nonnull_arg(struct CNonNullArgData *pData); +void __ubsan_handle_nonnull_arg_abort(struct CNonNullArgData *pData); +void __ubsan_handle_nonnull_return_v1(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer); +void __ubsan_handle_nonnull_return_v1_abort(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer); +void __ubsan_handle_nullability_arg(struct CNonNullArgData *pData); +void __ubsan_handle_nullability_arg_abort(struct CNonNullArgData *pData); +void __ubsan_handle_nullability_return_v1(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer); +void __ubsan_handle_nullability_return_v1_abort(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer); +void __ubsan_handle_out_of_bounds(struct COutOfBoundsData *pData, unsigned long ulIndex); +void __ubsan_handle_out_of_bounds_abort(struct COutOfBoundsData *pData, unsigned long ulIndex); +void __ubsan_handle_pointer_overflow(struct CPointerOverflowData *pData, unsigned long ulBase, unsigned long ulResult); +void __ubsan_handle_pointer_overflow_abort(struct CPointerOverflowData *pData, unsigned long ulBase, unsigned long ulResult); +void __ubsan_handle_shift_out_of_bounds(struct CShiftOutOfBoundsData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_shift_out_of_bounds_abort(struct CShiftOutOfBoundsData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_sub_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_sub_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS); +void __ubsan_handle_type_mismatch(struct CTypeMismatchData *pData, unsigned long ulPointer); +void __ubsan_handle_type_mismatch_abort(struct CTypeMismatchData *pData, unsigned long ulPointer); +void __ubsan_handle_type_mismatch_v1(struct CTypeMismatchData_v1 *pData, unsigned long ulPointer); +void __ubsan_handle_type_mismatch_v1_abort(struct CTypeMismatchData_v1 *pData, unsigned long ulPointer); +void __ubsan_handle_vla_bound_not_positive(struct CVLABoundData *pData, unsigned long ulBound); +void __ubsan_handle_vla_bound_not_positive_abort(struct CVLABoundData *pData, unsigned long ulBound); +void __ubsan_get_current_report_data(const char **ppOutIssueKind, const char **ppOutMessage, const char **ppOutFilename, uint32_t *pOutLine, uint32_t *pOutCol, char **ppOutMemoryAddr); + +static void HandleOverflow(bool isFatal, struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS, const char *szOperation); +static void HandleNegateOverflow(bool isFatal, struct COverflowData *pData, unsigned long ulOldValue); +static void HandleBuiltinUnreachable(bool isFatal, struct CUnreachableData *pData); +static void HandleTypeMismatch(bool isFatal, struct CSourceLocation *mLocation, struct CTypeDescriptor *mType, unsigned long mLogAlignment, uint8_t mTypeCheckKind, unsigned long ulPointer); +static void HandleVlaBoundNotPositive(bool isFatal, struct CVLABoundData *pData, unsigned long ulBound); +static void HandleOutOfBounds(bool isFatal, struct COutOfBoundsData *pData, unsigned long ulIndex); +static void HandleShiftOutOfBounds(bool isFatal, struct CShiftOutOfBoundsData *pData, unsigned long ulLHS, unsigned long ulRHS); +static void HandleLoadInvalidValue(bool isFatal, struct CInvalidValueData *pData, unsigned long ulValue); +static void HandleInvalidBuiltin(bool isFatal, struct CInvalidBuiltinData *pData); +static void HandleFunctionTypeMismatch(bool isFatal, struct CFunctionTypeMismatchData *pData, unsigned long ulFunction); +static void HandleCFIBadType(bool isFatal, struct CCFICheckFailData *pData, unsigned long ulVtable, bool *bValidVtable, bool *FromUnrecoverableHandler, unsigned long *ProgramCounter, unsigned long *FramePointer); +static void HandleDynamicTypeCacheMiss(bool isFatal, struct CDynamicTypeCacheMissData *pData, unsigned long ulPointer, unsigned long ulHash); +static void HandleFloatCastOverflow(bool isFatal, struct CFloatCastOverflowData *pData, unsigned long ulFrom); +static void HandleMissingReturn(bool isFatal, struct CUnreachableData *pData); +static void HandleNonnullArg(bool isFatal, struct CNonNullArgData *pData); +static void HandleNonnullReturn(bool isFatal, struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer); +static void HandlePointerOverflow(bool isFatal, struct CPointerOverflowData *pData, unsigned long ulBase, unsigned long ulResult); + +static void +HandleOverflow(bool isFatal, struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS, const char *szOperation) +{ + char szLocation[LOCATION_MAXLEN]; + char szLHS[NUMBER_MAXLEN]; + char szRHS[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szLHS, NUMBER_MAXLEN, pData->mType, ulLHS); + DeserializeNumber(szLocation, szRHS, NUMBER_MAXLEN, pData->mType, ulRHS); + + Report(isFatal, "UBSan: Undefined Behavior in %s, %s integer overflow: %s %s %s cannot be represented in type %s\n", + szLocation, ISSET(pData->mType->mTypeInfo, NUMBER_SIGNED_BIT) ? "signed" : "unsigned", szLHS, szOperation, szRHS, pData->mType->mTypeName); +} + +static void +HandleNegateOverflow(bool isFatal, struct COverflowData *pData, unsigned long ulOldValue) +{ + char szLocation[LOCATION_MAXLEN]; + char szOldValue[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szOldValue, NUMBER_MAXLEN, pData->mType, ulOldValue); + + Report(isFatal, "UBSan: Undefined Behavior in %s, negation of %s cannot be represented in type %s\n", + szLocation, szOldValue, pData->mType->mTypeName); +} + +static void +HandleBuiltinUnreachable(bool isFatal, struct CUnreachableData *pData) +{ + char szLocation[LOCATION_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + Report(isFatal, "UBSan: Undefined Behavior in %s, calling __builtin_unreachable()\n", + szLocation); +} + +static void +HandleTypeMismatch(bool isFatal, struct CSourceLocation *mLocation, struct CTypeDescriptor *mType, unsigned long mLogAlignment, uint8_t mTypeCheckKind, unsigned long ulPointer) +{ + char szLocation[LOCATION_MAXLEN]; + + ASSERT(mLocation); + ASSERT(mType); + + if (isAlreadyReported(mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, mLocation); + + if (ulPointer == 0) { + Report(isFatal, "UBSan: Undefined Behavior in %s, %s null pointer of type %s\n", + szLocation, DeserializeTypeCheckKind(mTypeCheckKind), mType->mTypeName); + } else if ((mLogAlignment - 1) & ulPointer) { + Report(isFatal, "UBSan: Undefined Behavior in %s, %s misaligned address %p for type %s which requires %ld byte alignment\n", + szLocation, DeserializeTypeCheckKind(mTypeCheckKind), REINTERPRET_CAST(void *, ulPointer), mType->mTypeName, mLogAlignment); + } else { + Report(isFatal, "UBSan: Undefined Behavior in %s, %s address %p with insufficient space for an object of type %s\n", + szLocation, DeserializeTypeCheckKind(mTypeCheckKind), REINTERPRET_CAST(void *, ulPointer), mType->mTypeName); + } +} + +static void +HandleVlaBoundNotPositive(bool isFatal, struct CVLABoundData *pData, unsigned long ulBound) +{ + char szLocation[LOCATION_MAXLEN]; + char szBound[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szBound, NUMBER_MAXLEN, pData->mType, ulBound); + + Report(isFatal, "UBSan: Undefined Behavior in %s, variable length array bound value %s <= 0\n", + szLocation, szBound); +} + +static void +HandleOutOfBounds(bool isFatal, struct COutOfBoundsData *pData, unsigned long ulIndex) +{ + char szLocation[LOCATION_MAXLEN]; + char szIndex[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szIndex, NUMBER_MAXLEN, pData->mIndexType, ulIndex); + + Report(isFatal, "UBSan: Undefined Behavior in %s, index %s is out of range for type %s\n", + szLocation, szIndex, pData->mArrayType->mTypeName); +} + +static void +HandleShiftOutOfBounds(bool isFatal, struct CShiftOutOfBoundsData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + char szLocation[LOCATION_MAXLEN]; + char szLHS[NUMBER_MAXLEN]; + char szRHS[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szLHS, NUMBER_MAXLEN, pData->mLHSType, ulLHS); + DeserializeNumber(szLocation, szRHS, NUMBER_MAXLEN, pData->mRHSType, ulRHS); + + if (isNegativeNumber(szLocation, pData->mRHSType, ulRHS)) + Report(isFatal, "UBSan: Undefined Behavior in %s, shift exponent %s is negative\n", + szLocation, szRHS); + else if (isShiftExponentTooLarge(szLocation, pData->mRHSType, ulRHS, zDeserializeTypeWidth(pData->mLHSType))) + Report(isFatal, "UBSan: Undefined Behavior in %s, shift exponent %s is too large for %zu-bit type %s\n", + szLocation, szRHS, zDeserializeTypeWidth(pData->mLHSType), pData->mLHSType->mTypeName); + else if (isNegativeNumber(szLocation, pData->mLHSType, ulLHS)) + Report(isFatal, "UBSan: Undefined Behavior in %s, left shift of negative value %s\n", + szLocation, szLHS); + else + Report(isFatal, "UBSan: Undefined Behavior in %s, left shift of %s by %s places cannot be represented in type %s\n", + szLocation, szLHS, szRHS, pData->mLHSType->mTypeName); +} + +static void +HandleLoadInvalidValue(bool isFatal, struct CInvalidValueData *pData, unsigned long ulValue) +{ + char szLocation[LOCATION_MAXLEN]; + char szValue[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szValue, NUMBER_MAXLEN, pData->mType, ulValue); + + Report(isFatal, "UBSan: Undefined Behavior in %s, load of value %s is not a valid value for type %s\n", + szLocation, szValue, pData->mType->mTypeName); +} + +static void +HandleInvalidBuiltin(bool isFatal, struct CInvalidBuiltinData *pData) +{ + char szLocation[LOCATION_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + Report(isFatal, "UBSan: Undefined Behavior in %s, passing zero to %s, which is not a valid argument\n", + szLocation, DeserializeBuiltinCheckKind(pData->mKind)); +} + +static void +HandleFunctionTypeMismatch(bool isFatal, struct CFunctionTypeMismatchData *pData, unsigned long ulFunction) +{ + char szLocation[LOCATION_MAXLEN]; + + /* + * There is no a portable C solution to translate an address of a + * function to its name. On the cost of getting this routine simple + * and portable without ifdefs between the userland and the kernel + * just print the address of the function as-is. + * + * For better diagnostic messages in the userland, users shall use + * the full upstream version shipped along with the compiler toolchain. + */ + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + Report(isFatal, "UBSan: Undefined Behavior in %s, call to function %#lx through pointer to incorrect function type %s\n", + szLocation, ulFunction, pData->mType->mTypeName); +} + +static void +HandleCFIBadType(bool isFatal, struct CCFICheckFailData *pData, unsigned long ulVtable, bool *bValidVtable, bool *FromUnrecoverableHandler, unsigned long *ProgramCounter, unsigned long *FramePointer) +{ + char szLocation[LOCATION_MAXLEN]; + + /* + * This is a minimal implementation without diving into C++ + * specifics and (Itanium) ABI deserialization. + */ + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + if (pData->mCheckKind == CFI_ICALL || pData->mCheckKind == CFI_VMFCALL) { + Report(isFatal, "UBSan: Undefined Behavior in %s, control flow integrity check for type %s failed during %s (vtable address %#lx)\n", + szLocation, pData->mType->mTypeName, DeserializeCFICheckKind(pData->mCheckKind), ulVtable); + } else { + Report(isFatal || FromUnrecoverableHandler, "UBSan: Undefined Behavior in %s, control flow integrity check for type %s failed during %s (vtable address %#lx; %s vtable; from %s handler; Program Counter %#lx; Frame Pointer %#lx)\n", + szLocation, pData->mType->mTypeName, DeserializeCFICheckKind(pData->mCheckKind), ulVtable, *bValidVtable ? "valid" : "invalid", *FromUnrecoverableHandler ? "unrecoverable" : "recoverable", *ProgramCounter, *FramePointer); + } +} + +static void +HandleDynamicTypeCacheMiss(bool isFatal, struct CDynamicTypeCacheMissData *pData, unsigned long ulPointer, unsigned long ulHash) +{ +#if 0 + char szLocation[LOCATION_MAXLEN]; + + /* + * Unimplemented. + * + * This UBSan handler is special as the check has to be impelemented + * in an implementation. In order to handle it there is need to + * introspect into C++ ABI internals (RTTI) and use low-level + * C++ runtime interfaces. + */ + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + Report(isFatal, "UBSan: Undefined Behavior in %s, %s address %#lx which might not point to an object of type %s\n" + szLocation, DeserializeTypeCheckKind(pData->mTypeCheckKind), ulPointer, pData->mType); +#endif +} + +static void +HandleFloatCastOverflow(bool isFatal, struct CFloatCastOverflowData *pData, unsigned long ulFrom) +{ + char szLocation[LOCATION_MAXLEN]; + char szFrom[NUMBER_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + DeserializeNumber(szLocation, szFrom, NUMBER_MAXLEN, pData->mFromType, ulFrom); + + Report(isFatal, "UBSan: Undefined Behavior in %s, %s (of type %s) is outside the range of representable values of type %s\n", + szLocation, szFrom, pData->mFromType->mTypeName, pData->mToType->mTypeName); +} + +static void +HandleMissingReturn(bool isFatal, struct CUnreachableData *pData) +{ + char szLocation[LOCATION_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + Report(isFatal, "UBSan: Undefined Behavior in %s, execution reached the end of a value-returning function without returning a value\n", + szLocation); +} + +static void +HandleNonnullArg(bool isFatal, struct CNonNullArgData *pData) +{ + char szLocation[LOCATION_MAXLEN]; + char szAttributeLocation[LOCATION_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + if (pData->mAttributeLocation.mFilename) + DeserializeLocation(szAttributeLocation, LOCATION_MAXLEN, &pData->mAttributeLocation); + else + szAttributeLocation[0] = '\0'; + + Report(isFatal, "UBSan: Undefined Behavior in %s, null pointer passed as argument %d, which is declared to never be null%s%s\n", + szLocation, pData->mArgIndex, pData->mAttributeLocation.mFilename ? ", nonnull/_Nonnull specified in " : "", szAttributeLocation); +} + +static void +HandleNonnullReturn(bool isFatal, struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer) +{ + char szLocation[LOCATION_MAXLEN]; + char szAttributeLocation[LOCATION_MAXLEN]; + + ASSERT(pData); + ASSERT(pLocationPointer); + + if (isAlreadyReported(pLocationPointer)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, pLocationPointer); + if (pData->mAttributeLocation.mFilename) + DeserializeLocation(szAttributeLocation, LOCATION_MAXLEN, &pData->mAttributeLocation); + else + szAttributeLocation[0] = '\0'; + + Report(isFatal, "UBSan: Undefined Behavior in %s, null pointer returned from function declared to never return null%s%s\n", + szLocation, pData->mAttributeLocation.mFilename ? ", nonnull/_Nonnull specified in " : "", szAttributeLocation); +} + +static void +HandlePointerOverflow(bool isFatal, struct CPointerOverflowData *pData, unsigned long ulBase, unsigned long ulResult) +{ + char szLocation[LOCATION_MAXLEN]; + + ASSERT(pData); + + if (isAlreadyReported(&pData->mLocation)) + return; + + DeserializeLocation(szLocation, LOCATION_MAXLEN, &pData->mLocation); + + Report(isFatal, "UBSan: Undefined Behavior in %s, pointer expression with base %#lx overflowed to %#lx\n", + szLocation, ulBase, ulResult); +} + +/* Definions of public symbols emitted by the instrumentation code */ +void +__ubsan_handle_add_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + + ASSERT(pData); + + HandleOverflow(false, pData, ulLHS, ulRHS, PLUS_STRING); +} + +void +__ubsan_handle_add_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + + ASSERT(pData); + + HandleOverflow(true, pData, ulLHS, ulRHS, PLUS_STRING); +} + +void +__ubsan_handle_builtin_unreachable(struct CUnreachableData *pData) +{ + + ASSERT(pData); + + HandleBuiltinUnreachable(true, pData); +} + +void +__ubsan_handle_cfi_bad_type(struct CCFICheckFailData *pData, unsigned long ulVtable, bool bValidVtable, bool FromUnrecoverableHandler, unsigned long ProgramCounter, unsigned long FramePointer) +{ + + ASSERT(pData); + + HandleCFIBadType(false, pData, ulVtable, &bValidVtable, &FromUnrecoverableHandler, &ProgramCounter, &FramePointer); +} + +void +__ubsan_handle_cfi_check_fail(struct CCFICheckFailData *pData, unsigned long ulValue, unsigned long ulValidVtable) +{ + + ASSERT(pData); + + HandleCFIBadType(false, pData, ulValue, 0, 0, 0, 0); +} + +void +__ubsan_handle_cfi_check_fail_abort(struct CCFICheckFailData *pData, unsigned long ulValue, unsigned long ulValidVtable) +{ + + ASSERT(pData); + + HandleCFIBadType(true, pData, ulValue, 0, 0, 0, 0); +} + +void +__ubsan_handle_divrem_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + + ASSERT(pData); + + HandleOverflow(false, pData, ulLHS, ulRHS, DIVREM_STRING); +} + +void +__ubsan_handle_divrem_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + + ASSERT(pData); + + HandleOverflow(true, pData, ulLHS, ulRHS, DIVREM_STRING); +} + +void +__ubsan_handle_dynamic_type_cache_miss(struct CDynamicTypeCacheMissData *pData, unsigned long ulPointer, unsigned long ulHash) +{ + + ASSERT(pData); + + HandleDynamicTypeCacheMiss(false, pData, ulPointer, ulHash); +} + +void +__ubsan_handle_dynamic_type_cache_miss_abort(struct CDynamicTypeCacheMissData *pData, unsigned long ulPointer, unsigned long ulHash) +{ + + ASSERT(pData); + + HandleDynamicTypeCacheMiss(false, pData, ulPointer, ulHash); +} + +void +__ubsan_handle_float_cast_overflow(struct CFloatCastOverflowData *pData, unsigned long ulFrom) +{ + + ASSERT(pData); + + HandleFloatCastOverflow(false, pData, ulFrom); +} + +void +__ubsan_handle_float_cast_overflow_abort(struct CFloatCastOverflowData *pData, unsigned long ulFrom) +{ + + ASSERT(pData); + + HandleFloatCastOverflow(true, pData, ulFrom); +} + +void +__ubsan_handle_function_type_mismatch(struct CFunctionTypeMismatchData *pData, unsigned long ulFunction) +{ + + ASSERT(pData); + + HandleFunctionTypeMismatch(false, pData, ulFunction); +} + +void +__ubsan_handle_function_type_mismatch_abort(struct CFunctionTypeMismatchData *pData, unsigned long ulFunction) +{ + + ASSERT(pData); + + HandleFunctionTypeMismatch(false, pData, ulFunction); +} + +void +__ubsan_handle_invalid_builtin(struct CInvalidBuiltinData *pData) +{ + + ASSERT(pData); + + HandleInvalidBuiltin(true, pData); +} + +void +__ubsan_handle_invalid_builtin_abort(struct CInvalidBuiltinData *pData) +{ + + ASSERT(pData); + + HandleInvalidBuiltin(true, pData); +} + +void +__ubsan_handle_load_invalid_value(struct CInvalidValueData *pData, unsigned long ulValue) +{ + + ASSERT(pData); + + HandleLoadInvalidValue(false, pData, ulValue); +} + +void +__ubsan_handle_load_invalid_value_abort(struct CInvalidValueData *pData, unsigned long ulValue) +{ + + ASSERT(pData); + + HandleLoadInvalidValue(true, pData, ulValue); +} + +void +__ubsan_handle_missing_return(struct CUnreachableData *pData) +{ + + ASSERT(pData); + + HandleMissingReturn(true, pData); +} + +void +__ubsan_handle_mul_overflow(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + + ASSERT(pData); + + HandleOverflow(false, pData, ulLHS, ulRHS, MUL_STRING); +} + +void +__ubsan_handle_mul_overflow_abort(struct COverflowData *pData, unsigned long ulLHS, unsigned long ulRHS) +{ + + ASSERT(pData); + + HandleOverflow(true, pData, ulLHS, ulRHS, MUL_STRING); +} + +void +__ubsan_handle_negate_overflow(struct COverflowData *pData, unsigned long ulOldValue) +{ + + ASSERT(pData); + + HandleNegateOverflow(false, pData, ulOldValue); +} + +void +__ubsan_handle_negate_overflow_abort(struct COverflowData *pData, unsigned long ulOldValue) +{ + + ASSERT(pData); + + HandleNegateOverflow(true, pData, ulOldValue); +} + +void +__ubsan_handle_nonnull_arg(struct CNonNullArgData *pData) +{ + + ASSERT(pData); + + HandleNonnullArg(false, pData); +} + +void +__ubsan_handle_nonnull_arg_abort(struct CNonNullArgData *pData) +{ + + ASSERT(pData); + + HandleNonnullArg(true, pData); +} + +void +__ubsan_handle_nonnull_return_v1(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer) +{ + + ASSERT(pData); + ASSERT(pLocationPointer); + + HandleNonnullReturn(false, pData, pLocationPointer); +} + +void +__ubsan_handle_nonnull_return_v1_abort(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer) +{ + + ASSERT(pData); + ASSERT(pLocationPointer); + + HandleNonnullReturn(true, pData, pLocationPointer); +} + +void +__ubsan_handle_nullability_arg(struct CNonNullArgData *pData) +{ + + ASSERT(pData); + + HandleNonnullArg(false, pData); +} + +void +__ubsan_handle_nullability_arg_abort(struct CNonNullArgData *pData) +{ + + ASSERT(pData); + + HandleNonnullArg(true, pData); +} + +void +__ubsan_handle_nullability_return_v1(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer) +{ + + ASSERT(pData); + ASSERT(pLocationPointer); + + HandleNonnullReturn(false, pData, pLocationPointer); +} + +void +__ubsan_handle_nullability_return_v1_abort(struct CNonNullReturnData *pData, struct CSourceLocation *pLocationPointer) +{ + + ASSERT(pData); + ASSERT(pLocationPointer); + + HandleNonnullReturn(true, pData, pLocationPointer); +} + +void +__ubsan_handle_out_of_bounds(struct COutOfBoundsData *pData, unsigned long ulIndex) +{ + + ASSERT(pData); + + HandleOutOfBounds(false, pData, ulIndex); +} + +void +__ubsan_handle_out_of_bounds_abort(struct COutOfBoundsData *pData, unsigned long ulIndex) +{ + + ASSERT(pData); + + HandleOutOfBounds(true, pData, ulIndex); +} + +void +__ubsan_handle_pointer_overflow(struct CPointerOverflowData *pData, unsigned long ulBase, unsigned long ulResult) +{ + + ASSERT(pData); + + HandlePointerOverflow(false, pData, ulBase, ulResult); +} + +void +__ubsan_handle_pointer_overflow_abort(struct CPointerOverflowData *pData, unsigned long ulBase, unsigned long ulResult) +{ + + ASSERT(pData); + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Tue Nov 6 17:01:26 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 50DF5112A247 for <svn-src-head@mailman.ysv.freebsd.org>; Tue, 6 Nov 2018 17:01:26 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD65A807EC for <svn-src-head@freebsd.org>; Tue, 6 Nov 2018 17:01:25 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by mail-oi1-f170.google.com with SMTP id p144-v6so11298235oic.12 for <svn-src-head@freebsd.org>; Tue, 06 Nov 2018 09:01:25 -0800 (PST) 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=XbfT05yRSiGrJrEEyBFNhjVksStwYPKVz3k/xf/Hd78=; b=mikv8F5mlzpsNo0fefidLo7GhR0D7ZSZ7WoNwajgKJUaHWZ9g62dRlqMEuZTBWgOQa R0W3LClQlm0QLcWJ9v4m+SKQb46tFvTLZ/Mlz6sv9PCDVMp4mQUJgG1RBKQDGhVDMbjq oBD/zReiQntY15ptj7KZE/LBU3zTJERPmDlxM+ARfr+DawooXU2AghoZzXAc53ubX0qI nZzaIjTAKF/OJ5ki+mHxA9b0msY5hX9Hwwl5c1nM2tp2H4HrQOH+NGtlhdUP+udtd43Y gAV7z4XeOJtGwsrmi1otf6SlISR+iGF6AOhsk8eDA0n68bSuaqTqOVZYgc46yvyyLwz0 2jDA== X-Gm-Message-State: AGRZ1gLMRKblR2dPqli3ogK0IZVg5zwlhCQTrPoaza2lfJvQn0LbOjkx YQK6tA3vJUdjWJGD7xHrs45/PqZqkP+RkAEBt2vyvA== X-Google-Smtp-Source: AJdET5d1bYYSNPRCO6da6/2ADvCk35qonfzHZVP34rahU7YQ/Cmqrb3GJKprilyc5vQSQnTxTU5Ku/o7VR6MuNkvgWc= X-Received: by 2002:aca:5c5:: with SMTP id 188-v6mr16720249oif.185.1541523261700; Tue, 06 Nov 2018 08:54:21 -0800 (PST) MIME-Version: 1.0 References: <201811061555.wA6FtfiT017783@repo.freebsd.org> <201811061630.wA6GUwaK096771@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811061630.wA6GUwaK096771@pdx.rh.CN85.dnsmgr.net> From: Maxim Sobolev <sobomax@freebsd.org> Date: Tue, 6 Nov 2018 08:54:10 -0800 Message-ID: <CAH7qZfvW2ZEqWL5yg9i67=zD562-KtY3tgcpSzCjku1JT3HGXQ@mail.gmail.com> Subject: Re: svn commit: r340187 - head/sys/geom To: rgrimes@freebsd.org Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: AD65A807EC X-Spamd-Result: default: False [-3.97 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt1.aspmx.l.google.com]; NEURAL_HAM_SHORT(-0.95)[-0.945,0]; RCVD_IN_DNSWL_NONE(0.00)[170.167.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.02)[ipnet: 209.85.128.0/17(-3.63), asn: 15169(-1.38), country: US(-0.08)]; FORGED_SENDER(0.30)[sobomax@freebsd.org,sobomax@sippysoft.com]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[sobomax@freebsd.org,sobomax@sippysoft.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 17:01:26 -0000 Rodney, this was actually my original intention, however then I noticed in the GEOM code there is at least one case when BIO_FLUSH request is being generated internally with bio_offset == mediasize and bio_lenth == 0, so I thought there might be some need to allow such requests through. But I'd happily go with the stricter rule if it does no harm. I simply don't know enough about the intended use and the logic behind zero-length transfers to make that call. -Max int g_io_flush(struct g_consumer *cp) { ... bp = g_alloc_bio(); bp->bio_cmd = BIO_FLUSH; ... bp->bio_offset = cp->provider->mediasize; bp->bio_length = 0; bp->bio_data = NULL; g_io_request(bp, cp); ... } On Tue, Nov 6, 2018 at 8:31 AM Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > Author: sobomax > > Date: Tue Nov 6 15:55:41 2018 > > New Revision: 340187 > > URL: https://svnweb.freebsd.org/changeset/base/340187 > > > > Log: > > Don't allow BIO_READ, BIO_WRITE or BIO_DELETE requests that are > > fully beyond the end of providers media. The only exception is made > > for the zero length transfers which are allowed to be just on the > > boundary. Previously, any requests starting on the boundary (i.e. next > > byte after the last one) have been allowed to go through. > > > > No response from: freebsd-geom@, phk > > MFC after: 1 month > > > > Modified: > > head/sys/geom/geom_io.c > > > > Modified: head/sys/geom/geom_io.c > > ============================================================================== > > --- head/sys/geom/geom_io.c Tue Nov 6 15:52:49 2018 (r340186) > > +++ head/sys/geom/geom_io.c Tue Nov 6 15:55:41 2018 (r340187) > > @@ -420,6 +420,8 @@ g_io_check(struct bio *bp) > > return (EIO); > > if (bp->bio_offset > pp->mediasize) > > return (EIO); > > + if (bp->bio_offset == pp->mediasize && bp->bio_length > 0) > > + return (EIO); > > Isnt mediasize 0 based, such that any operation at pp->mediasize is > technically past the end of the media and should get an EIO no > matter how big it is? > > Who is doing 0 byte operations at pp->mediasize? > That code should probably be fixed rather than allowing > this special case here. > > > /* Truncate requests to the end of providers media. */ > > excess = bp->bio_offset + bp->bio_length; > > > > > > -- > Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Tue Nov 6 17:12:17 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D3B4A112A6D7; Tue, 6 Nov 2018 17:12:16 +0000 (UTC) (envelope-from markiyan.kushnir@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 "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 25B3880DC3; Tue, 6 Nov 2018 17:12:16 +0000 (UTC) (envelope-from markiyan.kushnir@gmail.com) Received: by mail-io1-xd32.google.com with SMTP id k17-v6so9779008ioc.4; Tue, 06 Nov 2018 09:12:16 -0800 (PST) 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=pHgnMCGJpKT6g4SyBspUTfvd6PJQ11lT7IgEFFTshvI=; b=INdMCzXbMJn4c16zLttTAAv2KT7NTx2/ftButRzdb/pwzASVVErEz6M1lDGc8vZmiB L/SpM4FVtqcruZnZZuz1hL00lBboDPE/QeTiOvMmHtOsdxCaha0N1cSjBXDb171rUFlu fexiCygni86BtIce3RA2mnDNMme9Bwh8FI4stJ8jZyhwJ8cJ3B2l1IplwhV3K0yNW9Vm mlI/CsUPNNA04KwQLkIUAGYiSrUdBFfebCWmgV71kcQ/qm9qZhaGrp8H3jeaMfGdE1yY 00LacC3pF80e1oEIop3OUbzlUxfzDERQPnfv+ftqFQ0ymlzlGNIshnaAGPwd6AfBCFal f3XQ== 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=pHgnMCGJpKT6g4SyBspUTfvd6PJQ11lT7IgEFFTshvI=; b=azsvZCnKz/nnoQ9nKVoaGI2DwRHVx05yeKxm9ABVB5HX8IGL3SiL7MZ9a+PtFBQXIW hosGDUqKxrAz/DyScxm5knAtFTeFmEkMQfLU0ZTI4SUYf1QE5ya1F8t83Sn9b0sfHC3M pvUVMWdKIF00NUa5NazwMd7xuIW77JZB6lNTY8OrvimOu9XKnjroRodkxcbNwJff4vVe q+L1LBczuXxvbadDtBavthXJMYe8xvX+5/qfvAH90ywb1PivOwXKwt20pO2jLexpVK9U X41hYmaP98N0fdqjgQBDc2/FxOaa+uNftOkcvHg6dym6h8R/GLJn0UQSvviYDB3qrH4S nc/g== X-Gm-Message-State: AGRZ1gL8SicV8Nzdgk54e2F6hiDA9gy+4sCfIgBjYBYIjs4yk7SgE7fx enYmtQcOlwoQ1fZhLxkhioDGjo7L24a0fPO0VKLEWSF1 X-Google-Smtp-Source: AJdET5fLzzay5r3mgz/Du/Sg022ccliB5wxo6UIFUKC94cb03nJLkkkjtOeXzD8Li9T9vmPAXOZoZ6pmO0HkKzUwPE4= X-Received: by 2002:a6b:5503:: with SMTP id j3-v6mr21042952iob.209.1541524335159; Tue, 06 Nov 2018 09:12:15 -0800 (PST) MIME-Version: 1.0 References: <201810230631.w9N6VPR4008554@repo.freebsd.org> <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> <CA+Z_v8rcRXR86xnQs32Vgm5q+8DcjJJNHJRZOOuHUQrWSB19zQ@mail.gmail.com> In-Reply-To: <CA+Z_v8rcRXR86xnQs32Vgm5q+8DcjJJNHJRZOOuHUQrWSB19zQ@mail.gmail.com> From: Markiyan Kushnir <markiyan.kushnir@gmail.com> Date: Tue, 6 Nov 2018 19:12:03 +0200 Message-ID: <CACvtUJdu_c8DAxOA=JG6TRGB=ZOrPFL9s49s+SqpWbt4n0GEfA@mail.gmail.com> Subject: Re: svn commit: r339636 - in head: . share/mk To: arichardson@freebsd.org Cc: bdrewery@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-Rspamd-Queue-Id: 25B3880DC3 X-Spamd-Result: default: False [-3.42 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.963,0]; R_DKIM_ALLOW(-0.20)[gmail.com]; FROM_HAS_DN(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_DN_NONE(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; URI_COUNT_ODD(1.00)[15]; RCPT_COUNT_FIVE(0.00)[5]; IP_SCORE(-0.54)[ipnet: 2607:f8b0::/32(-1.25), asn: 15169(-1.39), country: US(-0.08)]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2.3.d.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]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.90)[-0.904,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 17:12:17 -0000 Alexander, Cannot tell exactly what change it was, might be one of your recent changes to bsd.compiler.mk or Makefile.inc1? ... Now running "make buildworld" I can proceed with "3.1: recording build metadata" only having USING_SYSTEM_COMPILER=3Dyes USING_SYSTEM_LINKER=3Dyes= set in my environment. Otherwise I'm getting this: sh: cc: not found make[2]: "/work/src.svn/share/mk/bsd.compiler.mk" line 176: Unable to determine compiler type for CC=3Dcc -target x86_64-unknown-freebsd13.0 --sysroot=3D//usr/obj/work/src.svn/amd64.amd64/tmp -B//usr/obj/work/src.svn/amd64.amd64/tmp/usr/bin. Consider setting COMPILER_TYPE. *** Error code 1 Stop. make[1]: stopped in /work/src.svn *** Error code 1 Stop. make: stopped in /work/src.svn Failed to build world I'm at rev. 340189. Could you please have a look? -- Markiyan =D0=B2=D1=82, 6 =D0=BB=D0=B8=D1=81=D1=82. 2018 =D0=BE 01:11 Alexander Richa= rdson <arichardson@freebsd.org> =D0=BF=D0=B8=D1=88=D0=B5: > On Mon, 5 Nov 2018 at 23:00, Bryan Drewery <bdrewery@freebsd.org> wrote: > > > > On 10/22/2018 11:31 PM, Alex Richardson wrote: > > > Author: arichardson > > > Date: Tue Oct 23 06:31:25 2018 > > > New Revision: 339636 > > > URL: https://svnweb.freebsd.org/changeset/base/339636 > > > > > > Log: > > > Only compute the X_COMPILER_*/X_LINKER_* variables when needed > > > > > > When building CheriBSD we have to set XLD/XCC/XCFLAGS on the comman= d > line. > > > This triggers the $XCC !=3D $CC case in bsd.compiler.mk (and the sa= me > for LD > > > in bsd.linker.mk) which causes it to call ${XCC} --version and > > > ${XLD} --version (plus various awk+sed+echo calls) in every > subdirectory. > > > For incremental builds and stages that only walk the source tree > this is > > > often the majority of the time spent in that directory. > > > > > ... > > > > > By only computing the value of the X_COMPILER_*/X_LINKER_* variable= s > if > > > _WANT_TOOLCHAIN_CROSS_VARS is set we can reduce the number of cc/ld > calls > > > to once per build stage instead of once per recursive make. > > > > This sounds wrong. bsd.compiler.mk *already* handles that kind of thing > > by exporting its computations. Adding a second hack for a similar > > problem isn't the right solution. > > > > I added debug .info statements for every time bsd.compiler.mk was > running cc --version and it was always running it for $XCC during make > buildworld. > As far as I can tell this happens because $CC and $XCC no longer match. > I believe the problem is that the toplevel makefile runs the cross > stages with CC=3D"${XCC} ${XCFLAGS}" so if you have XCFLAGS set in your > environment $CC will never be equal to $XCC. > This also means there is not cached variable for $XCC since it was > computed for "${XCC} ${XCFLAGS}" rather than $XCC . > > This patch massively reduced the incremental build time for CheriBSD > but if you can suggest I better fix that would be great. > > Alex > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" > From owner-svn-src-head@freebsd.org Tue Nov 6 17:32:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 01020112AE4D; Tue, 6 Nov 2018 17:32:10 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E07882546; Tue, 6 Nov 2018 17:32:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D97B1CB6; Tue, 6 Nov 2018 17:32:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6HW9Sb068643; Tue, 6 Nov 2018 17:32:09 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6HW8af068637; Tue, 6 Nov 2018 17:32:08 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201811061732.wA6HW8af068637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner <andrew@FreeBSD.org> Date: Tue, 6 Nov 2018 17:32:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340191 - in head/sys: conf kern X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head/sys: conf kern X-SVN-Commit-Revision: 340191 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7E07882546 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 17:32:10 -0000 Author: andrew Date: Tue Nov 6 17:32:07 2018 New Revision: 340191 URL: https://svnweb.freebsd.org/changeset/base/340191 Log: Port the NetBSD ubsan runtime to the FreeBSD kernel. This allows us to build the ubsan code added in r340189 into the kernel with the KUBSAN option. This will report when undefined behaviour is detected in the currently running kernel. As it can be large, the kernel is 65MB on arm64, loader may not be able to load the kernel on all architectures so is disabled by default for now. Sponsored by: DARPA, AFRL Modified: head/sys/conf/files head/sys/conf/kern.post.mk head/sys/conf/kern.pre.mk head/sys/conf/kmod.mk head/sys/conf/options head/sys/kern/kern_ubsan.c (contents, props changed) Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Nov 6 17:31:09 2018 (r340190) +++ head/sys/conf/files Tue Nov 6 17:32:07 2018 (r340191) @@ -3823,6 +3823,7 @@ kern/kern_thread.c standard kern/kern_time.c standard kern/kern_timeout.c standard kern/kern_tslog.c optional tslog +kern/kern_ubsan.c optional kubsan kern/kern_umtx.c standard kern/kern_uuid.c standard kern/kern_xxx.c standard Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Tue Nov 6 17:31:09 2018 (r340190) +++ head/sys/conf/kern.post.mk Tue Nov 6 17:32:07 2018 (r340191) @@ -28,6 +28,10 @@ MKMODULESENV+= WITH_CTF="${WITH_CTF}" MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" .endif +.if defined(SAN_CFLAGS) +MKMODULESENV+= SAN_CFLAGS="${SAN_CFLAGS}" +.endif + # Allow overriding the kernel debug directory, so kernel and user debug may be # installed in different directories. Setting it to "" restores the historical # behavior of installing debug files in the kernel directory. Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Tue Nov 6 17:31:09 2018 (r340190) +++ head/sys/conf/kern.pre.mk Tue Nov 6 17:32:07 2018 (r340191) @@ -113,6 +113,12 @@ PROF= -pg .endif DEFINED_PROF= ${PROF} +KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo +.if !empty(KUBSAN_ENABLED) +SAN_CFLAGS+= -fsanitize=undefined +.endif +CFLAGS+= ${SAN_CFLAGS} + # Put configuration-specific C flags last (except for ${PROF}) so that they # can override the others. CFLAGS+= ${CONF_CFLAGS} Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Tue Nov 6 17:31:09 2018 (r340190) +++ head/sys/conf/kmod.mk Tue Nov 6 17:32:07 2018 (r340191) @@ -377,6 +377,9 @@ ${_src}: .endfor .endif +# Add the sanitizer C flags +CFLAGS+= ${SAN_CFLAGS} + # Respect configuration-specific C flags. CFLAGS+= ${ARCH_FLAGS} ${CONF_CFLAGS} Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Tue Nov 6 17:31:09 2018 (r340190) +++ head/sys/conf/options Tue Nov 6 17:32:07 2018 (r340191) @@ -232,6 +232,9 @@ UMTX_CHAINS opt_global.h VERBOSE_SYSINIT ZSTDIO opt_zstdio.h +# Sanitizers +KUBSAN opt_global.h + # POSIX kernel options P1003_1B_MQUEUE opt_posix.h P1003_1B_SEMAPHORES opt_posix.h Modified: head/sys/kern/kern_ubsan.c ============================================================================== --- head/sys/kern/kern_ubsan.c Tue Nov 6 17:31:09 2018 (r340190) +++ head/sys/kern/kern_ubsan.c Tue Nov 6 17:32:07 2018 (r340191) @@ -37,17 +37,29 @@ */ #include <sys/cdefs.h> +#ifdef __FreeBSD__ +__FBSDID("$FreeBSD$"); +#else #if defined(_KERNEL) __KERNEL_RCSID(0, "$NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $"); #else __RCSID("$NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $"); #endif +#endif #if defined(_KERNEL) #include <sys/param.h> #include <sys/types.h> -#include <sys/stdarg.h> -#define ASSERT(x) KASSERT(x) +#include <sys/limits.h> +#include <sys/systm.h> +#include <machine/_inttypes.h> +#include <machine/stdarg.h> +#define ASSERT(x) KASSERT(x, ("%s: " __STRING(x) " failed", __func__)) +#define __arraycount(x) nitems(x) +#define ISSET(x, y) ((x) & (y)) +#define __BIT(x) ((uintmax_t)1 << (uintmax_t)(x)) +#define __LOWEST_SET_BIT(__mask) ((((__mask) - 1) & (__mask)) ^ (__mask)) +#define __SHIFTOUT(__x, __mask) (((__x) & (__mask)) / __LOWEST_SET_BIT(__mask)) #else #if defined(_LIBC) #include "namespace.h" From owner-svn-src-head@freebsd.org Tue Nov 6 17:32:26 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B2660112AEA6; Tue, 6 Nov 2018 17:32:26 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D6F4827A6; Tue, 6 Nov 2018 17:32:26 +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 001B31CFC; Tue, 6 Nov 2018 17:32:26 +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 wA6HWPhs069485; Tue, 6 Nov 2018 17:32:25 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6HWPGi069482; Tue, 6 Nov 2018 17:32:25 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811061732.wA6HWPGi069482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Tue, 6 Nov 2018 17:32:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340192 - in head/sys: dev/mrsas kern X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: dev/mrsas kern X-SVN-Commit-Revision: 340192 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1D6F4827A6 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 17:32:26 -0000 Author: markj Date: Tue Nov 6 17:32:25 2018 New Revision: 340192 URL: https://svnweb.freebsd.org/changeset/base/340192 Log: Use plain atomic_{add,subtract} when that's sufficient. CID: 1386920 MFC after: 2 weeks Modified: head/sys/dev/mrsas/mrsas.h head/sys/kern/uipc_mqueue.c head/sys/kern/vfs_bio.c Modified: head/sys/dev/mrsas/mrsas.h ============================================================================== --- head/sys/dev/mrsas/mrsas.h Tue Nov 6 17:32:07 2018 (r340191) +++ head/sys/dev/mrsas/mrsas.h Tue Nov 6 17:32:25 2018 (r340192) @@ -612,8 +612,8 @@ typedef union { #define mrsas_atomic_read(v) atomic_load_acq_int(&(v)->val) #define mrsas_atomic_set(v,i) atomic_store_rel_int(&(v)->val, i) -#define mrsas_atomic_dec(v) atomic_fetchadd_int(&(v)->val, -1) -#define mrsas_atomic_inc(v) atomic_fetchadd_int(&(v)->val, 1) +#define mrsas_atomic_dec(v) atomic_subtract_int(&(v)->val, 1) +#define mrsas_atomic_inc(v) atomic_add_int(&(v)->val, 1) /* IOCInit Request message */ typedef struct _MPI2_IOC_INIT_REQUEST { Modified: head/sys/kern/uipc_mqueue.c ============================================================================== --- head/sys/kern/uipc_mqueue.c Tue Nov 6 17:32:07 2018 (r340191) +++ head/sys/kern/uipc_mqueue.c Tue Nov 6 17:32:25 2018 (r340192) @@ -393,7 +393,7 @@ mqnode_free(struct mqfs_node *node) static __inline void mqnode_addref(struct mqfs_node *node) { - atomic_fetchadd_int(&node->mn_refcount, 1); + atomic_add_int(&node->mn_refcount, 1); } static __inline void Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Tue Nov 6 17:32:07 2018 (r340191) +++ head/sys/kern/vfs_bio.c Tue Nov 6 17:32:25 2018 (r340192) @@ -1656,7 +1656,7 @@ buf_alloc(struct bufdomain *bd) if (freebufs > 0) bp = uma_zalloc(buf_zone, M_NOWAIT); if (bp == NULL) { - atomic_fetchadd_int(&bd->bd_freebuffers, 1); + atomic_add_int(&bd->bd_freebuffers, 1); bufspace_daemon_wakeup(bd); counter_u64_add(numbufallocfails, 1); return (NULL); From owner-svn-src-head@freebsd.org Tue Nov 6 17:37:34 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4BC9B112B2C5; Tue, 6 Nov 2018 17:37:34 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-yw1-f45.google.com (mail-yw1-f45.google.com [209.85.161.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7D1A682C43; Tue, 6 Nov 2018 17:37:33 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-yw1-f45.google.com with SMTP id c126-v6so5467204ywd.8; Tue, 06 Nov 2018 09:37:33 -0800 (PST) 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=u/4c51+jqIZa+FA3Fmwq6u6KlmxexTLXHkQaziylwhM=; b=ZnsqI89hJOfGbKBh2VYOz6oyG5Bi9UnHlUu92C65hOW1JqV8snVTxlJlX+eivXc7nG rSZMXnFk4E4SJZJS47RWgj/Kg5ribJb4n5My3+4MfnFhbVBZj+G2gFbiMVsIxozIYlyJ NtoQYQBXt31VMm7XP1a66IREUfHY/6ODU9TdqTSl57/62gFmKnINef4a8ciiRunMMK4u eeRD5FmQ3jKYWaDHl2+6eP25/aEyULq82GHEi8xBj38GFAnuUxJbTh2dPxlyrEEVDePX c5julP4eVfRcRIDBZ1vVwr2qjwdgh5Ka2OReWsRIptDGyq/h4/AwU3v87bK7lUVb/a+Z w6aQ== X-Gm-Message-State: AGRZ1gIhE/ZQN58ofGoYum86QH3G7wWN7Kuo3LKA+u0ogtZst3wdlXC6 bREA6x0ZJKlnVZFQgEz2cm7eQIUsu2sUew== X-Google-Smtp-Source: AJdET5eBYUIbMIMaBL44+UWH0DIiVbgIJsBP7lkZ589kee49Y6ye2bowv+SzmQXjxQ6IPNb8lbgtOA== X-Received: by 2002:a81:592:: with SMTP id 140-v6mr26290922ywf.378.1541525846890; Tue, 06 Nov 2018 09:37:26 -0800 (PST) Received: from mail-yw1-f50.google.com (mail-yw1-f50.google.com. [209.85.161.50]) by smtp.gmail.com with ESMTPSA id s187-v6sm12541727ywe.10.2018.11.06.09.37.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 09:37:26 -0800 (PST) Received: by mail-yw1-f50.google.com with SMTP id k6-v6so5465160ywa.11; Tue, 06 Nov 2018 09:37:26 -0800 (PST) X-Received: by 2002:a81:30ca:: with SMTP id w193-v6mr25795388yww.506.1541525846038; Tue, 06 Nov 2018 09:37:26 -0800 (PST) MIME-Version: 1.0 References: <201810230631.w9N6VPR4008554@repo.freebsd.org> <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> <CA+Z_v8rcRXR86xnQs32Vgm5q+8DcjJJNHJRZOOuHUQrWSB19zQ@mail.gmail.com> <CACvtUJdu_c8DAxOA=JG6TRGB=ZOrPFL9s49s+SqpWbt4n0GEfA@mail.gmail.com> In-Reply-To: <CACvtUJdu_c8DAxOA=JG6TRGB=ZOrPFL9s49s+SqpWbt4n0GEfA@mail.gmail.com> From: Alexander Richardson <arichardson@freebsd.org> Date: Tue, 6 Nov 2018 17:37:14 +0000 X-Gmail-Original-Message-ID: <CA+Z_v8qRxqZ7di5s03c2AqGQfbT_i9nf-nfveU0PYJgW=Jkdnw@mail.gmail.com> Message-ID: <CA+Z_v8qRxqZ7di5s03c2AqGQfbT_i9nf-nfveU0PYJgW=Jkdnw@mail.gmail.com> Subject: Re: svn commit: r339636 - in head: . share/mk To: Markiyan Kushnir <markiyan.kushnir@gmail.com> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-Rspamd-Queue-Id: 7D1A682C43 X-Spamd-Result: default: False [-3.00 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RWL_MAILSPIKE_GOOD(0.00)[45.161.85.209.rep.mailspike.net : 127.0.0.18]; URI_COUNT_ODD(1.00)[15]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; FORGED_SENDER(0.30)[arichardson@freebsd.org,arichardsonkde@gmail.com]; FREEMAIL_TO(0.00)[gmail.com]; IP_SCORE(-1.01)[ipnet: 209.85.128.0/17(-3.57), asn: 15169(-1.39), country: US(-0.08)]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.993,0]; FROM_NEQ_ENVFROM(0.00)[arichardson@freebsd.org,arichardsonkde@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[45.161.85.209.list.dnswl.org : 127.0.5.0]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 17:37:34 -0000 Hi Markiyan, This looks exactly like the SYSTEM_COMPILER/SYSTEM_LINKER build failure that should have been fixed by r340167. Does passing BUILD_WITH_STRICT_TMPPATH=3D0 on the make command line fix the build error? If so it seems like I missed one more SYSTEM_COMPILER case. Could you send me your buildworld command+environment variables so I can see what's going wrong? Thanks, Alex On Tue, 6 Nov 2018 at 17:12 Markiyan Kushnir <markiyan.kushnir@gmail.com> wrote: > Alexander, > > Cannot tell exactly what change it was, might be one of your recent > changes to bsd.compiler.mk or Makefile.inc1? ... > > Now running "make buildworld" I can proceed with "3.1: recording build > metadata" only having USING_SYSTEM_COMPILER=3Dyes USING_SYSTEM_LINKER=3Dy= es set > in my environment. Otherwise I'm getting this: > > sh: cc: not found > make[2]: "/work/src.svn/share/mk/bsd.compiler.mk" line 176: Unable to > determine compiler type for CC=3Dcc -target x86_64-unknown-freebsd13.0 > --sysroot=3D//usr/obj/work/src.svn/amd64.amd64/tmp > -B//usr/obj/work/src.svn/amd64.amd64/tmp/usr/bin. Consider setting > COMPILER_TYPE. > *** Error code 1 > > Stop. > make[1]: stopped in /work/src.svn > *** Error code 1 > > Stop. > make: stopped in /work/src.svn > Failed to build world > > I'm at rev. 340189. Could you please have a look? > > -- > Markiyan > > =D0=B2=D1=82, 6 =D0=BB=D0=B8=D1=81=D1=82. 2018 =D0=BE 01:11 Alexander Ric= hardson <arichardson@freebsd.org> > =D0=BF=D0=B8=D1=88=D0=B5: > >> On Mon, 5 Nov 2018 at 23:00, Bryan Drewery <bdrewery@freebsd.org> wrote: >> > >> > On 10/22/2018 11:31 PM, Alex Richardson wrote: >> > > Author: arichardson >> > > Date: Tue Oct 23 06:31:25 2018 >> > > New Revision: 339636 >> > > URL: https://svnweb.freebsd.org/changeset/base/339636 >> > > >> > > Log: >> > > Only compute the X_COMPILER_*/X_LINKER_* variables when needed >> > > >> > > When building CheriBSD we have to set XLD/XCC/XCFLAGS on the >> command line. >> > > This triggers the $XCC !=3D $CC case in bsd.compiler.mk (and the >> same for LD >> > > in bsd.linker.mk) which causes it to call ${XCC} --version and >> > > ${XLD} --version (plus various awk+sed+echo calls) in every >> subdirectory. >> > > For incremental builds and stages that only walk the source tree >> this is >> > > often the majority of the time spent in that directory. >> > > >> > ... >> > >> > > By only computing the value of the X_COMPILER_*/X_LINKER_* >> variables if >> > > _WANT_TOOLCHAIN_CROSS_VARS is set we can reduce the number of cc/l= d >> calls >> > > to once per build stage instead of once per recursive make. >> > >> > This sounds wrong. bsd.compiler.mk *already* handles that kind of thin= g >> > by exporting its computations. Adding a second hack for a similar >> > problem isn't the right solution. >> > >> >> I added debug .info statements for every time bsd.compiler.mk was >> running cc --version and it was always running it for $XCC during make >> buildworld. >> As far as I can tell this happens because $CC and $XCC no longer match. >> I believe the problem is that the toplevel makefile runs the cross >> stages with CC=3D"${XCC} ${XCFLAGS}" so if you have XCFLAGS set in your >> environment $CC will never be equal to $XCC. >> This also means there is not cached variable for $XCC since it was >> computed for "${XCC} ${XCFLAGS}" rather than $XCC . >> >> This patch massively reduced the incremental build time for CheriBSD >> but if you can suggest I better fix that would be great. >> >> Alex >> > _______________________________________________ >> svn-src-all@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-all >> To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" >> > From owner-svn-src-head@freebsd.org Tue Nov 6 17:47:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 A95D9112B673; Tue, 6 Nov 2018 17:47:59 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 216FF8322A; Tue, 6 Nov 2018 17:47:59 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 030181E9A; Tue, 6 Nov 2018 17:47:59 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6HlwYa075049; Tue, 6 Nov 2018 17:47:58 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6HlwtG075048; Tue, 6 Nov 2018 17:47:58 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201811061747.wA6HlwtG075048@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner <andrew@FreeBSD.org> Date: Tue, 6 Nov 2018 17:47:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340193 - in head/sys: amd64/conf arm64/conf X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head/sys: amd64/conf arm64/conf X-SVN-Commit-Revision: 340193 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 216FF8322A X-Spamd-Result: default: False [-103.10 / 200.00]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 17:47:59 -0000 Author: andrew Date: Tue Nov 6 17:47:58 2018 New Revision: 340193 URL: https://svnweb.freebsd.org/changeset/base/340193 Log: Add the KUBSAN options to the arm64 and amd64 GENERIC kernel config files. As the kernel file size may be too large to run with a stock loader comment them out for now. Sponsored by: DARPA, AFRL Modified: head/sys/amd64/conf/GENERIC head/sys/arm64/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Tue Nov 6 17:32:25 2018 (r340192) +++ head/sys/amd64/conf/GENERIC Tue Nov 6 17:47:58 2018 (r340193) @@ -100,6 +100,8 @@ options WITNESS # Enable checks to detect deadlocks options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +# Warning: KUBSAN can result in a kernel too large for loader to load +#options KUBSAN # Kernel Undefined Behavior Sanitizer # Kernel dump features. options EKCD # Support for encrypted kernel dumps Modified: head/sys/arm64/conf/GENERIC ============================================================================== --- head/sys/arm64/conf/GENERIC Tue Nov 6 17:32:25 2018 (r340192) +++ head/sys/arm64/conf/GENERIC Tue Nov 6 17:47:58 2018 (r340193) @@ -92,6 +92,8 @@ options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence options USB_DEBUG # enable debug msgs options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default +# Warning: KUBSAN can result in a kernel too large for loader to load +#options KUBSAN # Kernel Undefined Behavior Sanitizer # Kernel dump features. options EKCD # Support for encrypted kernel dumps From owner-svn-src-head@freebsd.org Tue Nov 6 18:03:05 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 85FBE112BF1F; Tue, 6 Nov 2018 18:03:05 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 162AB83D96; Tue, 6 Nov 2018 18:03:05 +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 EC1522235; Tue, 6 Nov 2018 18:03:04 +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 wA6I34eN084911; Tue, 6 Nov 2018 18:03:04 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6I34OO084910; Tue, 6 Nov 2018 18:03:04 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811061803.wA6I34OO084910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Tue, 6 Nov 2018 18:03:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340194 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340194 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 162AB83D96 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:03:05 -0000 Author: oshogbo Date: Tue Nov 6 18:03:04 2018 New Revision: 340194 URL: https://svnweb.freebsd.org/changeset/base/340194 Log: Regenerate after r340129. Pointed out by: brooks Modified: head/sys/kern/init_sysent.c Modified: head/sys/kern/init_sysent.c ============================================================================== --- head/sys/kern/init_sysent.c Tue Nov 6 17:47:58 2018 (r340193) +++ head/sys/kern/init_sysent.c Tue Nov 6 18:03:04 2018 (r340194) @@ -594,7 +594,7 @@ struct sysent sysent[] = { { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 542 = pipe2 */ { AS(aio_mlock_args), (sy_call_t *)sys_aio_mlock, AUE_AIO_MLOCK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 543 = aio_mlock */ { AS(procctl_args), (sy_call_t *)sys_procctl, AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = procctl */ - { AS(ppoll_args), (sy_call_t *)sys_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 545 = ppoll */ + { AS(ppoll_args), (sy_call_t *)sys_ppoll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 545 = ppoll */ { AS(futimens_args), (sy_call_t *)sys_futimens, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 546 = futimens */ { AS(utimensat_args), (sy_call_t *)sys_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 547 = utimensat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = obsolete numa_getaffinity */ From owner-svn-src-head@freebsd.org Tue Nov 6 18:05:47 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 561E0112C01F; Tue, 6 Nov 2018 18:05:47 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9AAE83F65; Tue, 6 Nov 2018 18:05:46 +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 B5BBF2239; Tue, 6 Nov 2018 18:05:46 +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 wA6I5kvT085068; Tue, 6 Nov 2018 18:05:46 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6I5koI085067; Tue, 6 Nov 2018 18:05:46 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811061805.wA6I5koI085067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Tue, 6 Nov 2018 18:05:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340195 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340195 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D9AAE83F65 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:05:47 -0000 Author: oshogbo Date: Tue Nov 6 18:05:46 2018 New Revision: 340195 URL: https://svnweb.freebsd.org/changeset/base/340195 Log: capsicum: Add ppoll and freebsd32_ppoll to compat32. PR: 232495 Pointed out by: brooks MFC after: 2 weeks Modified: head/sys/compat/freebsd32/capabilities.conf Modified: head/sys/compat/freebsd32/capabilities.conf ============================================================================== --- head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:03:04 2018 (r340194) +++ head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:05:46 2018 (r340195) @@ -203,6 +203,8 @@ pdkill freebsd32_pipe pipe2 poll +ppoll +freebsd32_ppoll freebsd32_posix_fallocate freebsd32_pread freebsd32_preadv From owner-svn-src-head@freebsd.org Tue Nov 6 18:06:53 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5C48F112C0E6; Tue, 6 Nov 2018 18:06:53 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3FBC841D6; Tue, 6 Nov 2018 18:06:52 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85361223F; Tue, 6 Nov 2018 18:06:52 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6I6qaf085340; Tue, 6 Nov 2018 18:06:52 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6I6qQ6085339; Tue, 6 Nov 2018 18:06:52 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811061806.wA6I6qQ6085339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Tue, 6 Nov 2018 18:06:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340196 - head X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340196 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A3FBC841D6 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:06:53 -0000 Author: arichardson Date: Tue Nov 6 18:06:52 2018 New Revision: 340196 URL: https://svnweb.freebsd.org/changeset/base/340196 Log: Turn off BUILD_WITH_STRICT_TMPPATH by default Building with a strict $PATH (without inheriting from the parent environment) still causes build failures in some workflows/environemnts that I have not yet tested. I will try to bring this back once these issues have all been resolved since it is actually extremely useful in tracking broken dependencies and wrong assumptions about the build environemt. Discussed With: brooks Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Nov 6 18:05:46 2018 (r340195) +++ head/Makefile.inc1 Tue Nov 6 18:06:52 2018 (r340196) @@ -589,12 +589,11 @@ STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_ # the build to break on other systems that don't have that tool. For now we # still allow using the old behaviour (inheriting $PATH) if # BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed. -.if ${USING_SYSTEM_LINKER} != "no" || ${USING_SYSTEM_COMPILER} != "no" -# strict $PATH does not work yet with USING_SYSTEM_LINKER/USING_SYSTEM_COMPILER + +# Currently strict $PATH can cause build failures and does not work yet with +# USING_SYSTEM_LINKER/USING_SYSTEM_COMPILER. Once these issues have been +# resolved it will be turned on by default. BUILD_WITH_STRICT_TMPPATH?=0 -.else -BUILD_WITH_STRICT_TMPPATH?=1 -.endif .if ${BUILD_WITH_STRICT_TMPPATH} != 0 TMPPATH= ${STRICTTMPPATH} .else From owner-svn-src-head@freebsd.org Tue Nov 6 18:06:53 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8D599112C0E9; Tue, 6 Nov 2018 18:06: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 15ABF841DC; Tue, 6 Nov 2018 18:06: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 C69552240; Tue, 6 Nov 2018 18:06:52 +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 wA6I6qTU085352; Tue, 6 Nov 2018 18:06:52 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6I6qJS085351; Tue, 6 Nov 2018 18:06:52 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811061806.wA6I6qJS085351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Tue, 6 Nov 2018 18:06:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340197 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340197 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 15ABF841DC X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.995,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:06:53 -0000 Author: oshogbo Date: Tue Nov 6 18:06:52 2018 New Revision: 340197 URL: https://svnweb.freebsd.org/changeset/base/340197 Log: Regenerate after r340195. Modified: head/sys/compat/freebsd32/freebsd32_sysent.c Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Tue Nov 6 18:06:52 2018 (r340196) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Tue Nov 6 18:06:52 2018 (r340197) @@ -624,7 +624,7 @@ struct sysent freebsd32_sysent[] = { #else { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */ #endif - { AS(freebsd32_ppoll_args), (sy_call_t *)freebsd32_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 545 = freebsd32_ppoll */ + { AS(freebsd32_ppoll_args), (sy_call_t *)freebsd32_ppoll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 545 = freebsd32_ppoll */ { AS(freebsd32_futimens_args), (sy_call_t *)freebsd32_futimens, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 546 = freebsd32_futimens */ { AS(freebsd32_utimensat_args), (sy_call_t *)freebsd32_utimensat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 547 = freebsd32_utimensat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 548 = obsolete numa_getaffinity */ From owner-svn-src-head@freebsd.org Tue Nov 6 18:16:04 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 32717112C4EE; Tue, 6 Nov 2018 18:16:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 943E384963; Tue, 6 Nov 2018 18:16:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 77BA110A87D; Tue, 6 Nov 2018 13:16:01 -0500 (EST) Subject: Re: svn commit: r340195 - head/sys/compat/freebsd32 To: Mariusz Zaborski <oshogbo@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201811061805.wA6I5koI085067@repo.freebsd.org> From: John Baldwin <jhb@FreeBSD.org> Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= xsDiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg80eSm9obiBCYWxk d2luIDxqb2huQGJhbGR3aW4uY3g+wmMEExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX gAUCRND5wwIZAQAKCRBy3lIGd+N/BNLXAJ9KIb6teuDL1W+FkCgvv+y8PxKTkACeIUfbn3sl cueBzqTcf09idwa8YTbOwU0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Ds gnr31AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh +GojXlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cM SOrHYUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOF QVHOEVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq 1tqzhltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZ TwtXsNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m 7Z164yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioI AjjHaIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbU KWwxQ4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjH uW/CSQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZN wwCfafMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <2058a1da-305a-f001-b554-f3e09a44097f@FreeBSD.org> Date: Tue, 6 Nov 2018 10:16:00 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201811061805.wA6I5koI085067@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Tue, 06 Nov 2018 13:16:02 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-Rspamd-Queue-Id: 943E384963 X-Spamd-Result: default: False [-104.78 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,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)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; R_SPF_SOFTFAIL(0.00)[~all]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-1.67)[ipnet: 96.47.64.0/20(-4.59), asn: 11403(-3.68), country: US(-0.08)]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:16:04 -0000 On 11/6/18 10:05 AM, Mariusz Zaborski wrote: > Author: oshogbo > Date: Tue Nov 6 18:05:46 2018 > New Revision: 340195 > URL: https://svnweb.freebsd.org/changeset/base/340195 > > Log: > capsicum: Add ppoll and freebsd32_ppoll to compat32. > > PR: 232495 > Pointed out by: brooks > MFC after: 2 weeks > > Modified: > head/sys/compat/freebsd32/capabilities.conf > > Modified: head/sys/compat/freebsd32/capabilities.conf > ============================================================================== > --- head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:03:04 2018 (r340194) > +++ head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:05:46 2018 (r340195) > @@ -203,6 +203,8 @@ pdkill > freebsd32_pipe > pipe2 > poll > +ppoll > +freebsd32_ppoll > freebsd32_posix_fallocate > freebsd32_pread > freebsd32_preadv Presumably you don't need to list ppoll in this file since freebsd32 doesn't define a ppoll syscall, only freebsd32_ppoll? -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Tue Nov 6 18:26:41 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C359C112CAF4; Tue, 6 Nov 2018 18:26:41 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 553818511B; Tue, 6 Nov 2018 18:26: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 34EB1257D; Tue, 6 Nov 2018 18:26: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 wA6IQeqN095779; Tue, 6 Nov 2018 18:26:40 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6IQeVN095778; Tue, 6 Nov 2018 18:26:40 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811061826.wA6IQeVN095778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Tue, 6 Nov 2018 18:26:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340198 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340198 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 553818511B X-Spamd-Result: default: False [-103.09 / 200.00]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.990,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:26:41 -0000 Author: oshogbo Date: Tue Nov 6 18:26:40 2018 New Revision: 340198 URL: https://svnweb.freebsd.org/changeset/base/340198 Log: Remove ppoll. freebsd32 doesn't define a ppoll syscall. Reported by: jhb Modified: head/sys/compat/freebsd32/capabilities.conf Modified: head/sys/compat/freebsd32/capabilities.conf ============================================================================== --- head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:06:52 2018 (r340197) +++ head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:26:40 2018 (r340198) @@ -203,7 +203,6 @@ pdkill freebsd32_pipe pipe2 poll -ppoll freebsd32_ppoll freebsd32_posix_fallocate freebsd32_pread From owner-svn-src-head@freebsd.org Tue Nov 6 18:33:27 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 AF433112CE02; Tue, 6 Nov 2018 18:33:27 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1018985793; Tue, 6 Nov 2018 18:33:26 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id p6-v6so6599208pll.4; Tue, 06 Nov 2018 10:33:26 -0800 (PST) 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=Dc+gne0XvRGyZrnjlHwj0dNj2K4wv9+ZazhwUuRlDPk=; b=hjvT7hMNkrZoHNpRVQLqu7efNmvz2YADWDn4n0bETlUk/zc5CZw0EXg6J4r6lyZPdC 1je5KgHhCx14KhHNLE4eV5fn2gBjIr73PyQWznb/E4slJrQyaxYm9iq0F16IjuHM3V6a KR4dTQ4CBmjoJsxX+z0FL8Yv/Ohb+oeuj9eT5QgJpwAcwqdfyrQRUJBNfs/IS5KnzPne /17PoljaVX7HveKIjIR4DfV4ik3uVSNGY0QQaYYB7JQ7/IIeMIMuYQGPNJQ+CI1Zb5VN J8ANB0ONVwHNlg/z2YJ5bLX1SP9d4i3HcE9SIT0J1KGQ37JyPOEICSBBPJ9qgwXZhczT IgGA== X-Gm-Message-State: AGRZ1gKcxyuquYaTOxWlKdqMK4Lnjdy/q0pS9ZfSK7g0IHYzpbkGoaT4 MXSCqKbBL8bs33rdnuE2f/i8sWQFBYP/fgWXniKZEhfy X-Google-Smtp-Source: AJdET5fE9Wac4K3uZMKtn+9L//MXTfpnXpMwgZncyvQuisfyrxl0kw2Xu8pLXiNAKoF+xptRoj2FuouIZBk5086zCHM= X-Received: by 2002:a17:902:4523:: with SMTP id m32-v6mr3980723pld.276.1541528844908; Tue, 06 Nov 2018 10:27:24 -0800 (PST) MIME-Version: 1.0 References: <201811061805.wA6I5koI085067@repo.freebsd.org> <2058a1da-305a-f001-b554-f3e09a44097f@FreeBSD.org> In-Reply-To: <2058a1da-305a-f001-b554-f3e09a44097f@FreeBSD.org> From: Mariusz Zaborski <oshogbo@freebsd.org> Date: Tue, 6 Nov 2018 19:27:10 +0100 Message-ID: <CAGOYWV9DGGXLScd1sE-AoPF1a2GizCRr_UcPNqvbrEJ7ZtOmdQ@mail.gmail.com> Subject: Re: svn commit: r340195 - head/sys/compat/freebsd32 To: John Baldwin <jhb@freebsd.org> Cc: src-committers <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: 1018985793 X-Spamd-Result: default: False [-3.76 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.969,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; IP_SCORE(-1.00)[ipnet: 209.85.128.0/17(-3.50), asn: 15169(-1.41), country: US(-0.08)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.79)[-0.789,0]; RCVD_IN_DNSWL_NONE(0.00)[172.214.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[oshogbo@freebsd.org,oshogbovx@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]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[oshogbo@freebsd.org,oshogbovx@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:33:27 -0000 Right. Thanks! On Tue, 6 Nov 2018 at 19:16, John Baldwin <jhb@freebsd.org> wrote: > > On 11/6/18 10:05 AM, Mariusz Zaborski wrote: > > Author: oshogbo > > Date: Tue Nov 6 18:05:46 2018 > > New Revision: 340195 > > URL: https://svnweb.freebsd.org/changeset/base/340195 > > > > Log: > > capsicum: Add ppoll and freebsd32_ppoll to compat32. > > > > PR: 232495 > > Pointed out by: brooks > > MFC after: 2 weeks > > > > Modified: > > head/sys/compat/freebsd32/capabilities.conf > > > > Modified: head/sys/compat/freebsd32/capabilities.conf > > ============================================================================== > > --- head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:03:04 2018 (r340194) > > +++ head/sys/compat/freebsd32/capabilities.conf Tue Nov 6 18:05:46 2018 (r340195) > > @@ -203,6 +203,8 @@ pdkill > > freebsd32_pipe > > pipe2 > > poll > > +ppoll > > +freebsd32_ppoll > > freebsd32_posix_fallocate > > freebsd32_pread > > freebsd32_preadv > > Presumably you don't need to list ppoll in this file since freebsd32 > doesn't define a ppoll syscall, only freebsd32_ppoll? > > -- > John Baldwin > > From owner-svn-src-head@freebsd.org Tue Nov 6 18:46:40 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4E34C112D362; Tue, 6 Nov 2018 18:46:40 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DCB6985F5A; Tue, 6 Nov 2018 18:46:39 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF49828D0; Tue, 6 Nov 2018 18:46:39 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6Ikdfu006062; Tue, 6 Nov 2018 18:46:39 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6IkcBn006056; Tue, 6 Nov 2018 18:46:38 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811061846.wA6IkcBn006056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Tue, 6 Nov 2018 18:46:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340199 - in head/sys: compat/freebsd32 compat/linux fs/nfsclient kern sys X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 compat/linux fs/nfsclient kern sys X-SVN-Commit-Revision: 340199 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DCB6985F5A X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:46:40 -0000 Author: brooks Date: Tue Nov 6 18:46:38 2018 New Revision: 340199 URL: https://svnweb.freebsd.org/changeset/base/340199 Log: Use declared types for caddr_t arguments. Leave ptrace(2) alone for the moment as it's defined to take a caddr_t. Reviewed by: kib Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17852 Modified: head/sys/compat/freebsd32/syscalls.master head/sys/compat/linux/linux_socket.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/kern/syscalls.master head/sys/kern/uipc_syscalls.c head/sys/sys/syscallsubr.h Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Tue Nov 6 18:26:40 2018 (r340198) +++ head/sys/compat/freebsd32/syscalls.master Tue Nov 6 18:46:38 2018 (r340199) @@ -97,7 +97,7 @@ 20 AUE_GETPID NOPROTO { pid_t getpid(void); } 21 AUE_MOUNT NOPROTO { int mount(const char *type, \ const char *path, \ - int flags, caddr_t data); } + int flags, void *data); } 22 AUE_UMOUNT NOPROTO { int unmount(const char *path, int flags); } 23 AUE_SETUID NOPROTO { int setuid(uid_t uid); } 24 AUE_GETUID NOPROTO { uid_t getuid(void); } @@ -108,14 +108,17 @@ int flags); } 28 AUE_SENDMSG STD { int freebsd32_sendmsg(int s, struct msghdr32 *msg, \ int flags); } -29 AUE_RECVFROM STD { int freebsd32_recvfrom(int s, uint32_t buf, \ - uint32_t len, int flags, uint32_t from, \ +29 AUE_RECVFROM STD { int freebsd32_recvfrom(int s, void *buf, \ + uint32_t len, int flags, \ + struct sockaddr *from, \ uint32_t fromlenaddr); } -30 AUE_ACCEPT NOPROTO { int accept(int s, caddr_t name, \ +30 AUE_ACCEPT NOPROTO { int accept(int s, struct sockaddr *name, \ int *anamelen); } -31 AUE_GETPEERNAME NOPROTO { int getpeername(int fdes, caddr_t asa, \ +31 AUE_GETPEERNAME NOPROTO { int getpeername(int fdes, \ + struct sockaddr *asa, \ int *alen); } -32 AUE_GETSOCKNAME NOPROTO { int getsockname(int fdes, caddr_t asa, \ +32 AUE_GETSOCKNAME NOPROTO { int getsockname(int fdes, \ + struct sockaddr *asa, \ int *alen); } 33 AUE_ACCESS NOPROTO { int access(const char *path, int amode); } 34 AUE_CHFLAGS NOPROTO { int chflags(const char *path, u_long flags); } @@ -130,7 +133,7 @@ 41 AUE_DUP NOPROTO { int dup(u_int fd); } 42 AUE_PIPE COMPAT10 { int freebsd32_pipe(void); } 43 AUE_GETEGID NOPROTO { gid_t getegid(void); } -44 AUE_PROFILE NOPROTO { int profil(caddr_t samples, size_t size, \ +44 AUE_PROFILE NOPROTO { int profil(char *samples, size_t size, \ size_t offset, u_int scale); } 45 AUE_KTRACE NOPROTO { int ktrace(const char *fname, int ops, \ int facs, int pid); } @@ -214,7 +217,8 @@ int prio); } 97 AUE_SOCKET NOPROTO { int socket(int domain, int type, \ int protocol); } -98 AUE_CONNECT NOPROTO { int connect(int s, caddr_t name, \ +98 AUE_CONNECT NOPROTO { int connect(int s, \ + const struct sockaddr *name, \ int namelen); } 99 AUE_NULL OBSOL oaccept 100 AUE_GETPRIORITY NOPROTO { int getpriority(int which, int who); } @@ -222,10 +226,10 @@ 102 AUE_NULL OBSOL orecv 103 AUE_SIGRETURN COMPAT { int freebsd32_sigreturn( \ struct ia32_sigcontext3 *sigcntxp); } -104 AUE_BIND NOPROTO { int bind(int s, caddr_t name, \ +104 AUE_BIND NOPROTO { int bind(int s, const struct sockaddr *name, \ int namelen); } 105 AUE_SETSOCKOPT NOPROTO { int setsockopt(int s, int level, \ - int name, caddr_t val, int valsize); } + int name, const void *val, int valsize); } 106 AUE_LISTEN NOPROTO { int listen(int s, int backlog); } 107 AUE_NULL OBSOL vtimes 108 AUE_O_SIGVEC COMPAT { int freebsd32_sigvec(int signum, \ @@ -246,7 +250,7 @@ 117 AUE_GETRUSAGE STD { int freebsd32_getrusage(int who, \ struct rusage32 *rusage); } 118 AUE_GETSOCKOPT NOPROTO { int getsockopt(int s, int level, \ - int name, caddr_t val, int *avalsize); } + int name, void *val, int *avalsize); } 119 AUE_NULL UNIMPL resuba (BSD/OS 2.x) 120 AUE_READV STD { int freebsd32_readv(int fd, \ struct iovec32 *iovp, u_int iovcnt); } @@ -267,8 +271,9 @@ 130 AUE_FTRUNCATE COMPAT|NOPROTO { int ftruncate(int fd, int length); } 131 AUE_FLOCK NOPROTO { int flock(int fd, int how); } 132 AUE_MKFIFO NOPROTO { int mkfifo(const char *path, mode_t mode); } -133 AUE_SENDTO NOPROTO { int sendto(int s, caddr_t buf, \ - size_t len, int flags, caddr_t to, \ +133 AUE_SENDTO NOPROTO { int sendto(int s, const void *buf, \ + size_t len, int flags, \ + const struct sockaddr *to, \ int tolen); } 134 AUE_SHUTDOWN NOPROTO { int shutdown(int s, int how); } 135 AUE_SOCKETPAIR NOPROTO { int socketpair(int domain, int type, \ @@ -289,7 +294,7 @@ 146 AUE_KILLPG OBSOL killpg 147 AUE_SETSID NOPROTO { int setsid(void); } 148 AUE_QUOTACTL NOPROTO { int quotactl(const char *path, int cmd, \ - int uid, caddr_t arg); } + int uid, void *arg); } 149 AUE_O_QUOTA OBSOL oquota 150 AUE_GETSOCKNAME OBSOL ogetsockname @@ -368,7 +373,7 @@ __setrlimit_args int 196 AUE_GETDIRENTRIES COMPAT11 { int freebsd32_getdirentries(int fd, \ char *buf, u_int count, int32_t *basep); } -197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(caddr_t addr, \ +197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(void *addr, \ size_t len, int prot, int flags, int fd, \ int pad, uint32_t pos1, uint32_t pos2); } 198 AUE_NULL NOPROTO { int nosys(void); } __syscall \ @@ -852,11 +857,12 @@ 469 AUE_NULL UNIMPL __getpath_fromfd 470 AUE_NULL UNIMPL __getpath_fromaddr 471 AUE_SCTP_PEELOFF NOPROTO|NOSTD { int sctp_peeloff(int sd, uint32_t name); } -472 AUE_SCTP_GENERIC_SENDMSG NOPROTO|NOSTD { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \ - caddr_t to, __socklen_t tolen, \ +472 AUE_SCTP_GENERIC_SENDMSG NOPROTO|NOSTD { int sctp_generic_sendmsg( \ + int sd, void *msg, int mlen, \ + struct sockaddr *to, __socklen_t tolen, \ struct sctp_sndrcvinfo *sinfo, int flags); } 473 AUE_SCTP_GENERIC_SENDMSG_IOV NOPROTO|NOSTD { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \ - caddr_t to, __socklen_t tolen, \ + struct sockaddr *to, __socklen_t tolen, \ struct sctp_sndrcvinfo *sinfo, int flags); } 474 AUE_SCTP_GENERIC_RECVMSG NOPROTO|NOSTD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ @@ -870,7 +876,7 @@ const void *buf, size_t nbyte, \ int pad, \ uint32_t offset1, uint32_t offset2); } -477 AUE_MMAP STD { caddr_t freebsd32_mmap(caddr_t addr, \ +477 AUE_MMAP STD { caddr_t freebsd32_mmap(void *addr, \ size_t len, int prot, int flags, int fd, \ int pad, \ uint32_t pos1, uint32_t pos2); } @@ -891,7 +897,7 @@ 476 AUE_PWRITE STD { ssize_t freebsd32_pwrite(int fd, \ const void *buf, size_t nbyte, \ uint32_t offset1, uint32_t offset2); } -477 AUE_MMAP STD { caddr_t freebsd32_mmap(caddr_t addr, \ +477 AUE_MMAP STD { caddr_t freebsd32_mmap(void *addr, \ size_t len, int prot, int flags, int fd, \ uint32_t pos1, uint32_t pos2); } 478 AUE_LSEEK STD { off_t freebsd32_lseek(int fd, \ @@ -1054,9 +1060,11 @@ uint32_t fcntlrights); } 537 AUE_CAP_FCNTLS_GET NOPROTO { int cap_fcntls_get(int fd, \ uint32_t *fcntlrightsp); } -538 AUE_BINDAT NOPROTO { int bindat(int fd, int s, caddr_t name, \ +538 AUE_BINDAT NOPROTO { int bindat(int fd, int s, \ + const struct sockaddr *name, \ int namelen); } -539 AUE_CONNECTAT NOPROTO { int connectat(int fd, int s, caddr_t name, \ +539 AUE_CONNECTAT NOPROTO { int connectat(int fd, int s, \ + const struct sockaddr *name, \ int namelen); } 540 AUE_CHFLAGSAT NOPROTO { int chflagsat(int fd, const char *path, \ u_long flags, int atflag); } Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Tue Nov 6 18:26:40 2018 (r340198) +++ head/sys/compat/linux/linux_socket.c Tue Nov 6 18:46:38 2018 (r340199) @@ -1520,7 +1520,7 @@ linux_setsockopt(struct thread *td, struct linux_setso int s; int level; int name; - caddr_t val; + const void *val; int valsize; } */ bsd_args; l_timeval linux_tv; @@ -1570,10 +1570,11 @@ linux_setsockopt(struct thread *td, struct linux_setso bsd_args.valsize = args->optlen; if (name == IPV6_NEXTHOP) { - linux_to_bsd_sockaddr((struct sockaddr *)bsd_args.val, - bsd_args.valsize); + linux_to_bsd_sockaddr(__DECONST(struct sockaddr *, + bsd_args.val), bsd_args.valsize); error = sys_setsockopt(td, &bsd_args); - bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.val); + bsd_to_linux_sockaddr(__DECONST(struct sockaddr *, + bsd_args.val)); } else error = sys_setsockopt(td, &bsd_args); Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Tue Nov 6 18:26:40 2018 (r340198) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Tue Nov 6 18:46:38 2018 (r340199) @@ -1238,8 +1238,7 @@ nfs_mount(struct mount *mp) bzero(&hst[hstlen], MNAMELEN - hstlen); args.hostname = hst; /* getsockaddr() call must be after above copyin() calls */ - error = getsockaddr(&nam, (caddr_t)args.addr, - args.addrlen); + error = getsockaddr(&nam, args.addr, args.addrlen); if (error != 0) goto out; } else if (nfs_mount_parse_from(mp->mnt_optnew, Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Tue Nov 6 18:26:40 2018 (r340198) +++ head/sys/kern/syscalls.master Tue Nov 6 18:46:38 2018 (r340199) @@ -207,7 +207,7 @@ _In_z_ const char *type, _In_z_ const char *path, int flags, - _In_opt_ caddr_t data + _In_opt_ void *data ); } ; XXX `path' should have type `const char *' but we're not ready for that. @@ -253,7 +253,7 @@ 29 AUE_RECVFROM STD { int recvfrom( int s, - _Out_writes_bytes_(len) caddr_t buf, + _Out_writes_bytes_(len) void *buf, size_t len, int flags, _Out_writes_bytes_opt_(*fromlenaddr) struct sockaddr *from, @@ -336,7 +336,7 @@ } 44 AUE_PROFILE STD { int profil( - _Out_writes_bytes_(size) caddr_t samples, + _Out_writes_bytes_(size) char *samples, size_t size, size_t offset, u_int scale @@ -398,7 +398,7 @@ int ioctl( int fd, u_long com, - _Inout_opt_ caddr_t data + _Inout_opt_ char *data ); } 55 AUE_REBOOT STD { @@ -630,14 +630,14 @@ 98 AUE_CONNECT STD { int connect( int s, - _In_reads_bytes_(namelen) caddr_t name, + _In_reads_bytes_(namelen) const struct sockaddr *name, int namelen ); } 99 AUE_ACCEPT COMPAT|NOARGS { int accept( int s, - _Out_writes_bytes_opt_(*anamelen) caddr_t name, + _Out_writes_bytes_opt_(*anamelen) struct sockaddr *name, int *anamelen ); } accept accept_args int @@ -650,7 +650,7 @@ 101 AUE_SEND COMPAT { int send( int s, - _In_reads_bytes_(len) caddr_t buf, + _In_reads_bytes_(len) const void *buf, int len, int flags ); @@ -658,7 +658,7 @@ 102 AUE_RECV COMPAT { int recv( int s, - _Out_writes_bytes_(len) caddr_t buf, + _Out_writes_bytes_(len) void *buf, int len, int flags ); @@ -671,7 +671,7 @@ 104 AUE_BIND STD { int bind( int s, - _In_reads_bytes_(namelen) caddr_t name, + _In_reads_bytes_(namelen) const struct sockaddr *name, int namelen ); } @@ -680,7 +680,7 @@ int s, int level, int name, - _In_reads_bytes_opt_(valsize) caddr_t val, + _In_reads_bytes_opt_(valsize) const void *val, int valsize ); } @@ -731,7 +731,7 @@ 114 AUE_SENDMSG COMPAT { int sendmsg( int s, - _In_ caddr_t msg, + _In_ const void *msg, int flags ); } @@ -753,7 +753,7 @@ int s, int level, int name, - _Out_writes_bytes_opt_(*avalsize) caddr_t val, + _Out_writes_bytes_opt_(*avalsize) void *val, _Inout_ int *avalsize ); } @@ -794,10 +794,10 @@ 125 AUE_RECVFROM COMPAT|NOARGS { int recvfrom( int s, - _Out_writes_(len) caddr_t buf, + _Out_writes_(len) void *buf, size_t len, int flags, - _Out_writes_bytes_(*fromlenaddr) caddr_t from, + _Out_writes_bytes_(*fromlenaddr) struct sockaddr *from, _Inout_ int *fromlenaddr ); } recvfrom recvfrom_args int @@ -846,10 +846,10 @@ 133 AUE_SENDTO STD { int sendto( int s, - _In_reads_bytes_(len) caddr_t buf, + _In_reads_bytes_(len) const void *buf, size_t len, int flags, - _In_reads_bytes_opt_(tolen) caddr_t to, + _In_reads_bytes_opt_(tolen) const struct sockaddr *to, int tolen ); } @@ -894,7 +894,7 @@ 141 AUE_GETPEERNAME COMPAT { int getpeername( int fdes, - _Out_writes_bytes_(*alen) caddr_t asa, + _Out_writes_bytes_(*alen) struct sockaddr *asa, _Inout_opt_ int *alen ); } @@ -932,7 +932,7 @@ _In_z_ const char *path, int cmd, int uid, - _In_ caddr_t arg + _In_ void *arg ); } 149 AUE_O_QUOTA COMPAT { @@ -941,7 +941,7 @@ 150 AUE_GETSOCKNAME COMPAT|NOARGS { int getsockname( int fdec, - _Out_writes_bytes_(*alen) caddr_t asa, + _Out_writes_bytes_(*alen) struct sockaddr *asa, _Inout_ int *alen ); } getsockname getsockname_args int @@ -966,7 +966,7 @@ 155 AUE_NFS_SVC NOSTD { int nfssvc( int flag, - _In_ caddr_t argp + _In_ void *argp ); } 156 AUE_GETDIRENTRIES COMPAT { @@ -1171,7 +1171,7 @@ } 197 AUE_MMAP COMPAT6 { caddr_t mmap( - _In_ caddr_t addr, + _In_ void *addr, size_t len, int prot, int flags, @@ -2498,9 +2498,9 @@ 472 AUE_SCTP_GENERIC_SENDMSG NOSTD { int sctp_generic_sendmsg( int sd, - _In_reads_bytes_(mlen) caddr_t msg, + _In_reads_bytes_(mlen) void *msg, int mlen, - _In_reads_bytes_(tolen) caddr_t to, + _In_reads_bytes_(tolen) struct sockaddr *to, __socklen_t tolen, _In_opt_ struct sctp_sndrcvinfo *sinfo, int flags @@ -2511,7 +2511,7 @@ int sd, _In_reads_(iovlen) struct iovec *iov, int iovlen, - _In_reads_bytes_(tolen) caddr_t to, + _In_reads_bytes_(tolen) struct sockaddr *to, __socklen_t tolen, _In_opt_ struct sctp_sndrcvinfo *sinfo, int flags @@ -2546,7 +2546,7 @@ } 477 AUE_MMAP STD { caddr_t mmap( - _In_ caddr_t addr, + _In_ void *addr, size_t len, int prot, int flags, @@ -2967,7 +2967,7 @@ int bindat( int fd, int s, - _In_reads_bytes_(namelen) caddr_t name, + _In_reads_bytes_(namelen) const struct sockaddr *name, int namelen ); } @@ -2975,7 +2975,7 @@ int connectat( int fd, int s, - _In_reads_bytes_(namelen) caddr_t name, + _In_reads_bytes_(namelen) const struct sockaddr *name, int namelen ); } Modified: head/sys/kern/uipc_syscalls.c ============================================================================== --- head/sys/kern/uipc_syscalls.c Tue Nov 6 18:26:40 2018 (r340198) +++ head/sys/kern/uipc_syscalls.c Tue Nov 6 18:46:38 2018 (r340199) @@ -825,7 +825,7 @@ sys_sendto(struct thread *td, struct sendto_args *uap) struct msghdr msg; struct iovec aiov; - msg.msg_name = uap->to; + msg.msg_name = __DECONST(void *, uap->to); msg.msg_namelen = uap->tolen; msg.msg_iov = &aiov; msg.msg_iovlen = 1; @@ -833,7 +833,7 @@ sys_sendto(struct thread *td, struct sendto_args *uap) #ifdef COMPAT_OLDSOCK msg.msg_flags = 0; #endif - aiov.iov_base = uap->buf; + aiov.iov_base = __DECONST(void *, uap->buf); aiov.iov_len = uap->len; return (sendit(td, uap->s, &msg, uap->flags)); } @@ -849,7 +849,7 @@ osend(struct thread *td, struct osend_args *uap) msg.msg_namelen = 0; msg.msg_iov = &aiov; msg.msg_iovlen = 1; - aiov.iov_base = uap->buf; + aiov.iov_base = __DECONST(void *, uap->buf); aiov.iov_len = uap->len; msg.msg_control = 0; msg.msg_flags = 0; @@ -1225,7 +1225,7 @@ sys_setsockopt(struct thread *td, struct setsockopt_ar } int -kern_setsockopt(struct thread *td, int s, int level, int name, void *val, +kern_setsockopt(struct thread *td, int s, int level, int name, const void *val, enum uio_seg valseg, socklen_t valsize) { struct socket *so; @@ -1241,7 +1241,7 @@ kern_setsockopt(struct thread *td, int s, int level, i sopt.sopt_dir = SOPT_SET; sopt.sopt_level = level; sopt.sopt_name = name; - sopt.sopt_val = val; + sopt.sopt_val = __DECONST(void *, val); sopt.sopt_valsize = valsize; switch (valseg) { case UIO_USERSPACE: @@ -1546,7 +1546,7 @@ sockargs(struct mbuf **mp, char *buf, socklen_t buflen } int -getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len) +getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, size_t len) { struct sockaddr *sa; int error; Modified: head/sys/sys/syscallsubr.h ============================================================================== --- head/sys/sys/syscallsubr.h Tue Nov 6 18:26:40 2018 (r340198) +++ head/sys/sys/syscallsubr.h Tue Nov 6 18:46:38 2018 (r340199) @@ -243,7 +243,7 @@ int kern_setitimer(struct thread *, u_int, struct itim struct itimerval *); int kern_setrlimit(struct thread *, u_int, struct rlimit *); int kern_setsockopt(struct thread *td, int s, int level, int name, - void *optval, enum uio_seg valseg, socklen_t valsize); + const void *optval, enum uio_seg valseg, socklen_t valsize); int kern_settimeofday(struct thread *td, struct timeval *tv, struct timezone *tzp); int kern_shm_open(struct thread *td, const char *userpath, int flags, From owner-svn-src-head@freebsd.org Tue Nov 6 18:47:31 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 54C0A112D3FC; Tue, 6 Nov 2018 18:47:31 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E33B9860AD; Tue, 6 Nov 2018 18:47:30 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA01928D7; Tue, 6 Nov 2018 18:47:30 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6IlUkQ006142; Tue, 6 Nov 2018 18:47:30 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6IlTLd006137; Tue, 6 Nov 2018 18:47:29 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811061847.wA6IlTLd006137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Tue, 6 Nov 2018 18:47:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340200 - in head/sys: compat/freebsd32 kern sys X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 kern sys X-SVN-Commit-Revision: 340200 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E33B9860AD X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.990,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 18:47:31 -0000 Author: brooks Date: Tue Nov 6 18:47:29 2018 New Revision: 340200 URL: https://svnweb.freebsd.org/changeset/base/340200 Log: Regen after r340199: Use declared types for caddr_t arguments. Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17852 Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_systrace_args.c head/sys/kern/systrace_args.c head/sys/sys/socketvar.h head/sys/sys/sysproto.h Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Tue Nov 6 18:46:38 2018 (r340199) +++ head/sys/compat/freebsd32/freebsd32_proto.h Tue Nov 6 18:47:29 2018 (r340200) @@ -55,10 +55,10 @@ struct freebsd32_sendmsg_args { }; struct freebsd32_recvfrom_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(uint32_t)]; uint32_t buf; char buf_r_[PADR_(uint32_t)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; char len_l_[PADL_(uint32_t)]; uint32_t len; char len_r_[PADR_(uint32_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char from_l_[PADL_(uint32_t)]; uint32_t from; char from_r_[PADR_(uint32_t)]; + char from_l_[PADL_(struct sockaddr *)]; struct sockaddr * from; char from_r_[PADR_(struct sockaddr *)]; char fromlenaddr_l_[PADL_(uint32_t)]; uint32_t fromlenaddr; char fromlenaddr_r_[PADR_(uint32_t)]; }; struct freebsd10_freebsd32_pipe_args { @@ -417,7 +417,7 @@ struct freebsd32_pwrite_args { char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)]; }; struct freebsd32_mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; @@ -461,7 +461,7 @@ struct freebsd32_pwrite_args { char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)]; }; struct freebsd32_mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; @@ -1020,7 +1020,7 @@ struct freebsd6_freebsd32_pwrite_args { char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)]; }; struct freebsd6_freebsd32_mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Tue Nov 6 18:46:38 2018 (r340199) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Tue Nov 6 18:47:29 2018 (r340200) @@ -139,7 +139,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg uarg[0] = (intptr_t) p->type; /* const char * */ uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->flags; /* int */ - uarg[3] = (intptr_t) p->data; /* caddr_t */ + uarg[3] = (intptr_t) p->data; /* void * */ *n_args = 4; break; } @@ -200,10 +200,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 29: { struct freebsd32_recvfrom_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = p->buf; /* uint32_t */ + uarg[1] = (intptr_t) p->buf; /* void * */ uarg[2] = p->len; /* uint32_t */ iarg[3] = p->flags; /* int */ - uarg[4] = p->from; /* uint32_t */ + uarg[4] = (intptr_t) p->from; /* struct sockaddr * */ uarg[5] = p->fromlenaddr; /* uint32_t */ *n_args = 6; break; @@ -212,7 +212,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 30: { struct accept_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->name; /* caddr_t */ + uarg[1] = (intptr_t) p->name; /* struct sockaddr * */ uarg[2] = (intptr_t) p->anamelen; /* int * */ *n_args = 3; break; @@ -221,7 +221,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 31: { struct getpeername_args *p = params; iarg[0] = p->fdes; /* int */ - uarg[1] = (intptr_t) p->asa; /* caddr_t */ + uarg[1] = (intptr_t) p->asa; /* struct sockaddr * */ uarg[2] = (intptr_t) p->alen; /* int * */ *n_args = 3; break; @@ -230,7 +230,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 32: { struct getsockname_args *p = params; iarg[0] = p->fdes; /* int */ - uarg[1] = (intptr_t) p->asa; /* caddr_t */ + uarg[1] = (intptr_t) p->asa; /* struct sockaddr * */ uarg[2] = (intptr_t) p->alen; /* int * */ *n_args = 3; break; @@ -292,7 +292,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* profil */ case 44: { struct profil_args *p = params; - uarg[0] = (intptr_t) p->samples; /* caddr_t */ + uarg[0] = (intptr_t) p->samples; /* char * */ uarg[1] = p->size; /* size_t */ uarg[2] = p->offset; /* size_t */ uarg[3] = p->scale; /* u_int */ @@ -585,7 +585,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 98: { struct connect_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->name; /* caddr_t */ + uarg[1] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[2] = p->namelen; /* int */ *n_args = 3; break; @@ -602,7 +602,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 104: { struct bind_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->name; /* caddr_t */ + uarg[1] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[2] = p->namelen; /* int */ *n_args = 3; break; @@ -613,7 +613,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg iarg[0] = p->s; /* int */ iarg[1] = p->level; /* int */ iarg[2] = p->name; /* int */ - uarg[3] = (intptr_t) p->val; /* caddr_t */ + uarg[3] = (intptr_t) p->val; /* const void * */ iarg[4] = p->valsize; /* int */ *n_args = 5; break; @@ -648,7 +648,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg iarg[0] = p->s; /* int */ iarg[1] = p->level; /* int */ iarg[2] = p->name; /* int */ - uarg[3] = (intptr_t) p->val; /* caddr_t */ + uarg[3] = (intptr_t) p->val; /* void * */ uarg[4] = (intptr_t) p->avalsize; /* int * */ *n_args = 5; break; @@ -740,10 +740,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 133: { struct sendto_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->buf; /* caddr_t */ + uarg[1] = (intptr_t) p->buf; /* const void * */ uarg[2] = p->len; /* size_t */ iarg[3] = p->flags; /* int */ - uarg[4] = (intptr_t) p->to; /* caddr_t */ + uarg[4] = (intptr_t) p->to; /* const struct sockaddr * */ iarg[5] = p->tolen; /* int */ *n_args = 6; break; @@ -808,7 +808,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg uarg[0] = (intptr_t) p->path; /* const char * */ iarg[1] = p->cmd; /* int */ iarg[2] = p->uid; /* int */ - uarg[3] = (intptr_t) p->arg; /* caddr_t */ + uarg[3] = (intptr_t) p->arg; /* void * */ *n_args = 4; break; } @@ -2312,9 +2312,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 472: { struct sctp_generic_sendmsg_args *p = params; iarg[0] = p->sd; /* int */ - uarg[1] = (intptr_t) p->msg; /* caddr_t */ + uarg[1] = (intptr_t) p->msg; /* void * */ iarg[2] = p->mlen; /* int */ - uarg[3] = (intptr_t) p->to; /* caddr_t */ + uarg[3] = (intptr_t) p->to; /* struct sockaddr * */ iarg[4] = p->tolen; /* __socklen_t */ uarg[5] = (intptr_t) p->sinfo; /* struct sctp_sndrcvinfo * */ iarg[6] = p->flags; /* int */ @@ -2327,7 +2327,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg iarg[0] = p->sd; /* int */ uarg[1] = (intptr_t) p->iov; /* struct iovec * */ iarg[2] = p->iovlen; /* int */ - uarg[3] = (intptr_t) p->to; /* caddr_t */ + uarg[3] = (intptr_t) p->to; /* struct sockaddr * */ iarg[4] = p->tolen; /* __socklen_t */ uarg[5] = (intptr_t) p->sinfo; /* struct sctp_sndrcvinfo * */ iarg[6] = p->flags; /* int */ @@ -2375,7 +2375,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* freebsd32_mmap */ case 477: { struct freebsd32_mmap_args *p = params; - uarg[0] = (intptr_t) p->addr; /* caddr_t */ + uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->prot; /* int */ iarg[3] = p->flags; /* int */ @@ -2443,7 +2443,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* freebsd32_mmap */ case 477: { struct freebsd32_mmap_args *p = params; - uarg[0] = (intptr_t) p->addr; /* caddr_t */ + uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->prot; /* int */ iarg[3] = p->flags; /* int */ @@ -3021,7 +3021,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg struct bindat_args *p = params; iarg[0] = p->fd; /* int */ iarg[1] = p->s; /* int */ - uarg[2] = (intptr_t) p->name; /* caddr_t */ + uarg[2] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[3] = p->namelen; /* int */ *n_args = 4; break; @@ -3031,7 +3031,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg struct connectat_args *p = params; iarg[0] = p->fd; /* int */ iarg[1] = p->s; /* int */ - uarg[2] = (intptr_t) p->name; /* caddr_t */ + uarg[2] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[3] = p->namelen; /* int */ *n_args = 4; break; @@ -3462,7 +3462,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland void *"; break; default: break; @@ -3555,7 +3555,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "uint32_t"; + p = "userland void *"; break; case 2: p = "uint32_t"; @@ -3564,7 +3564,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 4: - p = "uint32_t"; + p = "userland struct sockaddr *"; break; case 5: p = "uint32_t"; @@ -3580,7 +3580,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 2: p = "userland int *"; @@ -3596,7 +3596,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 2: p = "userland int *"; @@ -3612,7 +3612,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 2: p = "userland int *"; @@ -3696,7 +3696,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 44: switch(ndx) { case 0: - p = "caddr_t"; + p = "userland char *"; break; case 1: p = "size_t"; @@ -4164,7 +4164,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 2: p = "int"; @@ -4193,7 +4193,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 2: p = "int"; @@ -4215,7 +4215,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland const void *"; break; case 4: p = "int"; @@ -4276,7 +4276,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland void *"; break; case 4: p = "userland int *"; @@ -4431,7 +4431,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland const void *"; break; case 2: p = "size_t"; @@ -4440,7 +4440,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 4: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 5: p = "int"; @@ -4546,7 +4546,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland void *"; break; default: break; @@ -6996,13 +6996,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland void *"; break; case 2: p = "int"; break; case 3: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 4: p = "__socklen_t"; @@ -7030,7 +7030,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 4: p = "__socklen_t"; @@ -7128,7 +7128,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 477: switch(ndx) { case 0: - p = "caddr_t"; + p = "userland void *"; break; case 1: p = "size_t"; @@ -7264,7 +7264,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 477: switch(ndx) { case 0: - p = "caddr_t"; + p = "userland void *"; break; case 1: p = "size_t"; @@ -8323,7 +8323,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 2: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 3: p = "int"; @@ -8342,7 +8342,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 2: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 3: p = "int"; Modified: head/sys/kern/systrace_args.c ============================================================================== --- head/sys/kern/systrace_args.c Tue Nov 6 18:46:38 2018 (r340199) +++ head/sys/kern/systrace_args.c Tue Nov 6 18:47:29 2018 (r340200) @@ -136,7 +136,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg uarg[0] = (intptr_t) p->type; /* const char * */ uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->flags; /* int */ - uarg[3] = (intptr_t) p->data; /* caddr_t */ + uarg[3] = (intptr_t) p->data; /* void * */ *n_args = 4; break; } @@ -197,7 +197,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 29: { struct recvfrom_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->buf; /* caddr_t */ + uarg[1] = (intptr_t) p->buf; /* void * */ uarg[2] = p->len; /* size_t */ iarg[3] = p->flags; /* int */ uarg[4] = (intptr_t) p->from; /* struct sockaddr * */ @@ -289,7 +289,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* profil */ case 44: { struct profil_args *p = params; - uarg[0] = (intptr_t) p->samples; /* caddr_t */ + uarg[0] = (intptr_t) p->samples; /* char * */ uarg[1] = p->size; /* size_t */ uarg[2] = p->offset; /* size_t */ uarg[3] = p->scale; /* u_int */ @@ -346,7 +346,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg struct ioctl_args *p = params; iarg[0] = p->fd; /* int */ uarg[1] = p->com; /* u_long */ - uarg[2] = (intptr_t) p->data; /* caddr_t */ + uarg[2] = (intptr_t) p->data; /* char * */ *n_args = 3; break; } @@ -582,7 +582,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 98: { struct connect_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->name; /* caddr_t */ + uarg[1] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[2] = p->namelen; /* int */ *n_args = 3; break; @@ -599,7 +599,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 104: { struct bind_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->name; /* caddr_t */ + uarg[1] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[2] = p->namelen; /* int */ *n_args = 3; break; @@ -610,7 +610,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg iarg[0] = p->s; /* int */ iarg[1] = p->level; /* int */ iarg[2] = p->name; /* int */ - uarg[3] = (intptr_t) p->val; /* caddr_t */ + uarg[3] = (intptr_t) p->val; /* const void * */ iarg[4] = p->valsize; /* int */ *n_args = 5; break; @@ -645,7 +645,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg iarg[0] = p->s; /* int */ iarg[1] = p->level; /* int */ iarg[2] = p->name; /* int */ - uarg[3] = (intptr_t) p->val; /* caddr_t */ + uarg[3] = (intptr_t) p->val; /* void * */ uarg[4] = (intptr_t) p->avalsize; /* int * */ *n_args = 5; break; @@ -737,10 +737,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 133: { struct sendto_args *p = params; iarg[0] = p->s; /* int */ - uarg[1] = (intptr_t) p->buf; /* caddr_t */ + uarg[1] = (intptr_t) p->buf; /* const void * */ uarg[2] = p->len; /* size_t */ iarg[3] = p->flags; /* int */ - uarg[4] = (intptr_t) p->to; /* caddr_t */ + uarg[4] = (intptr_t) p->to; /* const struct sockaddr * */ iarg[5] = p->tolen; /* int */ *n_args = 6; break; @@ -805,7 +805,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg uarg[0] = (intptr_t) p->path; /* const char * */ iarg[1] = p->cmd; /* int */ iarg[2] = p->uid; /* int */ - uarg[3] = (intptr_t) p->arg; /* caddr_t */ + uarg[3] = (intptr_t) p->arg; /* void * */ *n_args = 4; break; } @@ -823,7 +823,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 155: { struct nfssvc_args *p = params; iarg[0] = p->flag; /* int */ - uarg[1] = (intptr_t) p->argp; /* caddr_t */ + uarg[1] = (intptr_t) p->argp; /* void * */ *n_args = 2; break; } @@ -2474,9 +2474,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg case 472: { struct sctp_generic_sendmsg_args *p = params; iarg[0] = p->sd; /* int */ - uarg[1] = (intptr_t) p->msg; /* caddr_t */ + uarg[1] = (intptr_t) p->msg; /* void * */ iarg[2] = p->mlen; /* int */ - uarg[3] = (intptr_t) p->to; /* caddr_t */ + uarg[3] = (intptr_t) p->to; /* struct sockaddr * */ iarg[4] = p->tolen; /* __socklen_t */ uarg[5] = (intptr_t) p->sinfo; /* struct sctp_sndrcvinfo * */ iarg[6] = p->flags; /* int */ @@ -2489,7 +2489,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg iarg[0] = p->sd; /* int */ uarg[1] = (intptr_t) p->iov; /* struct iovec * */ iarg[2] = p->iovlen; /* int */ - uarg[3] = (intptr_t) p->to; /* caddr_t */ + uarg[3] = (intptr_t) p->to; /* struct sockaddr * */ iarg[4] = p->tolen; /* __socklen_t */ uarg[5] = (intptr_t) p->sinfo; /* struct sctp_sndrcvinfo * */ iarg[6] = p->flags; /* int */ @@ -2532,7 +2532,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg /* mmap */ case 477: { struct mmap_args *p = params; - uarg[0] = (intptr_t) p->addr; /* caddr_t */ + uarg[0] = (intptr_t) p->addr; /* void * */ uarg[1] = p->len; /* size_t */ iarg[2] = p->prot; /* int */ iarg[3] = p->flags; /* int */ @@ -3047,7 +3047,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg struct bindat_args *p = params; iarg[0] = p->fd; /* int */ iarg[1] = p->s; /* int */ - uarg[2] = (intptr_t) p->name; /* caddr_t */ + uarg[2] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[3] = p->namelen; /* int */ *n_args = 4; break; @@ -3057,7 +3057,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg struct connectat_args *p = params; iarg[0] = p->fd; /* int */ iarg[1] = p->s; /* int */ - uarg[2] = (intptr_t) p->name; /* caddr_t */ + uarg[2] = (intptr_t) p->name; /* const struct sockaddr * */ iarg[3] = p->namelen; /* int */ *n_args = 4; break; @@ -3467,7 +3467,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland void *"; break; default: break; @@ -3560,7 +3560,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland void *"; break; case 2: p = "size_t"; @@ -3701,7 +3701,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 44: switch(ndx) { case 0: - p = "caddr_t"; + p = "userland char *"; break; case 1: p = "size_t"; @@ -3794,7 +3794,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "u_long"; break; case 2: - p = "caddr_t"; + p = "userland char *"; break; default: break; @@ -4169,7 +4169,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 2: p = "int"; @@ -4198,7 +4198,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 2: p = "int"; @@ -4220,7 +4220,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland const void *"; break; case 4: p = "int"; @@ -4281,7 +4281,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland void *"; break; case 4: p = "userland int *"; @@ -4436,7 +4436,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland const void *"; break; case 2: p = "size_t"; @@ -4445,7 +4445,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 4: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 5: p = "int"; @@ -4551,7 +4551,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland void *"; break; default: break; @@ -4583,7 +4583,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland void *"; break; default: break; @@ -7276,13 +7276,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 1: - p = "caddr_t"; + p = "userland void *"; break; case 2: p = "int"; break; case 3: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 4: p = "__socklen_t"; @@ -7310,7 +7310,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 3: - p = "caddr_t"; + p = "userland struct sockaddr *"; break; case 4: p = "__socklen_t"; @@ -7395,7 +7395,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d case 477: switch(ndx) { case 0: - p = "caddr_t"; + p = "userland void *"; break; case 1: p = "size_t"; @@ -8312,7 +8312,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 2: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 3: p = "int"; @@ -8331,7 +8331,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "int"; break; case 2: - p = "caddr_t"; + p = "userland const struct sockaddr *"; break; case 3: p = "int"; Modified: head/sys/sys/socketvar.h ============================================================================== --- head/sys/sys/socketvar.h Tue Nov 6 18:46:38 2018 (r340199) +++ head/sys/sys/socketvar.h Tue Nov 6 18:47:29 2018 (r340200) @@ -379,7 +379,8 @@ struct uio; /* * From uipc_socket and friends */ -int getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len); +int getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, + size_t len); int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp, u_int *fflagp, struct filecaps *havecaps); void soabort(struct socket *so); Modified: head/sys/sys/sysproto.h ============================================================================== --- head/sys/sys/sysproto.h Tue Nov 6 18:46:38 2018 (r340199) +++ head/sys/sys/sysproto.h Tue Nov 6 18:47:29 2018 (r340200) @@ -99,7 +99,7 @@ struct mount_args { char type_l_[PADL_(const char *)]; const char * type; char type_r_[PADR_(const char *)]; char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)]; + char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; }; struct unmount_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; @@ -132,7 +132,7 @@ struct sendmsg_args { }; struct recvfrom_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; char from_l_[PADL_(struct sockaddr *)]; struct sockaddr * from; char from_r_[PADR_(struct sockaddr *)]; @@ -185,7 +185,7 @@ struct getegid_args { register_t dummy; }; struct profil_args { - char samples_l_[PADL_(caddr_t)]; caddr_t samples; char samples_r_[PADR_(caddr_t)]; + char samples_l_[PADL_(char *)]; char * samples; char samples_r_[PADR_(char *)]; char size_l_[PADL_(size_t)]; size_t size; char size_r_[PADR_(size_t)]; char offset_l_[PADL_(size_t)]; size_t offset; char offset_r_[PADR_(size_t)]; char scale_l_[PADL_(u_int)]; u_int scale; char scale_r_[PADR_(u_int)]; @@ -219,7 +219,7 @@ struct sigaltstack_args { struct ioctl_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char com_l_[PADL_(u_long)]; u_long com; char com_r_[PADR_(u_long)]; - char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)]; + char data_l_[PADL_(char *)]; char * data; char data_r_[PADR_(char *)]; }; struct reboot_args { char opt_l_[PADL_(int)]; int opt; char opt_r_[PADR_(int)]; @@ -347,7 +347,7 @@ struct socket_args { }; struct connect_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; + char name_l_[PADL_(const struct sockaddr *)]; const struct sockaddr * name; char name_r_[PADR_(const struct sockaddr *)]; char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)]; }; struct getpriority_args { @@ -356,14 +356,14 @@ struct getpriority_args { }; struct bind_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; + char name_l_[PADL_(const struct sockaddr *)]; const struct sockaddr * name; char name_r_[PADR_(const struct sockaddr *)]; char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)]; }; struct setsockopt_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; char level_l_[PADL_(int)]; int level; char level_r_[PADR_(int)]; char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; - char val_l_[PADL_(caddr_t)]; caddr_t val; char val_r_[PADR_(caddr_t)]; + char val_l_[PADL_(const void *)]; const void * val; char val_r_[PADR_(const void *)]; char valsize_l_[PADL_(int)]; int valsize; char valsize_r_[PADR_(int)]; }; struct listen_args { @@ -382,7 +382,7 @@ struct getsockopt_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; char level_l_[PADL_(int)]; int level; char level_r_[PADR_(int)]; char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; - char val_l_[PADL_(caddr_t)]; caddr_t val; char val_r_[PADR_(caddr_t)]; + char val_l_[PADL_(void *)]; void * val; char val_r_[PADR_(void *)]; char avalsize_l_[PADL_(int *)]; int * avalsize; char avalsize_r_[PADR_(int *)]; }; struct readv_args { @@ -430,10 +430,10 @@ struct mkfifo_args { }; struct sendto_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; + char to_l_[PADL_(const struct sockaddr *)]; const struct sockaddr * to; char to_r_[PADR_(const struct sockaddr *)]; char tolen_l_[PADL_(int)]; int tolen; char tolen_r_[PADR_(int)]; }; struct shutdown_args { @@ -471,7 +471,7 @@ struct quotactl_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)]; - char arg_l_[PADL_(caddr_t)]; caddr_t arg; char arg_r_[PADR_(caddr_t)]; + char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)]; }; struct oquota_args { register_t dummy; @@ -484,7 +484,7 @@ struct nlm_syscall_args { }; struct nfssvc_args { char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; - char argp_l_[PADL_(caddr_t)]; caddr_t argp; char argp_r_[PADR_(caddr_t)]; + char argp_l_[PADL_(void *)]; void * argp; char argp_r_[PADR_(void *)]; }; struct lgetfh_args { char fname_l_[PADL_(const char *)]; const char * fname; char fname_r_[PADR_(const char *)]; @@ -1318,9 +1318,9 @@ struct sctp_peeloff_args { }; struct sctp_generic_sendmsg_args { char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)]; - char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)]; + char msg_l_[PADL_(void *)]; void * msg; char msg_r_[PADR_(void *)]; char mlen_l_[PADL_(int)]; int mlen; char mlen_r_[PADR_(int)]; - char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; + char to_l_[PADL_(struct sockaddr *)]; struct sockaddr * to; char to_r_[PADR_(struct sockaddr *)]; char tolen_l_[PADL_(__socklen_t)]; __socklen_t tolen; char tolen_r_[PADR_(__socklen_t)]; char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; @@ -1329,7 +1329,7 @@ struct sctp_generic_sendmsg_iov_args { char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)]; char iov_l_[PADL_(struct iovec *)]; struct iovec * iov; char iov_r_[PADR_(struct iovec *)]; char iovlen_l_[PADL_(int)]; int iovlen; char iovlen_r_[PADR_(int)]; - char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; + char to_l_[PADL_(struct sockaddr *)]; struct sockaddr * to; char to_r_[PADR_(struct sockaddr *)]; char tolen_l_[PADL_(__socklen_t)]; __socklen_t tolen; char tolen_r_[PADR_(__socklen_t)]; char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; @@ -1356,7 +1356,7 @@ struct pwrite_args { char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; }; struct mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; @@ -1645,13 +1645,13 @@ struct cap_fcntls_get_args { struct bindat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; + char name_l_[PADL_(const struct sockaddr *)]; const struct sockaddr * name; char name_r_[PADR_(const struct sockaddr *)]; char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)]; }; struct connectat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; + char name_l_[PADL_(const struct sockaddr *)]; const struct sockaddr * name; char name_r_[PADR_(const struct sockaddr *)]; char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)]; }; struct chflagsat_args { @@ -2207,13 +2207,13 @@ struct sethostname_args { }; struct osend_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; + char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; struct orecv_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; + char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; @@ -2245,7 +2245,7 @@ struct orecvmsg_args { }; struct osendmsg_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)]; + char msg_l_[PADL_(const void *)]; const void * msg; char msg_r_[PADR_(const void *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; struct otruncate_args { @@ -2258,7 +2258,7 @@ struct oftruncate_args { }; struct ogetpeername_args { char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(caddr_t)]; caddr_t asa; char asa_r_[PADR_(caddr_t)]; + char asa_l_[PADL_(struct sockaddr *)]; struct sockaddr * asa; char asa_r_[PADR_(struct sockaddr *)]; char alen_l_[PADL_(int *)]; int * alen; char alen_r_[PADR_(int *)]; }; struct osethostid_args { @@ -2401,7 +2401,7 @@ struct freebsd6_pwrite_args { char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; }; struct freebsd6_mmap_args { - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; + char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; From owner-svn-src-head@freebsd.org Tue Nov 6 20:13:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 EBB33112FCF3; Tue, 6 Nov 2018 20:13:51 +0000 (UTC) (envelope-from markiyan.kushnir@gmail.com) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0522F6BD1F; Tue, 6 Nov 2018 20:13:51 +0000 (UTC) (envelope-from markiyan.kushnir@gmail.com) Received: by mail-io1-xd2e.google.com with SMTP id 79-v6so10222655iou.2; Tue, 06 Nov 2018 12:13:51 -0800 (PST) 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=hANb27LVd5l6beyz+fK9Pgh9w6ulISKZ1PuSm7/G8do=; b=nIuvKMufkVBMzikF5wLxCHw3c4GXpbLj9R+5f6MMb/Wd6H9v2Hn3f/0A30O2jgHbYo hTj623Twc52Iy8Tg4RfYtq0mRmx4RwCRglpnENZesfFzMPLOi5VSSYVN7hymqcwLBa0g ugDlJ1SPU4OhLq600+GMcyAc7gCPT6l8V76sALpNbJV0NnbS4tHU1OPG3G6NSOq2hNB6 dE0SANFeqBP6b2gqVujWcI7g/dM1ELLABueglpT6XZ62g3TRcB4ZyvKWOu5rxwWKt19u tXTfcw7iT+aHEtWycdcjKol2Qu8HSlmp+vW+1+G+ZpjJEJaJpG+ym6wzDG0OISOPE8GK Hy9w== 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=hANb27LVd5l6beyz+fK9Pgh9w6ulISKZ1PuSm7/G8do=; b=EDTIym8GGPkcY67Kz1nJ8jvxphzHkxdMrENPrYqdWStgUVTkDCb50Mfz/DhcnJJZYK JRV4iP4AqQ5AceXFxhnjw+IEkXxNqYsG2a7tZk1h/tyrJowsccZKKoJVq5tW+lSA+cBl 9tN+WEIDC1X7L0MSrpnabrdGl+Yn5oznD1c8Twqc2E6/R812cU9d4/W2F766l26RWNuF /QN0U82OiDal8zLvM7wAEZGkTE8xBhyl7clGSQ8uVGyEGVUg53fsNTVfHPRpOtfR+6TB XgYsBtUo2lubi4bDx+lV/UdWwRZC+yNDVgbx9Dmrpw76R2yLqGvM9lRRYm9hPhPHZCfT sdPQ== X-Gm-Message-State: AGRZ1gKsW7IVjuiOeGoRKjNKw3ytHbxd6hNGhhZIdHSEj3lt50n1n7jf jbzhFGc09TQU4+cQrV/tsX2WK32sIa4a4U9+bP1h+eO0ItE= X-Google-Smtp-Source: AJdET5czC0OJGUUhwrB3rOobm1WttIFvjBHptjuU3cF0IgmlSzIxwtV16wa955ogQrs11mCGVyvhNVw5FYEthiD1DP8= X-Received: by 2002:a6b:5503:: with SMTP id j3-v6mr21557783iob.209.1541535230007; Tue, 06 Nov 2018 12:13:50 -0800 (PST) MIME-Version: 1.0 References: <201810230631.w9N6VPR4008554@repo.freebsd.org> <9612d267-91dc-b1ee-7530-284376f08f08@FreeBSD.org> <CA+Z_v8rcRXR86xnQs32Vgm5q+8DcjJJNHJRZOOuHUQrWSB19zQ@mail.gmail.com> <CACvtUJdu_c8DAxOA=JG6TRGB=ZOrPFL9s49s+SqpWbt4n0GEfA@mail.gmail.com> <CA+Z_v8qRxqZ7di5s03c2AqGQfbT_i9nf-nfveU0PYJgW=Jkdnw@mail.gmail.com> In-Reply-To: <CA+Z_v8qRxqZ7di5s03c2AqGQfbT_i9nf-nfveU0PYJgW=Jkdnw@mail.gmail.com> From: Markiyan Kushnir <markiyan.kushnir@gmail.com> Date: Tue, 6 Nov 2018 22:13:38 +0200 Message-ID: <CACvtUJdV1PYvyNTOFnnFP8qZxZeLPtwOk-aCy6c1LVXnyxf4yA@mail.gmail.com> Subject: Re: svn commit: r339636 - in head: . share/mk To: arichardson@freebsd.org Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-Rspamd-Queue-Id: 0522F6BD1F X-Spamd-Result: default: False [-3.42 / 200.00]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; URI_COUNT_ODD(1.00)[15]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.93)[-0.929,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.961,0]; R_DKIM_ALLOW(-0.20)[gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.993,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; IP_SCORE(-0.52)[ipnet: 2607:f8b0::/32(-1.17), asn: 15169(-1.37), country: US(-0.08)]; RCVD_IN_DNSWL_NONE(0.00)[e.2.d.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]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 20:13:52 -0000 Here it is. Environment: # env SSH_CLIENT=3D10.1.2.10 43379 22 REPLYTO=3Dmarkiyan.kushnir@gmail.com LSCOLORS=3Dgxfxcxdxbxegedabagacad LOGNAME=3Droot PAGER=3Dless MAIL=3D/var/mail/root PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/b= in EDITOR=3Dvim ENV=3D/root/.shrc SSH_AUTH_SOCK=3D/tmp/ssh-vx8WNc4TSI/agent.56491 PWD=3D/root TERM=3Dxterm-256color SSH_TTY=3D/dev/pts/0 HOME=3D/root USER=3Droot GREP_COLOR=3D1;31 SSH_CONNECTION=3D10.1.2.10 43379 10.1.2.150 22 COLORTERM=3D1 SHELL=3D/bin/sh BLOCKSIZE=3DK # cat /etc/make.conf MALLOC_PRODUCTION=3Dtrue .if ${.CURDIR:M*/multimedia/ffmpeg} CFLAGS +=3D -ffast-math -fno-finite-math-only .endif # cat /etc/src.conf WITHOUT_ATM=3Dok WITH_BSD_GREP=3Dok WITHOUT_CROSS_COMPILER=3Dok WITH_CTF=3Dok WITHOUT_DMAGENT=3Dok WITH_EXTRA_TCP_STACKS=3Dok WITHOUT_FLOPPY=3Dok WITHOUT_GNU_DIFF=3Dok WITHOUT_GNU_GREP=3Dok WITHOUT_LIB32=3Dok WITHOUT_LLVM_TARGET_ALL=3Dok WITH_LOADER_LUA=3Dok WITHOUT_MAIL=3Dok # rm -Rf /usr/obj/* # cd /usr/src && /usr/bin/make cleandir # cd /usr/src && /usr/bin/make BUILD_WITH_STRICT_TMPPATH=3D0 buildworld TARGET=3Damd64 yes, "BUILD_WITH_STRICT_TMPPATH=3D0" fixed buildworld, it has just passed 3= .1 stage, now running as usual... -- Markiyan =D0=B2=D1=82, 6 =D0=BB=D0=B8=D1=81=D1=82. 2018 =D0=BE 19:37 Alexander Richa= rdson <arichardson@freebsd.org> =D0=BF=D0=B8=D1=88=D0=B5: > Hi Markiyan, > > > This looks exactly like the SYSTEM_COMPILER/SYSTEM_LINKER build failure > that should have been fixed by r340167. > Does passing BUILD_WITH_STRICT_TMPPATH=3D0 on the make command line fix t= he > build error? If so it seems like I missed one more SYSTEM_COMPILER case. > > Could you send me your buildworld command+environment variables so I can > see what's going wrong? > > Thanks, > Alex > > > On Tue, 6 Nov 2018 at 17:12 Markiyan Kushnir <markiyan.kushnir@gmail.com> > wrote: > >> Alexander, >> >> Cannot tell exactly what change it was, might be one of your recent >> changes to bsd.compiler.mk or Makefile.inc1? ... >> >> Now running "make buildworld" I can proceed with "3.1: recording build >> metadata" only having USING_SYSTEM_COMPILER=3Dyes USING_SYSTEM_LINKER=3D= yes set >> in my environment. Otherwise I'm getting this: >> >> sh: cc: not found >> make[2]: "/work/src.svn/share/mk/bsd.compiler.mk" line 176: Unable to >> determine compiler type for CC=3Dcc -target x86_64-unknown-freebsd13.0 >> --sysroot=3D//usr/obj/work/src.svn/amd64.amd64/tmp >> -B//usr/obj/work/src.svn/amd64.amd64/tmp/usr/bin. Consider setting >> COMPILER_TYPE. >> *** Error code 1 >> >> Stop. >> make[1]: stopped in /work/src.svn >> *** Error code 1 >> >> Stop. >> make: stopped in /work/src.svn >> Failed to build world >> >> I'm at rev. 340189. Could you please have a look? >> >> -- >> Markiyan >> >> =D0=B2=D1=82, 6 =D0=BB=D0=B8=D1=81=D1=82. 2018 =D0=BE 01:11 Alexander Ri= chardson <arichardson@freebsd.org> >> =D0=BF=D0=B8=D1=88=D0=B5: >> >>> On Mon, 5 Nov 2018 at 23:00, Bryan Drewery <bdrewery@freebsd.org> wrote= : >>> > >>> > On 10/22/2018 11:31 PM, Alex Richardson wrote: >>> > > Author: arichardson >>> > > Date: Tue Oct 23 06:31:25 2018 >>> > > New Revision: 339636 >>> > > URL: https://svnweb.freebsd.org/changeset/base/339636 >>> > > >>> > > Log: >>> > > Only compute the X_COMPILER_*/X_LINKER_* variables when needed >>> > > >>> > > When building CheriBSD we have to set XLD/XCC/XCFLAGS on the >>> command line. >>> > > This triggers the $XCC !=3D $CC case in bsd.compiler.mk (and the >>> same for LD >>> > > in bsd.linker.mk) which causes it to call ${XCC} --version and >>> > > ${XLD} --version (plus various awk+sed+echo calls) in every >>> subdirectory. >>> > > For incremental builds and stages that only walk the source tree >>> this is >>> > > often the majority of the time spent in that directory. >>> > > >>> > ... >>> > >>> > > By only computing the value of the X_COMPILER_*/X_LINKER_* >>> variables if >>> > > _WANT_TOOLCHAIN_CROSS_VARS is set we can reduce the number of >>> cc/ld calls >>> > > to once per build stage instead of once per recursive make. >>> > >>> > This sounds wrong. bsd.compiler.mk *already* handles that kind of >>> thing >>> > by exporting its computations. Adding a second hack for a similar >>> > problem isn't the right solution. >>> > >>> >>> I added debug .info statements for every time bsd.compiler.mk was >>> running cc --version and it was always running it for $XCC during make >>> buildworld. >>> As far as I can tell this happens because $CC and $XCC no longer match. >>> I believe the problem is that the toplevel makefile runs the cross >>> stages with CC=3D"${XCC} ${XCFLAGS}" so if you have XCFLAGS set in your >>> environment $CC will never be equal to $XCC. >>> This also means there is not cached variable for $XCC since it was >>> computed for "${XCC} ${XCFLAGS}" rather than $XCC . >>> >>> This patch massively reduced the incremental build time for CheriBSD >>> but if you can suggest I better fix that would be great. >>> >>> Alex >>> >> _______________________________________________ >>> svn-src-all@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/svn-src-all >>> To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" >>> >> From owner-svn-src-head@freebsd.org Tue Nov 6 20:45:16 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 749111130E1E; Tue, 6 Nov 2018 20:45:16 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 05E4A6D582; Tue, 6 Nov 2018 20:45:16 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB2D040EB; Tue, 6 Nov 2018 20:45:15 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6KjF0a068879; Tue, 6 Nov 2018 20:45:15 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6KjFvn068878; Tue, 6 Nov 2018 20:45:15 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811062045.wA6KjFvn068878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Tue, 6 Nov 2018 20:45:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340201 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340201 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 05E4A6D582 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.990,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 20:45:16 -0000 Author: brooks Date: Tue Nov 6 20:45:15 2018 New Revision: 340201 URL: https://svnweb.freebsd.org/changeset/base/340201 Log: Update some comments made obsolete by recent commits. Modified: head/sys/kern/syscalls.master Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Tue Nov 6 18:47:29 2018 (r340200) +++ head/sys/kern/syscalls.master Tue Nov 6 20:45:15 2018 (r340201) @@ -117,8 +117,7 @@ ); } ; XXX should be { int open(const char *path, int flags, ...); } -; but we're not ready for `const' or varargs. -; XXX man page says `mode_t mode'. +; but we're not ready for varargs. 6 AUE_CLOSE STD { int close( int fd @@ -210,7 +209,6 @@ _In_opt_ void *data ); } -; XXX `path' should have type `const char *' but we're not ready for that. 22 AUE_UMOUNT STD { int unmount( _In_z_ const char *path, From owner-svn-src-head@freebsd.org Tue Nov 6 21:47:23 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 DF08C1101E09; Tue, 6 Nov 2018 21:47:23 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 57FCE712BA; Tue, 6 Nov 2018 21:47:23 +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 396454AED; Tue, 6 Nov 2018 21:47:23 +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 wA6LlNUP005354; Tue, 6 Nov 2018 21:47:23 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6LlN4E005353; Tue, 6 Nov 2018 21:47:23 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811062147.wA6LlN4E005353@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Tue, 6 Nov 2018 21:47:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340203 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340203 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 57FCE712BA X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 21:47:24 -0000 Author: markj Date: Tue Nov 6 21:47:22 2018 New Revision: 340203 URL: https://svnweb.freebsd.org/changeset/base/340203 Log: We need opt_stack.h after r339605. Reviewed by: cem Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/tty_info.c Modified: head/sys/kern/tty_info.c ============================================================================== --- head/sys/kern/tty_info.c Tue Nov 6 20:46:00 2018 (r340202) +++ head/sys/kern/tty_info.c Tue Nov 6 21:47:22 2018 (r340203) @@ -45,6 +45,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_stack.h" + #include <sys/param.h> #include <sys/cons.h> #include <sys/kdb.h> From owner-svn-src-head@freebsd.org Tue Nov 6 21:49:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 98BA11101FB8; Tue, 6 Nov 2018 21:49:52 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED735715F2; Tue, 6 Nov 2018 21:49:51 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 CFE494AF4; Tue, 6 Nov 2018 21:49:51 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA6Lnpb3005506; Tue, 6 Nov 2018 21:49:51 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6Lno0O005502; Tue, 6 Nov 2018 21:49:50 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201811062149.wA6Lno0O005502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov <yuripv@FreeBSD.org> Date: Tue, 6 Nov 2018 21:49:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340204 - in head/tools/tools/locale: . etc tools X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: in head/tools/tools/locale: . etc tools X-SVN-Commit-Revision: 340204 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ED735715F2 X-Spamd-Result: default: False [-103.08 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.987,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 21:49:53 -0000 Author: yuripv Date: Tue Nov 6 21:49:50 2018 New Revision: 340204 URL: https://svnweb.freebsd.org/changeset/base/340204 Log: Cleanup locale tools: - Simplify the source dir specification, and update README appropriately - Drop the LC (doonly) processing, it's broken, and even if fixed, not really useful - Don't remove the target directories while installing new data as it removes Makefile.depend which we don't manage; only rm the files we are going to add/replace/delete instead - Restrict adding bsd.endian.mk to colldef and ctypedef Makefiles, it's not needed in other (text-only) categories - GC unused scripts; they don't seem to be particularly helpful standalone as well Reviewed by: bapt Approved by: kib (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17858 Deleted: head/tools/tools/locale/etc/unicode.conf head/tools/tools/locale/tools/UTF82encoding.pl head/tools/tools/locale/tools/changeoffset.pl head/tools/tools/locale/tools/unicode2src.pl head/tools/tools/locale/tools/whatis.pl Modified: head/tools/tools/locale/Makefile head/tools/tools/locale/README head/tools/tools/locale/tools/cldr2def.pl head/tools/tools/locale/tools/finalize head/tools/tools/locale/tools/utf8-rollup.pl Modified: head/tools/tools/locale/Makefile ============================================================================== --- head/tools/tools/locale/Makefile Tue Nov 6 21:47:22 2018 (r340203) +++ head/tools/tools/locale/Makefile Tue Nov 6 21:49:50 2018 (r340204) @@ -10,13 +10,10 @@ .OBJDIR: . -.if !defined(CLDRDIR) -CLDRDIR!= grep ^cldr etc/unicode.conf | cut -f 2 -d " " +.if !defined(UNIDIR) +.error UNIDIR is not set .endif -.if !defined(UNIDATADIR) -UNIDATADIR!= grep ^unidata etc/unicode.conf | cut -f 2 -d " " -.endif -PASSON= CLDRDIR="${CLDRDIR}" UNIDATADIR="${UNIDATADIR}" +PASSON= UNIDIR="${UNIDIR}" ETCDIR= ${.CURDIR}/etc @@ -49,12 +46,8 @@ COLLATIONS_SPECIAL_ENV+= ${area}.${enc} .endfor PASSON+= COLLATIONS_SPECIAL="${COLLATIONS_SPECIAL_ENV}" -.if defined(LC) -LC:= --lc=${LC} -.endif - all: - cp ${ETCDIR}/common.UTF-8.src ${CLDRDIR}/posix/xx_Comm_C.UTF-8.src + cp ${ETCDIR}/common.UTF-8.src ${UNIDIR}/posix/xx_Comm_C.UTF-8.src .for t in ${TYPES} . if ${KNOWN:M${t}} test -d ${t} || mkdir ${t} @@ -69,8 +62,9 @@ install: install-${t} install-${t}: . if ${KNOWN:M${t}} rm -rf ${.CURDIR}/${t}.draft - rm -rf ${.CURDIR}/../../../share/${t} - mv ${.CURDIR}/${t} ${.CURDIR}/../../../share/${t} + rm -f ${.CURDIR}/../../../share/${t}/Makefile + rm -f ${.CURDIR}/../../../share/${t}/*.src + mv ${.CURDIR}/${t}/* ${.CURDIR}/../../../share/${t}/ . endif .endfor @@ -86,10 +80,9 @@ post-install: gen-${t}: mkdir -p ${t} ${t}.draft perl -I tools tools/cldr2def.pl \ - --cldr=$$(realpath ${CLDRDIR}) \ - --unidata=$$(realpath ${UNIDATADIR}) \ + --unidir=$$(realpath ${UNIDIR}) \ --etc=$$(realpath ${ETCDIR}) \ - --type=${t} ${LC} + --type=${t} build-${t}: gen-${t} env ${PASSON} tools/finalize ${t} @@ -101,15 +94,16 @@ build-colldef: static-colldef static-colldef: .for area enc in ${COLLATION_SPECIAL} - awk -f tools/extract-colldef.awk ${CLDRDIR}/posix/${area}.${enc}.src > colldef.draft/${area}.${enc}.src + awk -f tools/extract-colldef.awk ${UNIDIR}/posix/${area}.${enc}.src > \ + colldef.draft/${area}.${enc}.src .endfor transfer-rollup: - cp ${ETCDIR}/common.UTF-8.src ${CLDRDIR}/posix/xx_Comm_C.UTF-8.src + cp ${ETCDIR}/common.UTF-8.src ${UNIDIR}/posix/xx_Comm_C.UTF-8.src rollup: perl -I tools tools/utf8-rollup.pl \ - --cldr=$$(realpath ${CLDRDIR}) \ + --unidir=$$(realpath ${UNIDIR}) \ --etc=$$(realpath ${ETCDIR}) clean: @@ -159,33 +153,33 @@ ENCODINGS= Big5 \ POSIX: -.if exists (${CLDRDIR}/tools/java/cldr.jar) - mkdir -p ${CLDRDIR}/posix +.if exists (${UNIDIR}/tools/java/cldr.jar) + mkdir -p ${UNIDIR}/posix . for area in ${BASE_LOCALES_OF_INTEREST} -. if !exists(${CLDRDIR}/posix/${area}.UTF-8.src) - java -DCLDR_DIR=${CLDRDIR:Q} -jar ${CLDRDIR}/tools/java/cldr.jar \ +. if !exists(${UNIDIR}/posix/${area}.UTF-8.src) + java -DCLDR_DIR=${UNIDIR:Q} -jar ${UNIDIR}/tools/java/cldr.jar \ org.unicode.cldr.posix.GeneratePOSIX \ - -d ${CLDRDIR}/posix -m ${area} -c UTF-8 + -d ${UNIDIR}/posix -m ${area} -c UTF-8 . endif . endfor . for area encoding in ${COLLATION_SPECIAL} -. if !exists(${CLDRDIR}/posix/${area}.${encoding}.src) - java -DCLDR_DIR=${CLDRDIR:Q} -jar ${CLDRDIR}/tools/java/cldr.jar \ +. if !exists(${UNIDIR}/posix/${area}.${encoding}.src) + java -DCLDR_DIR=${UNIDIR:Q} -jar ${UNIDIR}/tools/java/cldr.jar \ org.unicode.cldr.posix.GeneratePOSIX \ - -d ${CLDRDIR}/posix -m ${area} -c ${encoding} + -d ${UNIDIR}/posix -m ${area} -c ${encoding} . endif . endfor . for enc in ${ENCODINGS} -. if !exists(${CLDRDIR}/posix/${enc}.cm) - java -DCLDR_DIR=${CLDRDIR:Q} -jar ${CLDRDIR}/tools/java/cldr.jar \ +. if !exists(${UNIDIR}/posix/${enc}.cm) + java -DCLDR_DIR=${UNIDIR:Q} -jar ${UNIDIR}/tools/java/cldr.jar \ org.unicode.cldr.posix.GenerateCharmap \ - -d ${CLDRDIR}/posix -c ${enc} + -d ${UNIDIR}/posix -c ${enc} . endif . endfor .else @echo "Please install CLDR toolset for the desired release" - @echo "It should go at ${CLDRDIR}/tools" + @echo "It should go at ${UNIDIR}/tools" .endif clean-POSIX: - rm -f ${CLDRDIR}/posix/* + rm -f ${UNIDIR}/posix/* Modified: head/tools/tools/locale/README ============================================================================== --- head/tools/tools/locale/README Tue Nov 6 21:47:22 2018 (r340203) +++ head/tools/tools/locale/README Tue Nov 6 21:49:50 2018 (r340204) @@ -9,30 +9,23 @@ Tools needed: devel/p5-Tie-IxHash textproc/p5-XML-Parser -Fetch CLDR data from: http://unicode.org/Public/cldr/. You need all of the +1. Fetch CLDR data from: http://unicode.org/Public/cldr/. You need all of the core.zip, keyboards.zip, and tools.zip. - -Extract: - mkdir -p ~/unicode/cldr/v33.0 - cd ~/unicode/cldr/v33.0 - unzip ~/core.zip ~/keyboards.zip ~/tools.zip - -Fetch unidata (UCD.zip) from http://www.unicode.org/Public/zipped/latest. - -Extract: - mkdir -p ~/unicode/UNIDATA/11.0.0 - cd ~/unicode/UNIDATA/11.0.0 +2. Fetch unidata (UCD.zip) from http://www.unicode.org/Public/zipped/latest. +3. Extract: + mkdir -p ~/unicode + cd ~/unicode + unzip ~/core.zip + unzip ~/keyboards.zip + unzip ~/tools.zip unzip ~/UCD.zip - -Either modify tools/tools/locales/etc/unicode.conf or export variables: - CLDRDIR=~/unicode/cldr/v33.0; export CLDRDIR - UNIDATADIR=~/unicode/UNIDATA/9.0.0; export UNIDATADIR - -Build the CLDR tools: - cd $CLDRDIR/tools/java +4. Export variable: + UNIDIR=~/unicode; export UNIDIR +5. Build the CLDR tools: + cd $UNIDIR/tools/java ant jar - -Run: +6. Build POSIX data files from CLDR data: make POSIX +7. Build and install new locale data: make make install Modified: head/tools/tools/locale/tools/cldr2def.pl ============================================================================== --- head/tools/tools/locale/tools/cldr2def.pl Tue Nov 6 21:47:22 2018 (r340203) +++ head/tools/tools/locale/tools/cldr2def.pl Tue Nov 6 21:49:50 2018 (r340204) @@ -6,32 +6,27 @@ use File::Copy; use XML::Parser; use Tie::IxHash; use Text::Iconv; -use Data::Dumper; +#use Data::Dumper; use Getopt::Long; use Digest::SHA qw(sha1_hex); require "charmaps.pm"; if ($#ARGV < 2) { - print "Usage: $0 --cldr=<cldrdir> --unidata=<unidatadir> --etc=<etcdir> --type=<type> [--lc=<la_CC>]\n"; + print "Usage: $0 --unidir=<unidir> --etc=<etcdir> --type=<type>\n"; exit(1); } my $DEFENCODING = "UTF-8"; -my @filter = (); -my $CLDRDIR = undef; -my $UNIDATADIR = undef; +my $UNIDIR = undef; my $ETCDIR = undef; my $TYPE = undef; -my $doonly = undef; my $result = GetOptions ( - "cldr=s" => \$CLDRDIR, - "unidata=s" => \$UNIDATADIR, + "unidir=s" => \$UNIDIR, "etc=s" => \$ETCDIR, "type=s" => \$TYPE, - "lc=s" => \$doonly ); my %convertors = (); @@ -47,8 +42,8 @@ get_languages(); my %utf8map = (); my %utf8aliases = (); -get_unidata($UNIDATADIR); -get_utf8map("$CLDRDIR/posix/$DEFENCODING.cm"); +get_unidata($UNIDIR); +get_utf8map("$UNIDIR/posix/$DEFENCODING.cm"); get_encodings("$ETCDIR/charmaps"); my %keys = (); @@ -397,22 +392,6 @@ sub get_languages { %translations = %{$data{T}}; %alternativemonths = %{$data{AM}}; %encodings = %{$data{E}}; - - return if (!defined $doonly); - - my @a = split(/_/, $doonly); - if ($#a == 1) { - $filter[0] = $a[0]; - $filter[1] = "x"; - $filter[2] = $a[1]; - } elsif ($#a == 2) { - $filter[0] = $a[0]; - $filter[1] = $a[1]; - $filter[2] = $a[2]; - } - - print Dumper(@filter); - return; } sub transform_ctypes { @@ -422,8 +401,6 @@ sub transform_ctypes { foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { - next if ($#filter == 2 && ($filter[0] ne $l - || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); $languages{$l}{$f}{data}{$c}{$DEFENCODING} = 0; # unread @@ -432,7 +409,7 @@ sub transform_ctypes { $file .= "_" . $c if ($c ne "x"); my $actfile = $file; - my $filename = "$CLDRDIR/posix/xx_Comm_C.UTF-8.src"; + my $filename = "$UNIDIR/posix/xx_Comm_C.UTF-8.src"; if (! -f $filename) { print STDERR "Cannot open $filename\n"; next; @@ -455,7 +432,7 @@ sub transform_ctypes { close(FOUT); foreach my $enc (sort keys(%{$languages{$l}{$f}{data}{$c}})) { next if ($enc eq $DEFENCODING); - $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src"; + $filename = "$UNIDIR/posix/$file.$DEFENCODING.src"; if (! -f $filename) { print STDERR "Cannot open $filename\n"; next; @@ -494,8 +471,6 @@ sub transform_collation { foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { - next if ($#filter == 2 && ($filter[0] ne $l - || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); $languages{$l}{$f}{data}{$c}{$DEFENCODING} = 0; # unread @@ -505,15 +480,15 @@ sub transform_collation { $file .= $c; my $actfile = $file; - my $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src"; + my $filename = "$UNIDIR/posix/$file.$DEFENCODING.src"; $filename = "$ETCDIR/$file.$DEFENCODING.src" if (! -f $filename); if (! -f $filename && defined $languages{$l}{$f}{fallback}) { $file = $languages{$l}{$f}{fallback}; - $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src"; + $filename = "$UNIDIR/posix/$file.$DEFENCODING.src"; } - $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src" + $filename = "$UNIDIR/posix/$file.$DEFENCODING.src" if (! -f $filename); if (! -f $filename) { print STDERR @@ -564,8 +539,6 @@ sub get_fields { foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { - next if ($#filter == 2 && ($filter[0] ne $l - || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); @@ -575,15 +548,15 @@ sub get_fields { $file .= $f . "_" if ($f ne "x"); $file .= $c; - my $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src"; + my $filename = "$UNIDIR/posix/$file.$DEFENCODING.src"; $filename = "$ETCDIR/$file.$DEFENCODING.src" if (! -f $filename); if (! -f $filename && defined $languages{$l}{$f}{fallback}) { $file = $languages{$l}{$f}{fallback}; - $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src"; + $filename = "$UNIDIR/posix/$file.$DEFENCODING.src"; } - $filename = "$CLDRDIR/posix/$file.$DEFENCODING.src" + $filename = "$UNIDIR/posix/$file.$DEFENCODING.src" if (! -f $filename); if (! -f $filename) { print STDERR @@ -703,8 +676,6 @@ sub print_fields { foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { - next if ($#filter == 2 && ($filter[0] ne $l - || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); foreach my $enc (sort keys(%{$languages{$l}{$f}{data}{$c}})) { @@ -851,7 +822,6 @@ EOF } sub make_makefile { - return if ($#filter > -1); print "Creating Makefile for $TYPE\n"; my $SRCOUT; my $SRCOUT2; @@ -913,8 +883,16 @@ LOCALEDIR= \${SHAREDIR}/locale FILESNAME= $FILESNAMES{$TYPE} .SUFFIXES: .src .${SRCOUT2} ${MAPLOC} +EOF + + if ($TYPE eq "colldef" || $TYPE eq "ctypedef") { + print FOUT <<EOF; .include <bsd.endian.mk> +EOF + } + + print FOUT <<EOF; .src.${SRCOUT2}: $SRCOUT @@ -979,8 +957,6 @@ EOF foreach my $l (sort keys(%languages)) { foreach my $f (sort keys(%{$languages{$l}})) { foreach my $c (sort keys(%{$languages{$l}{$f}{data}})) { - next if ($#filter == 2 && ($filter[0] ne $l - || $filter[1] ne $f || $filter[2] ne $c)); next if (defined $languages{$l}{$f}{definitions} && $languages{$l}{$f}{definitions} !~ /$TYPE/); if (defined $languages{$l}{$f}{data}{$c}{$DEFENCODING} Modified: head/tools/tools/locale/tools/finalize ============================================================================== --- head/tools/tools/locale/tools/finalize Tue Nov 6 21:47:22 2018 (r340203) +++ head/tools/tools/locale/tools/finalize Tue Nov 6 21:49:50 2018 (r340204) @@ -116,13 +116,13 @@ then else {last1 = $1; last2 = $2}}' ${TEMP2} > ${TEMP3} rm -f ${TEMP2} /usr/bin/sed -E -e 's/[ ]+/ /g' \ - ${CLDRDIR}/posix/UTF-8.cm \ + ${UNIDIR}/posix/UTF-8.cm \ > ${base}/../etc/final-maps/map.UTF-8 /usr/bin/sed -E -e 's/[ ]+/ /g' \ - ${CLDRDIR}/posix/eucCN.cm \ + ${UNIDIR}/posix/eucCN.cm \ > ${base}/../etc/final-maps/map.eucCN /usr/bin/sed -E -e 's/[ ]+/ /g' \ - ${CLDRDIR}/posix/eucCN.cm \ + ${UNIDIR}/posix/eucCN.cm \ > ${base}/../etc/final-maps/map.GB2312 CHARMAPS="ARMSCII-8 Big5 CP1131 CP1251 \ CP866 GBK ISCII-DEV ISO8859-1 \ Modified: head/tools/tools/locale/tools/utf8-rollup.pl ============================================================================== --- head/tools/tools/locale/tools/utf8-rollup.pl Tue Nov 6 21:47:22 2018 (r340203) +++ head/tools/tools/locale/tools/utf8-rollup.pl Tue Nov 6 21:49:50 2018 (r340204) @@ -1,4 +1,5 @@ #!/usr/local/bin/perl -wC +# $FreeBSD$ use strict; #use File::Copy; @@ -11,15 +12,15 @@ use Getopt::Long; if ($#ARGV != 1) { - print "Usage: $0 --cldr=<cldrdir> --etc=<etcdir>\n"; + print "Usage: $0 --unidir=<unidir> --etc=<etcdir>\n"; exit(1); } -my $CLDRDIR = undef; +my $UNIDIR = undef; my $ETCDIR = undef; my $result = GetOptions ( - "cldr=s" => \$CLDRDIR, + "unidir=s" => \$UNIDIR, "etc=s" => \$ETCDIR, ); @@ -118,7 +119,7 @@ my $outfilename = "$ETCDIR/common.UTF-8.src"; my $manual_file = "$ETCDIR/manual-input.UTF-8"; my $stars = "**********************************************************************\n"; -get_utf8map("$CLDRDIR/posix/UTF-8.cm"); +get_utf8map("$UNIDIR/posix/UTF-8.cm"); generate_header (); generate_sections (); generate_footer (); @@ -252,7 +253,7 @@ sub compress_ctype { my @lines = initialize_lines ($territory); - my $filename = "$CLDRDIR/posix/$territory.UTF-8.src"; + my $filename = "$UNIDIR/posix/$territory.UTF-8.src"; if (! -f $filename) { print STDERR "Cannot open $filename\n"; return; From owner-svn-src-head@freebsd.org Tue Nov 6 21:57:04 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B5FB8110236A; Tue, 6 Nov 2018 21:57:04 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 070FC71BD7; Tue, 6 Nov 2018 21:57:04 +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 D6FE44C8E; Tue, 6 Nov 2018 21:57: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 wA6Lv3bh011198; Tue, 6 Nov 2018 21:57:03 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6Lv3b2011196; Tue, 6 Nov 2018 21:57:03 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811062157.wA6Lv3b2011196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Tue, 6 Nov 2018 21:57:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340205 - in head/sys: kern vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: kern vm X-SVN-Commit-Revision: 340205 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 070FC71BD7 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.985,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 21:57:04 -0000 Author: markj Date: Tue Nov 6 21:57:03 2018 New Revision: 340205 URL: https://svnweb.freebsd.org/changeset/base/340205 Log: Avoid specifying VM_PROT_EXECUTE in mappings from pipe_map and exec_map. These submaps are used for mapping pipe buffers and execv() argument strings respectively, so there's no need for such mappings to have execute permissions. Reported by: jhb Reviewed by: alc, jhb, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17827 Modified: head/sys/kern/sys_pipe.c head/sys/vm/vm_kern.c Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Tue Nov 6 21:49:50 2018 (r340204) +++ head/sys/kern/sys_pipe.c Tue Nov 6 21:57:03 2018 (r340205) @@ -509,9 +509,8 @@ retry: size = round_page(size); buffer = (caddr_t) vm_map_min(pipe_map); - error = vm_map_find(pipe_map, NULL, 0, - (vm_offset_t *) &buffer, size, 0, VMFS_ANY_SPACE, - VM_PROT_ALL, VM_PROT_ALL, 0); + error = vm_map_find(pipe_map, NULL, 0, (vm_offset_t *)&buffer, size, 0, + VMFS_ANY_SPACE, VM_PROT_RW, VM_PROT_RW, 0); if (error != KERN_SUCCESS) { if ((cpipe->pipe_buffer.buffer == NULL) && (size > SMALL_PIPE_SIZE)) { Modified: head/sys/vm/vm_kern.c ============================================================================== --- head/sys/vm/vm_kern.c Tue Nov 6 21:49:50 2018 (r340204) +++ head/sys/vm/vm_kern.c Tue Nov 6 21:57:03 2018 (r340205) @@ -650,8 +650,8 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size) map->needs_wakeup = TRUE; vm_map_unlock_and_wait(map, 0); } - vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_ALL, - VM_PROT_ALL, MAP_ACC_CHARGED); + vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_RW, VM_PROT_RW, + MAP_ACC_CHARGED); vm_map_unlock(map); return (addr); } From owner-svn-src-head@freebsd.org Tue Nov 6 22:33:38 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 F38FC1103511; Tue, 6 Nov 2018 22:33:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7BAC2737AB; Tue, 6 Nov 2018 22:33:37 +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 5B8D95329; Tue, 6 Nov 2018 22:33:37 +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 wA6MXbvI032205; Tue, 6 Nov 2018 22:33:37 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6MXbNl032204; Tue, 6 Nov 2018 22:33:37 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811062233.wA6MXbNl032204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Tue, 6 Nov 2018 22:33:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340206 - head/sys/dev/cxgbe X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/cxgbe X-SVN-Commit-Revision: 340206 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7BAC2737AB X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.993,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 22:33:38 -0000 Author: jhb Date: Tue Nov 6 22:33:36 2018 New Revision: 340206 URL: https://svnweb.freebsd.org/changeset/base/340206 Log: Treat the memory lengths for CHELSIO_T4_GET_MEM as unsigned. Previously attempts to read the MC region were failing since the length was greater than 2^31. Reviewed by: np MFC after: 2 months Differential Revision: https://reviews.freebsd.org/D17857 Modified: head/sys/dev/cxgbe/t4_main.c Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Tue Nov 6 21:57:03 2018 (r340205) +++ head/sys/dev/cxgbe/t4_main.c Tue Nov 6 22:33:36 2018 (r340206) @@ -529,9 +529,9 @@ struct intrs_and_queues { static void setup_memwin(struct adapter *); static void position_memwin(struct adapter *, int, uint32_t); -static int validate_mem_range(struct adapter *, uint32_t, int); +static int validate_mem_range(struct adapter *, uint32_t, uint32_t); static int fwmtype_to_hwmtype(int); -static int validate_mt_off_len(struct adapter *, int, uint32_t, int, +static int validate_mt_off_len(struct adapter *, int, uint32_t, uint32_t, uint32_t *); static int fixup_devlog_params(struct adapter *); static int cfg_itype_and_nqueues(struct adapter *, struct intrs_and_queues *); @@ -2826,14 +2826,14 @@ t4_range_cmp(const void *a, const void *b) * the card's address space. */ static int -validate_mem_range(struct adapter *sc, uint32_t addr, int len) +validate_mem_range(struct adapter *sc, uint32_t addr, uint32_t len) { struct t4_range mem_ranges[4], *r, *next; uint32_t em, addr_len; int i, n, remaining; /* Memory can only be accessed in naturally aligned 4 byte units */ - if (addr & 3 || len & 3 || len <= 0) + if (addr & 3 || len & 3 || len == 0) return (EINVAL); /* Enabled memories */ @@ -2972,7 +2972,7 @@ fwmtype_to_hwmtype(int mtype) * the start of the range is returned in addr. */ static int -validate_mt_off_len(struct adapter *sc, int mtype, uint32_t off, int len, +validate_mt_off_len(struct adapter *sc, int mtype, uint32_t off, uint32_t len, uint32_t *addr) { uint32_t em, addr_len, maddr; From owner-svn-src-head@freebsd.org Tue Nov 6 22:50:51 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 959D41103CB3; Tue, 6 Nov 2018 22:50:51 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2694A74020; Tue, 6 Nov 2018 22:50:51 +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 07A4B54EC; Tue, 6 Nov 2018 22:50:51 +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 wA6MooZc037369; Tue, 6 Nov 2018 22:50:50 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6Moo1Q037368; Tue, 6 Nov 2018 22:50:50 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201811062250.wA6Moo1Q037368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem <rmacklem@FreeBSD.org> Date: Tue, 6 Nov 2018 22:50:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340207 - head/sys/fs/nfsclient X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/fs/nfsclient X-SVN-Commit-Revision: 340207 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2694A74020 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 22:50:51 -0000 Author: rmacklem Date: Tue Nov 6 22:50:50 2018 New Revision: 340207 URL: https://svnweb.freebsd.org/changeset/base/340207 Log: Change nfs_advlock() so that the NFSVOPUNLOCK() is mostly done at the end. Prior to this patch, nfs_advlock() did NFSVOPUNLOCK(); return (error); in many places. This patch replaces these code sequenences with a "goto out;" and does the NFSVOPUNLOCK(); return (error); at the end of the function in order to make the vnode locking simpler. This patch does not change the semantics of nfs_advlock(). Suggested by: kib Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D17853 Modified: head/sys/fs/nfsclient/nfs_clvnops.c Modified: head/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvnops.c Tue Nov 6 22:33:36 2018 (r340206) +++ head/sys/fs/nfsclient/nfs_clvnops.c Tue Nov 6 22:50:50 2018 (r340207) @@ -3030,16 +3030,16 @@ nfs_advlock(struct vop_advlock_args *ap) struct proc *p = (struct proc *)ap->a_id; struct thread *td = curthread; /* XXX */ struct vattr va; - int ret, error = EOPNOTSUPP; + int ret, error; u_quad_t size; - ret = NFSVOPLOCK(vp, LK_SHARED); - if (ret != 0) + error = NFSVOPLOCK(vp, LK_SHARED); + if (error != 0) return (EBADF); if (NFS_ISV4(vp) && (ap->a_flags & (F_POSIX | F_FLOCK)) != 0) { if (vp->v_type != VREG) { - NFSVOPUNLOCK(vp, 0); - return (EINVAL); + error = EINVAL; + goto out; } if ((ap->a_flags & F_POSIX) != 0) cred = p->p_ucred; @@ -3047,8 +3047,8 @@ nfs_advlock(struct vop_advlock_args *ap) cred = td->td_ucred; NFSVOPLOCK(vp, LK_UPGRADE | LK_RETRY); if (vp->v_iflag & VI_DOOMED) { - NFSVOPUNLOCK(vp, 0); - return (EBADF); + error = EBADF; + goto out; } /* @@ -3077,21 +3077,21 @@ nfs_advlock(struct vop_advlock_args *ap) return (EINTR); NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY); if (vp->v_iflag & VI_DOOMED) { - NFSVOPUNLOCK(vp, 0); - return (EBADF); + error = EBADF; + goto out; } } } while (ret == NFSERR_DENIED && (ap->a_flags & F_WAIT) && ap->a_op == F_SETLK); if (ret == NFSERR_DENIED) { - NFSVOPUNLOCK(vp, 0); - return (EAGAIN); + error = EAGAIN; + goto out; } else if (ret == EINVAL || ret == EBADF || ret == EINTR) { - NFSVOPUNLOCK(vp, 0); - return (ret); + error = ret; + goto out; } else if (ret != 0) { - NFSVOPUNLOCK(vp, 0); - return (EACCES); + error = EACCES; + goto out; } /* @@ -3121,8 +3121,6 @@ nfs_advlock(struct vop_advlock_args *ap) np->n_flag |= NHASBEENLOCKED; mtx_unlock(&np->n_mtx); } - NFSVOPUNLOCK(vp, 0); - return (0); } else if (!NFS_ISV4(vp)) { if ((VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOLOCKD) != 0) { size = VTONFS(vp)->n_size; @@ -3146,8 +3144,11 @@ nfs_advlock(struct vop_advlock_args *ap) NFSVOPUNLOCK(vp, 0); } } + return (error); } else - NFSVOPUNLOCK(vp, 0); + error = EOPNOTSUPP; +out: + NFSVOPUNLOCK(vp, 0); return (error); } From owner-svn-src-head@freebsd.org Tue Nov 6 23:41:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3E38C1104FD3; Tue, 6 Nov 2018 23:41:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C521D75A4B; Tue, 6 Nov 2018 23:41:45 +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 8C1815E4C; Tue, 6 Nov 2018 23:41:45 +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 wA6NfjYL066449; Tue, 6 Nov 2018 23:41:45 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA6NfjYY066444; Tue, 6 Nov 2018 23:41:45 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811062341.wA6NfjYY066444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Tue, 6 Nov 2018 23:41:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340208 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 340208 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C521D75A4B X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2018 23:41:46 -0000 Author: markj Date: Tue Nov 6 23:41:44 2018 New Revision: 340208 URL: https://svnweb.freebsd.org/changeset/base/340208 Log: Avoid fixing the tty_info() buffer size in tty.h. Different compilation units may otherwise get a different view of the layout of struct tty depending on whether they include opt_printf.h. This caused a blowup in the number of types defined in the kernel's CTF file after r339468; thanks to dim@ for bisecting down to that revision. PR: 232675 Reported by: dim Reviewed by: cem (previous version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17877 Modified: head/sys/kern/tty.c head/sys/kern/tty_info.c head/sys/sys/tty.h Modified: head/sys/kern/tty.c ============================================================================== --- head/sys/kern/tty.c Tue Nov 6 22:50:50 2018 (r340207) +++ head/sys/kern/tty.c Tue Nov 6 23:41:44 2018 (r340208) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" +#include "opt_printf.h" #include <sys/param.h> #include <sys/capsicum.h> @@ -106,6 +107,12 @@ SYSCTL_INT(_kern, OID_AUTO, tty_drainwait, CTLFLAG_RWT #define TTYBUF_MAX 65536 +#ifdef PRINTF_BUFR_SIZE +#define TTY_PRBUF_SIZE PRINTF_BUFR_SIZE +#else +#define TTY_PRBUF_SIZE 256 +#endif + /* * Allocate buffer space if necessary, and set low watermarks, based on speed. * Note that the ttyxxxq_setsize() functions may drop and then reacquire the tty @@ -1051,7 +1058,9 @@ tty_alloc_mutex(struct ttydevsw *tsw, void *sc, struct PATCH_FUNC(busy); #undef PATCH_FUNC - tp = malloc(sizeof(struct tty), M_TTY, M_WAITOK|M_ZERO); + tp = malloc(sizeof(struct tty) + TTY_PRBUF_SIZE, M_TTY, + M_WAITOK | M_ZERO); + tp->t_prbufsz = TTY_PRBUF_SIZE; tp->t_devsw = tsw; tp->t_devswsoftc = sc; tp->t_flags = tsw->tsw_flags; Modified: head/sys/kern/tty_info.c ============================================================================== --- head/sys/kern/tty_info.c Tue Nov 6 22:50:50 2018 (r340207) +++ head/sys/kern/tty_info.c Tue Nov 6 23:41:44 2018 (r340208) @@ -271,7 +271,7 @@ tty_info(struct tty *tp) if (tty_checkoutq(tp) == 0) return; - (void)sbuf_new(&sb, tp->t_prbuf, sizeof(tp->t_prbuf), SBUF_FIXEDLEN); + (void)sbuf_new(&sb, tp->t_prbuf, tp->t_prbufsz, SBUF_FIXEDLEN); sbuf_set_drain(&sb, sbuf_tty_drain, tp); /* Print load average. */ Modified: head/sys/sys/tty.h ============================================================================== --- head/sys/sys/tty.h Tue Nov 6 22:50:50 2018 (r340207) +++ head/sys/sys/tty.h Tue Nov 6 23:41:44 2018 (r340208) @@ -133,12 +133,8 @@ struct tty { void *t_hooksoftc; /* (t) Soft config, for hooks. */ struct cdev *t_dev; /* (c) Primary character device. */ -#ifndef PRINTF_BUFR_SIZE -#define TTY_PRINTF_SIZE 256 -#else -#define TTY_PRINTF_SIZE PRINTF_BUFR_SIZE -#endif - char t_prbuf[TTY_PRINTF_SIZE]; /* (t) */ + size_t t_prbufsz; /* (t) SIGINFO buffer size. */ + char t_prbuf[]; /* (t) SIGINFO buffer. */ }; /* From owner-svn-src-head@freebsd.org Wed Nov 7 00:17:40 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 410521106447; Wed, 7 Nov 2018 00:17:40 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F2B677633; Wed, 7 Nov 2018 00:17:39 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA70HbgW098371; Tue, 6 Nov 2018 16:17:37 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA70HbO2098370; Tue, 6 Nov 2018 16:17:37 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811070017.wA70HbO2098370@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340187 - head/sys/geom In-Reply-To: <CAH7qZfvW2ZEqWL5yg9i67=zD562-KtY3tgcpSzCjku1JT3HGXQ@mail.gmail.com> To: Maxim Sobolev <sobomax@freebsd.org> Date: Tue, 6 Nov 2018 16:17:37 -0800 (PST) CC: rgrimes@freebsd.org, src-committers <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: 8F2B677633 X-Spamd-Result: default: False [2.12 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.11)[-0.112,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.08)]; NEURAL_SPAM_SHORT(0.62)[0.616,0]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_MEDIUM(0.74)[0.744,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 00:17:40 -0000 > Rodney, this was actually my original intention, however then I noticed in > the GEOM code there is at least one case when BIO_FLUSH request is being > generated internally with bio_offset == mediasize and bio_lenth == 0, so I > thought there might be some need to allow such requests through. But I'd > happily go with the stricter rule if it does no harm. I simply don't know > enough about the intended use and the logic behind zero-length transfers to > make that call. I am not sure enough on if mediasize is 0 based or not, if it is then the error case should be fixed, and the code you show below should also be fixed as it is technically making a request beyond the end of device. I am also murky on why we are even doing a 0 size operation and end of device, is that to validate we can access all the media? If so then this wrong code and wrong error return should be fixed as it is off by 1. > > -Max > > int > g_io_flush(struct g_consumer *cp) > { > ... > bp = g_alloc_bio(); > bp->bio_cmd = BIO_FLUSH; > ... > bp->bio_offset = cp->provider->mediasize; The above should have a - 1 on it. > bp->bio_length = 0; > bp->bio_data = NULL; > g_io_request(bp, cp); > ... > } > > > > On Tue, Nov 6, 2018 at 8:31 AM Rodney W. Grimes < > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > > Author: sobomax > > > Date: Tue Nov 6 15:55:41 2018 > > > New Revision: 340187 > > > URL: https://svnweb.freebsd.org/changeset/base/340187 > > > > > > Log: > > > Don't allow BIO_READ, BIO_WRITE or BIO_DELETE requests that are > > > fully beyond the end of providers media. The only exception is made > > > for the zero length transfers which are allowed to be just on the > > > boundary. Previously, any requests starting on the boundary (i.e. next > > > byte after the last one) have been allowed to go through. > > > > > > No response from: freebsd-geom@, phk > > > MFC after: 1 month > > > > > > Modified: > > > head/sys/geom/geom_io.c > > > > > > Modified: head/sys/geom/geom_io.c > > > > ============================================================================== > > > --- head/sys/geom/geom_io.c Tue Nov 6 15:52:49 2018 (r340186) > > > +++ head/sys/geom/geom_io.c Tue Nov 6 15:55:41 2018 (r340187) > > > @@ -420,6 +420,8 @@ g_io_check(struct bio *bp) > > > return (EIO); > > > if (bp->bio_offset > pp->mediasize) > > > return (EIO); > > > + if (bp->bio_offset == pp->mediasize && bp->bio_length > 0) > > > + return (EIO); > > > > Isnt mediasize 0 based, such that any operation at pp->mediasize is > > technically past the end of the media and should get an EIO no > > matter how big it is? > > > > Who is doing 0 byte operations at pp->mediasize? > > That code should probably be fixed rather than allowing > > this special case here. > > > > > /* Truncate requests to the end of providers media. */ > > > excess = bp->bio_offset + bp->bio_length; > > > > > > > > > > -- > > Rod Grimes > rgrimes@freebsd.org -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Wed Nov 7 01:42:01 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6F68211089E4; Wed, 7 Nov 2018 01:42:01 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 02AEE7AA45; Wed, 7 Nov 2018 01:42:01 +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 D965E721C; Wed, 7 Nov 2018 01:42:00 +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 wA71g0tH029348; Wed, 7 Nov 2018 01:42:00 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA71g0WT029347; Wed, 7 Nov 2018 01:42:00 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201811070142.wA71g0WT029347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits <jhibbits@FreeBSD.org> Date: Wed, 7 Nov 2018 01:42:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340209 - head/sys/powerpc/include X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/include X-SVN-Commit-Revision: 340209 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 02AEE7AA45 X-Spamd-Result: default: False [-103.05 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 01:42:01 -0000 Author: jhibbits Date: Wed Nov 7 01:42:00 2018 New Revision: 340209 URL: https://svnweb.freebsd.org/changeset/base/340209 Log: powerpc/atomic: Loosen the memory barrier on atomic_load_acq_*() 'sync' is pretty heavy-handed, and is unnecessary for this use case. It's a full barrier, which is applicable for all storage types. However, atomic_load_acq_*() is only expected to operate on physical memory, not device memory, so lwsync is sufficient (lwsync provides access ordering on memory that is marked as Coherency Required and is not Write Through nor Cache Inhibited). On 32-bit systems, this is a nop, since powerpc_lwsync() is defined to use sync, as a workaround for a silicon bug in the Freescale e500 core. Modified: head/sys/powerpc/include/atomic.h Modified: head/sys/powerpc/include/atomic.h ============================================================================== --- head/sys/powerpc/include/atomic.h Tue Nov 6 23:41:44 2018 (r340208) +++ head/sys/powerpc/include/atomic.h Wed Nov 7 01:42:00 2018 (r340209) @@ -510,7 +510,7 @@ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ u_##TYPE v; \ \ v = *p; \ - mb(); \ + powerpc_lwsync(); \ return (v); \ } \ \ From owner-svn-src-head@freebsd.org Wed Nov 7 02:44:41 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 2FFF71109D5D; Wed, 7 Nov 2018 02:44:41 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 69A667C38B; Wed, 7 Nov 2018 02:44:40 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id y15-v6so15740742wru.9; Tue, 06 Nov 2018 18:44:40 -0800 (PST) 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=6qFSU+9Z9yrBRCYKGnXdaukPDR/jE99pqZ+aryxVgMI=; b=mneDOpZE18odb7ZX0qVUXIXgGN8kx2vf//McdMUpcPSh/NXc/zw2aLQgIslUI5PNTd Fum/1OqvQDkdjJmQRzTgP2ggerxTmb9W2EEWZR3i6+eEwb2i2TLPphNv/6n7+daKOQzB 05kPmOEHG32NXuqWwRfQm+bfkUHz+ENFK6KfAwJw/nAdFaIKZ99LZ10AUaP+RJT1vioa WIo/EoH/EedtBda0r0iGfAZqwmeyQuZ1do0BKhnPiIZgCjT4hdEKoL6LIq8xh9S1W2AZ hE3QeMLzqIXEU/1kt9nEkE2RIsiwoQ0tWGmk1Q4N9dsodiHpaNXGsgNnp7HRJjfiWxOl Y2BA== X-Gm-Message-State: AGRZ1gLqRlZepiahLFVREMYUE/lXl6yghsJcOhBnD8A28tGx8MnbDfK7 FpONWly6+GvFe2n/m1sU63D2MYVGW10VpArhnPKk+Nh9t3Q= X-Google-Smtp-Source: AJdET5ctnSRx+jVT5qWK3A/8JvmSCWw2C2zKvQk9ok5uTsDH1ISfTcCsY3pFv1nVpRZpqQSKITYM5IgVvFtxyNH811Y= X-Received: by 2002:adf:e0ce:: with SMTP id e14-v6mr55973wri.199.1541558673140; Tue, 06 Nov 2018 18:44:33 -0800 (PST) MIME-Version: 1.0 References: <CAH7qZfvW2ZEqWL5yg9i67=zD562-KtY3tgcpSzCjku1JT3HGXQ@mail.gmail.com> <201811070017.wA70HbO2098370@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811070017.wA70HbO2098370@pdx.rh.CN85.dnsmgr.net> From: Li-Wen Hsu <lwhsu@freebsd.org> Date: Wed, 7 Nov 2018 03:44:22 +0100 Message-ID: <CAKBkRUziRrQGHNVq1wO9kG=Gw3ehqxe3ovdZwxpvOnYOALKJ9w@mail.gmail.com> Subject: Re: svn commit: r340187 - head/sys/geom To: sobomax@freebsd.org Cc: rgrimes@freebsd.org, 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: 69A667C38B X-Spamd-Result: default: False [-3.91 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.990,0]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-0.98)[-0.981,0]; RCVD_TLS_LAST(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; RCVD_IN_DNSWL_NONE(0.00)[53.221.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.97)[ipnet: 209.85.128.0/17(-3.40), asn: 15169(-1.37), country: US(-0.08)]; FORGED_SENDER(0.30)[lwhsu@freebsd.org,lwhsufreebsd@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]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[lwhsu@freebsd.org,lwhsufreebsd@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 02:44:41 -0000 Hi Maxim, There are 5 regression tests failing since this change: https://ci.freebsd.org/job/FreeBSD-head-amd64-test/9184/testReport/ sys.geom.class.* Can you help check them? Best, Li-Wen From owner-svn-src-head@freebsd.org Wed Nov 7 03:42:54 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 CCD07110AF92 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 03:42:54 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) Received: from sonic303-21.consmr.mail.gq1.yahoo.com (sonic303-21.consmr.mail.gq1.yahoo.com [98.137.64.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E6EF7E5C4 for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 03:42:54 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) X-YMail-OSG: mAKSiAIVM1lxI1_NixwBDjgt7tuwxSr_zyzaTocjnnii0ToPRqSFCbs6x1Jumd6 DX6ypi6zs.nGIsKp0z.ryv_dXBIkKuqkCS7gjyxAEKQFi0qvaKjssVNAPnuPQYeUEYOXFI9BnIyK LNESxJAXAsgeMUVfSqHxaznCQfJ4xF5zbRaZjnpZ88xB7u06Gxq4wPI3IFM8UQGiXOivlWbFwMBI MPdEja5jktJFemQJM4ijOdNvudn.fpwwnxzPFj6DcU7XS3UXHuGbqQYTJhDshR22C3trJFFOpIZp TRmcvnLHl.eVs.INUXdOhKrG7PKw8PYJm_E27d6STZmNcRnyEGwEuZfFJY9iEeBBNS5CJNP9oy6g nLEklpMLuOkYRp9eVrxi2SHOQbkIvdPxjh2siJYOLFvoZt9elMha4AndjYBR_W9wg6zJeMVq0VTX QSAGc5jytyy7JkpnQObg_wtAizFU9U8SJ5Ib8WFmKct_QqgCiifXAj2e.hMNEhhyyhbtpymg4t4v 2VcKkvihxn0ypJMVu4R0ssdVQQfYyCel8_6fuKoJV5_.kgqHJ1Duq.xP6t5EXG2S8nZgiZSjbW9X xy4qoZB93hbraIInujbgpfFENsaz9nVGyulpkz3_A.Zok5luJVfYqK9IBzmjTxpwAQsdEr4xZ8gj GuQs8g.16a1bCNh.cy7mVll0IyNtK7385belHDpVg1CiysYrGcAR995iGrenlQERnTZv.77tXen9 pJS.j9yCP6yq8i5Y7Ya1pkodl5qisQFoloTdJSq.7yO4oqc_4VNVaNfgm5XUXhdMo_0abBxTslRG tRbAue1VngeV8KvCHO864s8Y2a9uw4z4FwWpPw4cwbjj9PhSI9a.kCw..ecLcTh_Z.yw6Ik2tQkU XC_PyPBCRV3KxbA6Fo5itQl59izbtVO6QaOgvfcg02YBwGGSeUrj56edkJjHxvZHFFD.APz7oCDC r1O618sATs57EclcOOOqFj8C6rbGbS8cFWu9.r65wqgoqIdIv82aMJwG6I8sSD7pv2qT0gya.QWI JZ86ThbwSUlbJ7g8z_L8Ryuv04VOWC4NJ2TZAeN40_0Q1X68- Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.gq1.yahoo.com with HTTP; Wed, 7 Nov 2018 03:42:47 +0000 Received: from c-76-115-7-162.hsd1.or.comcast.net (EHLO [192.168.1.25]) ([76.115.7.162]) by smtp403.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID da931776c6a69aa625d2b63b380ee953; Wed, 07 Nov 2018 03:12:23 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.1 \(3445.101.1\)) Subject: Re: svn commit: r339876 - head/libexec/rtld-elf From: Mark Millard <marklmi26-fbsd@yahoo.com> In-Reply-To: <20181102185014.GP5335@kib.kiev.ua> Date: Tue, 6 Nov 2018 19:12:22 -0800 Cc: svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <8FFCF603-6315-4D1C-858B-FC7233C17DD7@yahoo.com> References: <8E5A5F3A-F1A7-4702-A2F7-65D74CC5B2E5@yahoo.com> <20181102004101.GI5335@kib.kiev.ua> <E44F5772-1F8A-40B8-9C4E-B8362B768F37@yahoo.com> <003A49D7-6E8B-4775-A70B-E0EB44505D4B@yahoo.com> <20181102113827.GM5335@kib.kiev.ua> <7B29A4C8-228D-41CB-B594-98DFA456E9C8@yahoo.com> <20181102155234.GN5335@kib.kiev.ua> <E93B3880-281E-482C-9DA7-851398543B97@yahoo.com> <20181102185014.GP5335@kib.kiev.ua> To: Konstantin Belousov <kostikbel@gmail.com> X-Mailer: Apple Mail (2.3445.101.1) X-Rspamd-Queue-Id: 1E6EF7E5C4 X-Spamd-Result: default: False [-3.23 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MV_CASE(0.50)[]; FREEMAIL_FROM(0.00)[yahoo.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[yahoo.com:+]; MX_GOOD(-0.01)[cached: mta6.am0.yahoodns.net]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.84)[-0.836,0]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(0.11)[ipnet: 98.137.64.0/21(0.36), asn: 36647(0.28), country: US(-0.08)]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/21, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; R_DKIM_ALLOW(-0.20)[yahoo.com]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[202.64.137.98.list.dnswl.org : 127.0.5.0] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 03:42:55 -0000 [I've present a little information about the longer-existing failure's odd backtrace for /libexec/ld-elf.so.1 /bin/ls --but on powerpc64 FreeBSD instead of 32-bit powerpc FreeBSD.] On 2018-Nov-2, at 11:50, Konstantin Belousov <kostikbel at gmail.com> = wrote: > On Fri, Nov 02, 2018 at 10:38:08AM -0700, Mark Millard wrote: >> On 2018-Nov-2, at 8:52 AM, Konstantin Belousov <kostikbel at = gmail.com> wrote: >>=20 >>> . . . >>=20 >> That seems better. But it crashes during /bin/ls execution >> ( 0x0180???? addresses ), apparently in a library routine >> ( 0x41?????? addresses ): >>=20 >> Program received signal SIGSEGV, Segmentation fault. >> 0x411220b4 in ?? () >> (gdb) bt >> #0 0x411220b4 in ?? () >> #1 0x4112200c in ?? () >> #2 0x01803c84 in ?? () >> #3 0x018023b4 in ?? () >> #4 0x010121a0 in .rtld_start () at = /usr/src/libexec/rtld-elf/powerpc/rtld_start.S:112 >>=20 >> Using a normal gdb run of /bin/ls suggests: >>=20 >> #2 0x01803c84 in ?? () should be in main and seems to be: bl = 0x1818914 <getopt_long@plt> >> #3 0x018023b4 in ?? () should be in _start >>=20 >> Looking in the test context: >>=20 >> 0x1803c80: bl 0x1818914 >> 0x1803c84: cmpwi cr7,r3,-1 >>=20 >> and: >>=20 >> 0x1818914: li r11,59 >> 0x1818918: b 0x18186f4 >>=20 >> and: >>=20 >> 0x18186f4: rlwinm r11,r11,2,0,29 >> 0x18186f8: addis r11,r11,386 >> 0x18186fc: lwz r11,-30316(r11) >> 0x1818700: mtctr r11 >> 0x1818704: bctr >>=20 >> Breaking at the bctr and using info reg: >>=20 >> r11 0x4125ffa0 1093009312 >>=20 >> It looks like there is some amount of >> activity before the traceback addresses >> show up. >>=20 >> I've not found a good way to fill in the "in ??()" >> (or analogous) information. The addresses 0x411220?? >> do not match up with a normal run of /bin/ls from >> gdb: the addresses can not be accessed. >>=20 >>=20 >>=20 >> It does appear that the code is in /lib/libc.so.7 in the >> test context: >>=20 >> Breakpoint 2, reloc_non_plt (obj=3D0x41041600, obj_rtld=3D0x41104b57, = flags=3D4, lockstate=3D0x0) at = /usr/src/libexec/rtld-elf/powerpc/reloc.c:338 >> . . . >>=20 > There seems to be an issue with the direct execution mode on ppc. > Even otherwise working ld-elf.so.1 segfaults if I try to use it as > standalone binary. >=20 > But if I specify patched ld-elf.so.1 as the interpreter for some = program, > using 'cc -Wl,-I,<path>/ld-elf.so.1' it works. So I see there two = bugs, > one is regression due to textsize calculation, which should be fixed = by > my patch. Another is the direct exec problem. I've got a little more information about the odd backtrace from the /libexec/ld-elf.so.1 /bin/ls failure that the prior patch allowed getting to, although for a powerpc64 example context. The information is only identifying where the code was in /bin/ls and /lib/libc.so.1 in the backtrace. For libc.so.1 I found the same code sequences in a gdb of /bin/ls directly, matching one first, using the addresses vs. in the /libexec/ld-elf.so.1 /bin/ls process to find offsets for going back and forth, and then used that two find the 2nd backtrace addresses material. Overall it suggests to me that (in somewhat=20 symbolic terms): bl <00001322.plt_call.getenv> eventually lead to executing the wrong code. The supporting detail is as follows. The /libexec/ld-elf.so.1 part of the backtrace was easy to find where the code was: (gdb) run /bin/ls Starting program: /libexec/ld-elf.so.1 /bin/ls Program received signal SIGSEGV, Segmentation fault. 0x000000080118d81c in ?? () (gdb) bt #0 0x000000080118d81c in ?? () #1 0x000000080118d920 in ?? () #2 0x0000000010002558 in ?? () #3 0x00000000100037b0 in ?? () #4 0x0000000001018450 in ._rtld_start () at = /usr/src/libexec/rtld-elf/powerpc64/rtld_start.S:104 Backtrace stopped: frame did not save the PC (gdb)=20 101 ld %r7,128(%r1) /* exit proc */ 102 ld %r8,136(%r1) /* ps_strings */ 103=09 104 blrl /* _start(argc, argv, envp, obj, cleanup, = ps_strings) */ 105=09 106 li %r0,1 /* _exit() */ 107 sc The /bin/ls part of the backtrace was easy to find were the code was: (gdb) symbol-file /bin/ls Load new symbol table from "/bin/ls"? (y or n) y Reading symbols from /bin/ls...Reading symbols from = /usr/lib/debug//bin/ls.debug...done. done. (gdb) bt #0 0x000000080118d81c in ?? () #1 0x000000080118d920 in ?? () #2 0x0000000010002558 in main (argc=3D<optimized out>, = argv=3D0x80134bdb0) at /usr/src/bin/ls/ls.c:268 #3 0x00000000100037b0 in _start (argc=3D<optimized out>, = argv=3D0x3fffffffffffdb70, env=3D0x3fffffffffffdb88, obj=3D<optimized = out>, cleanup=3D<optimized out>, ps_strings=3D<optimized out>) at /usr/src/lib/csu/powerpc64/crt1.c:96 #4 0x0000000001018450 in ?? () #5 0x0000000000000000 in ?? () (gdb) fr 3=20 #3 0x00000000100037b0 in _start (argc=3D<optimized out>, = argv=3D0x3fffffffffffdb70, env=3D0x3fffffffffffdb88, obj=3D<optimized = out>, cleanup=3D<optimized out>, ps_strings=3D<optimized out>) at /usr/src/lib/csu/powerpc64/crt1.c:96 96 exit(main(argc, argv, env)); (gdb) down #2 0x0000000010002558 in main (argc=3D<optimized out>, = argv=3D0x80134bdb0) at /usr/src/bin/ls/ls.c:268 268 while ((ch =3D getopt_long(argc, argv, For the messy lib.libc.so.1 part of the backtrace both addresses are in getopt_internal. I show extractions from the the gdb /bin/ls output because it has helpful symbolic information displayed. But that means that the addresses are offset from those in the bt for the failure process. For #1 0x000000080118d920 in ?? () I end up with: (gdb) x/32i 0x81019b6c0+0xad0-0x880 0x81019b910 <getopt_internal+592>: stw r9,0(r18) 0x81019b914 <getopt_internal+596>: addis r3,r2,-5 0x81019b918 <getopt_internal+600>: addi r3,r3,30120 0x81019b91c <getopt_internal+604>: bl 0x81018dfe0 = <00001322.plt_call.getenv> 0x81019b920 <getopt_internal+608>: ld r2,40(r1) (The machine code around it all matches around 0x000000080118d920 in the failure context.) The getenv call in the source is the 2nd line of: if (posixly_correct =3D=3D -1 || optreset) posixly_correct =3D (getenv("POSIXLY_CORRECT") !=3D = NULL); For #0 0x000000080118d81c in ?? () I end up with: (gdb) x/32i 0x81019b6c0+0xad0-0x880-0x110 0x81019b800 <getopt_internal+320>: bne cr7,0x81019b868 = <getopt_internal+424> 0x81019b804 <getopt_internal+324>: lwa r5,0(r29) 0x81019b808 <getopt_internal+328>: stw r17,0(r18) 0x81019b80c <getopt_internal+332>: cmpw cr7,r5,r19 0x81019b810 <getopt_internal+336>: bge cr7,0x81019ba60 = <getopt_internal+928> 0x81019b814 <getopt_internal+340>: rldicr r9,r5,3,60 0x81019b818 <getopt_internal+344>: ldx r10,r20,r9 0x81019b81c <getopt_internal+348>: lbz r9,0(r10) with the failure being that r10 is zero in that last line above. Again the surrounding code matches. The source code line is reported to be: if (*(place =3D nargv[optind]) !=3D '-' || I got the line number information from breakpoints 3 and 4 below (from the gdb /bin/ls process): (gdb) info br Num Type Disp Enb Address What 1 breakpoint keep y 0x0000000010002360 in main at = /usr/src/bin/ls/ls.c:231 breakpoint already hit 1 time 3 breakpoint keep y 0x000000081019b81c in getopt_internal at = /usr/src/lib/libc/stdlib/getopt_long.c:411 4 breakpoint keep y 0x000000081019b91c in getopt_internal at = /usr/src/lib/libc/stdlib/getopt_long.c:379 Line 379 has the getenv call, matching the machine code showing the call. (I set the breakpoints just as a way of using "info br" to list the information later.) Overall this seems to suggest that: bl <00001322.plt_call.getenv> lead to something odd happening and got to the wrong code. That is all the additional information that I have at this point. I hope it is of some use. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-svn-src-head@freebsd.org Wed Nov 7 04:20:30 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4427F110B7C4; Wed, 7 Nov 2018 04:20:30 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C48757F60B; Wed, 7 Nov 2018 04:20:29 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 A200410B15; Wed, 7 Nov 2018 04:20:29 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA74KTaI009334; Wed, 7 Nov 2018 04:20:29 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA74KTCj009333; Wed, 7 Nov 2018 04:20:29 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201811070420.wA74KTCj009333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo <araujo@FreeBSD.org> Date: Wed, 7 Nov 2018 04:20:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340210 - head/usr.sbin/bhyve X-SVN-Group: head X-SVN-Commit-Author: araujo X-SVN-Commit-Paths: head/usr.sbin/bhyve X-SVN-Commit-Revision: 340210 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C48757F60B X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.985,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 04:20:30 -0000 Author: araujo Date: Wed Nov 7 04:20:29 2018 New Revision: 340210 URL: https://svnweb.freebsd.org/changeset/base/340210 Log: Revert my bogus attempt to silence coverity on r340045, it created more bad side effects than good. PR: 233038 Submitted by: We Maag <jwmaag@gmail.com> Modified: head/usr.sbin/bhyve/pci_fbuf.c Modified: head/usr.sbin/bhyve/pci_fbuf.c ============================================================================== --- head/usr.sbin/bhyve/pci_fbuf.c Wed Nov 7 01:42:00 2018 (r340209) +++ head/usr.sbin/bhyve/pci_fbuf.c Wed Nov 7 04:20:29 2018 (r340210) @@ -319,7 +319,6 @@ pci_fbuf_parse_opts(struct pci_fbuf_softc *sc, char *o } done: - free(uopts); return (ret); } From owner-svn-src-head@freebsd.org Wed Nov 7 05:51:20 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 97FE0110D6A6; Wed, 7 Nov 2018 05:51:20 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E08D1830AB; Wed, 7 Nov 2018 05:51:19 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA75pIfN099373; Tue, 6 Nov 2018 21:51:18 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA75pIj8099372; Tue, 6 Nov 2018 21:51:18 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811070551.wA75pIj8099372@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340187 - head/sys/geom In-Reply-To: <CAKBkRUziRrQGHNVq1wO9kG=Gw3ehqxe3ovdZwxpvOnYOALKJ9w@mail.gmail.com> To: Li-Wen Hsu <lwhsu@freebsd.org> Date: Tue, 6 Nov 2018 21:51:18 -0800 (PST) CC: sobomax@freebsd.org, 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: E08D1830AB X-Spamd-Result: default: False [1.60 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.62)[0.623,0]; NEURAL_HAM_SHORT(-0.13)[-0.135,0]; NEURAL_SPAM_MEDIUM(0.24)[0.244,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 05:51:20 -0000 > Hi Maxim, > > There are 5 regression tests failing since this change: > > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/9184/testReport/ > > sys.geom.class.* > > Can you help check them? Maybe this should be backed out and looked at more closely? -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Wed Nov 7 06:29:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 23D39110DF65; Wed, 7 Nov 2018 06:29:02 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6DDF83F01; Wed, 7 Nov 2018 06:29:01 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 83DBA12045; Wed, 7 Nov 2018 06:29:01 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA76T1Hd075671; Wed, 7 Nov 2018 06:29:01 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA76T13B075670; Wed, 7 Nov 2018 06:29:01 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201811070629.wA76T13B075670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo <araujo@FreeBSD.org> Date: Wed, 7 Nov 2018 06:29:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340211 - head/usr.sbin/bhyve X-SVN-Group: head X-SVN-Commit-Author: araujo X-SVN-Commit-Paths: head/usr.sbin/bhyve X-SVN-Commit-Revision: 340211 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A6DDF83F01 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 06:29:02 -0000 Author: araujo Date: Wed Nov 7 06:29:01 2018 New Revision: 340211 URL: https://svnweb.freebsd.org/changeset/base/340211 Log: Comestic change to try to inline the memset with SSE/AVX instructions. Also switch from int to size_t to keep portability. Reviewed by: brooks Sponsored by: iXsystems Inc. Differential Revision: https://reviews.freebsd.org/D17795 Modified: head/usr.sbin/bhyve/pci_nvme.c Modified: head/usr.sbin/bhyve/pci_nvme.c ============================================================================== --- head/usr.sbin/bhyve/pci_nvme.c Wed Nov 7 04:20:29 2018 (r340210) +++ head/usr.sbin/bhyve/pci_nvme.c Wed Nov 7 06:29:01 2018 (r340211) @@ -251,11 +251,13 @@ static void pci_nvme_io_partial(struct blockif_req *br (NVME_STATUS_SC_MASK << NVME_STATUS_SC_SHIFT)) static __inline void -cpywithpad(char *dst, int dst_size, const char *src, char pad) +cpywithpad(char *dst, size_t dst_size, const char *src, char pad) { - int len = strnlen(src, dst_size); + size_t len; + + len = strnlen(src, dst_size); + memset(dst, pad, dst_size); memcpy(dst, src, len); - memset(dst + len, pad, dst_size - len); } static __inline void From owner-svn-src-head@freebsd.org Wed Nov 7 08:25:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 1B4D8110FF67; Wed, 7 Nov 2018 08:25:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C24886F86; Wed, 7 Nov 2018 08:25:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6923F133A1; Wed, 7 Nov 2018 08:25:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA78PjgI036857; Wed, 7 Nov 2018 08:25:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA78Pj6m036856; Wed, 7 Nov 2018 08:25:45 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201811070825.wA78Pj6m036856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> Date: Wed, 7 Nov 2018 08:25:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340212 - head/sys/dev/usb/controller X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/dev/usb/controller X-SVN-Commit-Revision: 340212 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8C24886F86 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 08:25:46 -0000 Author: hselasky Date: Wed Nov 7 08:25:44 2018 New Revision: 340212 URL: https://svnweb.freebsd.org/changeset/base/340212 Log: Sometimes the complete split packet may be queued too early and the transaction translator will return a NAK. Ignore this message and retry the complete split instead. MFC after: 3 days Sponsored by: Mellanox Technologies Modified: head/sys/dev/usb/controller/dwc_otg.c Modified: head/sys/dev/usb/controller/dwc_otg.c ============================================================================== --- head/sys/dev/usb/controller/dwc_otg.c Wed Nov 7 06:29:01 2018 (r340211) +++ head/sys/dev/usb/controller/dwc_otg.c Wed Nov 7 08:25:44 2018 (r340212) @@ -1432,6 +1432,19 @@ dwc_otg_host_data_rx(struct dwc_otg_softc *sc, struct goto receive_pkt; } } else if (td->ep_type == UE_ISOCHRONOUS) { + if (td->hcsplt != 0) { + /* + * Sometimes the complete + * split packet may be queued + * too early and the + * transaction translator will + * return a NAK. Ignore + * this message and retry the + * complete split instead. + */ + DPRINTF("Retrying complete split\n"); + goto receive_pkt; + } goto complete; } td->did_nak = 1; From owner-svn-src-head@freebsd.org Wed Nov 7 09:49:27 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8F0C31121C47; Wed, 7 Nov 2018 09:49:27 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C84C48A57A; Wed, 7 Nov 2018 09:49:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3A1014060; Wed, 7 Nov 2018 09:49:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA79nQAm077498; Wed, 7 Nov 2018 09:49:26 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA79nQWs077495; Wed, 7 Nov 2018 09:49:26 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201811070949.wA79nQWs077495@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner <andrew@FreeBSD.org> Date: Wed, 7 Nov 2018 09:49:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340213 - in head: lib/csu/mips lib/csu/sparc64 share/mk X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head: lib/csu/mips lib/csu/sparc64 share/mk X-SVN-Commit-Revision: 340213 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C84C48A57A X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 09:49:27 -0000 Author: andrew Date: Wed Nov 7 09:49:25 2018 New Revision: 340213 URL: https://svnweb.freebsd.org/changeset/base/340213 Log: Add the (untested) mips and sparc64 .init call sequences. The BSD crtbegin/crtend code now builds on all architectures, however further work is needed to check if it works correctly. MFC with: r339738 Sponsored by: DARPA, AFRL Modified: head/lib/csu/mips/crt.h head/lib/csu/sparc64/crt.h head/share/mk/src.opts.mk Modified: head/lib/csu/mips/crt.h ============================================================================== --- head/lib/csu/mips/crt.h Wed Nov 7 08:25:44 2018 (r340212) +++ head/lib/csu/mips/crt.h Wed Nov 7 09:49:25 2018 (r340213) @@ -27,5 +27,25 @@ #define _CRT_H_ #define HAVE_CTORS +#define CTORS_CONSTRUCTORS +#ifdef __mips_o32 +#define INIT_CALL_SEQ(func) \ + ".set noreorder \n" \ + "bal 1f \n" \ + "nop \n" \ + "1: \n" \ + ".cpload $ra \n" \ + ".set reorder \n" \ + "jal " __STRING(func) +#else +#define INIT_CALL_SEQ(func) \ + ".set noreorder \n" \ + "bal 1f \n" \ + "nop \n" \ + "1: \n" \ + ".set reorder \n" \ + ".cpsetup $ra, $v0, 1b \n" \ + "jal " __STRING(func) +#endif #endif Modified: head/lib/csu/sparc64/crt.h ============================================================================== --- head/lib/csu/sparc64/crt.h Wed Nov 7 08:25:44 2018 (r340212) +++ head/lib/csu/sparc64/crt.h Wed Nov 7 09:49:25 2018 (r340213) @@ -27,5 +27,7 @@ #define _CRT_H_ #define HAVE_CTORS +#define CTORS_CONSTRUCTORS +#define INIT_CALL_SEQ(func) "call " __STRING(func) "; nop" #endif Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed Nov 7 08:25:44 2018 (r340212) +++ head/share/mk/src.opts.mk Wed Nov 7 09:49:25 2018 (r340213) @@ -193,6 +193,7 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ + BSD_CRTBEGIN \ BSD_GREP \ CLANG_EXTRAS \ DTRACE_TESTS \ @@ -383,13 +384,6 @@ BROKEN_OPTIONS+=HYPERV # NVME is only x86 and powerpc64 .if ${__T} != "amd64" && ${__T} != "i386" && ${__T} != "powerpc64" BROKEN_OPTIONS+=NVME -.endif - -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \ - ${__T} == "powerpc64" -__DEFAULT_NO_OPTIONS+=BSD_CRTBEGIN -.else -BROKEN_OPTIONS+=BSD_CRTBEGIN .endif .include <bsd.mkopt.mk> From owner-svn-src-head@freebsd.org Wed Nov 7 11:14:24 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 1CF4A1123E36; Wed, 7 Nov 2018 11:14:24 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92F008CD9F; Wed, 7 Nov 2018 11:14:23 +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 70E4814EEF; Wed, 7 Nov 2018 11:14:23 +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 wA7BENYT023297; Wed, 7 Nov 2018 11:14:23 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7BEMSf023293; Wed, 7 Nov 2018 11:14:22 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201811071114.wA7BEMSf023293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome <tsoome@FreeBSD.org> Date: Wed, 7 Nov 2018 11:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340215 - in head/stand: common i386/libi386 X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: in head/stand: common i386/libi386 X-SVN-Commit-Revision: 340215 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 92F008CD9F X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 11:14:24 -0000 Author: tsoome Date: Wed Nov 7 11:14:22 2018 New Revision: 340215 URL: https://svnweb.freebsd.org/changeset/base/340215 Log: loader: always set media size from partition. The disk access is validated by using partition table definitions, therefore we have no need for if statements, just set the disk size. Of course the partition table itself may be incorrect/inconsistent, but if so, we are in trouble anyhow. Differential Revision: https://reviews.freebsd.org/D17822 Modified: head/stand/common/disk.c head/stand/common/part.c head/stand/i386/libi386/biosdisk.c Modified: head/stand/common/disk.c ============================================================================== --- head/stand/common/disk.c Wed Nov 7 09:55:31 2018 (r340214) +++ head/stand/common/disk.c Wed Nov 7 11:14:22 2018 (r340215) @@ -265,9 +265,7 @@ disk_open(struct disk_devdesc *dev, uint64_t mediasize rc = ENXIO; goto out; } - if (mediasize > od->mediasize) { - od->mediasize = mediasize; - } + od->mediasize = mediasize; if (ptable_gettype(od->table) == PTABLE_BSD && partition >= 0) { Modified: head/stand/common/part.c ============================================================================== --- head/stand/common/part.c Wed Nov 7 09:55:31 2018 (r340214) +++ head/stand/common/part.c Wed Nov 7 11:14:22 2018 (r340215) @@ -323,8 +323,7 @@ ptable_gptread(struct ptable *table, void *dev, diskre * Note, this is still not a foolproof way to get disk's size. For * example, an image file can be truncated when copied to smaller media. */ - if (hdr.hdr_lba_alt + 1 > table->sectors) - table->sectors = hdr.hdr_lba_alt + 1; + table->sectors = hdr.hdr_lba_alt + 1; for (i = 0; i < size / hdr.hdr_entsz; i++) { ent = (struct gpt_ent *)(tbl + i * hdr.hdr_entsz); Modified: head/stand/i386/libi386/biosdisk.c ============================================================================== --- head/stand/i386/libi386/biosdisk.c Wed Nov 7 09:55:31 2018 (r340214) +++ head/stand/i386/libi386/biosdisk.c Wed Nov 7 11:14:22 2018 (r340215) @@ -439,6 +439,33 @@ bd_print(int verbose) } /* + * Read disk size from partition. + * This is needed to work around buggy BIOS systems returning + * wrong (truncated) disk media size. + * During bd_probe() we tested if the multiplication of bd_sectors + * would overflow so it should be safe to perform here. + */ +static uint64_t +bd_disk_get_sectors(struct disk_devdesc *dev) +{ + struct disk_devdesc disk; + uint64_t size; + + disk.dd.d_dev = dev->dd.d_dev; + disk.dd.d_unit = dev->dd.d_unit; + disk.d_slice = -1; + disk.d_partition = -1; + disk.d_offset = 0; + + size = BD(dev).bd_sectors * BD(dev).bd_sectorsize; + if (disk_open(&disk, size, BD(dev).bd_sectorsize) == 0) { + (void) disk_ioctl(&disk, DIOCGMEDIASIZE, &size); + disk_close(&disk); + } + return (size / BD(dev).bd_sectorsize); +} + +/* * Attempt to open the disk described by (dev) for use by (f). * * Note that the philosophy here is "give them exactly what @@ -452,9 +479,7 @@ static int bd_open(struct open_file *f, ...) { struct disk_devdesc *dev; - struct disk_devdesc disk; va_list ap; - uint64_t size; int rc; va_start(ap, f); @@ -470,33 +495,12 @@ bd_open(struct open_file *f, ...) if ((BD(dev).bd_flags & BD_NO_MEDIA) == BD_NO_MEDIA) return (EIO); } - BD(dev).bd_open++; if (BD(dev).bd_bcache == NULL) BD(dev).bd_bcache = bcache_allocate(); - /* - * Read disk size from partition. - * This is needed to work around buggy BIOS systems returning - * wrong (truncated) disk media size. - * During bd_probe() we tested if the mulitplication of bd_sectors - * would overflow so it should be safe to perform here. - */ - disk.dd.d_dev = dev->dd.d_dev; - disk.dd.d_unit = dev->dd.d_unit; - disk.d_slice = -1; - disk.d_partition = -1; - disk.d_offset = 0; - - if (disk_open(&disk, BD(dev).bd_sectors * BD(dev).bd_sectorsize, - BD(dev).bd_sectorsize) == 0) { - - if (disk_ioctl(&disk, DIOCGMEDIASIZE, &size) == 0) { - size /= BD(dev).bd_sectorsize; - if (size > BD(dev).bd_sectors) - BD(dev).bd_sectors = size; - } - disk_close(&disk); - } + if (BD(dev).bd_open == 0) + BD(dev).bd_sectors = bd_disk_get_sectors(dev); + BD(dev).bd_open++; rc = disk_open(dev, BD(dev).bd_sectors * BD(dev).bd_sectorsize, BD(dev).bd_sectorsize); From owner-svn-src-head@freebsd.org Wed Nov 7 11:46:13 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 346A6112448B; Wed, 7 Nov 2018 11:46:13 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B231C8D95C; Wed, 7 Nov 2018 11:46:12 +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 7A3A4153B4; Wed, 7 Nov 2018 11:46:12 +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 wA7BkCCc038801; Wed, 7 Nov 2018 11:46:12 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7BkCgI038800; Wed, 7 Nov 2018 11:46:12 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201811071146.wA7BkCgI038800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala <trasz@FreeBSD.org> Date: Wed, 7 Nov 2018 11:46:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340216 - head/tools/tools/syscall_timing X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/tools/tools/syscall_timing X-SVN-Commit-Revision: 340216 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B231C8D95C X-Spamd-Result: default: False [-103.11 / 200.00]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 11:46:13 -0000 Author: trasz Date: Wed Nov 7 11:46:12 2018 New Revision: 340216 URL: https://svnweb.freebsd.org/changeset/base/340216 Log: Add benchmarks for lstat(2) and readlink(2). MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/tools/tools/syscall_timing/syscall_timing.c Modified: head/tools/tools/syscall_timing/syscall_timing.c ============================================================================== --- head/tools/tools/syscall_timing/syscall_timing.c Wed Nov 7 11:14:22 2018 (r340215) +++ head/tools/tools/syscall_timing/syscall_timing.c Wed Nov 7 11:46:12 2018 (r340216) @@ -335,6 +335,23 @@ test_getuid(uintmax_t num, uintmax_t int_arg __unused, } static uintmax_t +test_lstat(uintmax_t num, uintmax_t int_arg __unused, const char *path) +{ + struct stat sb; + uintmax_t i; + int error; + + benchmark_start(); + BENCHMARK_FOREACH(i, num) { + error = lstat(path, &sb); + if (error != 0) + err(-1, "lstat"); + } + benchmark_stop(); + return (i); +} + +static uintmax_t test_memcpy(uintmax_t num, uintmax_t int_arg, const char *path __unused) { char buf[int_arg], buf2[int_arg]; @@ -824,6 +841,23 @@ test_socketpair_dgram(uintmax_t num, uintmax_t int_arg } static uintmax_t +test_readlink(uintmax_t num, uintmax_t int_arg __unused, const char *path) +{ + char buf[PATH_MAX]; + ssize_t rv; + uintmax_t i; + + benchmark_start(); + BENCHMARK_FOREACH(i, num) { + rv = readlink(path, buf, sizeof(buf)); + if (rv < 0 && errno != EINVAL) + err(-1, "readlink"); + } + benchmark_stop(); + return (i); +} + +static uintmax_t test_vfork(uintmax_t num, uintmax_t int_arg __unused, const char *path __unused) { pid_t pid; @@ -904,6 +938,7 @@ static const struct test tests[] = { { "getresuid", test_getresuid, .t_flags = 0 }, { "gettimeofday", test_gettimeofday, .t_flags = 0 }, { "getuid", test_getuid, .t_flags = 0 }, + { "lstat", test_lstat, .t_flags = FLAG_PATH }, { "memcpy_1", test_memcpy, .t_flags = 0, .t_int = 1 }, { "memcpy_10", test_memcpy, .t_flags = 0, .t_int = 10 }, { "memcpy_100", test_memcpy, .t_flags = 0, .t_int = 100 }, @@ -962,6 +997,7 @@ static const struct test tests[] = { { "socketpair_dgram", test_socketpair_dgram, .t_flags = 0 }, { "socket_tcp", test_socket_stream, .t_int = PF_INET }, { "socket_udp", test_socket_dgram, .t_int = PF_INET }, + { "readlink", test_readlink, .t_flags = FLAG_PATH }, { "vfork", test_vfork, .t_flags = 0 }, { "vfork_exec", test_vfork_exec, .t_flags = 0 }, }; From owner-svn-src-head@freebsd.org Wed Nov 7 15:04:43 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 34BE911286E3; Wed, 7 Nov 2018 15:04:43 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B92966CD70; Wed, 7 Nov 2018 15:04:42 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9642117393; Wed, 7 Nov 2018 15:04:42 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7F4gEg040676; Wed, 7 Nov 2018 15:04:42 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7F4g8c040674; Wed, 7 Nov 2018 15:04:42 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201811071504.wA7F4g8c040674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson <arichardson@FreeBSD.org> Date: Wed, 7 Nov 2018 15:04:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340218 - in head: libexec/rtld-elf sys/sys X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: in head: libexec/rtld-elf sys/sys X-SVN-Commit-Revision: 340218 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B92966CD70 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.89), asn: 11403(-3.74), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 15:04:43 -0000 Author: arichardson Date: Wed Nov 7 15:04:41 2018 New Revision: 340218 URL: https://svnweb.freebsd.org/changeset/base/340218 Log: Handle the DT_MIPS_RLD_MAP_REL dynamic tag in RTLD This dynamic tag contains the location of the .rld_map section relative to the location of the dynamic tag. For PIE MIPS binaries DT_MIPS_RLD_MAP can not be used since it contains an absolute address. Without this change GDB can not find the function program counters in other libraries and once I apply this change I can successfully run info sharedlibraries again. Reviewed By: kib Differential Revision: https://reviews.freebsd.org/D17867 Modified: head/libexec/rtld-elf/rtld.c head/sys/sys/elf_common.h Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Wed Nov 7 12:08:26 2018 (r340217) +++ head/libexec/rtld-elf/rtld.c Wed Nov 7 15:04:41 2018 (r340218) @@ -1264,6 +1264,13 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_D *((Elf_Addr *)(dynp->d_un.d_ptr)) = (Elf_Addr) &r_debug; break; + case DT_MIPS_RLD_MAP_REL: + // The MIPS_RLD_MAP_REL tag stores the offset to the .rld_map + // section relative to the address of the tag itself. + *((Elf_Addr *)(__DECONST(char*, dynp) + dynp->d_un.d_val)) = + (Elf_Addr) &r_debug; + break; + case DT_MIPS_PLTGOT: obj->mips_pltgot = (Elf_Addr *)(obj->relocbase + dynp->d_un.d_ptr); Modified: head/sys/sys/elf_common.h ============================================================================== --- head/sys/sys/elf_common.h Wed Nov 7 12:08:26 2018 (r340217) +++ head/sys/sys/elf_common.h Wed Nov 7 15:04:41 2018 (r340218) @@ -707,6 +707,7 @@ typedef struct { #define DT_MIPS_PLTGOT 0x70000032 #define DT_MIPS_RLD_OBJ_UPDATE 0x70000033 #define DT_MIPS_RWPLT 0x70000034 +#define DT_MIPS_RLD_MAP_REL 0x70000035 #define DT_PPC_GOT 0x70000000 #define DT_PPC_TLSOPT 0x70000001 From owner-svn-src-head@freebsd.org Wed Nov 7 15:57:48 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E6005112939C for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 15:57:47 +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 1E7F76E5FA for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 15:57:47 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1541606258; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=Vp6tSPi1gAP+ehxpXRn8TVuYf0Zg9TRscGQf1r8tPpne21xRsO5+FCVx57bjXaZQLuNiG+NZR/Rsd P5Z1DFqa2XOkFdErw459y4IyoWdwr4WPm7QeiGpJ4aUu3oy/So20QFqDB0CWNluWkl54wLxcLc0nib qXopoSb0UQcq8vCUqbQcvIvHdpsqb0l15RiHcZR7ORNn26yZgUvoV1MI9m/IxVJVwqw5evTKlms+nc CzIxD+qADqpeItiA+6Tuj/sFANtFFE6Nwac/eu6WMdxWmNiOseJuty00bQTLn4+JnDmbT9sgILWOgD kzYcrIxTDnF5TOq6EkdY93XsshJowcg== 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=XnDOjznJWXyyWG2eWbFLLBWJJnOWgKzkpBgES7Qgb5I=; b=lZWdY4HWhx2NGtG/jxA4bNVpWHL2LoxA1u5v8xJgxBR6LLSJdcWyKTwnhgf30KSaqfm6KHiq4nfan zI75TKSmFdGNZCvNPkmvfZmzaEHeOTvBV2snpCMzACTH+7KPvWUENq4EQxES5W0DdwpMNaQ8AjSXxd q3eMUMoeaSrFJfpB+ApXr+ouZ5+d782LZ8DgIwIY9X/h8WFw8vqMcHaNBtv1tEXtp03VkfLSh80wj9 4Z/w+oCzGNPqUKnmJeaEkWQNqLdE0fc0dz8OBvq9fJfpgQurCk1EQJya5FgaxZGI9A5ZqYmKL1Bdar nC77oqFr8cMAGSPStkOEgiFJ37ZBVwg== ARC-Authentication-Results: i=1; outbound1.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=XnDOjznJWXyyWG2eWbFLLBWJJnOWgKzkpBgES7Qgb5I=; b=tkYY0S2OqvIhjqwbNqgePdHtVGBH8Cp9pIpwOir37o30jlsUCglQAoVdpODRsVVd7q5byATIOpXoX mNTKuO8SXHC5kUONjd9zEVFMSEiz+/F4zclzFp7D1+FimTtyrg8QuwcTTIUXI4KbjiZjZw9oEGPs3n 3xvyALZ1LtBpPgJQlC4pSFzsfoUaELQY4bXC84eOO+YJ3iH8tvDFp21ZSjB9ijgydkZm2lrBcYjcbu ILNfeM9dMJ/qopsNYb33ZmHryG3RizDaH5ecXsNDsGIbHLdqf/z7CA85/f+UkJBZpiGFj582JwE1bN M/WaALNCq7JB5UR0bwSuBGtiTeung3A== X-MHO-RoutePath: aGlwcGll X-MHO-User: d3f06d1c-e2a5-11e8-9048-075f73944867 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 outbound1.eu.mailhop.org (Halon) with ESMTPSA id d3f06d1c-e2a5-11e8-9048-075f73944867; Wed, 07 Nov 2018 15:57:34 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id wA7FvSOg083525; Wed, 7 Nov 2018 08:57:28 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1541606248.52306.42.camel@freebsd.org> Subject: Re: svn commit: r340187 - head/sys/geom From: Ian Lepore <ian@freebsd.org> To: rgrimes@freebsd.org, Maxim Sobolev <sobomax@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@FreeBSD.org> Date: Wed, 07 Nov 2018 08:57:28 -0700 In-Reply-To: <201811070017.wA70HbO2098370@pdx.rh.CN85.dnsmgr.net> References: <201811070017.wA70HbO2098370@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1E7F76E5FA X-Spamd-Result: default: False [-103.90 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org]; HAS_XOIP(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; DKIM_TRACE(0.00)[outbound.mailhop.org:+]; NEURAL_HAM_SHORT(-0.94)[-0.943,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.15)[asn: 16509(-0.67), country: US(-0.09)]; ARC_ALLOW(-1.00)[i=1]; ASN(0.00)[asn:16509, ipnet:52.58.0.0/15, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[60.211.177.67.zen.spamhaus.org : 127.0.0.10]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[outbound.mailhop.org]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[202.109.58.52.list.dnswl.org : 127.0.20.0] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 15:57:48 -0000 On Tue, 2018-11-06 at 16:17 -0800, Rodney W. Grimes wrote: > > > > Rodney, this was actually my original intention, however then I noticed in > > the GEOM code there is at least one case when BIO_FLUSH request is being > > generated internally with bio_offset == mediasize and bio_lenth == 0, so I > > thought there might be some need to allow such requests through. But I'd > > happily go with the stricter rule if it does no harm. I simply don't know > > enough about the intended use and the logic behind zero-length transfers to > > make that call. > I am not sure enough on if mediasize is 0 based or not, > if it is then the error case should be fixed, and the > code you show below should also be fixed as it is > technically making a request beyond the end of device. > > I am also murky on why we are even doing a 0 size > operation and end of device, is that to validate > we can access all the media?  If so then this wrong > code and wrong error return should be fixed as it > is off by 1. > > > > > > > -Max > > > > int > > g_io_flush(struct g_consumer *cp) > > { > > ... > >         bp = g_alloc_bio(); > >         bp->bio_cmd = BIO_FLUSH; > > ... > >         bp->bio_offset = cp->provider->mediasize; > The above should have a - 1 on it. > Unless offset > mediasize is specifically a signal to downstream code in some way about how the flush is to be performed. Nearly identical code to create a BIO_FLUSH bio appears in ufs softdeps and in zfs. Before starting to arbitrarily change code that has worked since 2006, it might be a good idea to track down why these values are set the way they are. Unfortunately, there is no clue in the commit logs, but maybe the author (pjd@, cc'd) can englighten us. -- Ian From owner-svn-src-head@freebsd.org Wed Nov 7 16:00:17 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D7AF911294EE for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 16:00:16 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4A1E76E817 for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 16:00:16 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by mail-oi1-f177.google.com with SMTP id p144-v6so14182604oic.12 for <svn-src-head@freebsd.org>; Wed, 07 Nov 2018 08:00:16 -0800 (PST) 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=oE5AEiqwyIl9yojmf3P9Mz/8BEn6EYhYwd82ukBkNgo=; b=rkVDSHwuR2T+n0b+/sS2qT4/E7LIK7Nc+yvcDSNNVpou/Te9vUB3mCXvwdS9iSc/1a xN5IKy0RVYcIrvY02C+PBy7p25b+d7z3BvfrURkra62nuWKHcvTSdCn6MY7FbrDVPuo8 nFlz4Ls6Dl137BAvTBSQtsHwc+1dLAJS/inGH2k7dLvH83FT4NxJZeI+H61UMnuFK0rH S7VnAGo6eiMGpjPbtlqP0SLNMcyqOuL4+uGbbwhZN+76AF+8cfMxwtebTTGMWUHhGb23 TKREqNHRXaFf7XJ5X6A3fcvxJU0hI+S+jUEziM6pVYB8uOeuW9SdHeGqVHuXi8ZbJ3lN KnLg== X-Gm-Message-State: AGRZ1gKuuJ7lp6QkkA5P6JzStfUUkMqYrCMNT/VcYYt6s8ywZva9VDk0 x6pcVykvWM50dbuC6/RgowIwvzkyVIlnedOpthsdRw== X-Google-Smtp-Source: AJdET5ctLZtgFq5h74c1aNYNDuOG3hAOSdsFwswOtQaiIXj6mVTkStacchB7cX/hjboOIWcnsZHMFhpoe5k1LMi54Io= X-Received: by 2002:aca:3582:: with SMTP id c124-v6mr384449oia.119.1541605953192; Wed, 07 Nov 2018 07:52:33 -0800 (PST) MIME-Version: 1.0 References: <CAKBkRUziRrQGHNVq1wO9kG=Gw3ehqxe3ovdZwxpvOnYOALKJ9w@mail.gmail.com> <201811070551.wA75pIj8099372@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811070551.wA75pIj8099372@pdx.rh.CN85.dnsmgr.net> From: Maxim Sobolev <sobomax@freebsd.org> Date: Wed, 7 Nov 2018 07:52:22 -0800 Message-ID: <CAH7qZfvj6oVEgO-z9yXXmKahypBA_uqBV6M0P35yodjzccY5dA@mail.gmail.com> Subject: Re: svn commit: r340187 - head/sys/geom To: rgrimes@freebsd.org Cc: Li-Wen Hsu <lwhsu@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4A1E76E817 X-Spamd-Result: default: False [-4.01 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt1.aspmx.l.google.com]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; RCVD_IN_DNSWL_NONE(0.00)[177.167.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.03)[ipnet: 209.85.128.0/17(-3.71), asn: 15169(-1.37), country: US(-0.09)]; FORGED_SENDER(0.30)[sobomax@freebsd.org,sobomax@sippysoft.com]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[sobomax@freebsd.org,sobomax@sippysoft.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:00:17 -0000 Li-Wen, thanks for pointing out. I will investigate in the next few hours and follow-up then. Perhaps I need to treat out-of-the bounds BIO_DELETE differently, which was the original issue at hand. -Max On Tue, Nov 6, 2018 at 9:51 PM Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > Hi Maxim, > > > > There are 5 regression tests failing since this change: > > > > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/9184/testReport/ > > > > sys.geom.class.* > > > > Can you help check them? > > Maybe this should be backed out and looked at more closely? > > > -- > Rod Grimes > rgrimes@freebsd.org > > From owner-svn-src-head@freebsd.org Wed Nov 7 16:06:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 A970E1129721; Wed, 7 Nov 2018 16:06:52 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 877E16EB7C; Wed, 7 Nov 2018 16:06:51 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA7G6mhn001640; Wed, 7 Nov 2018 08:06:48 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA7G6mQW001639; Wed, 7 Nov 2018 08:06:48 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340187 - head/sys/geom In-Reply-To: <1541606248.52306.42.camel@freebsd.org> To: Ian Lepore <ian@freebsd.org> Date: Wed, 7 Nov 2018 08:06:48 -0800 (PST) CC: rgrimes@freebsd.org, Maxim Sobolev <sobomax@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@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: 877E16EB7C X-Spamd-Result: default: False [1.95 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.44)[0.444,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.14)[0.140,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.50)[0.497,0]; RCPT_COUNT_SEVEN(0.00)[7]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:06:52 -0000 > On Tue, 2018-11-06 at 16:17 -0800, Rodney W. Grimes wrote: > > > > > > Rodney, this was actually my original intention, however then I noticed in > > > the GEOM code there is at least one case when BIO_FLUSH request is being > > > generated internally with bio_offset == mediasize and bio_lenth == 0, so I > > > thought there might be some need to allow such requests through. But I'd > > > happily go with the stricter rule if it does no harm. I simply don't know > > > enough about the intended use and the logic behind zero-length transfers to > > > make that call. > > I am not sure enough on if mediasize is 0 based or not, > > if it is then the error case should be fixed, and the > > code you show below should also be fixed as it is > > technically making a request beyond the end of device. > > > > I am also murky on why we are even doing a 0 size > > operation and end of device, is that to validate > > we can access all the media???If so then this wrong > > code and wrong error return should be fixed as it > > is off by 1. > > > > > > > > > > > -Max > > > > > > int > > > g_io_flush(struct g_consumer *cp) > > > { > > > ... > > > ????????bp = g_alloc_bio(); > > > ????????bp->bio_cmd = BIO_FLUSH; > > > ... > > > ????????bp->bio_offset = cp->provider->mediasize; > > The above should have a - 1 on it. > > > > Unless offset > mediasize is specifically a signal to downstream code > in some way about how the flush is to be performed. Could very well be, should be documented some place though. > Nearly identical code to create a BIO_FLUSH bio appears in ufs softdeps > and in zfs. Before starting to arbitrarily change code that has worked > since 2006, it might be a good idea to track down why these values are > set the way they are. Unfortunately, there is no clue in the commit > logs, but maybe the author (pjd@, cc'd) can englighten us. I agree with that take on the situation, and it is why I asked for a revert and investigation, rather than trying to solve why we suddenly fail some regression tests. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Wed Nov 7 16:28:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 67E791129B8C; Wed, 7 Nov 2018 16:28:10 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8CFC6F628; Wed, 7 Nov 2018 16:28:09 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 B56A218078; Wed, 7 Nov 2018 16:28:09 +0000 (UTC) (envelope-from sobomax@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7GS9wF081821; Wed, 7 Nov 2018 16:28:09 GMT (envelope-from sobomax@FreeBSD.org) Received: (from sobomax@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7GS9RQ081820; Wed, 7 Nov 2018 16:28:09 GMT (envelope-from sobomax@FreeBSD.org) Message-Id: <201811071628.wA7GS9RQ081820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sobomax set sender to sobomax@FreeBSD.org using -f From: Maxim Sobolev <sobomax@FreeBSD.org> Date: Wed, 7 Nov 2018 16:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340220 - head/sys/geom X-SVN-Group: head X-SVN-Commit-Author: sobomax X-SVN-Commit-Paths: head/sys/geom X-SVN-Commit-Revision: 340220 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D8CFC6F628 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.90), asn: 11403(-3.75), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:28:10 -0000 Author: sobomax Date: Wed Nov 7 16:28:09 2018 New Revision: 340220 URL: https://svnweb.freebsd.org/changeset/base/340220 Log: Revert r340187, it breaks EOD (end-of-device) detection logic. Turns out, i/o into last_sector+N is handled differently for N==1 and N>1 cases to accomodate that, so some other approach would be needed to fix DIOCGDELETE ioctl(2). Modified: head/sys/geom/geom_io.c Modified: head/sys/geom/geom_io.c ============================================================================== --- head/sys/geom/geom_io.c Wed Nov 7 16:22:18 2018 (r340219) +++ head/sys/geom/geom_io.c Wed Nov 7 16:28:09 2018 (r340220) @@ -420,8 +420,6 @@ g_io_check(struct bio *bp) return (EIO); if (bp->bio_offset > pp->mediasize) return (EIO); - if (bp->bio_offset == pp->mediasize && bp->bio_length > 0) - return (EIO); /* Truncate requests to the end of providers media. */ excess = bp->bio_offset + bp->bio_length; From owner-svn-src-head@freebsd.org Wed Nov 7 16:50:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B4EC2112A226 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 16:50:59 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 280F2703BD for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 16:50:59 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by mail-oi1-f196.google.com with SMTP id v198-v6so14404604oif.2 for <svn-src-head@freebsd.org>; Wed, 07 Nov 2018 08:50:59 -0800 (PST) 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=RmwxnyCBLP9hCrO6MmRs7ov0Vc2oHwTtXGE8uVr75gU=; b=fRKcb5Z1BpzaxCbPSIpLyXqzgTAJQQjgkTgMBZYMqRmnULfcfjMd4nkT+ozBHtnc9U ya+ApA7YhxjIraOMpwWm8hrmgXDTbU3LE54KcRaBN/bMi8kJb7JGOti1HIpMvrpcZegl fCgzp8oYLppnNyHrvkGGm38X6Z3rls0tfJtXwBhQa0txMM3p0qkxdopQU5p3Gwq9GhyP HhLsIpusPtHy/fXHGS48yWqbKzjRh/1sIm5MYjFUtHmwcER/UYlIAL7NUbAqH4+nuClW SQ2WcBR8OiMa1VQogRPJzsWd5/DQWT2wWjjoSYz8wYlWpc8LRUj/yPnvwkCPuIrIyLye XdsA== X-Gm-Message-State: AGRZ1gIykxJdJG8B2XpdiakJYmE+prUyrzSc6t0eOsYo19XL/yCDQyfS IReQn5LWDh2KKZaZBTUvmKoB2TpTVq6P/sFfUbkiFQ== X-Google-Smtp-Source: AJdET5e5xgomQG78vL5+WpW8wR95UGmIo1PL4Ae7C47CAInjgp7pzce9+t9wNcI2AZVZw0idydSwO3OIuoX4AQYPhQY= X-Received: by 2002:aca:e343:: with SMTP id a64-v6mr507514oih.79.1541609138453; Wed, 07 Nov 2018 08:45:38 -0800 (PST) MIME-Version: 1.0 References: <1541606248.52306.42.camel@freebsd.org> <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> From: Maxim Sobolev <sobomax@freebsd.org> Date: Wed, 7 Nov 2018 08:45:27 -0800 Message-ID: <CAH7qZfsfLbcqZ5j1R+SkB_BzU4gNxG=KKYsK+2GD=2FW1VO_+A@mail.gmail.com> Subject: Re: svn commit: r340187 - head/sys/geom To: rgrimes@freebsd.org Cc: Ian Lepore <ian@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@freebsd.org> X-Rspamd-Queue-Id: 280F2703BD X-Spamd-Result: default: False [-4.02 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt1.aspmx.l.google.com]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; RCVD_IN_DNSWL_NONE(0.00)[196.167.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.03)[ipnet: 209.85.128.0/17(-3.62), asn: 15169(-1.45), country: US(-0.09)]; FORGED_SENDER(0.30)[sobomax@freebsd.org,sobomax@sippysoft.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[196.167.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[sobomax@freebsd.org,sobomax@sippysoft.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:50:59 -0000 Reverted, sorry. Turns out that i/o into last_sector+1 is handled differently. I'll probably have to use different strategy to properly fail out-of-bound ioctl(DIOCGDELETE) or otherwise indicate its result to the userland app. To my defense, this patch has been out for 3 weeks on freebsd-geom, and I got 0 responses. -Max On Wed, Nov 7, 2018 at 8:06 AM Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > On Tue, 2018-11-06 at 16:17 -0800, Rodney W. Grimes wrote: > > > > > > > > Rodney, this was actually my original intention, however then I > noticed in > > > > the GEOM code there is at least one case when BIO_FLUSH request is > being > > > > generated internally with bio_offset == mediasize and bio_lenth == > 0, so I > > > > thought there might be some need to allow such requests through. But > I'd > > > > happily go with the stricter rule if it does no harm. I simply don't > know > > > > enough about the intended use and the logic behind zero-length > transfers to > > > > make that call. > > > I am not sure enough on if mediasize is 0 based or not, > > > if it is then the error case should be fixed, and the > > > code you show below should also be fixed as it is > > > technically making a request beyond the end of device. > > > > > > I am also murky on why we are even doing a 0 size > > > operation and end of device, is that to validate > > > we can access all the media???If so then this wrong > > > code and wrong error return should be fixed as it > > > is off by 1. > > > > > > > > > > > > > > > -Max > > > > > > > > int > > > > g_io_flush(struct g_consumer *cp) > > > > { > > > > ... > > > > ????????bp = g_alloc_bio(); > > > > ????????bp->bio_cmd = BIO_FLUSH; > > > > ... > > > > ????????bp->bio_offset = cp->provider->mediasize; > > > The above should have a - 1 on it. > > > > > > > Unless offset > mediasize is specifically a signal to downstream code > > in some way about how the flush is to be performed. > > Could very well be, should be documented some place though. > > > Nearly identical code to create a BIO_FLUSH bio appears in ufs softdeps > > and in zfs. Before starting to arbitrarily change code that has worked > > since 2006, it might be a good idea to track down why these values are > > set the way they are. Unfortunately, there is no clue in the commit > > logs, but maybe the author (pjd@, cc'd) can englighten us. > > I agree with that take on the situation, and it is why I asked > for a revert and investigation, rather than trying to solve > why we suddenly fail some regression tests. > > -- > Rod Grimes > rgrimes@freebsd.org > > From owner-svn-src-head@freebsd.org Wed Nov 7 16:51:03 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B7141112A260; Wed, 7 Nov 2018 16:51:03 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B678703D0; Wed, 7 Nov 2018 16:51:02 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA7GoxDM001837; Wed, 7 Nov 2018 08:51:00 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA7GoxYY001836; Wed, 7 Nov 2018 08:50:59 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811071650.wA7GoxYY001836@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340220 - head/sys/geom In-Reply-To: <201811071628.wA7GS9RQ081820@repo.freebsd.org> To: Maxim Sobolev <sobomax@freebsd.org> Date: Wed, 7 Nov 2018 08:50:59 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 0B678703D0 X-Spamd-Result: default: False [1.90 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; 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)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.24)[0.243,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; NEURAL_SPAM_SHORT(0.09)[0.087,0]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.70)[0.701,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:51:03 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: sobomax > Date: Wed Nov 7 16:28:09 2018 > New Revision: 340220 > URL: https://svnweb.freebsd.org/changeset/base/340220 > > Log: > Revert r340187, it breaks EOD (end-of-device) detection logic. Turns out, > i/o into last_sector+N is handled differently for N==1 and N>1 cases to > accomodate that, so some other approach would be needed to fix DIOCGDELETE > ioctl(2). > > Modified: > head/sys/geom/geom_io.c > > Modified: head/sys/geom/geom_io.c > ============================================================================== > --- head/sys/geom/geom_io.c Wed Nov 7 16:22:18 2018 (r340219) > +++ head/sys/geom/geom_io.c Wed Nov 7 16:28:09 2018 (r340220) > @@ -420,8 +420,6 @@ g_io_check(struct bio *bp) > return (EIO); > if (bp->bio_offset > pp->mediasize) > return (EIO); > - if (bp->bio_offset == pp->mediasize && bp->bio_length > 0) > - return (EIO); > > /* Truncate requests to the end of providers media. */ > excess = bp->bio_offset + bp->bio_length; Thanks, I think this is the best thing to do while investigation goes on. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Wed Nov 7 16:55:06 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 EACC1112A383; Wed, 7 Nov 2018 16:55:05 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 65284707BD; Wed, 7 Nov 2018 16:55:05 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A36D1857F; Wed, 7 Nov 2018 16:55:05 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7Gt5Z6097186; Wed, 7 Nov 2018 16:55:05 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7Gt4hU097183; Wed, 7 Nov 2018 16:55:04 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811071655.wA7Gt4hU097183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Wed, 7 Nov 2018 16:55:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340221 - in head/sys: compat/freebsd32 kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 340221 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 65284707BD X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.75), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:55:06 -0000 Author: brooks Date: Wed Nov 7 16:55:04 2018 New Revision: 340221 URL: https://svnweb.freebsd.org/changeset/base/340221 Log: makesyscalls.sh: allow pointer return types. The previous code required that the return type be a single word. This allows it to be a pointer without using a typedef. Update the return types of break, mmap, and shmat to be void * as declared. This only effects systrace output in-tree, but can aid in generating system call wrappers from syscalls.master. Reviewed by: kib Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17873 Modified: head/sys/compat/freebsd32/syscalls.master head/sys/kern/makesyscalls.sh head/sys/kern/syscalls.master Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Wed Nov 7 16:28:09 2018 (r340220) +++ head/sys/compat/freebsd32/syscalls.master Wed Nov 7 16:55:04 2018 (r340221) @@ -88,7 +88,7 @@ int mode, int dev); } 15 AUE_CHMOD NOPROTO { int chmod(const char *path, mode_t mode); } 16 AUE_CHOWN NOPROTO { int chown(const char *path, int uid, int gid); } -17 AUE_NULL NOPROTO { caddr_t break(char *nsize); } +17 AUE_NULL NOPROTO { void *break(char *nsize); } 18 AUE_GETFSSTAT COMPAT4 { int freebsd32_getfsstat( \ struct statfs32 *buf, long bufsize, \ int mode); } @@ -175,7 +175,7 @@ 68 AUE_NULL OBSOL vwrite 69 AUE_SBRK NOPROTO { int sbrk(int incr); } 70 AUE_SSTK NOPROTO { int sstk(int incr); } -71 AUE_MMAP COMPAT|NOPROTO { int mmap(void *addr, int len, \ +71 AUE_MMAP COMPAT|NOPROTO { void *mmap(void *addr, int len, \ int prot, int flags, int fd, int pos); } 72 AUE_O_VADVISE COMPAT11|NOPROTO { int vadvise(int anom); } 73 AUE_MUNMAP NOPROTO { int munmap(void *addr, size_t len); } @@ -373,7 +373,7 @@ __setrlimit_args int 196 AUE_GETDIRENTRIES COMPAT11 { int freebsd32_getdirentries(int fd, \ char *buf, u_int count, int32_t *basep); } -197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(void *addr, \ +197 AUE_MMAP COMPAT6 { void *freebsd32_mmap(void *addr, \ size_t len, int prot, int flags, int fd, \ int pad, uint32_t pos1, uint32_t pos2); } 198 AUE_NULL NOPROTO { int nosys(void); } __syscall \ @@ -432,7 +432,7 @@ size_t msgsz, int msgflg); } 227 AUE_MSGRCV NOSTD { int freebsd32_msgrcv(int msqid, void *msgp, \ size_t msgsz, long msgtyp, int msgflg); } -228 AUE_SHMAT NOSTD|NOPROTO { int shmat(int shmid, void *shmaddr, \ +228 AUE_SHMAT NOSTD|NOPROTO { void *shmat(int shmid, void *shmaddr, \ int shmflg); } 229 AUE_SHMCTL COMPAT7|NOSTD { int freebsd32_shmctl( \ int shmid, int cmd, \ @@ -876,7 +876,7 @@ const void *buf, size_t nbyte, \ int pad, \ uint32_t offset1, uint32_t offset2); } -477 AUE_MMAP STD { caddr_t freebsd32_mmap(void *addr, \ +477 AUE_MMAP STD { void *freebsd32_mmap(void *addr, \ size_t len, int prot, int flags, int fd, \ int pad, \ uint32_t pos1, uint32_t pos2); } @@ -897,7 +897,7 @@ 476 AUE_PWRITE STD { ssize_t freebsd32_pwrite(int fd, \ const void *buf, size_t nbyte, \ uint32_t offset1, uint32_t offset2); } -477 AUE_MMAP STD { caddr_t freebsd32_mmap(void *addr, \ +477 AUE_MMAP STD { void *freebsd32_mmap(void *addr, \ size_t len, int prot, int flags, int fd, \ uint32_t pos1, uint32_t pos2); } 478 AUE_LSEEK STD { off_t freebsd32_lseek(int fd, \ Modified: head/sys/kern/makesyscalls.sh ============================================================================== --- head/sys/kern/makesyscalls.sh Wed Nov 7 16:28:09 2018 (r340220) +++ head/sys/kern/makesyscalls.sh Wed Nov 7 16:55:04 2018 (r340221) @@ -325,6 +325,7 @@ sed -e ' } function parseline() { f=4 # toss number, type, audit event + ret_inc = 0 argc= 0; argssize = "0" thr_flag = "SY_THR_STATIC" @@ -340,12 +341,15 @@ sed -e ' funcalias="" argalias="" rettype="int" + if ($(f+2) == "*") { + ret_inc = 1 + } end=NF } if (flag("NODEF")) { auditev="AUE_NULL" - funcname=$4 - argssize = "AS(" $6 ")" + funcname=$(4 + ret_inc) + argssize = "AS(" $(6 + ret_inc) ")" return } if ($f != "{") @@ -363,6 +367,11 @@ sed -e ' syscallret=$f f++ + while (ret_inc > 0) { + syscallret=syscallret " " $f + f++ + ret_inc-- + } funcname=$f Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Wed Nov 7 16:28:09 2018 (r340220) +++ head/sys/kern/syscalls.master Wed Nov 7 16:55:04 2018 (r340221) @@ -180,7 +180,7 @@ ); } 17 AUE_NULL STD { - caddr_t break( + void *break( _In_ char *nsize ); } @@ -480,7 +480,7 @@ ); } 71 AUE_MMAP COMPAT { - int mmap( + void *mmap( _In_ void *addr, int len, int prot, @@ -1168,7 +1168,7 @@ ); } 197 AUE_MMAP COMPAT6 { - caddr_t mmap( + void *mmap( _In_ void *addr, size_t len, int prot, @@ -1317,7 +1317,7 @@ ); } 228 AUE_SHMAT NOSTD { - int shmat( + void *shmat( int shmid, _In_ const void *shmaddr, int shmflg @@ -2543,7 +2543,7 @@ ); } 477 AUE_MMAP STD { - caddr_t mmap( + void *mmap( _In_ void *addr, size_t len, int prot, From owner-svn-src-head@freebsd.org Wed Nov 7 16:56:09 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 22E9A112A3E6; Wed, 7 Nov 2018 16:56:09 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A20857093D; Wed, 7 Nov 2018 16:56:08 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 601A118585; Wed, 7 Nov 2018 16:56:08 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7Gu86Y097272; Wed, 7 Nov 2018 16:56:08 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7Gu7FB097270; Wed, 7 Nov 2018 16:56:07 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811071656.wA7Gu7FB097270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Wed, 7 Nov 2018 16:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340222 - in head/sys: compat/freebsd32 kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 340222 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A20857093D X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.75), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:56:09 -0000 Author: brooks Date: Wed Nov 7 16:56:07 2018 New Revision: 340222 URL: https://svnweb.freebsd.org/changeset/base/340222 Log: Regen after r340221: allow pointer return types. Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17873 Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c head/sys/kern/systrace_args.c Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Wed Nov 7 16:55:04 2018 (r340221) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Wed Nov 7 16:56:07 2018 (r340222) @@ -8839,7 +8839,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* break */ case 17: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* getpid */ case 20: @@ -9388,7 +9388,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* shmat */ case 228: if (ndx == 0 || ndx == 1) - p = "int"; + p = "void *"; break; /* shmdt */ case 230: @@ -10139,7 +10139,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* freebsd32_mmap */ case 477: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* freebsd32_lseek */ case 478: @@ -10170,7 +10170,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* freebsd32_mmap */ case 477: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* freebsd32_lseek */ case 478: Modified: head/sys/kern/systrace_args.c ============================================================================== --- head/sys/kern/systrace_args.c Wed Nov 7 16:55:04 2018 (r340221) +++ head/sys/kern/systrace_args.c Wed Nov 7 16:56:07 2018 (r340222) @@ -8788,7 +8788,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* break */ case 17: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* getpid */ case 20: @@ -9357,7 +9357,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* shmat */ case 228: if (ndx == 0 || ndx == 1) - p = "int"; + p = "void *"; break; /* shmdt */ case 230: @@ -10187,7 +10187,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * /* mmap */ case 477: if (ndx == 0 || ndx == 1) - p = "caddr_t"; + p = "void *"; break; /* lseek */ case 478: From owner-svn-src-head@freebsd.org Wed Nov 7 16:56:33 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3787B112A421; Wed, 7 Nov 2018 16:56:33 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC19970ABE; Wed, 7 Nov 2018 16:56:32 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 9DD4418586; Wed, 7 Nov 2018 16:56:32 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7GuWej097331; Wed, 7 Nov 2018 16:56:32 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7GuWxZ097330; Wed, 7 Nov 2018 16:56:32 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <201811071656.wA7GuWxZ097330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 7 Nov 2018 16:56:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340223 - head/share/man/man8 X-SVN-Group: head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/share/man/man8 X-SVN-Commit-Revision: 340223 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BC19970ABE X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.75), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:56:33 -0000 Author: 0mp (ports committer) Date: Wed Nov 7 16:56:32 2018 New Revision: 340223 URL: https://svnweb.freebsd.org/changeset/base/340223 Log: rc.subr(8): Document when required_* variables are processed At the moment rc.subr(8) supports the following required_* variables: required_dirs, required_files, required_modules and required_vars. This patch documents when every of those required_* variables is actually processed (before or after running start_precmd). Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Sponsored by: Bally Wulff Games & Entertainment GmbH Differential Revision: https://reviews.freebsd.org/D17895 Modified: head/share/man/man8/rc.subr.8 Modified: head/share/man/man8/rc.subr.8 ============================================================================== --- head/share/man/man8/rc.subr.8 Wed Nov 7 16:56:07 2018 (r340222) +++ head/share/man/man8/rc.subr.8 Wed Nov 7 16:56:32 2018 (r340223) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 19, 2018 +.Dd November 7, 2018 .Dt RC.SUBR 8 .Os .Sh NAME @@ -491,16 +491,22 @@ Check for the existence of the listed directories before running the .Cm start method. +The list is checked before running +.Va start_precmd . .It Va required_files Check for the readability of the listed files before running the .Cm start method. +The list is checked before running +.Va start_precmd . .It Va required_modules Ensure that the listed kernel modules are loaded before running the .Cm start method. +The list is checked after running +.Va start_precmd . This is done after invoking the commands from .Va start_precmd so that the missing modules are not loaded in vain @@ -531,6 +537,8 @@ on each of the list variables before running the .Cm start method. +The list is checked after running +.Va start_precmd . .It Va ${name}_chdir Directory to .Ic cd From owner-svn-src-head@freebsd.org Wed Nov 7 16:59:27 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D6DAC112A4FD; Wed, 7 Nov 2018 16:59:26 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 501F770CC8; Wed, 7 Nov 2018 16:59:26 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wA7GxOa6001892; Wed, 7 Nov 2018 08:59:24 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wA7GxO8Q001891; Wed, 7 Nov 2018 08:59:24 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811071659.wA7GxO8Q001891@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340187 - head/sys/geom In-Reply-To: <CAH7qZfsfLbcqZ5j1R+SkB_BzU4gNxG=KKYsK+2GD=2FW1VO_+A@mail.gmail.com> To: Maxim Sobolev <sobomax@freebsd.org> Date: Wed, 7 Nov 2018 08:59:24 -0800 (PST) CC: rgrimes@freebsd.org, Ian Lepore <ian@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@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: 501F770CC8 X-Spamd-Result: default: False [2.10 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.60)[0.596,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.14)[0.137,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.49)[0.495,0]; RCPT_COUNT_SEVEN(0.00)[7]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 16:59:27 -0000 > Reverted, sorry. Turns out that i/o into last_sector+1 is handled > differently. I'll probably have to use different strategy to properly fail > out-of-bound ioctl(DIOCGDELETE) or otherwise indicate its result to the > userland app. To my defense, this patch has been out for 3 weeks on > freebsd-geom, and I got 0 responses. Well you have some now, so lets try to sort this out and at least document what the funny "access one byte past end with zero size I/O" is about. A good stratergy when you get no response on a phabricator review is to poke about it on @current or @arch requesting feedback. The phabricator notificaiton to potential reviewers is very low. freebsd-geom is also probably a pretty short list. > -Max > > On Wed, Nov 7, 2018 at 8:06 AM Rodney W. Grimes < > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > On Tue, 2018-11-06 at 16:17 -0800, Rodney W. Grimes wrote: > > > > > > > > > > Rodney, this was actually my original intention, however then I > > noticed in > > > > > the GEOM code there is at least one case when BIO_FLUSH request is > > being > > > > > generated internally with bio_offset == mediasize and bio_lenth == > > 0, so I > > > > > thought there might be some need to allow such requests through. But > > I'd > > > > > happily go with the stricter rule if it does no harm. I simply don't > > know > > > > > enough about the intended use and the logic behind zero-length > > transfers to > > > > > make that call. > > > > I am not sure enough on if mediasize is 0 based or not, > > > > if it is then the error case should be fixed, and the > > > > code you show below should also be fixed as it is > > > > technically making a request beyond the end of device. > > > > > > > > I am also murky on why we are even doing a 0 size > > > > operation and end of device, is that to validate > > > > we can access all the media???If so then this wrong > > > > code and wrong error return should be fixed as it > > > > is off by 1. > > > > > > > > > > > > > > > > > > > -Max > > > > > > > > > > int > > > > > g_io_flush(struct g_consumer *cp) > > > > > { > > > > > ... > > > > > ????????bp = g_alloc_bio(); > > > > > ????????bp->bio_cmd = BIO_FLUSH; > > > > > ... > > > > > ????????bp->bio_offset = cp->provider->mediasize; > > > > The above should have a - 1 on it. > > > > > > > > > > Unless offset > mediasize is specifically a signal to downstream code > > > in some way about how the flush is to be performed. > > > > Could very well be, should be documented some place though. > > > > > Nearly identical code to create a BIO_FLUSH bio appears in ufs softdeps > > > and in zfs. Before starting to arbitrarily change code that has worked > > > since 2006, it might be a good idea to track down why these values are > > > set the way they are. Unfortunately, there is no clue in the commit > > > logs, but maybe the author (pjd@, cc'd) can englighten us. > > > > I agree with that take on the situation, and it is why I asked > > for a revert and investigation, rather than trying to solve > > why we suddenly fail some regression tests. > > > > -- > > Rod Grimes > > rgrimes@freebsd.org > > > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Wed Nov 7 18:27:47 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E1CF7112C084; Wed, 7 Nov 2018 18:27:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8474A73913; Wed, 7 Nov 2018 18:27:44 +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 5FE5A193F3; Wed, 7 Nov 2018 18:27:44 +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 wA7IRiWA043295; Wed, 7 Nov 2018 18:27:44 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7IRi7P043294; Wed, 7 Nov 2018 18:27:44 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811071827.wA7IRi7P043294@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Wed, 7 Nov 2018 18:27:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340228 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 340228 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8474A73913 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.76), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 18:27:47 -0000 Author: jhb Date: Wed Nov 7 18:27:43 2018 New Revision: 340228 URL: https://svnweb.freebsd.org/changeset/base/340228 Log: Enable use of a global shared page for RISC-V. machine/vmparam.h already defines the SHAREDPAGE constant. This change just enables it for ELF executables. The only use of the shared page currently is to hold the signal trampoline. Reviewed by: markj, kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D17875 Modified: head/sys/riscv/riscv/elf_machdep.c Modified: head/sys/riscv/riscv/elf_machdep.c ============================================================================== --- head/sys/riscv/riscv/elf_machdep.c Wed Nov 7 18:12:18 2018 (r340227) +++ head/sys/riscv/riscv/elf_machdep.c Wed Nov 7 18:27:43 2018 (r340228) @@ -83,10 +83,12 @@ struct sysentvec elf64_freebsd_sysvec = { .sv_setregs = exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_FREEBSD | SV_LP64, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 | SV_SHP, .sv_set_syscall_retval = cpu_set_syscall_retval, .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, + .sv_shared_page_base = SHAREDPAGE, + .sv_shared_page_len = PAGE_SIZE, .sv_schedtail = NULL, .sv_thread_detach = NULL, .sv_trap = NULL, From owner-svn-src-head@freebsd.org Wed Nov 7 18:28:56 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5B089112C0F4; Wed, 7 Nov 2018 18:28:56 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9B2673A99; Wed, 7 Nov 2018 18:28:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0AD2193FA; Wed, 7 Nov 2018 18:28:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7IStw3043383; Wed, 7 Nov 2018 18:28:55 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7IStAF043382; Wed, 7 Nov 2018 18:28:55 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811071828.wA7IStAF043382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Wed, 7 Nov 2018 18:28:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340229 - in head/sys: arm64/arm64 riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/sys: arm64/arm64 riscv/riscv X-SVN-Commit-Revision: 340229 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D9B2673A99 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.76), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 18:28:56 -0000 Author: jhb Date: Wed Nov 7 18:28:55 2018 New Revision: 340229 URL: https://svnweb.freebsd.org/changeset/base/340229 Log: Drop the legacy ELF brandinfo for the old rtld from arm64 and riscv. These architectures never shipped binaries with an rtld path of /usr/libexec/ld-elf.so.1. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D17876 Modified: head/sys/arm64/arm64/elf_machdep.c head/sys/riscv/riscv/elf_machdep.c Modified: head/sys/arm64/arm64/elf_machdep.c ============================================================================== --- head/sys/arm64/arm64/elf_machdep.c Wed Nov 7 18:27:43 2018 (r340228) +++ head/sys/arm64/arm64/elf_machdep.c Wed Nov 7 18:28:55 2018 (r340229) @@ -107,21 +107,6 @@ static Elf64_Brandinfo freebsd_brand_info = { SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t)elf64_insert_brand_entry, &freebsd_brand_info); -static Elf64_Brandinfo freebsd_brand_oinfo = { - .brand = ELFOSABI_FREEBSD, - .machine = EM_AARCH64, - .compat_3_brand = "FreeBSD", - .emul_path = NULL, - .interp_path = "/usr/libexec/ld-elf.so.1", - .sysvec = &elf64_freebsd_sysvec, - .interp_newpath = NULL, - .brand_note = &elf64_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE -}; - -SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, - (sysinit_cfunc_t)elf64_insert_brand_entry, &freebsd_brand_oinfo); - void elf64_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) Modified: head/sys/riscv/riscv/elf_machdep.c ============================================================================== --- head/sys/riscv/riscv/elf_machdep.c Wed Nov 7 18:27:43 2018 (r340228) +++ head/sys/riscv/riscv/elf_machdep.c Wed Nov 7 18:28:55 2018 (r340229) @@ -111,22 +111,6 @@ SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); -static Elf64_Brandinfo freebsd_brand_oinfo = { - .brand = ELFOSABI_FREEBSD, - .machine = EM_RISCV, - .compat_3_brand = "FreeBSD", - .emul_path = NULL, - .interp_path = "/usr/libexec/ld-elf.so.1", - .sysvec = &elf64_freebsd_sysvec, - .interp_newpath = NULL, - .brand_note = &elf64_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE -}; - -SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, - (sysinit_cfunc_t) elf64_insert_brand_entry, - &freebsd_brand_oinfo); - static int debug_kld; SYSCTL_INT(_kern, OID_AUTO, debug_kld, CTLFLAG_RW, &debug_kld, 0, From owner-svn-src-head@freebsd.org Wed Nov 7 18:32:03 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D12A0112C32F; Wed, 7 Nov 2018 18:32: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6413573F89; Wed, 7 Nov 2018 18:32: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 4688219571; Wed, 7 Nov 2018 18:32: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 wA7IW3DZ045870; Wed, 7 Nov 2018 18:32:03 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7IW3VI045865; Wed, 7 Nov 2018 18:32:03 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811071832.wA7IW3VI045865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Wed, 7 Nov 2018 18:32:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340231 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340231 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6413573F89 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.73)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.76), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 18:32:04 -0000 Author: jhb Date: Wed Nov 7 18:32:02 2018 New Revision: 340231 URL: https://svnweb.freebsd.org/changeset/base/340231 Log: Enable non-executable stacks by default on RISC-V. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D17878 Modified: head/sys/kern/imgact_elf.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), int __elfN(nxstack) = #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ + defined(__riscv) 1; #else 0; From owner-svn-src-head@freebsd.org Wed Nov 7 19:31:50 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 EA702112D1F5; Wed, 7 Nov 2018 19:31:49 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 75A1475CD7; Wed, 7 Nov 2018 19:31:49 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57E5F19F04; Wed, 7 Nov 2018 19:31:49 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7JVn1E077313; Wed, 7 Nov 2018 19:31:49 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7JVnIi077312; Wed, 7 Nov 2018 19:31:49 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201811071931.wA7JVnIi077312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd <shurd@FreeBSD.org> Date: Wed, 7 Nov 2018 19:31:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340236 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 340236 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 75A1475CD7 X-Spamd-Result: default: False [-106.84 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.77), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 19:31:50 -0000 Author: shurd Date: Wed Nov 7 19:31:48 2018 New Revision: 340236 URL: https://svnweb.freebsd.org/changeset/base/340236 Log: Fix rxcsum issue introduced in r338838 r338838 attempted to fix issues with rxcsum and rxcsum6. However, the rxcsum bits were set as though if_setcapenablebit() was being called, not if_togglecapenable() which is in use. As a result, it was not possible to disable rxcsum when rxcsum6 was supported. PR: 233004 Reported by: lev Reviewed by: lev MFC after: 3 days Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D17881 Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Wed Nov 7 18:54:24 2018 (r340235) +++ head/sys/net/iflib.c Wed Nov 7 19:31:48 2018 (r340236) @@ -4256,18 +4256,13 @@ iflib_if_ioctl(if_t ifp, u_long command, caddr_t data) setmask |= (mask & IFCAP_WOL); /* - * If we're disabling any RX csum, disable all the ones - * the driver supports. This assumes all supported are - * enabled. - * - * Otherwise, if they've changed, enable all of them. + * If any RX csum has changed, change all the ones that + * are supported by the driver. */ - if ((setmask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) < - (oldmask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6))) - setmask &= ~(IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - else if ((setmask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != - (oldmask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6))) - setmask |= (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)); + if (setmask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { + setmask |= ctx->ifc_softc_ctx.isc_capabilities & + (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); + } /* * want to ensure that traffic has stopped before we change any of the flags From owner-svn-src-head@freebsd.org Wed Nov 7 19:46:19 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0BA6A112D547 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 19:46:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it1-x12f.google.com (mail-it1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 40CA8764AA for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 19:46:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it1-x12f.google.com with SMTP id d6so24660655itl.4 for <svn-src-head@freebsd.org>; Wed, 07 Nov 2018 11:46:18 -0800 (PST) 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=0fEepdcobfoFrANBARpij6dGx1TimEQj48VbeAF/BfQ=; b=HvCD7//8f1t2SJnkhb+yQqAUcpccx12wYfrr9Y+cti1Tvl5H9KnDful6dM3I2H3Wyv AEDFxjddEVtdV2s5i5A891U8D9ClbRKkJ/DinTWG5AsAKJ7q/P/h+jQoGl5FU2C2F0pQ TMkVAGqBOGNpWoZGYqs+Tx/0xkcmW1yusJK8uSKcuNyzsN9Gp+3BsahlefRUtDnUorLP dPjJ7zvmn+ODOFfNUczjH7Bk7JWYvq8vZfl2myX75Yz27e5nxG4lsseW0yYsRJgqFkiE VqloeRBUDas0gUM5T7xCNMuvwfefNgdmCCf4UM8YuRXhOd2Z2zgjJ/o/tPHcX4uwxeVU zrIA== 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=0fEepdcobfoFrANBARpij6dGx1TimEQj48VbeAF/BfQ=; b=TW+bQS2RI3J8rm9bpk4t6g6RenjZgeno0bcfey1zrumsXwre/Rj8hA2eFPtqZ+Llhz MjVjfk7d/R/fRTZjN2jfVta+nOrjStq5QgFtmHrql8Ga8bRBJCarvw29zflSgeNFZW0v mt2UIYrio4jrMoOC4spBkrY4Wk05CEjHF9BZt+fCoRGvhOE5pP3p2aw0gr0fHhLrvZO0 CdPRILBJDPldyM2agio10hAmbWhk72vFxhWP8ASlP1JOEEBXuXX8pv71/3WgzhGlA+1o n8QTt3NNCanSY9IAf5Pwf1xwJM/32B1t88wqOMPqWXT8mjuIDLC7jC67llEbTA9mXUQO YjTA== X-Gm-Message-State: AGRZ1gIo6uWHhZWVyyfma1TcwdxIfmMVEM3WkCYbB5VEfWK6fi37thCP Zsop4rQgZgQTrvizM6Xi7CPkRiXt7a7rrTppqV34vg== X-Google-Smtp-Source: AJdET5cjl2YxU12CyqLUQ/kfr+p1nP4LlCpVIxvavg+Rwej+nsrqJT8nPPuzRRpu7e8SyKsljDLCZ+JGSgM6ll1kiOw= X-Received: by 2002:a24:5f94:: with SMTP id r142-v6mr1424608itb.171.1541619977468; Wed, 07 Nov 2018 11:46:17 -0800 (PST) MIME-Version: 1.0 References: <1541606248.52306.42.camel@freebsd.org> <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> From: Warner Losh <imp@bsdimp.com> Date: Wed, 7 Nov 2018 12:46:06 -0700 Message-ID: <CANCZdfrK-7vBETkhfQ9KkM4usrvjVh8wS_OZJiDmH5336DTsqQ@mail.gmail.com> Subject: Re: svn commit: r340187 - head/sys/geom To: "Rodney W. Grimes" <rgrimes@freebsd.org> Cc: Ian Lepore <ian@freebsd.org>, Maxim Sobolev <sobomax@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@freebsd.org> X-Rspamd-Queue-Id: 40CA8764AA X-Spamd-Result: default: False [-3.29 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.70)[-0.703,0]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT1.aspmx.l.google.com]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[f.2.1.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]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.58)[ipnet: 2607:f8b0::/32(-1.33), asn: 15169(-1.50), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 19:46:19 -0000 On Wed, Nov 7, 2018 at 9:07 AM Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > On Tue, 2018-11-06 at 16:17 -0800, Rodney W. Grimes wrote: > > > > > > > > Rodney, this was actually my original intention, however then I > noticed in > > > > the GEOM code there is at least one case when BIO_FLUSH request is > being > > > > generated internally with bio_offset == mediasize and bio_lenth == > 0, so I > > > > thought there might be some need to allow such requests through. But > I'd > > > > happily go with the stricter rule if it does no harm. I simply don't > know > > > > enough about the intended use and the logic behind zero-length > transfers to > > > > make that call. > > > I am not sure enough on if mediasize is 0 based or not, > > > if it is then the error case should be fixed, and the > > > code you show below should also be fixed as it is > > > technically making a request beyond the end of device. > > > > > > I am also murky on why we are even doing a 0 size > > > operation and end of device, is that to validate > > > we can access all the media???If so then this wrong > > > code and wrong error return should be fixed as it > > > is off by 1. > > > > > > > > > > > > > > > -Max > > > > > > > > int > > > > g_io_flush(struct g_consumer *cp) > > > > { > > > > ... > > > > ????????bp = g_alloc_bio(); > > > > ????????bp->bio_cmd = BIO_FLUSH; > > > > ... > > > > ????????bp->bio_offset = cp->provider->mediasize; > > > The above should have a - 1 on it. > > > > > > > Unless offset > mediasize is specifically a signal to downstream code > > in some way about how the flush is to be performed. > > Could very well be, should be documented some place though. > > > Nearly identical code to create a BIO_FLUSH bio appears in ufs softdeps > > and in zfs. Before starting to arbitrarily change code that has worked > > since 2006, it might be a good idea to track down why these values are > > set the way they are. Unfortunately, there is no clue in the commit > > logs, but maybe the author (pjd@, cc'd) can englighten us. > > I agree with that take on the situation, and it is why I asked > for a revert and investigation, rather than trying to solve > why we suddenly fail some regression tests. > BIO_FLUSH is primarily done to force ordering points, since they are one of the only users of BIO_ORDERED in the system (the other is one place in UFS that shouldn't be doing BIO_ORDERED in theory, but in practice it's hard to fix. The exact values of the request don't really matter for the most part, though flushing past the end is seems ill defined. There's no way we'd force out blocks past the end. NVME, SCSI and ATA all implement BIO_FLUSH as either a NOP, or as simple command to flush all caches to stable media. Other drivers that I looked at appear to do something similar, though I've not looked at every single one of them in detail. Warner From owner-svn-src-head@freebsd.org Wed Nov 7 19:53:33 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 41C54112D767 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 19:53:33 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C5AC7696C for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 19:53:31 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) X-YMail-OSG: QMCDtlAVM1nRCNhX7TWA309zeiKoQ675tHtyWoSx4W7.hmSn32q3k8xd9tCoPSJ VJYwvBlnhpvc49KOQ04xEgpsF4yWtqkNdPsOKCVGrzG9yfuPohTpYLyh6oXTsXroTgGwD7utdrLh BWEktQoicHaW1uwHVUnAXj2GohViK7dMrCXA9_Pjuak1FCEfXSY.KzseLOBovDgtq7Tw2Xhe1Kps 88ps27kzdKiMAI80CRJtvtiK.Lq9tSEfxLUiM9vBdk3tZ0fpXx1ndG5Lpk3X56OXZFRoxUaLMWsS HvWKtK1T.oo1pGx3Y6UFudqXjkalsZlXHz5JxNs_NOgUbiHrymorItAuVGULYHdKAx7OybO3ieEr emYNP.bg8RDHZkoCvW56mopTGafv0HQPGVMCjdDAbfNJ493e8Xpq64uCu49mPnxS1nS5ploxdGHP Zo6b9C0Yma9gjWA9oG4LHmsQ2G1rE6oxdoTKGddLy4JapCAoX3JxL4Do.lnHdFHq6d5mQoURpudl q.KPHIbvy4rCPd2Rpp1CjzQKizrw5kX0dZXYFafWAJC2nYP1eciNhTQzXO78Swev4zhkjGHHjz1Z LxlI0tvUtWa.IZStiuFglnvVRub0_JaNesDSYIIVnB6LuDBEzQon7L02hV2RKsac3zHsvQu68mk3 RRjmtZzOL9l2baxo9JP9FKkrDkmUQzZigD8ZkSve0XqBhlvkY_pfhlIUgZNB67nhF6HkdtPU_HxY nWZQ4kNi5inulsbNXVAWmzlm_FM6dfvJU95fG.mlzwdPS0eKKYzw9HHf.ZjOCX41W07pUdddULg8 XlnxlyRIHfg2olkTKe9uy5thwoDBP5.mwB4GEiZGP9rntB_wMD4ErNWytzVS8EdRjJ330jEEeldD c0LAzFboW16MWz6Vyj1nnlev49kJqmnXxc5YdguzcH7cCOkM5H0tsFPxs4MmTRGeFExFXYh3kMom BXIB2lrtbhPpptu.xMkCkm4BZy1MpZMR7K5G20PXH3qRzOsVZJ6S5r41SYu3SRU7alUY.wTpTczI NI2Bn2Hz7QHSEfnoMUF1v.oGKzOCvChe1d71whnZSM6jmfDk- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Wed, 7 Nov 2018 19:53:24 +0000 Received: from c-76-115-7-162.hsd1.or.comcast.net (EHLO [192.168.1.25]) ([76.115.7.162]) by smtp413.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 527e366f4f767dc945c35f96702bea57; Wed, 07 Nov 2018 19:53:21 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.1 \(3445.101.1\)) Subject: Re: svn commit: r339876 - head/libexec/rtld-elf From: Mark Millard <marklmi26-fbsd@yahoo.com> In-Reply-To: <8FFCF603-6315-4D1C-858B-FC7233C17DD7@yahoo.com> Date: Wed, 7 Nov 2018 11:53:20 -0800 Cc: svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <7757A519-9262-40CC-A3F6-77AD243DDB28@yahoo.com> References: <8E5A5F3A-F1A7-4702-A2F7-65D74CC5B2E5@yahoo.com> <20181102004101.GI5335@kib.kiev.ua> <E44F5772-1F8A-40B8-9C4E-B8362B768F37@yahoo.com> <003A49D7-6E8B-4775-A70B-E0EB44505D4B@yahoo.com> <20181102113827.GM5335@kib.kiev.ua> <7B29A4C8-228D-41CB-B594-98DFA456E9C8@yahoo.com> <20181102155234.GN5335@kib.kiev.ua> <E93B3880-281E-482C-9DA7-851398543B97@yahoo.com> <20181102185014.GP5335@kib.kiev.ua> <8FFCF603-6315-4D1C-858B-FC7233C17DD7@yahoo.com> To: Konstantin Belousov <kostikbel@gmail.com> X-Mailer: Apple Mail (2.3445.101.1) X-Rspamd-Queue-Id: 0C5AC7696C X-Spamd-Result: default: False [-1.90 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MV_CASE(0.50)[]; FREEMAIL_FROM(0.00)[yahoo.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[yahoo.com:+]; MX_GOOD(-0.01)[cached: mta6.am0.yahoodns.net]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/21, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[yahoo.com]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.48)[0.476,0]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; MIME_GOOD(-0.10)[text/plain]; IP_SCORE(0.13)[ipnet: 98.137.64.0/21(0.41), asn: 36647(0.33), country: US(-0.09)]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[83.68.137.98.list.dnswl.org : 127.0.5.0] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 19:53:33 -0000 [I trace code associated with bl <00001322.plt_call.getenv> in the two contexts and extend the range over which things appear to match: up to some point after the branch b <__glink_PLTresolve> .] On 2018-Nov-6, at 19:12, Mark Millard <marklmi26-fbsd@yahoo.com> wrote: > [I've present a little information about the longer-existing > failure's odd backtrace for /libexec/ld-elf.so.1 /bin/ls > --but on powerpc64 FreeBSD instead of 32-bit powerpc FreeBSD.] >=20 > On 2018-Nov-2, at 11:50, Konstantin Belousov <kostikbel at gmail.com> = wrote: >=20 >> On Fri, Nov 02, 2018 at 10:38:08AM -0700, Mark Millard wrote: >>> On 2018-Nov-2, at 8:52 AM, Konstantin Belousov <kostikbel at = gmail.com> wrote: >>>=20 >>>> . . . >>>=20 >>> That seems better. But it crashes during /bin/ls execution >>> ( 0x0180???? addresses ), apparently in a library routine >>> ( 0x41?????? addresses ): >>>=20 >>> Program received signal SIGSEGV, Segmentation fault. >>> 0x411220b4 in ?? () >>> (gdb) bt >>> #0 0x411220b4 in ?? () >>> #1 0x4112200c in ?? () >>> #2 0x01803c84 in ?? () >>> #3 0x018023b4 in ?? () >>> #4 0x010121a0 in .rtld_start () at = /usr/src/libexec/rtld-elf/powerpc/rtld_start.S:112 >>>=20 >>> Using a normal gdb run of /bin/ls suggests: >>>=20 >>> #2 0x01803c84 in ?? () should be in main and seems to be: bl = 0x1818914 <getopt_long@plt> >>> #3 0x018023b4 in ?? () should be in _start >>>=20 >>> Looking in the test context: >>>=20 >>> 0x1803c80: bl 0x1818914 >>> 0x1803c84: cmpwi cr7,r3,-1 >>>=20 >>> and: >>>=20 >>> 0x1818914: li r11,59 >>> 0x1818918: b 0x18186f4 >>>=20 >>> and: >>>=20 >>> 0x18186f4: rlwinm r11,r11,2,0,29 >>> 0x18186f8: addis r11,r11,386 >>> 0x18186fc: lwz r11,-30316(r11) >>> 0x1818700: mtctr r11 >>> 0x1818704: bctr >>>=20 >>> Breaking at the bctr and using info reg: >>>=20 >>> r11 0x4125ffa0 1093009312 >>>=20 >>> It looks like there is some amount of >>> activity before the traceback addresses >>> show up. >>>=20 >>> I've not found a good way to fill in the "in ??()" >>> (or analogous) information. The addresses 0x411220?? >>> do not match up with a normal run of /bin/ls from >>> gdb: the addresses can not be accessed. >>>=20 >>>=20 >>>=20 >>> It does appear that the code is in /lib/libc.so.7 in the >>> test context: >>>=20 >>> Breakpoint 2, reloc_non_plt (obj=3D0x41041600, obj_rtld=3D0x41104b57, = flags=3D4, lockstate=3D0x0) at = /usr/src/libexec/rtld-elf/powerpc/reloc.c:338 >>> . . . >>>=20 >> There seems to be an issue with the direct execution mode on ppc. >> Even otherwise working ld-elf.so.1 segfaults if I try to use it as >> standalone binary. >>=20 >> But if I specify patched ld-elf.so.1 as the interpreter for some = program, >> using 'cc -Wl,-I,<path>/ld-elf.so.1' it works. So I see there two = bugs, >> one is regression due to textsize calculation, which should be fixed = by >> my patch. Another is the direct exec problem. >=20 > I've got a little more information about the odd backtrace > from the /libexec/ld-elf.so.1 /bin/ls failure that the > prior patch allowed getting to, although for a powerpc64 > example context. >=20 > The information is only identifying where the code was > in /bin/ls and /lib/libc.so.1 in the backtrace. For > libc.so.1 I found the same code sequences in a gdb of > /bin/ls directly, matching one first, using the addresses > vs. in the /libexec/ld-elf.so.1 /bin/ls process to > find offsets for going back and forth, and then used > that two find the 2nd backtrace addresses material. >=20 > Overall it suggests to me that (in somewhat=20 > symbolic terms): >=20 > bl <00001322.plt_call.getenv> >=20 > eventually lead to executing the wrong code. >=20 >=20 > The supporting detail is as follows. >=20 > The /libexec/ld-elf.so.1 part of the backtrace was > easy to find where the code was: >=20 > (gdb) run /bin/ls > Starting program: /libexec/ld-elf.so.1 /bin/ls >=20 > Program received signal SIGSEGV, Segmentation fault. > 0x000000080118d81c in ?? () > (gdb) bt > #0 0x000000080118d81c in ?? () > #1 0x000000080118d920 in ?? () > #2 0x0000000010002558 in ?? () > #3 0x00000000100037b0 in ?? () > #4 0x0000000001018450 in ._rtld_start () at = /usr/src/libexec/rtld-elf/powerpc64/rtld_start.S:104 > Backtrace stopped: frame did not save the PC >=20 > (gdb)=20 > 101 ld %r7,128(%r1) /* exit proc */ > 102 ld %r8,136(%r1) /* ps_strings */ > 103=09 > 104 blrl /* _start(argc, argv, envp, obj, cleanup, = ps_strings) */ > 105=09 > 106 li %r0,1 /* _exit() */ > 107 sc >=20 >=20 > The /bin/ls part of the backtrace was easy to find > were the code was: >=20 > (gdb) symbol-file /bin/ls > Load new symbol table from "/bin/ls"? (y or n) y > Reading symbols from /bin/ls...Reading symbols from = /usr/lib/debug//bin/ls.debug...done. > done. > (gdb) bt > #0 0x000000080118d81c in ?? () > #1 0x000000080118d920 in ?? () > #2 0x0000000010002558 in main (argc=3D<optimized out>, = argv=3D0x80134bdb0) at /usr/src/bin/ls/ls.c:268 > #3 0x00000000100037b0 in _start (argc=3D<optimized out>, = argv=3D0x3fffffffffffdb70, env=3D0x3fffffffffffdb88, obj=3D<optimized = out>, cleanup=3D<optimized out>, ps_strings=3D<optimized out>) > at /usr/src/lib/csu/powerpc64/crt1.c:96 > #4 0x0000000001018450 in ?? () > #5 0x0000000000000000 in ?? () >=20 > (gdb) fr 3=20 > #3 0x00000000100037b0 in _start (argc=3D<optimized out>, = argv=3D0x3fffffffffffdb70, env=3D0x3fffffffffffdb88, obj=3D<optimized = out>, cleanup=3D<optimized out>, ps_strings=3D<optimized out>) > at /usr/src/lib/csu/powerpc64/crt1.c:96 > 96 exit(main(argc, argv, env)); > (gdb) down > #2 0x0000000010002558 in main (argc=3D<optimized out>, = argv=3D0x80134bdb0) at /usr/src/bin/ls/ls.c:268 > 268 while ((ch =3D getopt_long(argc, argv, >=20 >=20 >=20 > For the messy lib.libc.so.1 part of the backtrace both > addresses are in getopt_internal. I show extractions from > the the gdb /bin/ls output because it has helpful symbolic > information displayed. But that means that the addresses > are offset from those in the bt for the failure process. >=20 > For #1 0x000000080118d920 in ?? () I end up with: >=20 > (gdb) x/32i 0x81019b6c0+0xad0-0x880 > 0x81019b910 <getopt_internal+592>: stw r9,0(r18) > 0x81019b914 <getopt_internal+596>: addis r3,r2,-5 > 0x81019b918 <getopt_internal+600>: addi r3,r3,30120 > 0x81019b91c <getopt_internal+604>: bl 0x81018dfe0 = <00001322.plt_call.getenv> > 0x81019b920 <getopt_internal+608>: ld r2,40(r1) >=20 > (The machine code around it all matches around > 0x000000080118d920 in the failure context.) >=20 > The getenv call in the source is the 2nd line of: >=20 > if (posixly_correct =3D=3D -1 || optreset) > posixly_correct =3D (getenv("POSIXLY_CORRECT") !=3D = NULL); >=20 > For #0 0x000000080118d81c in ?? () I end up with: >=20 > (gdb) x/32i 0x81019b6c0+0xad0-0x880-0x110 > 0x81019b800 <getopt_internal+320>: bne cr7,0x81019b868 = <getopt_internal+424> > 0x81019b804 <getopt_internal+324>: lwa r5,0(r29) > 0x81019b808 <getopt_internal+328>: stw r17,0(r18) > 0x81019b80c <getopt_internal+332>: cmpw cr7,r5,r19 > 0x81019b810 <getopt_internal+336>: bge cr7,0x81019ba60 = <getopt_internal+928> > 0x81019b814 <getopt_internal+340>: rldicr r9,r5,3,60 > 0x81019b818 <getopt_internal+344>: ldx r10,r20,r9 > 0x81019b81c <getopt_internal+348>: lbz r9,0(r10) >=20 > with the failure being that r10 is zero in that last > line above. Again the surrounding code matches. >=20 > The source code line is reported to be: >=20 > if (*(place =3D nargv[optind]) !=3D '-' || >=20 > I got the line number information from breakpoints 3 and 4 > below (from the gdb /bin/ls process): >=20 > (gdb) info br > Num Type Disp Enb Address What > 1 breakpoint keep y 0x0000000010002360 in main at = /usr/src/bin/ls/ls.c:231 > breakpoint already hit 1 time > 3 breakpoint keep y 0x000000081019b81c in getopt_internal = at /usr/src/lib/libc/stdlib/getopt_long.c:411 > 4 breakpoint keep y 0x000000081019b91c in getopt_internal = at /usr/src/lib/libc/stdlib/getopt_long.c:379 >=20 > Line 379 has the getenv call, matching the machine code showing > the call. >=20 > (I set the breakpoints just as a way of using "info br" to list > the information later.) >=20 > Overall this seems to suggest that: >=20 > bl <00001322.plt_call.getenv> >=20 > lead to something odd happening and got to the wrong > code. >=20 > That is all the additional information that I have > at this point. I hope it is of some use. >=20 I'll note that the normal cases execution does the getenv call but does not execute the lbz r9,0(r10) related code. I'll also note that for the libc.so.1 code the /libexec/ld-elf.so.1 /bin/ls code addresses are bigger than the /bin/ls addresses by: 0x81019b920 - 0x80118d920 =3D 0xF00E000 I use this to go back and forth, checking for matching code as I go. Presenting the normal /bin/ls use in gdb first for up to b <__glink_PLTresolve> : I'd already shown: 0x81019b91c <getopt_internal+604>: bl 0x81018dfe0 = <00001322.plt_call.getenv> Looking: 0x81018dfe0 <00001322.plt_call.getenv>: std r2,40(r1) 0x81018dfe4 <00001322.plt_call.getenv+4>: ld r12,480(r2) 0x81018dfe8 <00001322.plt_call.getenv+8>: mtctr r12 0x81018dfec <00001322.plt_call.getenv+12>: ld r11,496(r2) 0x81018dff0 <00001322.plt_call.getenv+16>: ld r2,488(r2) 0x81018dff4 <00001322.plt_call.getenv+20>: cmpldi r2,0 0x81018dff8 <00001322.plt_call.getenv+24>: bnectr+=20 0x81018dffc <00001322.plt_call.getenv+28>: b 0x81030f3dc = <getenv@plt> As for getenv@pl : 0x81030f3dc <getenv@plt>: li r0,925 0x81030f3e0 <getenv@plt+4>: b 0x81030d6c8 <__glink_PLTresolve> Note that 0x81018dfe0 - 0xF00E000 =3D 0x80117ffe0 . Back in the /libexec/ld-elf.so.1 /bin/ls context: (gdb) bt #0 0x000000080118d81c in ?? () #1 0x000000080118d920 in ?? () [Just after the bl = <00001322.plt_call.getenv> .] #2 0x0000000010002558 in ?? () #3 0x00000000100037b0 in ?? () #4 0x0000000001018450 in ?? () #5 0x0000000000000000 in ?? () (gdb) x/i 0x000000080118d920-0x4 0x80118d91c: bl 0x80117ffe0 So matching what was calculated earlier. (gdb) x/32i 0x81018dfe0-0xf00e000=20 0x80117ffe0: std r2,40(r1) 0x80117ffe4: ld r12,480(r2) 0x80117ffe8: mtctr r12 0x80117ffec: ld r11,496(r2) 0x80117fff0: ld r2,488(r2) 0x80117fff4: cmpldi r2,0 0x80117fff8: bnectr+=20 0x80117fffc: b 0x8013013dc (gdb) x/2i 0x8013013dc 0x8013013dc: li r0,925 0x8013013e0: b 0x8012ff6c8 0x81030d6c8 - 0x8012ff6c8 =3D 0xF00E000 Still matching tp to this point. So the two contexts seem to match up to some point after: b <__glink_PLTresolve> . I've not looked beyond this. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-svn-src-head@freebsd.org Wed Nov 7 20:20:27 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3F2E7112DCC2; Wed, 7 Nov 2018 20:20:27 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from phk.freebsd.dk (phk.freebsd.dk [130.225.244.222]) by mx1.freebsd.org (Postfix) with ESMTP id E878277385; Wed, 7 Nov 2018 20:20:25 +0000 (UTC) (envelope-from phk@critter.freebsd.dk) Received: from critter.freebsd.dk (unknown [192.168.55.3]) by phk.freebsd.dk (Postfix) with ESMTP id 789B314842; Wed, 7 Nov 2018 20:20:17 +0000 (UTC) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.15.2/8.15.2) with ESMTPS id wA7KKG7P001605 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 7 Nov 2018 20:20:16 GMT (envelope-from phk@critter.freebsd.dk) Received: (from phk@localhost) by critter.freebsd.dk (8.15.2/8.15.2/Submit) id wA7KKGUp001604; Wed, 7 Nov 2018 20:20:16 GMT (envelope-from phk) To: Warner Losh <imp@bsdimp.com> cc: "Rodney W. Grimes" <rgrimes@freebsd.org>, Ian Lepore <ian@freebsd.org>, Maxim Sobolev <sobomax@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@freebsd.org> Subject: Re: svn commit: r340187 - head/sys/geom In-reply-to: <CANCZdfrK-7vBETkhfQ9KkM4usrvjVh8wS_OZJiDmH5336DTsqQ@mail.gmail.com> From: "Poul-Henning Kamp" <phk@phk.freebsd.dk> References: <1541606248.52306.42.camel@freebsd.org> <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> <CANCZdfrK-7vBETkhfQ9KkM4usrvjVh8wS_OZJiDmH5336DTsqQ@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <1602.1541622015.1@critter.freebsd.dk> Content-Transfer-Encoding: quoted-printable Date: Wed, 07 Nov 2018 20:20:15 +0000 Message-ID: <1603.1541622015@critter.freebsd.dk> X-Rspamd-Queue-Id: E878277385 X-Spamd-Result: default: False [0.64 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.61)[-0.607,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.15)[0.152,0]; NEURAL_HAM_LONG(-0.20)[-0.197,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.dk]; AUTH_NA(1.00)[]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[phk.freebsd.dk]; RCPT_COUNT_SEVEN(0.00)[8]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[phk@phk.freebsd.dk,phk@critter.freebsd.dk]; RCVD_NO_TLS_LAST(0.10)[]; R_DKIM_NA(0.00)[]; IP_SCORE(0.00)[country: EU(0.00)]; ASN(0.00)[asn:1835, ipnet:130.225.0.0/16, country:EU]; FROM_NEQ_ENVFROM(0.00)[phk@phk.freebsd.dk,phk@critter.freebsd.dk] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 20:20:27 -0000 -------- In message <CANCZdfrK-7vBETkhfQ9KkM4usrvjVh8wS_OZJiDmH5336DTsqQ@mail.gmail= .com> , Warner Losh writes: >BIO_FLUSH is primarily done to force ordering points, = Originally BIO_FLUSH was defined the way it is, to make it possible to flush an isolated specified range on providers which support that so that fsync(2) could be implemented that way. I can't remember the exact semantics of the two "magic" flush operations (off=3D0,len=3D0) and (off=3Dend,len=3D0) but they were differe= nt from each other in some important aspect (Pawel?) -- = Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe = Never attribute to malice what can adequately be explained by incompetence= . From owner-svn-src-head@freebsd.org Wed Nov 7 20:31:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B9CCF112E2A3 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 20:31:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it1-x12e.google.com (mail-it1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 001FB77CFD for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 20:31:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it1-x12e.google.com with SMTP id w7-v6so24771403itd.1 for <svn-src-head@freebsd.org>; Wed, 07 Nov 2018 12:31:51 -0800 (PST) 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=rMQaQk4t1r7hf3haFSb1C5KAXW4ZlHPsrP25lqur6fw=; b=RklflZtiWMlMAqvCSjpAZws/QtgDoRcNMH5j1yyY4OIR8cEKrVXppR+Xgch3Qk9Rnb iSwfEx751+hi0yvRThGcME7z3XeLDxw442gpT6K7QSvVhimSUrmWkWhmOPufi6UsJJMi gd7qbGqj+UHAtHFDCygxUgheO++oEihnEtilKVx03qaYyiXC4DmSHEyCCcaGkLFkQgVd BEdYppdcnHotwCXBfzvAvU8xArPn/8GLCM4cMysjl81EJ+iSeyqn7J/ZVkxWtPznyK09 0vUJh5AvWWXCDx49Z9MijDEhiUgVgdCbS0ItYr75fD0ETiNHWzKnJQRT2o+QJy1oi849 JmIg== 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=rMQaQk4t1r7hf3haFSb1C5KAXW4ZlHPsrP25lqur6fw=; b=pCxk4es9KcJDqhAZCXeVd6QZtmxEBlwP0mnUc6eqt4r0B9uE0UN1jZleRW93TO97CW HKmArtdIc9xG3/dy2m6oY8BxBJl/ecwbOdB6DncmGXwRPCiITW2OFia57dchAHoNSRqf kbf1SRGfCH2gahWvet5SMwTIcs4vbf+ZwxE6QDxnWIXV5kbPaiqAtooyyAx6Bu8DtWwu 1Is+P5s3u0394CwMvmEmr1e9Rclzym4yJWVixV49Bz6mX261kE/jQsHEdoPr35igcQ/i B245E9svhWbB/21+CEl7fbP0Zh8AktIDLyhk9UbUv/X0ev1C3tA4RuZOB5FLo+ZzTO2N pLsw== X-Gm-Message-State: AGRZ1gIsjakIOsXSND5SIpoS4RfNN9+bNXITiX9DXROCuhgNiJFdutIL B39Ps1Mbr5BPpoe6Pu3caMcV6DiHAtgnv/AtfvfA/g== X-Google-Smtp-Source: AJdET5cWK08/dP29QeHZPTU6p9VYzQmCYyon8i4iqSjDR7N8QxPwPY2RqJahlyPAf8VGTiH0AevyiXiAR5wzk3x7neE= X-Received: by 2002:a02:9951:: with SMTP id d17-v6mr1589918jak.78.1541622709847; Wed, 07 Nov 2018 12:31:49 -0800 (PST) MIME-Version: 1.0 References: <1541606248.52306.42.camel@freebsd.org> <201811071606.wA7G6mQW001639@pdx.rh.CN85.dnsmgr.net> <CANCZdfrK-7vBETkhfQ9KkM4usrvjVh8wS_OZJiDmH5336DTsqQ@mail.gmail.com> <1603.1541622015@critter.freebsd.dk> In-Reply-To: <1603.1541622015@critter.freebsd.dk> From: Warner Losh <imp@bsdimp.com> Date: Wed, 7 Nov 2018 13:31:38 -0700 Message-ID: <CANCZdfr0gvfoeDfQu5L0QuGV8L+fJeQ=HQiWeaQuosP5fw3YyQ@mail.gmail.com> Subject: Re: svn commit: r340187 - head/sys/geom To: Poul-Henning Kamp <phk@phk.freebsd.dk> Cc: "Rodney W. Grimes" <rgrimes@freebsd.org>, Ian Lepore <ian@freebsd.org>, Maxim Sobolev <sobomax@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Pawel Jakub Dawidek <pjd@freebsd.org> X-Rspamd-Queue-Id: 001FB77CFD X-Spamd-Result: default: False [-3.40 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.81)[-0.814,0]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT1.aspmx.l.google.com]; RCPT_COUNT_SEVEN(0.00)[8]; RCVD_IN_DNSWL_NONE(0.00)[e.2.1.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]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.59)[ipnet: 2607:f8b0::/32(-1.35), asn: 15169(-1.50), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 20:31:53 -0000 On Wed, Nov 7, 2018 at 1:20 PM Poul-Henning Kamp <phk@phk.freebsd.dk> wrote: > -------- > In message < > CANCZdfrK-7vBETkhfQ9KkM4usrvjVh8wS_OZJiDmH5336DTsqQ@mail.gmail.com> > , Warner Losh writes: > > >BIO_FLUSH is primarily done to force ordering points, > > Originally BIO_FLUSH was defined the way it is, to make it possible > to flush an isolated specified range on providers which support that > so that fsync(2) could be implemented that way. > > I can't remember the exact semantics of the two "magic" flush > operations (off=0,len=0) and (off=end,len=0) but they were different > from each other in some important aspect (Pawel?) > I couldn't find any place where the different types of flush are differentiated (nothing in CAM for sure), though I suppose I could have missed something. All the CAM drivers just use it to push data to the device and don't look at the flags. Warner From owner-svn-src-head@freebsd.org Wed Nov 7 20:36:58 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 30284112E580; Wed, 7 Nov 2018 20:36:58 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B1C55781AF; Wed, 7 Nov 2018 20:36: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 8F8651A8E6; Wed, 7 Nov 2018 20:36:57 +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 wA7Kav0l011234; Wed, 7 Nov 2018 20:36:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7KavGZ011233; Wed, 7 Nov 2018 20:36:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811072036.wA7KavGZ011233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Wed, 7 Nov 2018 20:36:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340238 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 340238 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B1C55781AF X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.77), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 20:36:58 -0000 Author: emaste Date: Wed Nov 7 20:36:57 2018 New Revision: 340238 URL: https://svnweb.freebsd.org/changeset/base/340238 Log: newvers.sh: avoid regenerating vers.c if content unchanged When reproducible build mode is enabled vers.c may be unchanged between successive builds. In this case avoid changing the file's metadata so that it does not cause dependent targets to be rebuilt. Sponsored by: The FreeBSD Foundation Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D17892 Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Wed Nov 7 20:31:36 2018 (r340237) +++ head/sys/conf/newvers.sh Wed Nov 7 20:36:57 2018 (r340238) @@ -328,7 +328,7 @@ else VERSTR="${VERINFO}\\n ${u}@${h}:${d}\\n" fi -cat << EOF > vers.c +vers_content_new=$(cat << EOF $COPYRIGHT #define SCCSSTR "@(#)${VERINFO}" #define VERSTR "${VERSTR}" @@ -342,5 +342,10 @@ char osrelease[sizeof(RELSTR) > 32 ? sizeof(RELSTR) : int osreldate = ${RELDATE}; char kern_ident[] = "${i}"; EOF +) +vers_content_old=$(cat vers.c 2>/dev/null || true) +if [ "$vers_content_new" != "$vers_content_old" ]; then + echo "$vers_content_new" > vers.c +fi echo $((v + 1)) > version From owner-svn-src-head@freebsd.org Wed Nov 7 21:01:15 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8B641112EDDC; Wed, 7 Nov 2018 21:01:15 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B65179323; Wed, 7 Nov 2018 21:01:15 +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 F21A51AC66; Wed, 7 Nov 2018 21:01:14 +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 wA7L1EDa021994; Wed, 7 Nov 2018 21:01:14 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7L1E8v021993; Wed, 7 Nov 2018 21:01:14 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201811072101.wA7L1E8v021993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski <oshogbo@FreeBSD.org> Date: Wed, 7 Nov 2018 21:01:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340239 - head/usr.bin/bsdiff/bspatch X-SVN-Group: head X-SVN-Commit-Author: oshogbo X-SVN-Commit-Paths: head/usr.bin/bsdiff/bspatch X-SVN-Commit-Revision: 340239 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1B65179323 X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.78), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 21:01:15 -0000 Author: oshogbo Date: Wed Nov 7 21:01:14 2018 New Revision: 340239 URL: https://svnweb.freebsd.org/changeset/base/340239 Log: bspatch: simplify capsicumization Assume that user wants to run with capsicum support if he builds the software with HAVE_CAPSICUM. Treat running application without capsicum in the kernel as an error. MFC after: 3 weeks Modified: head/usr.bin/bsdiff/bspatch/bspatch.c Modified: head/usr.bin/bsdiff/bspatch/bspatch.c ============================================================================== --- head/usr.bin/bsdiff/bspatch/bspatch.c Wed Nov 7 20:36:57 2018 (r340238) +++ head/usr.bin/bsdiff/bspatch/bspatch.c Wed Nov 7 21:01:14 2018 (r340239) @@ -144,26 +144,22 @@ int main(int argc, char *argv[]) atexit(exit_cleanup); #ifdef HAVE_CAPSICUM - if (cap_enter() < 0) { - /* Failed to sandbox, fatal if CAPABILITY_MODE enabled */ - if (errno != ENOSYS) - err(1, "failed to enter security sandbox"); - } else { - /* Capsicum Available */ - cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); - cap_rights_init(&rights_wr, CAP_WRITE); - cap_rights_init(&rights_dir, CAP_UNLINKAT); + if (cap_enter() < 0) + err(1, "failed to enter security sandbox"); - if (cap_rights_limit(fileno(f), &rights_ro) < 0 || - cap_rights_limit(fileno(cpf), &rights_ro) < 0 || - cap_rights_limit(fileno(dpf), &rights_ro) < 0 || - cap_rights_limit(fileno(epf), &rights_ro) < 0 || - cap_rights_limit(oldfd, &rights_ro) < 0 || - cap_rights_limit(newfd, &rights_wr) < 0 || - cap_rights_limit(dirfd, &rights_dir) < 0) - err(1, "cap_rights_limit() failed, could not restrict" - " capabilities"); - } + cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); + cap_rights_init(&rights_wr, CAP_WRITE); + cap_rights_init(&rights_dir, CAP_UNLINKAT); + + if (cap_rights_limit(fileno(f), &rights_ro) < 0 || + cap_rights_limit(fileno(cpf), &rights_ro) < 0 || + cap_rights_limit(fileno(dpf), &rights_ro) < 0 || + cap_rights_limit(fileno(epf), &rights_ro) < 0 || + cap_rights_limit(oldfd, &rights_ro) < 0 || + cap_rights_limit(newfd, &rights_wr) < 0 || + cap_rights_limit(dirfd, &rights_dir) < 0) + err(1, "cap_rights_limit() failed, could not restrict" + " capabilities"); #endif /* From owner-svn-src-head@freebsd.org Wed Nov 7 21:01:33 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 23161112EE01 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 21:01:33 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DEF7D7946B for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 21:01:31 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-ed1-x52c.google.com with SMTP id c25-v6so14575045edt.8 for <svn-src-head@freebsd.org>; Wed, 07 Nov 2018 13:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vOGdiOaKC9QeuPIpFTCbNV9o7kq43j4IZ808i4rEbaQ=; b=McmtHufan6fxQuyCruEsA+hbB15bLFKuqWg0Br1vYZUWRw6uUmA7pm8lbnjHvTShVz hQ74sAVzypcMQorD5VWmeokUuVYh1EIcx0uKGWEjVmOk0Yrk9+bLQrpxwiI9T5RikECi uOr1OcR94EteSGnUEc7Y2LvSkCl2e3SOU8XCXZzCEChbEOCOzcJwox0YPeNq8EeuDJAs 4n5QWdRZ65yK435ko3OZEawDHzuPL2K2hskrdvgOapZCPe2hDkmBBvq27IzOJPB+gXKR TG6q6lEhBCMBTadGdD3EfPmkAoZA3RUlxxVpjJtice8IElja8AoHAmpkdJtON6XyBKpY aaUQ== 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=vOGdiOaKC9QeuPIpFTCbNV9o7kq43j4IZ808i4rEbaQ=; b=D8Aga2/g66iZqxMVFzJkeYozSBeqGv+45Iwf3ObZMp8apsxKVr614SnME9AOuseHZ0 U2MNQL9YTGmvZVEAJGzXI+37bgTPEEjVgzMDTbSt8iDq4k0k42G+v6Q4J24jxvKklCTz 1V9NWSpvbyZ5iZ088DMJeRwrCUNrcz5EKpDXNShz9VoHzRQ3TliworuNbEUbNNpjHhkh KRgcRVADXOZUfvw55muQDNHhh2cBpe8530cHqwm+xYXW+f6FB3FRElQ7w4MEjZ50AnA7 FIP9Mox3X7on7eVKb3+8zNKFph3jIvoYnnS48zmQLz9Grek1mp7yUOPSxIuPxJatJeyG 4Rww== X-Gm-Message-State: AGRZ1gKLoIwPZsNsqUosgOgrYIcrKbmzaHOfKQNLT23hanhJoYHIr9OK KJ97W+7IxY3aA1XxVf7r7/2tJAv47uV5mTth7xzlLw== X-Google-Smtp-Source: AJdET5c4ZlUhGrji9EaVB3dyc09sLMQ2ZKiXgygfjbWZZ46Xk/Cc2D7vSj3mV23OHfvDi8wsphLeZDvlggLA1MUE9CU= X-Received: by 2002:a17:906:78c1:: with SMTP id r1-v6mr1161251ejn.150.1541624490320; Wed, 07 Nov 2018 13:01:30 -0800 (PST) MIME-Version: 1.0 References: <201811071832.wA7IW3VI045865@repo.freebsd.org> In-Reply-To: <201811071832.wA7IW3VI045865@repo.freebsd.org> From: Ed Schouten <ed@nuxi.nl> Date: Wed, 7 Nov 2018 22:01:04 +0100 Message-ID: <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> Subject: Re: svn commit: r340231 - head/sys/kern To: John Baldwin <jhb@freebsd.org> Cc: src-committers <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: DEF7D7946B X-Spamd-Result: default: False [-5.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[nuxi-nl.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; 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)[nuxi.nl]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[nuxi-nl.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[ASPMX.L.GOOGLE.COM,ALT2.ASPMX.L.GOOGLE.COM,ASPMX5.GOOGLEMAIL.COM,ALT1.ASPMX.L.GOOGLE.COM,ASPMX4.GOOGLEMAIL.COM,ASPMX3.GOOGLEMAIL.COM,ASPMX2.GOOGLEMAIL.COM]; RCVD_IN_DNSWL_NONE(0.00)[c.2.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-2.58)[ip: (-9.27), ipnet: 2a00:1450::/32(-2.03), asn: 15169(-1.51), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 21:01:33 -0000 Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb@freebsd.org>: > Modified: head/sys/kern/imgact_elf.c > ============================================================================== > --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) > +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) > @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), > > int __elfN(nxstack) = > #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ > - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) > + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ > + defined(__riscv) > 1; > #else > 0; Are we getting to the point that it might make sense to invert this logic, i.e., just list the architectures that require executable stacks? -- Ed Schouten <ed@nuxi.nl> From owner-svn-src-head@freebsd.org Wed Nov 7 21:36:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D5073112F57F; Wed, 7 Nov 2018 21:36:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C9017A548; Wed, 7 Nov 2018 21:36:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 7DB2410AFCD; Wed, 7 Nov 2018 16:35:59 -0500 (EST) Subject: Re: svn commit: r340231 - head/sys/kern To: Ed Schouten <ed@nuxi.nl> References: <201811071832.wA7IW3VI045865@repo.freebsd.org> <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: John Baldwin <jhb@FreeBSD.org> Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= xsDiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg80eSm9obiBCYWxk d2luIDxqb2huQGJhbGR3aW4uY3g+wmMEExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX gAUCRND5wwIZAQAKCRBy3lIGd+N/BNLXAJ9KIb6teuDL1W+FkCgvv+y8PxKTkACeIUfbn3sl cueBzqTcf09idwa8YTbOwU0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Ds gnr31AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh +GojXlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cM SOrHYUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOF QVHOEVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq 1tqzhltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZ TwtXsNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m 7Z164yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioI AjjHaIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbU KWwxQ4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjH uW/CSQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZN wwCfafMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> Date: Wed, 7 Nov 2018 13:35:57 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Wed, 07 Nov 2018 16:35:59 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-Rspamd-Queue-Id: 2C9017A548 X-Spamd-Result: default: False [-104.72 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-1.61)[ipnet: 2001:470::/32(-4.44), asn: 6939(-3.54), country: US(-0.09)]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 21:36:02 -0000 On 11/7/18 1:01 PM, Ed Schouten wrote: > Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb@freebsd.org>: >> Modified: head/sys/kern/imgact_elf.c >> ============================================================================== >> --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) >> +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) >> @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), >> >> int __elfN(nxstack) = >> #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ >> - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) >> + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ >> + defined(__riscv) >> 1; >> #else >> 0; > > Are we getting to the point that it might make sense to invert this > logic, i.e., just list the architectures that require executable > stacks? It's not clear. The remaining set is i386 (should be able to use nxstack when using PAE and PG_NX is supported), MIPS (no X permission in PTEs), 32-bit powerpc (no X permissions in PTEs AFAICT), and sparc64 (no X permissions in PTEs AFAICT). For architectures without X ptes, removing VM_PROT_EXECUTE from the stack permissions is a no-op and would be harmless, so we could perhaps just default this to always on at this point? -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Wed Nov 7 21:36:53 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8B86F112F604; Wed, 7 Nov 2018 21:36:53 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1537F7A6CE; Wed, 7 Nov 2018 21:36:53 +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 E6E951B2DD; Wed, 7 Nov 2018 21:36:52 +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 wA7LaqiT042278; Wed, 7 Nov 2018 21:36:52 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7Laq8q042277; Wed, 7 Nov 2018 21:36:52 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201811072136.wA7Laq8q042277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome <tsoome@FreeBSD.org> Date: Wed, 7 Nov 2018 21:36:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340240 - head/stand/common X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/common X-SVN-Commit-Revision: 340240 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1537F7A6CE X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.78), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 21:36:53 -0000 Author: tsoome Date: Wed Nov 7 21:36:52 2018 New Revision: 340240 URL: https://svnweb.freebsd.org/changeset/base/340240 Log: loader: ptable_open() check for ptable_cd9660read result is wrong The ptable_*read() functions return NULL on read errors (and partition table closed as an side effect). The ptable_open must check the return value and act properly. PR: 232483 Reported by: lev Reviewed by: lev,cem Differential Revision: https://reviews.freebsd.org/D17890 Modified: head/stand/common/part.c Modified: head/stand/common/part.c ============================================================================== --- head/stand/common/part.c Wed Nov 7 21:01:14 2018 (r340239) +++ head/stand/common/part.c Wed Nov 7 21:36:52 2018 (r340240) @@ -675,10 +675,12 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sect table->type = PTABLE_NONE; STAILQ_INIT(&table->entries); - if (ptable_iso9660read(table, dev, dread) != NULL) { - if (table->type == PTABLE_ISO9660) - goto out; - } + if (ptable_iso9660read(table, dev, dread) == NULL) { + /* Read error. */ + table = NULL; + goto out; + } else if (table->type == PTABLE_ISO9660) + goto out; #ifdef LOADER_VTOC8_SUPPORT if (be16dec(buf + offsetof(struct vtoc8, magic)) == VTOC_MAGIC) { From owner-svn-src-head@freebsd.org Wed Nov 7 22:23:31 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D92AF11303F4 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 22:23:30 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-11.consmr.mail.ne1.yahoo.com (sonic308-11.consmr.mail.ne1.yahoo.com [66.163.187.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 284F77BE4B for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 22:23:30 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-YMail-OSG: HXL38AEVM1nYK8CBsxkxRjF6pLy4e6hVk57ATyMWKlnls8RDOP12IOGS75Lj7uJ oFfKrGIbQCA9iYYngZMT1z2ciV6dYz.AgopocaFKDVGdtLsZzVRgD2JMC8iOl9ms5858bFQgF9HO 3S8swXrlLIdjLNKIUSNG1KewWRVeXkbK4KfE5lMsC7RAK2Y.qYqVxpRT.yLeU9k6PWKN7eA91MsP _4xgtrTsyzNXHAKr.jqSWgSSkPl5cNvd06M2c9sIANypqNZKfpGqx0GM5JEpqWKuHV4eQHqxTcco NkPs5jlUjBhqalCcr_5N6irefr_YhhWIJOlSUqyAfcfqq2gpHBfMJRDCjj4zx7asN4LT8aXZWiIO Sk153Egk0Khl4yrXpxjaFQDp8cOawvg4Kkfw70RVUNn1xirsI_43VVWP3tX0NXpGNmJ3eNKEBmdL VRefK96B7ESb.eMnpFhHDd.YzmtChkHHfcF9I3nc6cMaXyycfaO5HKkaZ4lYVRKN7F.CcLVfl72Z JD4QuyfmA7CvSixdkzv3H.MAec0Mu74VeUH3zOkURjSeF8wB1ClhJlRKwwqpWOhbW6mzkTghA0sO bbtvwblj_bGbx8e8YUw70CDlAzAxHgduz_pKZ6.Ac0Sz12hfLL.ISvRpi6bX_Av5LdK9qvFFU24H 6abqe2Iepnra2XijK.Z_Y1RbWbOoOxcuxuDzNpiCauy_7XnF.ZWgNbjqfNhlIuKCj1S113yMcRUi 2NOkmc.BM.uAVk85mPo2joz46rHqCUro4KVQA2KnMhiIzjIUKK5maZ0Y3N134JSe6xUUPERAosqn EeRU2A7HxTiQNd7lEmqdHTfoxGQkBltfDGFkRPAKkmBwrHSJ0wJNA9xrjjfWP3Y5.vngRb5IARqW HRP.Wkti6FLXa44omoJKADiHAubGWKNISL5dqJtOdAzaGwrLhipZQGbJcq_3L2PrYC_KDN_5SjgN bifg_NkvCLA.0BsbikqSwUvISNXcnf8VC1lR8DsLx9byqDe8PZl8KNXkX3GfpwehsFr9EWvRYdU9 EAMb37Ld11KUos0UiTX5cfJ_H0FFxG6zMm5MvBtTZMOkLYg-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ne1.yahoo.com with HTTP; Wed, 7 Nov 2018 22:23:28 +0000 Received: from c-76-115-7-162.hsd1.or.comcast.net (EHLO [192.168.1.25]) ([76.115.7.162]) by smtp426.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 356b8d99781583b2b72774db342ce218; Wed, 07 Nov 2018 22:23:25 +0000 (UTC) From: Mark Millard <marklmi@yahoo.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 12.1 \(3445.101.1\)) Subject: Re: svn commit: r340231 - head/sys/kern Message-Id: <F4A4E491-0792-409B-BFF9-C7BE8C8B7B87@yahoo.com> Date: Wed, 7 Nov 2018 14:23:23 -0800 To: John Baldwin <jhb@freebsd.org>, svn-src-head@freebsd.org X-Mailer: Apple Mail (2.3445.101.1) X-Rspamd-Queue-Id: 284F77BE4B X-Spamd-Result: default: False [-0.03 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MV_CASE(0.50)[]; FREEMAIL_FROM(0.00)[yahoo.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[yahoo.com:+]; MX_GOOD(-0.01)[cached: mta6.am0.yahoodns.net]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(0.41)[ipnet: 66.163.184.0/21(1.19), asn: 36646(0.95), country: US(-0.09)]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; FAKE_REPLY(1.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com]; NEURAL_HAM_MEDIUM(-0.85)[-0.845,0]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.69)[0.694,0]; NEURAL_HAM_LONG(-0.78)[-0.781,0]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[34.187.163.66.list.dnswl.org : 127.0.5.0] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 22:23:31 -0000 John Baldwin jhb at FreeBSD.org wrote on Wed Nov 7 21:36:02 UTC 2018 : > On 11/7/18 1:01 PM, Ed Schouten wrote: > > Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb at = freebsd.org>: > >> Modified: head/sys/kern/imgact_elf.c > >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > >> --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 = (r340230) > >> +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 = (r340231) > >> @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, = __elfN(legacy_coredump), > >> > >> int __elfN(nxstack) =3D > >> #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 = bit */ || \ > >> - (defined(__arm__) && __ARM_ARCH >=3D 7) || = defined(__aarch64__) > >> + (defined(__arm__) && __ARM_ARCH >=3D 7) || = defined(__aarch64__) || \ > >> + defined(__riscv) > >> 1; > >> #else > >> 0; > >=20 > > Are we getting to the point that it might make sense to invert this > > logic, i.e., just list the architectures that require executable > > stacks? >=20 > It's not clear. The remaining set is i386 (should be able to use = nxstack > when using PAE and PG_NX is supported), MIPS (no X permission in = PTEs), > 32-bit powerpc (no X permissions in PTEs AFAICT), and sparc64 (no X > permissions in PTEs AFAICT). For architectures without X ptes, = removing > VM_PROT_EXECUTE from the stack permissions is a no-op and would be > harmless, so we could perhaps just default this to always on at this > point? FreeBSD for 32-bit powerpc can also run on powerpc64 hardware, something I commonly do with 32-bit powerpc FreeBSD. So I'm not sure if some of the powerpc64 context sometimes applies for such use or not. May be the mode of use is as-if it was limited like 32-bit powerpc hardware for what you propose? I do not now if i386 or mips have the same sort of question relative to use on 64-bit capable hardware. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-svn-src-head@freebsd.org Wed Nov 7 22:56:44 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6190311310D5 for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 22:56:44 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw1-xc2f.google.com (mail-yw1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 736F37D48A for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 22:56:43 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw1-xc2f.google.com with SMTP id c126-v6so7276311ywd.8 for <svn-src-head@freebsd.org>; Wed, 07 Nov 2018 14:56:43 -0800 (PST) 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=LGL4x6dkIdgJZOkDHkmFJxEgR3EfxdT6D9M0NZ47Uu0=; b=gotq5iHa1bYAxllf8KNqr1JjfwPYGZtnYLDZmvV9p9ZYQz4HjQ9wATmvNFkb68TJX+ wxgN3ERcmwhR6OfYoCwl99KLfGOt6C3WrJB5fUfdZkdWPD1+lw6Q92sz7WM0D+pxpz65 9EeZ6nFmmCcaA2FE5Ph6WtDwJ5NjXmJHZIl9LRyjmV84u+TVHHC79H+9OHQPyuo1ob8O kRc5Ap1qzCk+nIofwlgSPDW74wfPrGrzgv+Z/6YkPgGNEvDWr/YaSl2D/pxs+qKNPkw8 5+3ZMv50PIWwOX+Yz1dNDQN1IFhY7sdZdcqmAo06XyPPppVq5d62ivYiMyuJY6KkaO2/ u1wQ== 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=LGL4x6dkIdgJZOkDHkmFJxEgR3EfxdT6D9M0NZ47Uu0=; b=uLBhiREZRytU0A28957Trppv9DkN34Ivsi8DDrDErMGi1cOb0ny1fLr21El1Yo/Ovr NcR4Ro3TmJ7x/HLJG8glDStYfTlP5Hp6kEVB5AAP5A2+sLEoOoZgNtlyEcVkOGapYmZ+ LqJzGcFvTPt9X0JfgJnsgDtZxh5pzrg+ZTezDVfQ+dYhsTG3aBmD7I7LT91dofCpCyJJ aj4I6dJGy5BSAV3/KMKINTJxouGDmRYILpEDVuOcCWFBrHzFGd3G2eeecZ6Idj5C7YxQ BhigbsjVe8cEZ6wIzIRO47kr7Z1b9xZF/Sxac+FauFFvz/vdDZ+w0I3+z6fFEb3ektUZ R6Qg== X-Gm-Message-State: AGRZ1gJDrsm1o2u/CL/n5JmvnwhOUwhkKntmOPHCPNSi8xg/GnJ8YgOV QMs7s4RCJRLjKB+o7H8Ldy8qNAE78J5Mu64kGmjXBQ== X-Google-Smtp-Source: AJdET5dlLO/OjpUP7xU0PmGQPctg2QTw263jGjMV2rerT+vDN6FeM0hTEJ3rFhh79JSwWEKCr2Wpxfv/grI4L7Weeas= X-Received: by 2002:a0d:d5d7:: with SMTP id x206-v6mr2180308ywd.331.1541631402675; Wed, 07 Nov 2018 14:56:42 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a25:84d2:0:0:0:0:0 with HTTP; Wed, 7 Nov 2018 14:56:42 -0800 (PST) In-Reply-To: <CAPQ4fft9F6cVjVOn+3AT9FLx8EvC6g9W3kAFq-md-BVz6y7GBw@mail.gmail.com> References: <201810221939.w9MJdKiW071014@repo.freebsd.org> <CAPQ4fft9F6cVjVOn+3AT9FLx8EvC6g9W3kAFq-md-BVz6y7GBw@mail.gmail.com> From: Oliver Pinter <oliver.pinter@hardenedbsd.org> Date: Wed, 7 Nov 2018 23:56:42 +0100 Message-ID: <CAPQ4ffvOZrkcCMgg-PWJD5ki5Qa4s51HFcHWE35mj1OZvc9f7g@mail.gmail.com> Subject: Re: svn commit: r339609 - in head/release: amd64 i386 powerpc sparc64 To: Ed Maste <emaste@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> X-Rspamd-Queue-Id: 736F37D48A X-Spamd-Result: default: False [-2.63 / 200.00]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org]; NEURAL_HAM_MEDIUM(-0.98)[-0.981,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-0.98)[-0.977,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_DN_SOME(0.00)[]; URI_COUNT_ODD(1.00)[13]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; 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]; RCVD_IN_DNSWL_NONE(0.00)[f.2.c.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.57)[-0.568,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.59)[ipnet: 2607:f8b0::/32(-1.36), asn: 15169(-1.51), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 22:56:44 -0000 This fixes a build for us: https://github.com/HardenedBSD/hardenedBSD/commit/c1a6f17c2a62ca9d1d0f4d788d8d832e9e909b6b On Sunday, November 4, 2018, Oliver Pinter <oliver.pinter@hardenedbsd.org> wrote: > On 10/22/18, Ed Maste <emaste@freebsd.org> wrote: > > Author: emaste > > Date: Mon Oct 22 19:39:20 2018 > > New Revision: 339609 > > URL: https://svnweb.freebsd.org/changeset/base/339609 > > > > Log: > > release: set -e to exit on error in iso image scripts > > > > Reviewed by: gjb > > Differential Revision: https://reviews.freebsd.org/D17651 > > > > Modified: > > head/release/amd64/mkisoimages.sh > > head/release/i386/mkisoimages.sh > > head/release/powerpc/mkisoimages.sh > > head/release/sparc64/mkisoimages.sh > > > > Modified: head/release/amd64/mkisoimages.sh > > This commit catches an warning / error in cd generation for amd64, > with this error: > > >>> Installing everything completed on Mon Oct 22 18:07:00 UTC 2018 > -------------------------------------------------------------- > 1+0 records in > 1+0 records out > 4096 bytes transferred in 0.000197 secs (20757002 bytes/sec) > 200+0 records in > 200+0 records out > 819200 bytes transferred in 0.020971 secs (39064121 bytes/sec) > newfs_msdos: cannot get number of sectors per track: Operation not > supported > newfs_msdos: cannot get number of heads: Operation not supported > newfs_msdos: trim 25 sectors to adjust to a multiple of 63 > /dev/md0: 1532 sectors in 1532 FAT12 clusters (512 bytes/cluster) > BytesPerSec=512 SecPerClust=1 ResSectors=1 FATs=2 RootDirEnts=512 > Sectors=1575 Media=0xf8 FATsecs=5 SecPerTrack=63 Heads=1 HiddenSecs=0 > cp: chown: efi/efi/boot/bootx64.efi: Invalid argument > 1+0 records in > 1+0 records out > > The last working cd generation was before this commit: > https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD- > CURRENT-amd64/1361/console > > And after this commit it breaks on the above line: > https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-amd64/ > > in ${SRCTOP}/release/amd64/mkisoimages.sh the -p option can't work > when you copy to a FAT FS, so the easiest fix would be to remove the > -p option from cp's line. > Other problem with a script after the set -e changes, that if > something fails, no one cleans up the created md devices. > > > > ============================================================ > ================== > > --- head/release/amd64/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/amd64/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -23,6 +23,8 @@ > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > > > +set -e > > + > > if [ -z $ETDUMP ]; then > > ETDUMP=etdump > > fi > > > > Modified: head/release/i386/mkisoimages.sh > > ============================================================ > ================== > > --- head/release/i386/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/i386/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -23,6 +23,8 @@ > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > > > +set -e > > + > > if [ "$1" = "-b" ]; then > > # This is highly x86-centric and will be used directly below. > > bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" > > > > Modified: head/release/powerpc/mkisoimages.sh > > ============================================================ > ================== > > --- head/release/powerpc/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/powerpc/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -23,6 +23,7 @@ > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > > > +set -e > > > > if [ "$1" = "-b" ]; then > > bootable=1 > > > > Modified: head/release/sparc64/mkisoimages.sh > > ============================================================ > ================== > > --- head/release/sparc64/mkisoimages.sh Mon Oct 22 18:41:22 2018 > (r339608) > > +++ head/release/sparc64/mkisoimages.sh Mon Oct 22 19:39:20 2018 > (r339609) > > @@ -22,6 +22,8 @@ > > # resulting ISO image, base-bits-dir contains the image contents and > > # extra-bits-dir, if provided, contains additional files to be merged > > # into base-bits-dir as part of making the image. > > +set -e > > + > > if [ $# -lt 3 ]; then > > echo "Usage: $0 [-b] image-label image-name base-bits-dir > > [extra-bits-dir]" > /dev/stderr > > exit 1 > > _______________________________________________ > > 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 Wed Nov 7 23:08:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 25FF7113161F; Wed, 7 Nov 2018 23:08:45 +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 AB54D7DCD6; Wed, 7 Nov 2018 23:08:43 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id wA7N8WUY085439 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 8 Nov 2018 01:08:35 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua wA7N8WUY085439 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id wA7N8WhW085438; Thu, 8 Nov 2018 01:08:32 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 8 Nov 2018 01:08:32 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: John Baldwin <jhb@FreeBSD.org> Cc: Ed Schouten <ed@nuxi.nl>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340231 - head/sys/kern Message-ID: <20181107230832.GZ5335@kib.kiev.ua> References: <201811071832.wA7IW3VI045865@repo.freebsd.org> <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> User-Agent: Mutt/1.10.1 (2018-07-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-Rspamd-Queue-Id: AB54D7DCD6 X-Spamd-Result: default: False [-5.01 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[alt3.gmail-smtp-in.l.google.com,alt4.gmail-smtp-in.l.google.com,gmail-smtp-in.l.google.com,alt2.gmail-smtp-in.l.google.com,alt1.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; IP_SCORE(-2.03)[ip: (-2.05), ipnet: 2001:470::/32(-4.45), asn: 6939(-3.55), country: US(-0.09)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_TLS_LAST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 23:08:45 -0000 On Wed, Nov 07, 2018 at 01:35:57PM -0800, John Baldwin wrote: > On 11/7/18 1:01 PM, Ed Schouten wrote: > > Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb@freebsd.org>: > >> Modified: head/sys/kern/imgact_elf.c > >> ============================================================================== > >> --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) > >> +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) > >> @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), > >> > >> int __elfN(nxstack) = > >> #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ > >> - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) > >> + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ > >> + defined(__riscv) > >> 1; > >> #else > >> 0; > > > > Are we getting to the point that it might make sense to invert this > > logic, i.e., just list the architectures that require executable > > stacks? > > It's not clear. The remaining set is i386 (should be able to use nxstack > when using PAE and PG_NX is supported), MIPS (no X permission in PTEs), > 32-bit powerpc (no X permissions in PTEs AFAICT), and sparc64 (no X > permissions in PTEs AFAICT). For architectures without X ptes, removing > VM_PROT_EXECUTE from the stack permissions is a no-op and would be > harmless, so we could perhaps just default this to always on at this > point? AFAIR sparc64 ABI defines its stack as nx always (and PTEs do allow to control exec permission). From owner-svn-src-head@freebsd.org Wed Nov 7 23:09:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 ABF7F113168E for <svn-src-head@mailman.ysv.freebsd.org>; Wed, 7 Nov 2018 23:09:51 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) Received: from sonic306-22.consmr.mail.ne1.yahoo.com (sonic306-22.consmr.mail.ne1.yahoo.com [66.163.189.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6FD07DE52 for <svn-src-head@freebsd.org>; Wed, 7 Nov 2018 23:09:50 +0000 (UTC) (envelope-from marklmi26-fbsd@yahoo.com) X-YMail-OSG: mUkZbWEVM1nbBpI4Q9ctGjXsCBSu.mGbumadOcGIGKMU6VFIlOZB3pQ8gIkzoas Tj3l7PT4qeCMebHqUn7uMkCa1uyY.H4nWtoovuerz1FVKSlqrTtt2EAsMqQ1taPHYJ1oPcpe7Cbf 9JY.sThYHqAwb9fBBIH9W39rryqcJwXtmMgipviBlU_g9FwMqQ1grcsrNYkf4qSaciVbkTopVEYC 3YVkv.F7sGx3mXIK.wNiQ0Cr2VKrJpk4nNJJC9oVIdnieA6YNsRYEPIFn_eqBqjPvz.djxWNWkue 7M8Iuz0gU7GvKUA310FF4SvzC9SVJydqtipjiKLTwEHs1b6HJZ_8EiE5nPwjdVQF8.vsX5oYTdlx B_a7REErQ0uOqYhvTR0j11xbCUBHzgCKAfdMwQfWqgbCSAhv7nHGRtF2yyT_aSYliLJD6L8vvsw8 .mM.YzdQ4JveYsx7xkAldoKMm4tlXn5sXQy8m7KdCKObYloEoT43XgZv_Q_23HNKeWjT0xF7LANa Pp_TymL0MK7KU541LXzgh6fegDiFqBV2H.T7S1XE.rOTNEJvrY4mnTcJvAscQ5v0JZe35Bwwz_LD KU9VmwQQLxND1SsyThOT5v7JyFaaT3lKO1Oxy8MHfPU8QIWbiUqAztJzbKO3SurzZsF2CqQuqpGq m.DabWldjz0E4TJ8wbmYMNMObsoNWXR3LJpu.GZQvdCD60ou8oqdo1jkVwEymaNO8uTKicdAiG1W 9EhT1Q_o7afsnxlsy5.e8I15SqJSyfeEZnhP973M9qtVbNqHuH.SHTp4xriXgNDzFtqUxLPd60O2 L0ApU.j0UCsmLTrEY9dS88Cq8UL0oHjfo5GHQaki5T772LZ60lf93zmD_VApQ3Je3MSfn_.JAxW2 p87Npb7147cMQPDL_kMm4DFl6SMDtZpJL32qkRmqYoD3L_95Dx46MZ0kpmHmqG0JZnfAxjyUae_X f2.FYMigIAmtsEUEJrHVAEkpKBLhDP1kWMbeBe2km5BqgeD6LWBe3L4jugD.MZ1u7ZpOJwnfBysf aobqVZiS5nsurR7hI6eV8pGUyrVjukTCusVtiGK.mUp011mbaMYw- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.ne1.yahoo.com with HTTP; Wed, 7 Nov 2018 23:09:43 +0000 Received: from c-76-115-7-162.hsd1.or.comcast.net (EHLO [192.168.1.25]) ([76.115.7.162]) by smtp419.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 9cc6a3350d2160bc413261dda9beee88; Wed, 07 Nov 2018 23:09:40 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.1 \(3445.101.1\)) Subject: Re: svn commit: r339876 - head/libexec/rtld-elf From: Mark Millard <marklmi26-fbsd@yahoo.com> In-Reply-To: <7757A519-9262-40CC-A3F6-77AD243DDB28@yahoo.com> Date: Wed, 7 Nov 2018 15:09:39 -0800 Cc: svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <554EC215-3BC7-409A-A9C2-FFB15C039266@yahoo.com> References: <8E5A5F3A-F1A7-4702-A2F7-65D74CC5B2E5@yahoo.com> <20181102004101.GI5335@kib.kiev.ua> <E44F5772-1F8A-40B8-9C4E-B8362B768F37@yahoo.com> <003A49D7-6E8B-4775-A70B-E0EB44505D4B@yahoo.com> <20181102113827.GM5335@kib.kiev.ua> <7B29A4C8-228D-41CB-B594-98DFA456E9C8@yahoo.com> <20181102155234.GN5335@kib.kiev.ua> <E93B3880-281E-482C-9DA7-851398543B97@yahoo.com> <20181102185014.GP5335@kib.kiev.ua> <8FFCF603-6315-4D1C-858B-FC7233C17DD7@yahoo.com> <7757A519-9262-40CC-A3F6-77AD243DDB28@yahoo.com> To: Konstantin Belousov <kostikbel@gmail.com> X-Mailer: Apple Mail (2.3445.101.1) X-Rspamd-Queue-Id: E6FD07DE52 X-Spamd-Result: default: False [-1.23 / 200.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MV_CASE(0.50)[]; FREEMAIL_FROM(0.00)[yahoo.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[yahoo.com:+]; MX_GOOD(-0.01)[cached: mta6.am0.yahoodns.net]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(0.39)[ipnet: 66.163.184.0/21(1.14), asn: 36646(0.91), country: US(-0.09)]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; R_DKIM_ALLOW(-0.20)[yahoo.com]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(0.87)[0.868,0]; NEURAL_HAM_LONG(-0.99)[-0.986,0]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[84.189.163.66.list.dnswl.org : 127.0.5.0] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 23:09:52 -0000 [I note what I've failed to find a way to investigate.] On 2018-Nov-7, at 11:53, Mark Millard <marklmi26-fbsd at yahoo.com> = wrote: > [I trace code associated with bl <00001322.plt_call.getenv> > in the two contexts and extend the range over which things > appear to match: up to some point after the branch > b <__glink_PLTresolve> .] >=20 > On 2018-Nov-6, at 19:12, Mark Millard <marklmi26-fbsd at yahoo.com> = wrote: >=20 >> [I've present a little information about the longer-existing >> failure's odd backtrace for /libexec/ld-elf.so.1 /bin/ls >> --but on powerpc64 FreeBSD instead of 32-bit powerpc FreeBSD.] >>=20 >> On 2018-Nov-2, at 11:50, Konstantin Belousov <kostikbel at gmail.com> = wrote: >>=20 >>> On Fri, Nov 02, 2018 at 10:38:08AM -0700, Mark Millard wrote: >>>> On 2018-Nov-2, at 8:52 AM, Konstantin Belousov <kostikbel at = gmail.com> wrote: >>>>=20 >>>>> . . . >>>>=20 >>>> That seems better. But it crashes during /bin/ls execution >>>> ( 0x0180???? addresses ), apparently in a library routine >>>> ( 0x41?????? addresses ): >>>>=20 >>>> Program received signal SIGSEGV, Segmentation fault. >>>> 0x411220b4 in ?? () >>>> (gdb) bt >>>> #0 0x411220b4 in ?? () >>>> #1 0x4112200c in ?? () >>>> #2 0x01803c84 in ?? () >>>> #3 0x018023b4 in ?? () >>>> #4 0x010121a0 in .rtld_start () at = /usr/src/libexec/rtld-elf/powerpc/rtld_start.S:112 >>>>=20 >>>> Using a normal gdb run of /bin/ls suggests: >>>>=20 >>>> #2 0x01803c84 in ?? () should be in main and seems to be: bl = 0x1818914 <getopt_long@plt> >>>> #3 0x018023b4 in ?? () should be in _start >>>>=20 >>>> Looking in the test context: >>>>=20 >>>> 0x1803c80: bl 0x1818914 >>>> 0x1803c84: cmpwi cr7,r3,-1 >>>>=20 >>>> and: >>>>=20 >>>> 0x1818914: li r11,59 >>>> 0x1818918: b 0x18186f4 >>>>=20 >>>> and: >>>>=20 >>>> 0x18186f4: rlwinm r11,r11,2,0,29 >>>> 0x18186f8: addis r11,r11,386 >>>> 0x18186fc: lwz r11,-30316(r11) >>>> 0x1818700: mtctr r11 >>>> 0x1818704: bctr >>>>=20 >>>> Breaking at the bctr and using info reg: >>>>=20 >>>> r11 0x4125ffa0 1093009312 >>>>=20 >>>> It looks like there is some amount of >>>> activity before the traceback addresses >>>> show up. >>>>=20 >>>> I've not found a good way to fill in the "in ??()" >>>> (or analogous) information. The addresses 0x411220?? >>>> do not match up with a normal run of /bin/ls from >>>> gdb: the addresses can not be accessed. >>>>=20 >>>>=20 >>>>=20 >>>> It does appear that the code is in /lib/libc.so.7 in the >>>> test context: >>>>=20 >>>> Breakpoint 2, reloc_non_plt (obj=3D0x41041600, obj_rtld=3D0x41104b57,= flags=3D4, lockstate=3D0x0) at = /usr/src/libexec/rtld-elf/powerpc/reloc.c:338 >>>> . . . >>>>=20 >>> There seems to be an issue with the direct execution mode on ppc. >>> Even otherwise working ld-elf.so.1 segfaults if I try to use it as >>> standalone binary. >>>=20 >>> But if I specify patched ld-elf.so.1 as the interpreter for some = program, >>> using 'cc -Wl,-I,<path>/ld-elf.so.1' it works. So I see there two = bugs, >>> one is regression due to textsize calculation, which should be fixed = by >>> my patch. Another is the direct exec problem. >>=20 >> I've got a little more information about the odd backtrace >> from the /libexec/ld-elf.so.1 /bin/ls failure that the >> prior patch allowed getting to, although for a powerpc64 >> example context. >>=20 >> The information is only identifying where the code was >> in /bin/ls and /lib/libc.so.1 in the backtrace. For >> libc.so.1 I found the same code sequences in a gdb of >> /bin/ls directly, matching one first, using the addresses >> vs. in the /libexec/ld-elf.so.1 /bin/ls process to >> find offsets for going back and forth, and then used >> that two find the 2nd backtrace addresses material. >>=20 >> Overall it suggests to me that (in somewhat=20 >> symbolic terms): >>=20 >> bl <00001322.plt_call.getenv> >>=20 >> eventually lead to executing the wrong code. >>=20 >>=20 >> The supporting detail is as follows. >>=20 >> The /libexec/ld-elf.so.1 part of the backtrace was >> easy to find where the code was: >>=20 >> (gdb) run /bin/ls >> Starting program: /libexec/ld-elf.so.1 /bin/ls >>=20 >> Program received signal SIGSEGV, Segmentation fault. >> 0x000000080118d81c in ?? () >> (gdb) bt >> #0 0x000000080118d81c in ?? () >> #1 0x000000080118d920 in ?? () >> #2 0x0000000010002558 in ?? () >> #3 0x00000000100037b0 in ?? () >> #4 0x0000000001018450 in ._rtld_start () at = /usr/src/libexec/rtld-elf/powerpc64/rtld_start.S:104 >> Backtrace stopped: frame did not save the PC >>=20 >> (gdb)=20 >> 101 ld %r7,128(%r1) /* exit proc */ >> 102 ld %r8,136(%r1) /* ps_strings */ >> 103=09 >> 104 blrl /* _start(argc, argv, envp, obj, cleanup, = ps_strings) */ >> 105=09 >> 106 li %r0,1 /* _exit() */ >> 107 sc >>=20 >>=20 >> The /bin/ls part of the backtrace was easy to find >> were the code was: >>=20 >> (gdb) symbol-file /bin/ls >> Load new symbol table from "/bin/ls"? (y or n) y >> Reading symbols from /bin/ls...Reading symbols from = /usr/lib/debug//bin/ls.debug...done. >> done. >> (gdb) bt >> #0 0x000000080118d81c in ?? () >> #1 0x000000080118d920 in ?? () >> #2 0x0000000010002558 in main (argc=3D<optimized out>, = argv=3D0x80134bdb0) at /usr/src/bin/ls/ls.c:268 >> #3 0x00000000100037b0 in _start (argc=3D<optimized out>, = argv=3D0x3fffffffffffdb70, env=3D0x3fffffffffffdb88, obj=3D<optimized = out>, cleanup=3D<optimized out>, ps_strings=3D<optimized out>) >> at /usr/src/lib/csu/powerpc64/crt1.c:96 >> #4 0x0000000001018450 in ?? () >> #5 0x0000000000000000 in ?? () >>=20 >> (gdb) fr 3=20 >> #3 0x00000000100037b0 in _start (argc=3D<optimized out>, = argv=3D0x3fffffffffffdb70, env=3D0x3fffffffffffdb88, obj=3D<optimized = out>, cleanup=3D<optimized out>, ps_strings=3D<optimized out>) >> at /usr/src/lib/csu/powerpc64/crt1.c:96 >> 96 exit(main(argc, argv, env)); >> (gdb) down >> #2 0x0000000010002558 in main (argc=3D<optimized out>, = argv=3D0x80134bdb0) at /usr/src/bin/ls/ls.c:268 >> 268 while ((ch =3D getopt_long(argc, argv, >>=20 >>=20 >>=20 >> For the messy lib.libc.so.1 part of the backtrace both >> addresses are in getopt_internal. I show extractions from >> the the gdb /bin/ls output because it has helpful symbolic >> information displayed. But that means that the addresses >> are offset from those in the bt for the failure process. >>=20 >> For #1 0x000000080118d920 in ?? () I end up with: >>=20 >> (gdb) x/32i 0x81019b6c0+0xad0-0x880 >> 0x81019b910 <getopt_internal+592>: stw r9,0(r18) >> 0x81019b914 <getopt_internal+596>: addis r3,r2,-5 >> 0x81019b918 <getopt_internal+600>: addi r3,r3,30120 >> 0x81019b91c <getopt_internal+604>: bl 0x81018dfe0 = <00001322.plt_call.getenv> >> 0x81019b920 <getopt_internal+608>: ld r2,40(r1) >>=20 >> (The machine code around it all matches around >> 0x000000080118d920 in the failure context.) >>=20 >> The getenv call in the source is the 2nd line of: >>=20 >> if (posixly_correct =3D=3D -1 || optreset) >> posixly_correct =3D (getenv("POSIXLY_CORRECT") !=3D = NULL); >>=20 >> For #0 0x000000080118d81c in ?? () I end up with: >>=20 >> (gdb) x/32i 0x81019b6c0+0xad0-0x880-0x110 >> 0x81019b800 <getopt_internal+320>: bne cr7,0x81019b868 = <getopt_internal+424> >> 0x81019b804 <getopt_internal+324>: lwa r5,0(r29) >> 0x81019b808 <getopt_internal+328>: stw r17,0(r18) >> 0x81019b80c <getopt_internal+332>: cmpw cr7,r5,r19 >> 0x81019b810 <getopt_internal+336>: bge cr7,0x81019ba60 = <getopt_internal+928> >> 0x81019b814 <getopt_internal+340>: rldicr r9,r5,3,60 >> 0x81019b818 <getopt_internal+344>: ldx r10,r20,r9 >> 0x81019b81c <getopt_internal+348>: lbz r9,0(r10) >>=20 >> with the failure being that r10 is zero in that last >> line above. Again the surrounding code matches. >>=20 >> The source code line is reported to be: >>=20 >> if (*(place =3D nargv[optind]) !=3D '-' || >>=20 >> I got the line number information from breakpoints 3 and 4 >> below (from the gdb /bin/ls process): >>=20 >> (gdb) info br >> Num Type Disp Enb Address What >> 1 breakpoint keep y 0x0000000010002360 in main at = /usr/src/bin/ls/ls.c:231 >> breakpoint already hit 1 time >> 3 breakpoint keep y 0x000000081019b81c in getopt_internal = at /usr/src/lib/libc/stdlib/getopt_long.c:411 >> 4 breakpoint keep y 0x000000081019b91c in getopt_internal = at /usr/src/lib/libc/stdlib/getopt_long.c:379 >>=20 >> Line 379 has the getenv call, matching the machine code showing >> the call. >>=20 >> (I set the breakpoints just as a way of using "info br" to list >> the information later.) >>=20 >> Overall this seems to suggest that: >>=20 >> bl <00001322.plt_call.getenv> >>=20 >> lead to something odd happening and got to the wrong >> code. >>=20 >> That is all the additional information that I have >> at this point. I hope it is of some use. >>=20 >=20 > I'll note that the normal cases execution does the > getenv call but does not execute the lbz r9,0(r10) > related code. >=20 > I'll also note that for the libc.so.1 code > the /libexec/ld-elf.so.1 /bin/ls code > addresses are bigger than the /bin/ls > addresses by: >=20 > 0x81019b920 - 0x80118d920 =3D 0xF00E000 >=20 > I use this to go back and forth, checking for matching > code as I go. >=20 > Presenting the normal /bin/ls use in gdb first for > up to b <__glink_PLTresolve> : >=20 > I'd already shown: >=20 > 0x81019b91c <getopt_internal+604>: bl 0x81018dfe0 = <00001322.plt_call.getenv> >=20 > Looking: >=20 > 0x81018dfe0 <00001322.plt_call.getenv>: std r2,40(r1) > 0x81018dfe4 <00001322.plt_call.getenv+4>: ld r12,480(r2) > 0x81018dfe8 <00001322.plt_call.getenv+8>: mtctr r12 > 0x81018dfec <00001322.plt_call.getenv+12>: ld r11,496(r2) > 0x81018dff0 <00001322.plt_call.getenv+16>: ld r2,488(r2) > 0x81018dff4 <00001322.plt_call.getenv+20>: cmpldi r2,0 > 0x81018dff8 <00001322.plt_call.getenv+24>: bnectr+=20 > 0x81018dffc <00001322.plt_call.getenv+28>: b 0x81030f3dc = <getenv@plt> >=20 > As for getenv@pl : >=20 > 0x81030f3dc <getenv@plt>: li r0,925 > 0x81030f3e0 <getenv@plt+4>: b 0x81030d6c8 <__glink_PLTresolve> >=20 >=20 > Note that 0x81018dfe0 - 0xF00E000 =3D 0x80117ffe0 . >=20 > Back in the /libexec/ld-elf.so.1 /bin/ls context: >=20 > (gdb) bt > #0 0x000000080118d81c in ?? () > #1 0x000000080118d920 in ?? () [Just after the bl = <00001322.plt_call.getenv> .] > #2 0x0000000010002558 in ?? () > #3 0x00000000100037b0 in ?? () > #4 0x0000000001018450 in ?? () > #5 0x0000000000000000 in ?? () >=20 > (gdb) x/i 0x000000080118d920-0x4 > 0x80118d91c: bl 0x80117ffe0 >=20 > So matching what was calculated earlier. >=20 > (gdb) x/32i 0x81018dfe0-0xf00e000=20 > 0x80117ffe0: std r2,40(r1) > 0x80117ffe4: ld r12,480(r2) > 0x80117ffe8: mtctr r12 > 0x80117ffec: ld r11,496(r2) > 0x80117fff0: ld r2,488(r2) > 0x80117fff4: cmpldi r2,0 > 0x80117fff8: bnectr+=20 > 0x80117fffc: b 0x8013013dc >=20 > (gdb) x/2i 0x8013013dc > 0x8013013dc: li r0,925 > 0x8013013e0: b 0x8012ff6c8 >=20 > 0x81030d6c8 - 0x8012ff6c8 =3D 0xF00E000 >=20 > Still matching tp to this point. >=20 > So the two contexts seem to match up to > some point after: b <__glink_PLTresolve> . >=20 > I've not looked beyond this. [ Based on normal-case text for better symbolic information . . . ] For the failing context and its use of the below code (presentation edited): 00001322.plt_call.getenv>: std r2,40(r1) 00001322.plt_call.getenv+4>: ld r12,480(r2) 00001322.plt_call.getenv+8>: mtctr r12 00001322.plt_call.getenv+12>: ld r11,496(r2) 00001322.plt_call.getenv+16>: ld r2,488(r2) 00001322.plt_call.getenv+20>: cmpldi r2,0 00001322.plt_call.getenv+24>: bnectr+=20 I've not come up with a way to investigate the potential indirect jump (bnectr+) and what sets up for it. (The branch following the bnectr+ seems okay.) Similarly relative to the bctr in (edited): (gdb) disass __glink_PLTresolve Dump of assembler code for function __glink_PLTresolve: 0>: mflr r12 +4>: bcl 20,4*cr7+so, <__glink_PLTresolve+8> +8>: mflr r11 +12>: ld r2,-16(r11) +16>: mtlr r12 +20>: add r11,r2,r11 +24>: ld r12,0(r11) +28>: ld r2,8(r11) +32>: mtctr r12 +36>: ld r11,16(r11) +40>: bctr End of assembler dump. Registers such as ctr, r12, and r11 seem to have been replaced by the time of the crash. (r12 seems to point to strncmp and ctr has the value 0xf . r11 is 0x0 .) At this point, it does not look like I'll be much help for analyzing this failure on the powerpc families. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-svn-src-head@freebsd.org Wed Nov 7 23:28:12 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7EE3C1131CFC; Wed, 7 Nov 2018 23:28:12 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0C377E749; Wed, 7 Nov 2018 23:28:11 +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 B72C21C496; Wed, 7 Nov 2018 23:28:11 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA7NSBR7099223; Wed, 7 Nov 2018 23:28:11 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA7NSBUr099222; Wed, 7 Nov 2018 23:28:11 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811072328.wA7NSBUr099222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Wed, 7 Nov 2018 23:28:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340241 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 340241 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E0C377E749 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.985,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 07 Nov 2018 23:28:12 -0000 Author: markj Date: Wed Nov 7 23:28:11 2018 New Revision: 340241 URL: https://svnweb.freebsd.org/changeset/base/340241 Log: Fix a use-after-free in swp_pager_meta_free(). This was introduced in r326329 and explains the crashes mentioned in the commit log message for r339934. In particular, on INVARIANTS kernels, UMA trashing causes the loop to exit early, leaving swap blocks behind when they should have been freed. After r336984 this became more problematic since new anonymous mappings were more likely to reuse swapped-out subranges of existing VM objects, so faults would trigger pageins of freed memory rather than returning zeroed pages. Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17897 Modified: head/sys/vm/swap_pager.c Modified: head/sys/vm/swap_pager.c ============================================================================== --- head/sys/vm/swap_pager.c Wed Nov 7 21:36:52 2018 (r340240) +++ head/sys/vm/swap_pager.c Wed Nov 7 23:28:11 2018 (r340241) @@ -1972,13 +1972,13 @@ swp_pager_meta_free(vm_object_t object, vm_pindex_t pi swp_pager_update_freerange(&s_free, &n_free, sb->d[i]); sb->d[i] = SWAPBLK_NONE; } + pindex = sb->p + SWAP_META_PAGES; if (swp_pager_swblk_empty(sb, 0, start) && swp_pager_swblk_empty(sb, limit, SWAP_META_PAGES)) { SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); uma_zfree(swblk_zone, sb); } - pindex = sb->p + SWAP_META_PAGES; } swp_pager_freeswapspace(s_free, n_free); } From owner-svn-src-head@freebsd.org Thu Nov 8 00:35:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 34C65110130A; Thu, 8 Nov 2018 00:35:02 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BB6C280ECB; Thu, 8 Nov 2018 00:35:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97CAE1CFFC; Thu, 8 Nov 2018 00:35:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA80Z1wA035378; Thu, 8 Nov 2018 00:35:01 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA80Z1Qc035376; Thu, 8 Nov 2018 00:35:01 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811080035.wA80Z1Qc035376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Thu, 8 Nov 2018 00:35:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340242 - head X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340242 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BB6C280ECB X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.79), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 00:35:02 -0000 Author: brooks Date: Thu Nov 8 00:35:00 2018 New Revision: 340242 URL: https://svnweb.freebsd.org/changeset/base/340242 Log: Add a top-level make target to rebuild all sysent files. The sysent target is useful when changing makesyscalls.sh, when making paired changes to syscalls.master files, or in a future where freebsd32 sysent entries are built from the default syscalls.master. Reviewed by: bdrewery Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17899 Modified: head/Makefile head/Makefile.inc1 Modified: head/Makefile ============================================================================== --- head/Makefile Wed Nov 7 23:28:11 2018 (r340241) +++ head/Makefile Thu Nov 8 00:35:00 2018 (r340242) @@ -33,6 +33,7 @@ # targets - Print a list of supported TARGET/TARGET_ARCH pairs # for world and kernel targets. # toolchains - Build a toolchain for all world and kernel targets. +# sysent - (Re)build syscall entries from syscalls.master. # xdev - xdev-build + xdev-install for the architecture # specified with TARGET and TARGET_ARCH. # xdev-build - Build cross-development tools. @@ -135,6 +136,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel bu reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries maninstall \ obj objlink showconfig tags toolchain update \ + sysent \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _build-metadata _cross-tools _includes _libraries \ build32 distribute32 install32 buildsoft distributesoft installsoft \ Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Nov 7 23:28:11 2018 (r340241) +++ head/Makefile.inc1 Thu Nov 8 00:35:00 2018 (r340242) @@ -1434,6 +1434,18 @@ packageworld: .PHONY . endif .endfor +_sysent_dirs= sys/kern +_sysent_dirs+= sys/compat/freebsd32 +_sysent_dirs+= sys/i386/ibcs2 +_sysent_dirs+= sys/amd64/linux \ + sys/amd64/linux32 \ + sys/arm64/linux \ + sys/i386/linux +sysent: .PHONY +.for _dir in ${_sysent_dirs} + ${_+_}${MAKE} -C ${.CURDIR}/${_dir} sysent +.endfor + # # reinstall # From owner-svn-src-head@freebsd.org Thu Nov 8 06:24:04 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E4C74110EFDF; Thu, 8 Nov 2018 06:24:03 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B4A2A702EA; Thu, 8 Nov 2018 06:24:02 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 11C1C8D4A241; Thu, 8 Nov 2018 06:24:00 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id CB94FD1F819; Thu, 8 Nov 2018 06:23:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id nJUs3PN53jLo; Thu, 8 Nov 2018 06:23:58 +0000 (UTC) Received: from [192.168.1.88] (fresh-ayiya.sbone.de [IPv6:fde9:577b:c1a9:f001::2]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id BA0D7D1F813; Thu, 8 Nov 2018 06:23:57 +0000 (UTC) From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: "Brooks Davis" <brooks@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340242 - head Date: Thu, 08 Nov 2018 06:23:55 +0000 X-Mailer: MailMate (2.0BETAr6126) Message-ID: <4F3AECDE-DE4E-4B88-B1FA-6334038D4189@lists.zabbadoz.net> In-Reply-To: <201811080035.wA80Z1Qc035376@repo.freebsd.org> References: <201811080035.wA80Z1Qc035376@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B4A2A702EA X-Spamd-Result: default: False [-4.40 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:13b:39f::9f:25]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[zabbadoz.net]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; IP_SCORE(-1.12)[ipnet: 2a01:4f8::/29(-2.75), asn: 24940(-2.81), country: DE(-0.01)]; MX_GOOD(-0.01)[cross.sbone.de]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 06:24:04 -0000 On 8 Nov 2018, at 0:35, Brooks Davis wrote: > Author: brooks > Date: Thu Nov 8 00:35:00 2018 > New Revision: 340242 > URL: https://svnweb.freebsd.org/changeset/base/340242 > > Log: > Add a top-level make target to rebuild all sysent files. > > The sysent target is useful when changing makesyscalls.sh, when > making paired changes to syscalls.master files, or in a future where > freebsd32 sysent entries are built from the default syscalls.master. > > Reviewed by: bdrewery > Obtained from: CheriBSD > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D17899 > > Modified: > head/Makefile > head/Makefile.inc1 I was wondering if the Makefile.inc1 parts shouldn’t mostly be in sys/Makefile or similar rather than at the top-level? /bz From owner-svn-src-head@freebsd.org Thu Nov 8 09:45:14 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4C7B61123CED; Thu, 8 Nov 2018 09:45:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B028B766DA; Thu, 8 Nov 2018 09:45:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 8FE9622D86; Thu, 8 Nov 2018 09:45:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA89jD1l017218; Thu, 8 Nov 2018 09:45:13 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA89jDbD017217; Thu, 8 Nov 2018 09:45:13 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811080945.wA89jDbD017217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Thu, 8 Nov 2018 09:45:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340245 - head/sbin/ping X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/sbin/ping X-SVN-Commit-Revision: 340245 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B028B766DA X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 09:45:14 -0000 Author: eugen Date: Thu Nov 8 09:45:13 2018 New Revision: 340245 URL: https://svnweb.freebsd.org/changeset/base/340245 Log: ping(8): improve diagnostics in case of wrong arguments. For example, in case of super-user: $ sudo ping -s -64 127.0.0.1 PING 127.0.0.1 (127.0.0.1): -64 data bytes ping: sendto: Invalid argument For unprivileged user: $ ping -s -64 127.0.0.1 ping: packet size too large: 18446744073709551552 > 56: Operation not permitted Fix this by switching from strtoul() to strtol() for integer arguments and adding explicit checks for negative values. MFC after: 1 month Modified: head/sbin/ping/ping.c Modified: head/sbin/ping/ping.c ============================================================================== --- head/sbin/ping/ping.c Thu Nov 8 03:25:18 2018 (r340244) +++ head/sbin/ping/ping.c Thu Nov 8 09:45:13 2018 (r340245) @@ -242,7 +242,8 @@ main(int argc, char *const *argv) #endif struct sockaddr_in *to; double t; - u_long alarmtimeout, ultmp; + u_long alarmtimeout; + long ltmp; int almost_done, ch, df, hold, i, icmp_len, mib[4], preload; int ssend_errno, srecv_errno, tos, ttl; char ctrl[CMSG_SPACE(sizeof(struct timeval))]; @@ -311,12 +312,12 @@ main(int argc, char *const *argv) options |= F_AUDIBLE; break; case 'c': - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp > LONG_MAX || !ultmp) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp > LONG_MAX || ltmp <=0) errx(EX_USAGE, "invalid count of packets to transmit: `%s'", optarg); - npackets = ultmp; + npackets = ltmp; break; case 'D': options |= F_HDRINCL; @@ -334,46 +335,46 @@ main(int argc, char *const *argv) setbuf(stdout, (char *)NULL); break; case 'G': /* Maximum packet size for ping sweep */ - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp <= 0) errx(EX_USAGE, "invalid packet size: `%s'", optarg); - if (uid != 0 && ultmp > DEFDATALEN) { + if (uid != 0 && ltmp > DEFDATALEN) { errno = EPERM; err(EX_NOPERM, - "packet size too large: %lu > %u", - ultmp, DEFDATALEN); + "packet size too large: %ld > %u", + ltmp, DEFDATALEN); } options |= F_SWEEP; - sweepmax = ultmp; + sweepmax = ltmp; break; case 'g': /* Minimum packet size for ping sweep */ - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp <= 0) errx(EX_USAGE, "invalid packet size: `%s'", optarg); - if (uid != 0 && ultmp > DEFDATALEN) { + if (uid != 0 && ltmp > DEFDATALEN) { errno = EPERM; err(EX_NOPERM, - "packet size too large: %lu > %u", - ultmp, DEFDATALEN); + "packet size too large: %ld > %u", + ltmp, DEFDATALEN); } options |= F_SWEEP; - sweepmin = ultmp; + sweepmin = ltmp; break; case 'h': /* Packet size increment for ping sweep */ - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp < 1) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp < 1) errx(EX_USAGE, "invalid increment size: `%s'", optarg); - if (uid != 0 && ultmp > DEFDATALEN) { + if (uid != 0 && ltmp > DEFDATALEN) { errno = EPERM; err(EX_NOPERM, - "packet size too large: %lu > %u", - ultmp, DEFDATALEN); + "packet size too large: %ld > %u", + ltmp, DEFDATALEN); } options |= F_SWEEP; - sweepincr = ultmp; + sweepincr = ltmp; break; case 'I': /* multicast interface */ if (inet_aton(optarg, &ifaddr) == 0) @@ -399,15 +400,15 @@ main(int argc, char *const *argv) loop = 0; break; case 'l': - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp > INT_MAX) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp > INT_MAX || ltmp < 0) errx(EX_USAGE, "invalid preload value: `%s'", optarg); if (uid) { errno = EPERM; err(EX_NOPERM, "-l flag"); } - preload = ultmp; + preload = ltmp; break; case 'M': switch(optarg[0]) { @@ -425,10 +426,10 @@ main(int argc, char *const *argv) } break; case 'm': /* TTL */ - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp > MAXTTL) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp > MAXTTL || ltmp < 0) errx(EX_USAGE, "invalid TTL: `%s'", optarg); - ttl = ultmp; + ttl = ltmp; options |= F_TTL; break; case 'n': @@ -470,24 +471,24 @@ main(int argc, char *const *argv) source = optarg; break; case 's': /* size of packet to send */ - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp < 0) errx(EX_USAGE, "invalid packet size: `%s'", optarg); - if (uid != 0 && ultmp > DEFDATALEN) { + if (uid != 0 && ltmp > DEFDATALEN) { errno = EPERM; err(EX_NOPERM, - "packet size too large: %lu > %u", - ultmp, DEFDATALEN); + "packet size too large: %ld > %u", + ltmp, DEFDATALEN); } - datalen = ultmp; + datalen = ltmp; break; case 'T': /* multicast TTL */ - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp > MAXTTL) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp > MAXTTL || ltmp < 0) errx(EX_USAGE, "invalid multicast TTL: `%s'", optarg); - mttl = ultmp; + mttl = ltmp; options |= F_MTTL; break; case 't': @@ -513,10 +514,10 @@ main(int argc, char *const *argv) break; case 'z': options |= F_HDRINCL; - ultmp = strtoul(optarg, &ep, 0); - if (*ep || ep == optarg || ultmp > MAXTOS) + ltmp = strtol(optarg, &ep, 0); + if (*ep || ep == optarg || ltmp > MAXTOS || ltmp < 0) errx(EX_USAGE, "invalid TOS: `%s'", optarg); - tos = ultmp; + tos = ltmp; break; default: usage(); From owner-svn-src-head@freebsd.org Thu Nov 8 12:43:15 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 00BA61128D6B; Thu, 8 Nov 2018 12:43:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 842C97C618; Thu, 8 Nov 2018 12:43:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6556B24AE0; Thu, 8 Nov 2018 12:43:14 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8ChEhn009031; Thu, 8 Nov 2018 12:43:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8ChEsP009030; Thu, 8 Nov 2018 12:43:14 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201811081243.wA8ChEsP009030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> Date: Thu, 8 Nov 2018 12:43:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340246 - head/usr.sbin/newsyslog X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/usr.sbin/newsyslog X-SVN-Commit-Revision: 340246 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 842C97C618 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.992,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 12:43:15 -0000 Author: hselasky Date: Thu Nov 8 12:43:13 2018 New Revision: 340246 URL: https://svnweb.freebsd.org/changeset/base/340246 Log: Add /var/log/opensm.log to list of rotating log files. MFC after: 3 days Sponsored by: Mellanox Technologies Modified: head/usr.sbin/newsyslog/newsyslog.conf Modified: head/usr.sbin/newsyslog/newsyslog.conf ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 09:45:13 2018 (r340245) +++ head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 12:43:13 2018 (r340246) @@ -26,6 +26,7 @@ /var/log/maillog 640 7 * @T00 JC /var/log/messages 644 5 1000 @0101T JC /var/log/monthly.log 640 12 * $M1D0 JN +/var/log/opensm.log 644 3 1000 * J /var/log/devd.log 644 3 1000 * JC /var/log/security 600 10 1000 * JC /var/log/utx.log 644 3 * @01T05 B From owner-svn-src-head@freebsd.org Thu Nov 8 12:46:48 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 09C3A1128FB6; Thu, 8 Nov 2018 12:46:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F1817CA11; Thu, 8 Nov 2018 12:46:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70ADF24AE3; Thu, 8 Nov 2018 12:46:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8Cklas009286; Thu, 8 Nov 2018 12:46:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8Cklvw009285; Thu, 8 Nov 2018 12:46:47 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201811081246.wA8Cklvw009285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> Date: Thu, 8 Nov 2018 12:46:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340248 - head/sys/dev/sound/usb X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/dev/sound/usb X-SVN-Commit-Revision: 340248 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8F1817CA11 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.992,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 12:46:48 -0000 Author: hselasky Date: Thu Nov 8 12:46:47 2018 New Revision: 340248 URL: https://svnweb.freebsd.org/changeset/base/340248 Log: Don't read the USB audio sync endpoint when we don't use it to save isochronous bandwidth. MFC after: 3 days Sponsored by: Mellanox Technologies Modified: head/sys/dev/sound/usb/uaudio.c Modified: head/sys/dev/sound/usb/uaudio.c ============================================================================== --- head/sys/dev/sound/usb/uaudio.c Thu Nov 8 12:45:28 2018 (r340247) +++ head/sys/dev/sound/usb/uaudio.c Thu Nov 8 12:46:47 2018 (r340248) @@ -100,7 +100,7 @@ static int uaudio_default_channels = 0; /* use defaul static int uaudio_buffer_ms = 8; #ifdef USB_DEBUG -static int uaudio_debug = 0; +static int uaudio_debug; static SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); @@ -136,6 +136,8 @@ uaudio_buffer_ms_sysctl(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_hw_usb_uaudio, OID_AUTO, buffer_ms, CTLTYPE_INT | CTLFLAG_RWTUN, 0, sizeof(int), uaudio_buffer_ms_sysctl, "I", "uaudio buffering delay from 2ms to 8ms"); +#else +#define uaudio_debug 0 #endif #define UAUDIO_NFRAMES 64 /* must be factor of 8 due HS-USB */ @@ -2161,6 +2163,14 @@ uaudio_chan_play_sync_callback(struct usb_xfer *xfer, break; case USB_ST_SETUP: + /* + * Check if the recording stream can be used as a + * source of jitter information to save some + * isochronous bandwidth: + */ + if (ch->priv_sc->sc_rec_chan.num_alt != 0 && + uaudio_debug == 0) + break; usbd_xfer_set_frames(xfer, 1); usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_framelen(xfer)); usbd_transfer_submit(xfer); From owner-svn-src-head@freebsd.org Thu Nov 8 13:17:39 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 47F681129ECA; Thu, 8 Nov 2018 13:17:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CBD317DC11; Thu, 8 Nov 2018 13:17:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 AD03324FF2; Thu, 8 Nov 2018 13:17:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8DHcv7024609; Thu, 8 Nov 2018 13:17:38 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8DHcMG024608; Thu, 8 Nov 2018 13:17:38 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811081317.wA8DHcMG024608@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Thu, 8 Nov 2018 13:17:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340249 - head/sbin/ipfw X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/sbin/ipfw X-SVN-Commit-Revision: 340249 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CBD317DC11 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 13:17:39 -0000 Author: eugen Date: Thu Nov 8 13:17:38 2018 New Revision: 340249 URL: https://svnweb.freebsd.org/changeset/base/340249 Log: ipfw.8: fix small syntax error in an example MFC after: 3 days Modified: head/sbin/ipfw/ipfw.8 Modified: head/sbin/ipfw/ipfw.8 ============================================================================== --- head/sbin/ipfw/ipfw.8 Thu Nov 8 12:46:47 2018 (r340248) +++ head/sbin/ipfw/ipfw.8 Thu Nov 8 13:17:38 2018 (r340249) @@ -4285,7 +4285,7 @@ In the following example per-interface firewall is cre .Pp The following example illustrate usage of flow tables: .Pp -.Dl "ipfw table fl create type flow:flow:src-ip,proto,dst-ip,dst-port" +.Dl "ipfw table fl create type flow:src-ip,proto,dst-ip,dst-port" .Dl "ipfw table fl add 2a02:6b8:77::88,tcp,2a02:6b8:77::99,80 11" .Dl "ipfw table fl add 10.0.0.1,udp,10.0.0.2,53 12" .Dl ".." From owner-svn-src-head@freebsd.org Thu Nov 8 14:46:23 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 087C8112C605; Thu, 8 Nov 2018 14:46:23 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 899C581272; Thu, 8 Nov 2018 14:46:22 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 6A9A225EC0; Thu, 8 Nov 2018 14:46:22 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8EkM7n070857; Thu, 8 Nov 2018 14:46:22 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8EkMHh070856; Thu, 8 Nov 2018 14:46:22 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201811081446.wA8EkMHh070856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" <bz@FreeBSD.org> Date: Thu, 8 Nov 2018 14:46:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340251 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 340251 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 899C581272 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 14:46:23 -0000 Author: bz Date: Thu Nov 8 14:46:21 2018 New Revision: 340251 URL: https://svnweb.freebsd.org/changeset/base/340251 Log: Update rum(4) and run(4) man pages to reflect that newer versions of TP-LINK TL-WN321G are run(4) and not rum(4) anymore. Reported by: J (tech-lists zyxst.net) MFC after: 3 days Modified: head/share/man/man4/rum.4 head/share/man/man4/run.4 Modified: head/share/man/man4/rum.4 ============================================================================== --- head/share/man/man4/rum.4 Thu Nov 8 14:21:25 2018 (r340250) +++ head/share/man/man4/rum.4 Thu Nov 8 14:46:21 2018 (r340251) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 9, 2016 +.Dd November 8, 2018 .Dt RUM 4 .Os .Sh NAME @@ -123,7 +123,7 @@ including: .It "Sitecom WL-113 ver 2" Ta USB .It "Sitecom WL-172" Ta USB .It "Sweex LW053" Ta USB -.It "TP-LINK TL-WN321G" Ta USB +.It "TP-LINK TL-WN321G v1/v2/v3" Ta USB .El .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): Modified: head/share/man/man4/run.4 ============================================================================== --- head/share/man/man4/run.4 Thu Nov 8 14:21:25 2018 (r340250) +++ head/share/man/man4/run.4 Thu Nov 8 14:46:21 2018 (r340251) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 10, 2018 +.Dd November 8, 2018 .Dt RUN 4 .Os .Sh NAME @@ -176,6 +176,7 @@ driver supports the following wireless adapters: .It Sweex LW303 .It Sweex LW313 .It TP-LINK TL-WDN3200 +.It TP-LINK TL-WN321G v4 .It TP-LINK TL-WN727N v3 .It Unex DNUR-81 .It Unex DNUR-82 From owner-svn-src-head@freebsd.org Thu Nov 8 15:04:57 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 00C2B112CF49; Thu, 8 Nov 2018 15:04:57 +0000 (UTC) (envelope-from jonlooney@gmail.com) Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0423E827A4; Thu, 8 Nov 2018 15:04:55 +0000 (UTC) (envelope-from jonlooney@gmail.com) Received: by mail-ed1-f49.google.com with SMTP id e18-v6so5228899eds.2; Thu, 08 Nov 2018 07:04:55 -0800 (PST) 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=NmVLWVfLuHC62f1QpXzjR1L+TMeE4yCAeZAROJ8Sclg=; b=FPDVy8F+zJcqhVYpqN6rnk7Vn7UxVo2InnM2ocEjweOKJPlHwNqCDWo56U113VpZTn uLB1WH3coM++XbwEisHHr+PovhZodBlNPgtzKNO1SEQKV8ozyPouFaH4Q5ArkxIQZi1O hHU9ti6Z25V6cpuV3QA2BB72EkI1wQ4VE3hCFWdwMsoJg4NvUrUGHLiCc+gLJAAD3eru vwS/x56nzklvEuv2czJ9fSC70z1G9/pQ12ZQYA3thAm5s33mBEpd3bT90m0WPqt4cKtt Chl8hVbCkrz7LshBZDRlkFlRqaLjy1ql94O6ktn1YADQkqxsp3x8kPZLKhzWoUZ9HONx Ce7g== X-Gm-Message-State: AGRZ1gIZN0qw3dAKzWWXMrpkwtM92OmY9uYO9zTasUkQP1v53CcfY8cO wT9KemQcvYXVn+xskYcJFoEhZqQI X-Google-Smtp-Source: AJdET5c2aiCTjzVaJg2S+hQwKPM9xj1DzFIMl4hFPvvfaREXjrrNN3EmWbhHZJo/aMUdN5EmWtt+JA== X-Received: by 2002:a50:b574:: with SMTP id z49-v6mr4144092edd.219.1541689488769; Thu, 08 Nov 2018 07:04:48 -0800 (PST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com. [209.85.128.49]) by smtp.gmail.com with ESMTPSA id s14-v6sm616180ejb.20.2018.11.08.07.04.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 07:04:48 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id s10-v6so1598165wmc.5; Thu, 08 Nov 2018 07:04:48 -0800 (PST) X-Received: by 2002:a1c:1802:: with SMTP id 2-v6mr1608311wmy.11.1541689488042; Thu, 08 Nov 2018 07:04:48 -0800 (PST) MIME-Version: 1.0 References: <201811072328.wA7NSBUr099222@repo.freebsd.org> In-Reply-To: <201811072328.wA7NSBUr099222@repo.freebsd.org> From: "Jonathan T. Looney" <jtl@freebsd.org> Date: Thu, 8 Nov 2018 10:04:37 -0500 X-Gmail-Original-Message-ID: <CADrOrmthwgNz_kz+fa-bTY6MpbNiR25uo66GXk2Q1cKWy04z3A@mail.gmail.com> Message-ID: <CADrOrmthwgNz_kz+fa-bTY6MpbNiR25uo66GXk2Q1cKWy04z3A@mail.gmail.com> Subject: Re: svn commit: r340241 - head/sys/vm To: Mark Johnston <markj@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 0423E827A4 X-Spamd-Result: default: False [-3.99 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCVD_COUNT_THREE(0.00)[4]; IP_SCORE(-1.03)[ipnet: 209.85.128.0/17(-3.52), asn: 15169(-1.53), country: US(-0.09)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; RCVD_IN_DNSWL_NONE(0.00)[49.208.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[jtl@freebsd.org,jonlooney@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)[jtl@freebsd.org,jonlooney@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 15:04:57 -0000 Nice find! Jonathan On Wed, Nov 7, 2018 at 6:28 PM Mark Johnston <markj@freebsd.org> wrote: > Author: markj > Date: Wed Nov 7 23:28:11 2018 > New Revision: 340241 > URL: https://svnweb.freebsd.org/changeset/base/340241 > > Log: > Fix a use-after-free in swp_pager_meta_free(). > > This was introduced in r326329 and explains the crashes mentioned in > the commit log message for r339934. In particular, on INVARIANTS > kernels, UMA trashing causes the loop to exit early, leaving swap > blocks behind when they should have been freed. After r336984 this > became more problematic since new anonymous mappings were more > likely to reuse swapped-out subranges of existing VM objects, so faults > would trigger pageins of freed memory rather than returning zeroed > pages. > > Reviewed by: kib > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D17897 > > Modified: > head/sys/vm/swap_pager.c > > Modified: head/sys/vm/swap_pager.c > > ============================================================================== > --- head/sys/vm/swap_pager.c Wed Nov 7 21:36:52 2018 (r340240) > +++ head/sys/vm/swap_pager.c Wed Nov 7 23:28:11 2018 (r340241) > @@ -1972,13 +1972,13 @@ swp_pager_meta_free(vm_object_t object, > vm_pindex_t pi > swp_pager_update_freerange(&s_free, &n_free, > sb->d[i]); > sb->d[i] = SWAPBLK_NONE; > } > + pindex = sb->p + SWAP_META_PAGES; > if (swp_pager_swblk_empty(sb, 0, start) && > swp_pager_swblk_empty(sb, limit, SWAP_META_PAGES)) { > SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, > sb->p); > uma_zfree(swblk_zone, sb); > } > - pindex = sb->p + SWAP_META_PAGES; > } > swp_pager_freeswapspace(s_free, n_free); > } > > From owner-svn-src-head@freebsd.org Thu Nov 8 15:12:38 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0A83A112D2F7; Thu, 8 Nov 2018 15:12:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8A78182DC2; Thu, 8 Nov 2018 15:12:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64DA0263AC; Thu, 8 Nov 2018 15:12:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8FCbCM086294; Thu, 8 Nov 2018 15:12:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8FCbqG086293; Thu, 8 Nov 2018 15:12:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201811081512.wA8FCbqG086293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik <mjg@FreeBSD.org> Date: Thu, 8 Nov 2018 15:12:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340252 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 340252 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8A78182DC2 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 15:12:38 -0000 Author: mjg Date: Thu Nov 8 15:12:36 2018 New Revision: 340252 URL: https://svnweb.freebsd.org/changeset/base/340252 Log: amd64: align memset buffers to 16 bytes before using rep stos Both Intel manual and Agner Fog's docs suggest aligning to 16. See the review for benchmark results. Reviewed by: kib (previous version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17661 Modified: head/sys/amd64/amd64/support.S Modified: head/sys/amd64/amd64/support.S ============================================================================== --- head/sys/amd64/amd64/support.S Thu Nov 8 14:46:21 2018 (r340251) +++ head/sys/amd64/amd64/support.S Thu Nov 8 15:12:36 2018 (r340252) @@ -515,24 +515,38 @@ END(memcpy_erms) 1256: movq %rdi,%r9 movq %r10,%rax + testl $15,%edi + jnz 3f +1: .if \erms == 1 rep stosb movq %r9,%rax .else + movq %rcx,%rdx shrq $3,%rcx rep stosq movq %r9,%rax andl $7,%edx - jnz 1f + jnz 2f POP_FRAME_POINTER ret -1: +2: movq %r10,-8(%rdi,%rdx) .endif POP_FRAME_POINTER ret + ALIGN_TEXT +3: + movq %r10,(%rdi) + movq %r10,8(%rdi) + movq %rdi,%r8 + andq $15,%r8 + leaq -16(%rcx,%r8),%rcx + neg %r8 + leaq 16(%rdi,%r8),%rdi + jmp 1b .endm ENTRY(memset_std) From owner-svn-src-head@freebsd.org Thu Nov 8 16:14:36 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8CBD0112F324; Thu, 8 Nov 2018 16:14:36 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF65C85760; Thu, 8 Nov 2018 16:14:35 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-io1-xd34.google.com with SMTP id h19-v6so15007552iog.9; Thu, 08 Nov 2018 08:14:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=jFpV7j1P21ROkV2swJu5HCtOgW8N6lId8/+FLcjX9Jk=; b=RgjPCH9sOdUGH0hFpNwsvrzjDlNrEfvFGcvys7JrEdtSnEg9VLbZ8bVJWRyHqbtKXv VPaeAPa1uncZWLc4hRBg+nVkDzey2L7rENvXyG46Um0FjmZosW1iPCp0vLhhJQGB1K7x 4/N38sh5CTNgkqcfFjbCpvDuw8J8647f5KShDF2pvRS4EAdtjZ20Ib5qmYE9dKsNispd YTKUCPpbVdfBKmSJsCf9y4XeigjMBFHQBbVZ/nnt9Bn6qwsCwpfXjcYgV4D2I6vzxgqi GLKr/Q1cOb47tXU2c5uH4qbdgl5bgUiMwGS8boDV5UQxBIw6eAWyOUphpDTdDlshYzBd TN9w== 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=jFpV7j1P21ROkV2swJu5HCtOgW8N6lId8/+FLcjX9Jk=; b=PK9Agx/Ouptl0cwZFCk8pNm5h/1MJlbYHINxipBQi0eBEvGjcav5OrFHx+FnzILBll hnjotN5f0JbQsZsno/6KOHQevwuptoub4G+C9mABleWHxsnuXTwkl8Z4Hft+gWeMT5Z7 brL/9LxVSylj9MD58RZ0M6yKycLsna59HFN2UYG18Bks2Q3hkiy6kv6CZ1Bhfv8oCGpg oSWrYgLK/CB/QL9D5fLay/nBIKgZgGBas3kYEmOXJmNsMyow//xioW7hjvzZIP1v/Cp4 JtTL42CDdieU/gdTLH/O6XJ91KRTkIvss1FOKddYrmj4mYmmoxaKcQYhVdZ9hFnDvBwt c7bw== X-Gm-Message-State: AGRZ1gJR/v9ONeAZGfh09j1Toy3F+KJZrNsKv95Y8RALghsr9og26apD S3fdu2xmztETiRMSuz7sZ/0k5r/X X-Google-Smtp-Source: AJdET5dgsA8ECd+LyBuLY8/b7cTAwtLkmiSpLOxY+/gpTcBEdtKpwKY13TMdSQ5MytFN3QIqzUCUKg== X-Received: by 2002:a6b:c0c6:: with SMTP id q189-v6mr4504211iof.31.1541693674953; Thu, 08 Nov 2018 08:14:34 -0800 (PST) Received: from raichu (toroon0560w-lp130-08-67-71-176-199.dsl.bell.ca. [67.71.176.199]) by smtp.gmail.com with ESMTPSA id m19-v6sm1826390iti.1.2018.11.08.08.14.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 08:14:34 -0800 (PST) Sender: Mark Johnston <markjdb@gmail.com> Date: Thu, 8 Nov 2018 11:14:29 -0500 From: Mark Johnston <markj@freebsd.org> To: Hans Petter Selasky <hselasky@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340246 - head/usr.sbin/newsyslog Message-ID: <20181108161429.GA24751@raichu> References: <201811081243.wA8ChEsP009030@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201811081243.wA8ChEsP009030@repo.freebsd.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: DF65C85760 X-Spamd-Result: default: False [-3.30 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.61)[ipnet: 2607:f8b0::/32(-1.44), asn: 15169(-1.52), country: US(-0.09)]; DKIM_TRACE(0.00)[gmail.com:+]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[4.3.d.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.98)[-0.982,0]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MID_RHS_NOT_FQDN(0.50)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 16:14:36 -0000 On Thu, Nov 08, 2018 at 12:43:14PM +0000, Hans Petter Selasky wrote: > Author: hselasky > Date: Thu Nov 8 12:43:13 2018 > New Revision: 340246 > URL: https://svnweb.freebsd.org/changeset/base/340246 > > Log: > Add /var/log/opensm.log to list of rotating log files. > > MFC after: 3 days > Sponsored by: Mellanox Technologies > > Modified: > head/usr.sbin/newsyslog/newsyslog.conf There is already an usr.sbin/newsyslog/newsyslog.d/opensm.conf. > > Modified: head/usr.sbin/newsyslog/newsyslog.conf > ============================================================================== > --- head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 09:45:13 2018 (r340245) > +++ head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 12:43:13 2018 (r340246) > @@ -26,6 +26,7 @@ > /var/log/maillog 640 7 * @T00 JC > /var/log/messages 644 5 1000 @0101T JC > /var/log/monthly.log 640 12 * $M1D0 JN > +/var/log/opensm.log 644 3 1000 * J > /var/log/devd.log 644 3 1000 * JC > /var/log/security 600 10 1000 * JC > /var/log/utx.log 644 3 * @01T05 B > From owner-svn-src-head@freebsd.org Thu Nov 8 16:23:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 9FF7C112F75C; Thu, 8 Nov 2018 16:23:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2E82585D24; Thu, 8 Nov 2018 16:23:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F72926F98; Thu, 8 Nov 2018 16:23:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8GN9Q8022649; Thu, 8 Nov 2018 16:23:09 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8GN9Km022648; Thu, 8 Nov 2018 16:23:09 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201811081623.wA8GN9Km022648@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> Date: Thu, 8 Nov 2018 16:23:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340253 - head/usr.sbin/newsyslog X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/usr.sbin/newsyslog X-SVN-Commit-Revision: 340253 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2E82585D24 X-Spamd-Result: default: False [-103.11 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 16:23:10 -0000 Author: hselasky Date: Thu Nov 8 16:23:09 2018 New Revision: 340253 URL: https://svnweb.freebsd.org/changeset/base/340253 Log: Revert r340246. Sponsored by: Mellanox Technologies Modified: head/usr.sbin/newsyslog/newsyslog.conf Modified: head/usr.sbin/newsyslog/newsyslog.conf ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 15:12:36 2018 (r340252) +++ head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 16:23:09 2018 (r340253) @@ -26,7 +26,6 @@ /var/log/maillog 640 7 * @T00 JC /var/log/messages 644 5 1000 @0101T JC /var/log/monthly.log 640 12 * $M1D0 JN -/var/log/opensm.log 644 3 1000 * J /var/log/devd.log 644 3 1000 * JC /var/log/security 600 10 1000 * JC /var/log/utx.log 644 3 * @01T05 B From owner-svn-src-head@freebsd.org Thu Nov 8 16:25:31 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 1F89D112F8A7; Thu, 8 Nov 2018 16:25:31 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 772B485F50; Thu, 8 Nov 2018 16:25:30 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [178.17.145.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 164BE2601FE; Thu, 8 Nov 2018 17:25:23 +0100 (CET) Subject: Re: svn commit: r340246 - head/usr.sbin/newsyslog To: Mark Johnston <markj@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201811081243.wA8ChEsP009030@repo.freebsd.org> <20181108161429.GA24751@raichu> From: Hans Petter Selasky <hps@selasky.org> Message-ID: <19afa685-8109-566c-6a8a-91b712e80fe9@selasky.org> Date: Thu, 8 Nov 2018 17:24:49 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.0.1 MIME-Version: 1.0 In-Reply-To: <20181108161429.GA24751@raichu> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 772B485F50 X-Spamd-Result: default: False [-4.86 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mail.turbocat.net]; NEURAL_HAM_SHORT(-0.99)[-0.988,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-1.57)[ipnet: 88.99.0.0/16(-4.91), asn: 24940(-2.91), country: DE(-0.01)]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 16:25:31 -0000 On 11/8/18 5:14 PM, Mark Johnston wrote: > On Thu, Nov 08, 2018 at 12:43:14PM +0000, Hans Petter Selasky wrote: >> Author: hselasky >> Date: Thu Nov 8 12:43:13 2018 >> New Revision: 340246 >> URL: https://svnweb.freebsd.org/changeset/base/340246 >> >> Log: >> Add /var/log/opensm.log to list of rotating log files. >> >> MFC after: 3 days >> Sponsored by: Mellanox Technologies >> >> Modified: >> head/usr.sbin/newsyslog/newsyslog.conf > > There is already an usr.sbin/newsyslog/newsyslog.d/opensm.conf. > Thank you. Do you have any objections adding a size limit for opensm.conf, and also to use bzip2? > Index: usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf > =================================================================== > --- usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf (revision 339922) > +++ usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf (working copy) > @@ -1,3 +1,3 @@ > # $FreeBSD$ > > -/var/log/opensm.log 600 7 * * Z /var/run/opensm.pid 30 > +/var/log/opensm.log 600 7 1000 * J /var/run/opensm.pid 30 --HPS >> >> Modified: head/usr.sbin/newsyslog/newsyslog.conf >> ============================================================================== >> --- head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 09:45:13 2018 (r340245) >> +++ head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 12:43:13 2018 (r340246) >> @@ -26,6 +26,7 @@ >> /var/log/maillog 640 7 * @T00 JC >> /var/log/messages 644 5 1000 @0101T JC >> /var/log/monthly.log 640 12 * $M1D0 JN >> +/var/log/opensm.log 644 3 1000 * J >> /var/log/devd.log 644 3 1000 * JC >> /var/log/security 600 10 1000 * JC >> /var/log/utx.log 644 3 * @01T05 B >> > > From owner-svn-src-head@freebsd.org Thu Nov 8 16:54:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 637A81130629; Thu, 8 Nov 2018 16:54:46 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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 73463870C9; Thu, 8 Nov 2018 16:54:45 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 378853C475F; Thu, 8 Nov 2018 16:54:38 +0000 (UTC) Date: Thu, 8 Nov 2018 16:54:38 +0000 From: Brooks Davis <brooks@freebsd.org> To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Cc: Brooks Davis <brooks@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340242 - head Message-ID: <20181108165438.GA30723@spindle.one-eyed-alien.net> References: <201811080035.wA80Z1Qc035376@repo.freebsd.org> <4F3AECDE-DE4E-4B88-B1FA-6334038D4189@lists.zabbadoz.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W/nzBZO5zC0uMSeA" Content-Disposition: inline In-Reply-To: <4F3AECDE-DE4E-4B88-B1FA-6334038D4189@lists.zabbadoz.net> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 73463870C9 X-Spamd-Result: default: False [-0.29 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.82)[-0.824,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.95)[-0.946,0]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[spindle.one-eyed-alien.net]; MX_MISSING(3.50)[requested record is not found]; NEURAL_HAM_SHORT(-0.36)[-0.358,0]; R_SPF_NA(0.00)[]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; IP_SCORE(-0.75)[asn: 36236(-3.65), country: US(-0.09)]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 16:54:46 -0000 --W/nzBZO5zC0uMSeA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 08, 2018 at 06:23:55AM +0000, Bjoern A. Zeeb wrote: > On 8 Nov 2018, at 0:35, Brooks Davis wrote: >=20 > > Author: brooks > > Date: Thu Nov 8 00:35:00 2018 > > New Revision: 340242 > > URL: https://svnweb.freebsd.org/changeset/base/340242 > > > > Log: > > Add a top-level make target to rebuild all sysent files. > > > > The sysent target is useful when changing makesyscalls.sh, when > > making paired changes to syscalls.master files, or in a future where > > freebsd32 sysent entries are built from the default syscalls.master. > > > > Reviewed by: bdrewery > > Obtained from: CheriBSD > > Sponsored by: DARPA, AFRL > > Differential Revision: https://reviews.freebsd.org/D17899 > > > > Modified: > > head/Makefile > > head/Makefile.inc1 >=20 > I was wondering if the Makefile.inc1 parts shouldn???t mostly be in=20 > sys/Makefile or similar rather than at the top-level? It seemed like a tossup. I picked Makefile.inc1 because I didn't want to polute Makefile with a list of directories and because it makes sure the right tools (bmake) are used. -- Brooks --W/nzBZO5zC0uMSeA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJb5GpNAAoJEKzQXbSebgfAQAEH/R+I8eh69BpM0w3lNEdUIXGR YuoTmCOzNaq2P1izb12RruOVapClMFmM7zIBFglMiJAdxpNK15bOovvLhxsWzxl0 K/+7iVHmhJ7qEI+onrQtktEdAgZ/PzB+CmxiFiSoUNS5qByymS1rWgUIOjiDwwJ4 pOPtUrk0Fatc40P6KprHY3vIAIirw6J6iBoPpQ9Odjm+uBaCrhVlgmOWYarHX6AZ YGvfjnnrRx/u8osRLOOPtwNg3yIJ9mRdXvZ/xHZYGIIyMLG21PBc8VqUYUkUqisD m8kvYpIngcrBIXmhYDj/dqW07uwK02OkdDt6kAJGJTH2dRfamzSe/OAtw5kT70w= =ODkV -----END PGP SIGNATURE----- --W/nzBZO5zC0uMSeA-- From owner-svn-src-head@freebsd.org Thu Nov 8 16:56:12 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8FC001130710; Thu, 8 Nov 2018 16:56:12 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E454087387; Thu, 8 Nov 2018 16:56:11 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-io1-xd44.google.com with SMTP id 79-v6so15133024iou.2; Thu, 08 Nov 2018 08:56:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=k1yRlqYDSuy0NatX4Vxzw9ob0TUgkwcKokOwzO7H9tg=; b=CTyjz034/bOxZC+n9H5k4mjO4adHmr5p/8Xuf1XUsSy7oP/WEcfjuxeAtOskN9+i4z MsVE6nWAykQUUVUQR7+xq2FuXzzAnt4N7wXVBJYt2O6yupeXjtoO/XZTJ+a6EhYxm/yv zu9NhoCI8a2Bz5d6CXaEpUyh4clJl1Czzh15v7Tp4yj2UXrJUItoIJwCuX4zvqCpR9yZ PGPF709+MecL3w4snGKIYxfFg6rg8N823beoDUUZhp9CsVgM212d1YaG+paWzEHq+FCH DmjBYB4YPJOi3BjCmc2PmXefVQzZ7rQY5Qgc2TTRjnqztc66Gkiu7NsRmc/WaWX3cWE1 3eGw== 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=k1yRlqYDSuy0NatX4Vxzw9ob0TUgkwcKokOwzO7H9tg=; b=od6m+jfl4Jtk3NVrtO/KLfwsgcrg6wjS4VZJE6zjXl0KcSuGIJFI+biPT56Cmdcwph XPomYITxH8JHVQPG5GJ7sxEwm4AairmTuGhPgxj4O5ZSHUSYldZ4TfmQYMBYsjqqWTWb t8USFpGf4OchLHvr9ElLuW4In8Vu1KpKgVTsPUxtVocDmOm26cDsFkFMevLS4u1x1IX4 h3v4t9RShs0mlBFi8Hw/eIYMySDX8+Lo+0azv+3QqTHCrVrQW2BQ0cv7Hq/uSaO4XtpS Xj4KISJYQKS6I+q4HYGi0sI8WuD69RjIKrb8w424VVhj82cJ7Ho/I2pVvPRwRTTg9khk +gqw== X-Gm-Message-State: AGRZ1gK7LjuVFNosqlZOLF1jg+PkMu/GNOMsFydntNQVKTCr7kYXYaLy amt/n+UcXWh8IlBhGSBMuy/NO+XB X-Google-Smtp-Source: AJdET5cxNE2ZYi6NEeEfWg/y8og95sDKG44H4+HTIw5GR2LqfYV8D4alx7txQJDKY3XVC0/kzDdDDA== X-Received: by 2002:a6b:c982:: with SMTP id z124-v6mr4267386iof.130.1541696171225; Thu, 08 Nov 2018 08:56:11 -0800 (PST) Received: from raichu (toroon0560w-lp130-08-67-71-176-199.dsl.bell.ca. [67.71.176.199]) by smtp.gmail.com with ESMTPSA id h24-v6sm1430536iog.81.2018.11.08.08.56.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 08:56:10 -0800 (PST) Sender: Mark Johnston <markjdb@gmail.com> Date: Thu, 8 Nov 2018 11:56:08 -0500 From: Mark Johnston <markj@freebsd.org> To: Hans Petter Selasky <hps@selasky.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340246 - head/usr.sbin/newsyslog Message-ID: <20181108165608.GE24751@raichu> References: <201811081243.wA8ChEsP009030@repo.freebsd.org> <20181108161429.GA24751@raichu> <19afa685-8109-566c-6a8a-91b712e80fe9@selasky.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <19afa685-8109-566c-6a8a-91b712e80fe9@selasky.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: E454087387 X-Spamd-Result: default: False [-3.32 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[4.4.d.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.94)[-0.943,0]; IP_SCORE(-0.66)[ipnet: 2607:f8b0::/32(-1.66), asn: 15169(-1.57), country: US(-0.09)]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MID_RHS_NOT_FQDN(0.50)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 16:56:12 -0000 On Thu, Nov 08, 2018 at 05:24:49PM +0100, Hans Petter Selasky wrote: > On 11/8/18 5:14 PM, Mark Johnston wrote: > > On Thu, Nov 08, 2018 at 12:43:14PM +0000, Hans Petter Selasky wrote: > >> Author: hselasky > >> Date: Thu Nov 8 12:43:13 2018 > >> New Revision: 340246 > >> URL: https://svnweb.freebsd.org/changeset/base/340246 > >> > >> Log: > >> Add /var/log/opensm.log to list of rotating log files. > >> > >> MFC after: 3 days > >> Sponsored by: Mellanox Technologies > >> > >> Modified: > >> head/usr.sbin/newsyslog/newsyslog.conf > > > > There is already an usr.sbin/newsyslog/newsyslog.d/opensm.conf. > > > Thank you. Do you have any objections adding a size limit for > opensm.conf, and also to use bzip2? Nope. I don't interact with opensm anymore though. FWIW, opensm's logging can be quite verbose and I very often found myself wanting to go back further than the log retention limit (which was fairly small due to space constraints on OneFS). I think switching to bzip2 is a good idea, and the size limit you added looks reasonable. > > Index: usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf > > =================================================================== > > --- usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf (revision 339922) > > +++ usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf (working copy) > > @@ -1,3 +1,3 @@ > > # $FreeBSD$ > > > > -/var/log/opensm.log 600 7 * * Z /var/run/opensm.pid 30 > > +/var/log/opensm.log 600 7 1000 * J /var/run/opensm.pid 30 > > --HPS > > >> > >> Modified: head/usr.sbin/newsyslog/newsyslog.conf > >> ============================================================================== > >> --- head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 09:45:13 2018 (r340245) > >> +++ head/usr.sbin/newsyslog/newsyslog.conf Thu Nov 8 12:43:13 2018 (r340246) > >> @@ -26,6 +26,7 @@ > >> /var/log/maillog 640 7 * @T00 JC > >> /var/log/messages 644 5 1000 @0101T JC > >> /var/log/monthly.log 640 12 * $M1D0 JN > >> +/var/log/opensm.log 644 3 1000 * J > >> /var/log/devd.log 644 3 1000 * JC > >> /var/log/security 600 10 1000 * JC > >> /var/log/utx.log 644 3 * @01T05 B > >> > > > > > From owner-svn-src-head@freebsd.org Thu Nov 8 17:00:06 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 987B611308B5; Thu, 8 Nov 2018 17:00:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 19F6087624; Thu, 8 Nov 2018 17:00:06 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF263274C1; Thu, 8 Nov 2018 17:00:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8H05gG038216; Thu, 8 Nov 2018 17:00:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8H05lt038215; Thu, 8 Nov 2018 17:00:05 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201811081700.wA8H05lt038215@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky <hselasky@FreeBSD.org> Date: Thu, 8 Nov 2018 17:00:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340254 - head/usr.sbin/newsyslog/newsyslog.conf.d X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/usr.sbin/newsyslog/newsyslog.conf.d X-SVN-Commit-Revision: 340254 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 19F6087624 X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.81), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 17:00:06 -0000 Author: hselasky Date: Thu Nov 8 17:00:05 2018 New Revision: 340254 URL: https://svnweb.freebsd.org/changeset/base/340254 Log: Put a size limit on the opensm.log and use bzip2(1). Discussed with: markj@ Sponsored by: Mellanox Technologies Modified: head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf Modified: head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf Thu Nov 8 16:23:09 2018 (r340253) +++ head/usr.sbin/newsyslog/newsyslog.conf.d/opensm.conf Thu Nov 8 17:00:05 2018 (r340254) @@ -1,3 +1,3 @@ # $FreeBSD$ -/var/log/opensm.log 600 7 * * Z /var/run/opensm.pid 30 +/var/log/opensm.log 600 7 1000 * J /var/run/opensm.pid 30 From owner-svn-src-head@freebsd.org Thu Nov 8 17:20:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E956D11314B0; Thu, 8 Nov 2018 17:20: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7AB7888C1F; Thu, 8 Nov 2018 17:20:01 +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 5D3CE27820; Thu, 8 Nov 2018 17:20:01 +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 wA8HK1KO048119; Thu, 8 Nov 2018 17:20:01 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8HK1tP048118; Thu, 8 Nov 2018 17:20:01 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811081720.wA8HK1tP048118@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Thu, 8 Nov 2018 17:20:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340255 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 340255 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7AB7888C1F X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.74)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.81), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 17:20:02 -0000 Author: markj Date: Thu Nov 8 17:20:00 2018 New Revision: 340255 URL: https://svnweb.freebsd.org/changeset/base/340255 Log: Use --work-tree instead of specifying an absolute path. Otherwise the diff command being run from outside the checkout resulted in warnings. Discussed with: emaste X-MFC with: r340083 Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Thu Nov 8 17:00:05 2018 (r340254) +++ head/sys/conf/newvers.sh Thu Nov 8 17:20:00 2018 (r340255) @@ -83,18 +83,17 @@ git_tree_modified() # git's internal state. The latter case is indicated by an all-zero # destination file hash. - local fifo vcstop_abs + local fifo fifo=$(mktemp -u) mkfifo -m 600 $fifo - vcstop_abs=$(realpath $VCSTOP) $git_cmd --work-tree=${VCSTOP} diff-index HEAD > $fifo & while read smode dmode ssha dsha status file; do if ! expr $dsha : '^00*$' >/dev/null; then rm $fifo return 0 fi - if ! $git_cmd diff --quiet -- "${vcstop_abs}/${file}"; then + if ! $git_cmd --work-tree=${VCSTOP} diff --quiet -- "${file}"; then rm $fifo return 0 fi From owner-svn-src-head@freebsd.org Thu Nov 8 19:10:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 04CDE1101ACC; Thu, 8 Nov 2018 19:10:45 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 651738D0B7; Thu, 8 Nov 2018 19:10:44 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 45C33BAD; Thu, 8 Nov 2018 19:10:44 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8JAi4M004681; Thu, 8 Nov 2018 19:10:44 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8JAh2E004677; Thu, 8 Nov 2018 19:10:43 GMT (envelope-from erj@FreeBSD.org) Message-Id: <201811081910.wA8JAh2E004677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner <erj@FreeBSD.org> Date: Thu, 8 Nov 2018 19:10:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340256 - head/sys/dev/ixl X-SVN-Group: head X-SVN-Commit-Author: erj X-SVN-Commit-Paths: head/sys/dev/ixl X-SVN-Commit-Revision: 340256 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 651738D0B7 X-Spamd-Result: default: False [-106.85 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.81), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 19:10:45 -0000 Author: erj Date: Thu Nov 8 19:10:43 2018 New Revision: 340256 URL: https://svnweb.freebsd.org/changeset/base/340256 Log: ixl/iavf(4): Fix TSO offloads when TXCSUM is disabled From Jake: The iflib stack does not disable TSO automatically when TXCSUM is disabled, instead assuming that the driver will correctly handle TSOs even when CSUM_IP is not set. This results in iflib calling ixl_isc_txd_encap with packets which have CSUM_IP_TSO, but do not have CSUM_IP or CSUM_IP_TCP set. Because of this, ixl_tx_setup_offload will not setup the IPv4 checksum offloading. This results in bad TSO packets being sent if a user disables TXCSUM without disabling TSO. Fix this by updating the ixl_tx_setup_offload function to check both CSUM_IP and CSUM_IP_TSO when deciding whether to enable IPv4 checksums. Once this is corrected, another issue for TSO packets is revealed. The driver sets IFLIB_NEED_ZERO_CSUM in order to enable a work around that causes the ip->sum field to be zero'd. This is necessary for ixl hardware to correctly perform TSOs. However, if TXCSUM is disabled, then the work around is not enabled, as CSUM_IP will not be set when the iflib stack checks to see if it should clear the sum field. Fix this by adding IFLIB_TSO_INIT_IP to the iflib flags for the iavf and ixl interface files. It is uncertain if the hardware needs IFLIB_NEED_ZERO_CSUM for any other case besides TSO, so leave that flag assigned. It may be worth investigating to see if this work around flag could be disabled in a future change. Once both of these changes are made, the ixl driver should correctly offload TSO packets when TSO4 offload is enabled, regardless of whether TXCSUM is enabled or disabled. Submitted by: Jacob Keller <jacob.e.keller@intel.com> Reviewed by: erj@, shurd@ MFC after: 0 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D17900 Modified: head/sys/dev/ixl/if_iavf.c head/sys/dev/ixl/if_ixl.c head/sys/dev/ixl/ixl.h head/sys/dev/ixl/ixl_txrx.c Modified: head/sys/dev/ixl/if_iavf.c ============================================================================== --- head/sys/dev/ixl/if_iavf.c Thu Nov 8 17:20:00 2018 (r340255) +++ head/sys/dev/ixl/if_iavf.c Thu Nov 8 19:10:43 2018 (r340256) @@ -260,7 +260,7 @@ static struct if_shared_ctx iavf_sctx_init = { .isc_vendor_info = iavf_vendor_info_array, .isc_driver_version = IAVF_DRIVER_VERSION_STRING, .isc_driver = &iavf_if_driver, - .isc_flags = IFLIB_NEED_SCRATCH | IFLIB_NEED_ZERO_CSUM | IFLIB_IS_VF, + .isc_flags = IFLIB_NEED_SCRATCH | IFLIB_NEED_ZERO_CSUM | IFLIB_TSO_INIT_IP | IFLIB_IS_VF, .isc_nrxd_min = {IXL_MIN_RING}, .isc_ntxd_min = {IXL_MIN_RING}, Modified: head/sys/dev/ixl/if_ixl.c ============================================================================== --- head/sys/dev/ixl/if_ixl.c Thu Nov 8 17:20:00 2018 (r340255) +++ head/sys/dev/ixl/if_ixl.c Thu Nov 8 19:10:43 2018 (r340256) @@ -323,7 +323,7 @@ static struct if_shared_ctx ixl_sctx_init = { .isc_vendor_info = ixl_vendor_info_array, .isc_driver_version = IXL_DRIVER_VERSION_STRING, .isc_driver = &ixl_if_driver, - .isc_flags = IFLIB_NEED_SCRATCH | IFLIB_NEED_ZERO_CSUM | IFLIB_ADMIN_ALWAYS_RUN, + .isc_flags = IFLIB_NEED_SCRATCH | IFLIB_NEED_ZERO_CSUM | IFLIB_TSO_INIT_IP | IFLIB_ADMIN_ALWAYS_RUN, .isc_nrxd_min = {IXL_MIN_RING}, .isc_ntxd_min = {IXL_MIN_RING}, Modified: head/sys/dev/ixl/ixl.h ============================================================================== --- head/sys/dev/ixl/ixl.h Thu Nov 8 17:20:00 2018 (r340255) +++ head/sys/dev/ixl/ixl.h Thu Nov 8 19:10:43 2018 (r340256) @@ -258,6 +258,8 @@ (CSUM_IP_UDP|CSUM_IP6_UDP) #define IXL_CSUM_SCTP \ (CSUM_IP_SCTP|CSUM_IP6_SCTP) +#define IXL_CSUM_IPV4 \ + (CSUM_IP|CSUM_IP_TSO) /* Pre-11 counter(9) compatibility */ #if __FreeBSD_version >= 1100036 Modified: head/sys/dev/ixl/ixl_txrx.c ============================================================================== --- head/sys/dev/ixl/ixl_txrx.c Thu Nov 8 17:20:00 2018 (r340255) +++ head/sys/dev/ixl/ixl_txrx.c Thu Nov 8 19:10:43 2018 (r340256) @@ -225,7 +225,7 @@ ixl_tx_setup_offload(struct ixl_tx_queue *que, switch (pi->ipi_etype) { #ifdef INET case ETHERTYPE_IP: - if (pi->ipi_csum_flags & CSUM_IP) + if (pi->ipi_csum_flags & IXL_CSUM_IPV4) *cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM; else *cmd |= I40E_TX_DESC_CMD_IIPT_IPV4; From owner-svn-src-head@freebsd.org Thu Nov 8 19:26:05 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3BD1511023DE; Thu, 8 Nov 2018 19:26:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A82DC8E637; Thu, 8 Nov 2018 19:26:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 8116A10B429; Thu, 8 Nov 2018 14:26:02 -0500 (EST) Subject: Re: svn commit: r340242 - head To: Brooks Davis <brooks@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201811080035.wA80Z1Qc035376@repo.freebsd.org> From: John Baldwin <jhb@FreeBSD.org> Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= xsDiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg80eSm9obiBCYWxk d2luIDxqb2huQGJhbGR3aW4uY3g+wmMEExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX gAUCRND5wwIZAQAKCRBy3lIGd+N/BNLXAJ9KIb6teuDL1W+FkCgvv+y8PxKTkACeIUfbn3sl cueBzqTcf09idwa8YTbOwU0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Ds gnr31AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh +GojXlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cM SOrHYUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOF QVHOEVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq 1tqzhltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZ TwtXsNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m 7Z164yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioI AjjHaIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbU KWwxQ4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjH uW/CSQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZN wwCfafMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <6aafd9bb-da26-62f5-6ea6-f40c653613c9@FreeBSD.org> Date: Thu, 8 Nov 2018 11:25:59 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201811080035.wA80Z1Qc035376@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Thu, 08 Nov 2018 14:26:04 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-Rspamd-Queue-Id: A82DC8E637 X-Spamd-Result: default: False [-106.81 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,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)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; R_SPF_SOFTFAIL(0.00)[~all]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-3.70)[ip: (-9.85), ipnet: 96.47.64.0/20(-4.73), asn: 11403(-3.82), country: US(-0.09)]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 19:26:05 -0000 On 11/7/18 4:35 PM, Brooks Davis wrote: > Author: brooks > Date: Thu Nov 8 00:35:00 2018 > New Revision: 340242 > URL: https://svnweb.freebsd.org/changeset/base/340242 > > Log: > Add a top-level make target to rebuild all sysent files. > > The sysent target is useful when changing makesyscalls.sh, when > making paired changes to syscalls.master files, or in a future where > freebsd32 sysent entries are built from the default syscalls.master. +1 That qualifies for a free drink the next time we are colocated. Thanks! -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Thu Nov 8 19:49:30 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7ED2F1102D49; Thu, 8 Nov 2018 19:49:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00E768F34C; Thu, 8 Nov 2018 19:49:29 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id DE1CA10AFD2; Thu, 8 Nov 2018 14:49:28 -0500 (EST) Subject: Re: svn commit: r340231 - head/sys/kern To: Konstantin Belousov <kostikbel@gmail.com> References: <201811071832.wA7IW3VI045865@repo.freebsd.org> <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> <20181107230832.GZ5335@kib.kiev.ua> Cc: Ed Schouten <ed@nuxi.nl>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: John Baldwin <jhb@FreeBSD.org> Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= xsDiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg80eSm9obiBCYWxk d2luIDxqb2huQGJhbGR3aW4uY3g+wmMEExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX gAUCRND5wwIZAQAKCRBy3lIGd+N/BNLXAJ9KIb6teuDL1W+FkCgvv+y8PxKTkACeIUfbn3sl cueBzqTcf09idwa8YTbOwU0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Ds gnr31AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh +GojXlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cM SOrHYUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOF QVHOEVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq 1tqzhltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZ TwtXsNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m 7Z164yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioI AjjHaIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbU KWwxQ4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjH uW/CSQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZN wwCfafMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <60a839f8-9830-7d6e-98a2-a7aa596e68e9@FreeBSD.org> Date: Thu, 8 Nov 2018 11:49:28 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181107230832.GZ5335@kib.kiev.ua> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Thu, 08 Nov 2018 14:49:29 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-Rspamd-Queue-Id: 00E768F34C X-Spamd-Result: default: False [-106.81 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-3.70)[ip: (-9.86), ipnet: 96.47.64.0/20(-4.73), asn: 11403(-3.82), country: US(-0.09)]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 19:49:30 -0000 On 11/7/18 3:08 PM, Konstantin Belousov wrote: > On Wed, Nov 07, 2018 at 01:35:57PM -0800, John Baldwin wrote: >> On 11/7/18 1:01 PM, Ed Schouten wrote: >>> Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb@freebsd.org>: >>>> Modified: head/sys/kern/imgact_elf.c >>>> ============================================================================== >>>> --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) >>>> +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) >>>> @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), >>>> >>>> int __elfN(nxstack) = >>>> #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ >>>> - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) >>>> + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ >>>> + defined(__riscv) >>>> 1; >>>> #else >>>> 0; >>> >>> Are we getting to the point that it might make sense to invert this >>> logic, i.e., just list the architectures that require executable >>> stacks? >> >> It's not clear. The remaining set is i386 (should be able to use nxstack >> when using PAE and PG_NX is supported), MIPS (no X permission in PTEs), >> 32-bit powerpc (no X permissions in PTEs AFAICT), and sparc64 (no X >> permissions in PTEs AFAICT). For architectures without X ptes, removing >> VM_PROT_EXECUTE from the stack permissions is a no-op and would be >> harmless, so we could perhaps just default this to always on at this >> point? > AFAIR sparc64 ABI defines its stack as nx always (and PTEs do allow to > control exec permission). Hmm, I couldn't find any uses of VM_PROT_EXECUTE in pmap.c that seemed to affect permissions. There is a software TTE bit that is used to know which address ranges require icache flushing, but it seems to only be used for that. Regardless, for the purposes of this sysctl, is there any reason we can't just define it to 1 always now? It is only honored if the architecture is using a shared page to hold the signal trampoline and only has an effect if the pmap honors VM_PROT_EXECUTE. That would at least fix i386 with PAE to DTRT I think. -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Thu Nov 8 19:50:24 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7554E1102E03; Thu, 8 Nov 2018 19:50:24 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0686D8F4C4; Thu, 8 Nov 2018 19:50:24 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 DBADC128A; Thu, 8 Nov 2018 19:50:23 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8JoNhH023584; Thu, 8 Nov 2018 19:50:23 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8JoN1q023583; Thu, 8 Nov 2018 19:50:23 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201811081950.wA8JoN1q023583@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen <vangyzen@FreeBSD.org> Date: Thu, 8 Nov 2018 19:50:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340257 - head/sys/netinet6 X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/sys/netinet6 X-SVN-Commit-Revision: 340257 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0686D8F4C4 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.91), asn: 11403(-3.82), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 19:50:24 -0000 Author: vangyzen Date: Thu Nov 8 19:50:23 2018 New Revision: 340257 URL: https://svnweb.freebsd.org/changeset/base/340257 Log: in6_ifattach_linklocal: handle immediate removal of the new LLA If another thread immediately removes the link-local address added by in6_update_ifa(), in6ifa_ifpforlinklocal() can return NULL, so the following assertion (or dereference) is wrong. Remove the assertion, and handle NULL somewhat better than panicking. This matches all of the other callers of in6_update_ifa(). PR: 219250 Reviewed by: bz, dab (both an earlier version) MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D17898 Modified: head/sys/netinet6/in6_ifattach.c Modified: head/sys/netinet6/in6_ifattach.c ============================================================================== --- head/sys/netinet6/in6_ifattach.c Thu Nov 8 19:10:43 2018 (r340256) +++ head/sys/netinet6/in6_ifattach.c Thu Nov 8 19:50:23 2018 (r340257) @@ -481,9 +481,16 @@ in6_ifattach_linklocal(struct ifnet *ifp, struct ifnet return (-1); } - ia = in6ifa_ifpforlinklocal(ifp, 0); /* ia must not be NULL */ - KASSERT(ia != NULL, ("%s: ia == NULL, ifp=%p", __func__, ifp)); - + ia = in6ifa_ifpforlinklocal(ifp, 0); + if (ia == NULL) { + /* + * Another thread removed the address that we just added. + * This should be rare, but it happens. + */ + nd6log((LOG_NOTICE, "%s: %s: new link-local address " + "disappeared\n", __func__, if_name(ifp))); + return (-1); + } ifa_free(&ia->ia_ifa); /* From owner-svn-src-head@freebsd.org Thu Nov 8 20:12:43 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 95B9D1103BF8; Thu, 8 Nov 2018 20:12:43 +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 BD75D6A25D; Thu, 8 Nov 2018 20:12:42 +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 wA8KCVhh075820 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 8 Nov 2018 22:12:34 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua wA8KCVhh075820 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id wA8KCVPo075819; Thu, 8 Nov 2018 22:12:31 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 8 Nov 2018 22:12:31 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: John Baldwin <jhb@FreeBSD.org> Cc: Ed Schouten <ed@nuxi.nl>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340231 - head/sys/kern Message-ID: <20181108201231.GA5335@kib.kiev.ua> References: <201811071832.wA7IW3VI045865@repo.freebsd.org> <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> <20181107230832.GZ5335@kib.kiev.ua> <60a839f8-9830-7d6e-98a2-a7aa596e68e9@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <60a839f8-9830-7d6e-98a2-a7aa596e68e9@FreeBSD.org> User-Agent: Mutt/1.10.1 (2018-07-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-Rspamd-Queue-Id: BD75D6A25D X-Spamd-Result: default: False [-5.02 / 200.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; IP_SCORE(-2.02)[ip: (-1.99), ipnet: 2001:470::/32(-4.48), asn: 6939(-3.54), country: US(-0.09)]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 20:12:43 -0000 On Thu, Nov 08, 2018 at 11:49:28AM -0800, John Baldwin wrote: > On 11/7/18 3:08 PM, Konstantin Belousov wrote: > > On Wed, Nov 07, 2018 at 01:35:57PM -0800, John Baldwin wrote: > >> On 11/7/18 1:01 PM, Ed Schouten wrote: > >>> Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb@freebsd.org>: > >>>> Modified: head/sys/kern/imgact_elf.c > >>>> ============================================================================== > >>>> --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) > >>>> +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) > >>>> @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), > >>>> > >>>> int __elfN(nxstack) = > >>>> #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ > >>>> - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) > >>>> + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ > >>>> + defined(__riscv) > >>>> 1; > >>>> #else > >>>> 0; > >>> > >>> Are we getting to the point that it might make sense to invert this > >>> logic, i.e., just list the architectures that require executable > >>> stacks? > >> > >> It's not clear. The remaining set is i386 (should be able to use nxstack > >> when using PAE and PG_NX is supported), MIPS (no X permission in PTEs), > >> 32-bit powerpc (no X permissions in PTEs AFAICT), and sparc64 (no X > >> permissions in PTEs AFAICT). For architectures without X ptes, removing > >> VM_PROT_EXECUTE from the stack permissions is a no-op and would be > >> harmless, so we could perhaps just default this to always on at this > >> point? > > AFAIR sparc64 ABI defines its stack as nx always (and PTEs do allow to > > control exec permission). > > Hmm, I couldn't find any uses of VM_PROT_EXECUTE in pmap.c that seemed to > affect permissions. There is a software TTE bit that is used to know which > address ranges require icache flushing, but it seems to only be used for > that. AFAIR TLB faults are software-assisted and there are different faults for instruction and data TLB fill. It seems that exception.S immu_miss handler checks the TD_EXEC software bit before loading TTE into instructions TLB. Later versions of sparcv9 arch specification define optional hw execute bit in TTE. > > Regardless, for the purposes of this sysctl, is there any reason we can't > just define it to 1 always now? It is only honored if the architecture > is using a shared page to hold the signal trampoline and only has an effect > if the pmap honors VM_PROT_EXECUTE. That would at least fix i386 with > PAE to DTRT I think. i386 PAE already handles it, see i386/initcpu.c:754. Unconditionally setting the vars to 1 would break any arch that 1. does not allow to use shared page 2. honors VM_PROT_EXEC in pmap 3. not using local hacks for signal trampolines, like sparc64 does. We might not have any such architecture now (ia64 certainly was such case). From owner-svn-src-head@freebsd.org Thu Nov 8 20:17:38 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D596A1103FB5; Thu, 8 Nov 2018 20:17:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4AEC06A705; Thu, 8 Nov 2018 20:17:37 +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 2D5441781; Thu, 8 Nov 2018 20:17:37 +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 wA8KHasw038911; Thu, 8 Nov 2018 20:17:36 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8KHaxZ038910; Thu, 8 Nov 2018 20:17:36 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811082017.wA8KHaxZ038910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Thu, 8 Nov 2018 20:17:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340260 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 340260 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4AEC06A705 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 20:17:38 -0000 Author: emaste Date: Thu Nov 8 20:17:36 2018 New Revision: 340260 URL: https://svnweb.freebsd.org/changeset/base/340260 Log: Avoid buffer underwrite in icmp_error icmp_error allocates either an mbuf (with pkthdr) or a cluster depending on the size of data to be quoted in the ICMP reply, but the calculation failed to account for the additional padding that m_align may apply. Include the ip header in the size passed to m_align. On 64-bit archs this will have the net effect of moving everything 4 bytes later in the mbuf or cluster. This will result in slightly pessimal alignment for the ICMP data copy. Also add an assertion that we do not move m_data before the beginning of the mbuf or cluster. Reported by: A reddit user Reviewed by: bz, jtl MFC after: 3 days Security: CVE-2018-17156 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17909 Modified: head/sys/netinet/ip_icmp.c Modified: head/sys/netinet/ip_icmp.c ============================================================================== --- head/sys/netinet/ip_icmp.c Thu Nov 8 19:56:45 2018 (r340259) +++ head/sys/netinet/ip_icmp.c Thu Nov 8 20:17:36 2018 (r340260) @@ -320,7 +320,8 @@ stdreply: icmpelen = max(8, min(V_icmp_quotelen, ntohs #endif icmplen = min(icmplen, M_TRAILINGSPACE(m) - sizeof(struct ip) - ICMP_MINLEN); - m_align(m, ICMP_MINLEN + icmplen); + m_align(m, sizeof(struct ip) + ICMP_MINLEN + icmplen); + m->m_data += sizeof(struct ip); m->m_len = ICMP_MINLEN + icmplen; /* XXX MRT make the outgoing packet use the same FIB @@ -362,6 +363,8 @@ stdreply: icmpelen = max(8, min(V_icmp_quotelen, ntohs * reply should bypass as well. */ m->m_flags |= n->m_flags & M_SKIP_FIREWALL; + KASSERT(M_LEADINGSPACE(m) >= sizeof(struct ip), + ("insufficient space for ip header")); m->m_data -= sizeof(struct ip); m->m_len += sizeof(struct ip); m->m_pkthdr.len = m->m_len; From owner-svn-src-head@freebsd.org Thu Nov 8 20:18:45 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 05C8C110404B; Thu, 8 Nov 2018 20:18:45 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [18.222.6.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.soaustin.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7119C6A8AC; Thu, 8 Nov 2018 20:18:44 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from lonesome.com (unknown [18.188.142.31]) by mail.soaustin.net (Postfix) with ESMTPSA id 1E00417086; Thu, 8 Nov 2018 20:18:38 +0000 (UTC) Date: Thu, 8 Nov 2018 20:18:36 +0000 From: Mark Linimon <linimon@lonesome.com> To: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Cc: Maxim Sobolev <sobomax@freebsd.org>, src-committers <src-committers@freebsd.org>, Pawel Jakub Dawidek <pjd@freebsd.org>, Ian Lepore <ian@freebsd.org>, svn-src-all@freebsd.org, rgrimes@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340187 - head/sys/geom Message-ID: <20181108201835.GA22540@lonesome.com> References: <CAH7qZfsfLbcqZ5j1R+SkB_BzU4gNxG=KKYsK+2GD=2FW1VO_+A@mail.gmail.com> <201811071659.wA7GxO8Q001891@pdx.rh.CN85.dnsmgr.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201811071659.wA7GxO8Q001891@pdx.rh.CN85.dnsmgr.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-Rspamd-Queue-Id: 7119C6A8AC X-Spamd-Result: default: False [-1.12 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.989,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.67)[-0.667,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[lonesome.com]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[11.6.222.18.list.dnswl.org : 127.0.5.2]; MX_GOOD(-0.01)[mail.soaustin.net]; RCPT_COUNT_SEVEN(0.00)[8]; NEURAL_HAM_SHORT(-0.13)[-0.127,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-0.02)[ipnet: 18.220.0.0/14(0.68), asn: 16509(-0.70), country: US(-0.09)]; ASN(0.00)[asn:16509, ipnet:18.220.0.0/14, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 20:18:45 -0000 On Wed, Nov 07, 2018 at 08:59:24AM -0800, Rodney W. Grimes wrote: > freebsd-geom is also probably a pretty short list. IMHO it's one of our mailing lists that became obsolete once the initial work was done. The bugbusters still assign to these lists, however. ISTM that some of these assignee lists' recent archives contain only bug assignments and spam :-/ mcl From owner-svn-src-head@freebsd.org Thu Nov 8 20:31:13 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6A8F411046FB; Thu, 8 Nov 2018 20:31:13 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E7CCE6B13E; Thu, 8 Nov 2018 20:31:12 +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 CA70D1981; Thu, 8 Nov 2018 20:31:12 +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 wA8KVCZ9049288; Thu, 8 Nov 2018 20:31:12 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8KVCeh049287; Thu, 8 Nov 2018 20:31:12 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201811082031.wA8KVCeh049287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits <jhibbits@FreeBSD.org> Date: Thu, 8 Nov 2018 20:31:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340261 - head/sys/powerpc/powernv X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/powernv X-SVN-Commit-Revision: 340261 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E7CCE6B13E X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 20:31:13 -0000 Author: jhibbits Date: Thu Nov 8 20:31:12 2018 New Revision: 340261 URL: https://svnweb.freebsd.org/changeset/base/340261 Log: powerpc/powernv: Restrict the busdma tag to only POWER8 It seems this tag is causing problems on POWER9 systems. Since no POWER9 user has encountered the problem fixed by r339589 just restrict it to POWER8 for now. A better fix will likely be to update powerpc/busdma_machdep.c to handle the window correctly. Reported by: mmacy, others Modified: head/sys/powerpc/powernv/opal_pci.c Modified: head/sys/powerpc/powernv/opal_pci.c ============================================================================== --- head/sys/powerpc/powernv/opal_pci.c Thu Nov 8 20:17:36 2018 (r340260) +++ head/sys/powerpc/powernv/opal_pci.c Thu Nov 8 20:31:12 2018 (r340261) @@ -433,20 +433,26 @@ opalpci_attach(device_t dev) } /* Create the parent DMA tag */ - err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ - 1, 0, /* alignment, bounds */ - OPAL_PCI_BUS_SPACE_LOWADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR_32BIT, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - BUS_SPACE_MAXSIZE, /* maxsize */ - BUS_SPACE_UNRESTRICTED, /* nsegments */ - BUS_SPACE_MAXSIZE, /* maxsegsize */ - 0, /* flags */ - NULL, NULL, /* lockfunc, lockarg */ - &sc->ofw_sc.sc_dmat); - if (err != 0) { - device_printf(dev, "Failed to create DMA tag\n"); - return (err); + /* + * Constrain it to POWER8 PHB (ioda2) for now. It seems to mess up on + * POWER9 systems. + */ + if (ofw_bus_is_compatible(dev, "ibm,ioda2-phb")) { + err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ + 1, 0, /* alignment, bounds */ + OPAL_PCI_BUS_SPACE_LOWADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR_32BIT, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + BUS_SPACE_MAXSIZE, /* maxsize */ + BUS_SPACE_UNRESTRICTED, /* nsegments */ + BUS_SPACE_MAXSIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->ofw_sc.sc_dmat); + if (err != 0) { + device_printf(dev, "Failed to create DMA tag\n"); + return (err); + } } /* From owner-svn-src-head@freebsd.org Thu Nov 8 20:48:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 1EF861105524; Thu, 8 Nov 2018 20:48:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 764C76C039; Thu, 8 Nov 2018 20:48:45 +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 3E2DF1C97; Thu, 8 Nov 2018 20:48:45 +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 wA8KmjJk054479; Thu, 8 Nov 2018 20:48:45 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8KmjRd054478; Thu, 8 Nov 2018 20:48:45 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201811082048.wA8KmjRd054478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits <jhibbits@FreeBSD.org> Date: Thu, 8 Nov 2018 20:48:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340262 - 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: 340262 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 764C76C039 X-Spamd-Result: default: False [-103.07 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 20:48:46 -0000 Author: jhibbits Date: Thu Nov 8 20:48:44 2018 New Revision: 340262 URL: https://svnweb.freebsd.org/changeset/base/340262 Log: powerpc64: Fix "show spr" command on ELFv2 kernels Summary: When compiling for ELFv2, it is necessary to adjust the offset to get_spr and factor in the function prologue to ensure the correct instruction is being edited. Test Plan: Before: ``` db> show spr 110 KDB: reentering KDB: stack backtrace: 0xc008000020fb96e0: at 0xc000000002bb2e34 = kdb_backtrace+0x68 0xc008000020fb97f0: at 0xc000000002bb3798 = kdb_reenter+0x54 0xc008000020fb9860: at 0xc000000002f87090 = trap+0x4e4 0xc008000020fb9990: at 0xc000000002f78a60 = powerpc_interrupt+0x110 0xc008000020fb9a20: kernel trap 0xe40 by 0xc000000002401978 = get_spr+0x8: srr1=0x9000000000001032 r1=0xc008000020fb9cd0 cr=0x80009438 xer=0x20040000 ctr=0xc000000002f7b40c r2=0xc0000000037fd000 saved LR(0xfffffffffffffffb) is invalid. ``` After: ``` db> show spr 110 SPR 272(110): c000000003cae900 ``` Submitted by: git_bdragon.rtk0.net Differential Revision: https://reviews.freebsd.org/D17813 Modified: head/sys/powerpc/powerpc/machdep.c Modified: head/sys/powerpc/powerpc/machdep.c ============================================================================== --- head/sys/powerpc/powerpc/machdep.c Thu Nov 8 20:31:12 2018 (r340261) +++ head/sys/powerpc/powerpc/machdep.c Thu Nov 8 20:48:44 2018 (r340262) @@ -530,6 +530,10 @@ DB_SHOW_COMMAND(spr, db_show_spr) saved_sprno = sprno = (intptr_t) addr; sprno = ((sprno & 0x3e0) >> 5) | ((sprno & 0x1f) << 5); p = (uint32_t *)(void *)&get_spr; +#if defined(_CALL_ELF) && _CALL_ELF == 2 + /* Account for ELFv2 function prologue. */ + p += 2; +#endif *p = (*p & ~0x001ff800) | (sprno << 11); __syncicache(get_spr, cacheline_size); spr = get_spr(sprno); From owner-svn-src-head@freebsd.org Thu Nov 8 21:53:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 77E4B1107BE3; Thu, 8 Nov 2018 21:53:10 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A0A06EE35; Thu, 8 Nov 2018 21:53:10 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 DF39F285D; Thu, 8 Nov 2018 21:53:09 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8Lr9Gw092724; Thu, 8 Nov 2018 21:53:09 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8Lr9mR092723; Thu, 8 Nov 2018 21:53:09 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201811082153.wA8Lr9mR092723@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost <kp@FreeBSD.org> Date: Thu, 8 Nov 2018 21:53:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340264 - head/sbin/pfctl X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/sbin/pfctl X-SVN-Commit-Revision: 340264 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0A0A06EE35 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.83), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 21:53:10 -0000 Author: kp Date: Thu Nov 8 21:53:09 2018 New Revision: 340264 URL: https://svnweb.freebsd.org/changeset/base/340264 Log: pfctl: Populate ifname in ifa_lookup() pfctl_adjust_skip_ifaces() relies on this name. MFC after: 2 weeks Modified: head/sbin/pfctl/pfctl_parser.c Modified: head/sbin/pfctl/pfctl_parser.c ============================================================================== --- head/sbin/pfctl/pfctl_parser.c Thu Nov 8 21:36:45 2018 (r340263) +++ head/sbin/pfctl/pfctl_parser.c Thu Nov 8 21:53:09 2018 (r340264) @@ -1403,6 +1403,7 @@ ifa_lookup(const char *ifa_name, int flags) set_ipmask(n, 128); } n->ifindex = p->ifindex; + n->ifname = strdup(p->ifname); n->next = NULL; n->tail = n; From owner-svn-src-head@freebsd.org Thu Nov 8 21:54:41 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4EFC61107D1A; Thu, 8 Nov 2018 21:54:41 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D621F6F09A; Thu, 8 Nov 2018 21:54:40 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 B72AB2866; Thu, 8 Nov 2018 21:54:40 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8Lseu3092827; Thu, 8 Nov 2018 21:54:40 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8LseEv092826; Thu, 8 Nov 2018 21:54:40 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201811082154.wA8LseEv092826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost <kp@FreeBSD.org> Date: Thu, 8 Nov 2018 21:54:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340265 - head/sys/netpfil/pf X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/sys/netpfil/pf X-SVN-Commit-Revision: 340265 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D621F6F09A X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.83), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 21:54:41 -0000 Author: kp Date: Thu Nov 8 21:54:40 2018 New Revision: 340265 URL: https://svnweb.freebsd.org/changeset/base/340265 Log: pf: Prevent tables referenced by rules in anchors from getting disabled. PR: 183198 Obtained from: OpenBSD MFC after: 2 weeks Modified: head/sys/netpfil/pf/pf_table.c Modified: head/sys/netpfil/pf/pf_table.c ============================================================================== --- head/sys/netpfil/pf/pf_table.c Thu Nov 8 21:53:09 2018 (r340264) +++ head/sys/netpfil/pf/pf_table.c Thu Nov 8 21:54:40 2018 (r340265) @@ -1754,6 +1754,7 @@ pfr_setflags_ktable(struct pfr_ktable *kt, int newf) PF_RULES_WASSERT(); if (!(newf & PFR_TFLAG_REFERENCED) && + !(newf & PFR_TFLAG_REFDANCHOR) && !(newf & PFR_TFLAG_PERSIST)) newf &= ~PFR_TFLAG_ACTIVE; if (!(newf & PFR_TFLAG_ACTIVE)) From owner-svn-src-head@freebsd.org Thu Nov 8 21:56:07 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7842A1107E76; Thu, 8 Nov 2018 21:56:07 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 03E9F6F354; Thu, 8 Nov 2018 21:56:07 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 D9ED9286B; Thu, 8 Nov 2018 21:56:06 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA8Lu6Je092969; Thu, 8 Nov 2018 21:56:06 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA8Lu65i092968; Thu, 8 Nov 2018 21:56:06 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201811082156.wA8Lu65i092968@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost <kp@FreeBSD.org> Date: Thu, 8 Nov 2018 21:56:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340266 - head/tests/sys/netpfil/pf X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/tests/sys/netpfil/pf X-SVN-Commit-Revision: 340266 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 03E9F6F354 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.83), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 21:56:07 -0000 Author: kp Date: Thu Nov 8 21:56:06 2018 New Revision: 340266 URL: https://svnweb.freebsd.org/changeset/base/340266 Log: pf tests: Test PR 183198 Create a table which is only used inside an anchor, ensure that the table exists. PR: 183198 MFC after: 2 weeks Added: head/tests/sys/netpfil/pf/anchor.sh (contents, props changed) Modified: head/tests/sys/netpfil/pf/Makefile Modified: head/tests/sys/netpfil/pf/Makefile ============================================================================== --- head/tests/sys/netpfil/pf/Makefile Thu Nov 8 21:54:40 2018 (r340265) +++ head/tests/sys/netpfil/pf/Makefile Thu Nov 8 21:56:06 2018 (r340266) @@ -5,7 +5,8 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf TESTS_SUBDIRS+= ioctl -ATF_TESTS_SH+= pass_block \ +ATF_TESTS_SH+= anchor \ + pass_block \ forward \ fragmentation \ set_tos \ Added: head/tests/sys/netpfil/pf/anchor.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/netpfil/pf/anchor.sh Thu Nov 8 21:56:06 2018 (r340266) @@ -0,0 +1,40 @@ +# $FreeBSD$ + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "pr183198" "cleanup" +pr183198_head() +{ + atf_set descr 'Test tables referenced by rules in anchors' + atf_set require.user root +} + +pr183198_body() +{ + pft_init + + epair=$(pft_mkepair) + pft_mkjail alcatraz ${epair}b + jexec alcatraz pfctl -e + + # Forward with pf enabled + pft_set_rules alcatraz \ + "table <test> { 10.0.0.1, 10.0.0.2, 10.0.0.3 }" \ + "block in" \ + "anchor \"epair\" on ${epair}b { \n\ + pass in from <test> \n\ + }" + + atf_check -s exit:0 -o ignore jexec alcatraz pfctl -sr -a '*' + atf_check -s exit:0 -o ignore jexec alcatraz pfctl -t test -T show +} + +pr183198_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "pr183198" +} From owner-svn-src-head@freebsd.org Thu Nov 8 22:35:53 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 72C9C1109658; Thu, 8 Nov 2018 22:35:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5E797145C; Thu, 8 Nov 2018 22:35:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-2.local (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id 500C210A87D; Thu, 8 Nov 2018 17:35:51 -0500 (EST) Subject: Re: svn commit: r340231 - head/sys/kern To: Konstantin Belousov <kostikbel@gmail.com> References: <201811071832.wA7IW3VI045865@repo.freebsd.org> <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> <20181107230832.GZ5335@kib.kiev.ua> <60a839f8-9830-7d6e-98a2-a7aa596e68e9@FreeBSD.org> <20181108201231.GA5335@kib.kiev.ua> Cc: Ed Schouten <ed@nuxi.nl>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: John Baldwin <jhb@FreeBSD.org> Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= xsDiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg80eSm9obiBCYWxk d2luIDxqb2huQGJhbGR3aW4uY3g+wmMEExECACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX gAUCRND5wwIZAQAKCRBy3lIGd+N/BNLXAJ9KIb6teuDL1W+FkCgvv+y8PxKTkACeIUfbn3sl cueBzqTcf09idwa8YTbOwU0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Ds gnr31AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh +GojXlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cM SOrHYUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOF QVHOEVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq 1tqzhltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZ TwtXsNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m 7Z164yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioI AjjHaIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbU KWwxQ4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjH uW/CSQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZN wwCfafMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <d900cf86-5c4f-02a3-275e-c2edf5fd1597@FreeBSD.org> Date: Thu, 8 Nov 2018 14:35:50 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181108201231.GA5335@kib.kiev.ua> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Thu, 08 Nov 2018 17:35:51 -0500 (EST) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-Rspamd-Queue-Id: D5E797145C X-Spamd-Result: default: False [-104.73 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-1.62)[ipnet: 2001:470::/32(-4.46), asn: 6939(-3.53), country: US(-0.09)]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 22:35:53 -0000 On 11/8/18 12:12 PM, Konstantin Belousov wrote: > On Thu, Nov 08, 2018 at 11:49:28AM -0800, John Baldwin wrote: >> On 11/7/18 3:08 PM, Konstantin Belousov wrote: >>> On Wed, Nov 07, 2018 at 01:35:57PM -0800, John Baldwin wrote: >>>> On 11/7/18 1:01 PM, Ed Schouten wrote: >>>>> Op wo 7 nov. 2018 om 19:32 schreef John Baldwin <jhb@freebsd.org>: >>>>>> Modified: head/sys/kern/imgact_elf.c >>>>>> ============================================================================== >>>>>> --- head/sys/kern/imgact_elf.c Wed Nov 7 18:29:54 2018 (r340230) >>>>>> +++ head/sys/kern/imgact_elf.c Wed Nov 7 18:32:02 2018 (r340231) >>>>>> @@ -120,7 +120,8 @@ SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), >>>>>> >>>>>> int __elfN(nxstack) = >>>>>> #if defined(__amd64__) || defined(__powerpc64__) /* both 64 and 32 bit */ || \ >>>>>> - (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) >>>>>> + (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__) || \ >>>>>> + defined(__riscv) >>>>>> 1; >>>>>> #else >>>>>> 0; >>>>> >>>>> Are we getting to the point that it might make sense to invert this >>>>> logic, i.e., just list the architectures that require executable >>>>> stacks? >>>> >>>> It's not clear. The remaining set is i386 (should be able to use nxstack >>>> when using PAE and PG_NX is supported), MIPS (no X permission in PTEs), >>>> 32-bit powerpc (no X permissions in PTEs AFAICT), and sparc64 (no X >>>> permissions in PTEs AFAICT). For architectures without X ptes, removing >>>> VM_PROT_EXECUTE from the stack permissions is a no-op and would be >>>> harmless, so we could perhaps just default this to always on at this >>>> point? >>> AFAIR sparc64 ABI defines its stack as nx always (and PTEs do allow to >>> control exec permission). >> >> Hmm, I couldn't find any uses of VM_PROT_EXECUTE in pmap.c that seemed to >> affect permissions. There is a software TTE bit that is used to know which >> address ranges require icache flushing, but it seems to only be used for >> that. > AFAIR TLB faults are software-assisted and there are different faults > for instruction and data TLB fill. It seems that exception.S immu_miss > handler checks the TD_EXEC software bit before loading TTE into > instructions TLB. > > Later versions of sparcv9 arch specification define optional hw > execute bit in TTE. Hummm, ok. >> Regardless, for the purposes of this sysctl, is there any reason we can't >> just define it to 1 always now? It is only honored if the architecture >> is using a shared page to hold the signal trampoline and only has an effect >> if the pmap honors VM_PROT_EXECUTE. That would at least fix i386 with >> PAE to DTRT I think. > > i386 PAE already handles it, see i386/initcpu.c:754. I see. > Unconditionally setting the vars to 1 would break any arch that > 1. does not allow to use shared page > 2. honors VM_PROT_EXEC in pmap > 3. not using local hacks for signal trampolines, like sparc64 does. > We might not have any such architecture now (ia64 certainly was such case). 1. is not quite true. We require both nxstack != 0 and sv_shared_obj != NULL before we honor PT_GNU_STACK. So you'd have to have an arch that was using the shared page but insisted on not using the copy of the sigcode stored in the shared page and then 2) honors VM_PROT_EXECUTE. This seems unlikely to be something we'd do in the future. -- John Baldwin                                                                              From owner-svn-src-head@freebsd.org Thu Nov 8 23:24:32 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3CD5F110B537; Thu, 8 Nov 2018 23:24:32 +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 B7D2973905; Thu, 8 Nov 2018 23:24:30 +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 wA8NOJRc033563 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 9 Nov 2018 01:24:23 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua wA8NOJRc033563 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id wA8NOJGQ033562; Fri, 9 Nov 2018 01:24:19 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 9 Nov 2018 01:24:19 +0200 From: Konstantin Belousov <kostikbel@gmail.com> To: John Baldwin <jhb@FreeBSD.org> Cc: Ed Schouten <ed@nuxi.nl>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340231 - head/sys/kern Message-ID: <20181108232419.GC2378@kib.kiev.ua> References: <201811071832.wA7IW3VI045865@repo.freebsd.org> <CABh_MKm_g+Z6m2LQWjEDcQZdki6JeVLJ+Z-q3Y=EaxaJm7DHjQ@mail.gmail.com> <081a4dfe-c95e-f8f1-ffc6-04ed5173999d@FreeBSD.org> <20181107230832.GZ5335@kib.kiev.ua> <60a839f8-9830-7d6e-98a2-a7aa596e68e9@FreeBSD.org> <20181108201231.GA5335@kib.kiev.ua> <d900cf86-5c4f-02a3-275e-c2edf5fd1597@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <d900cf86-5c4f-02a3-275e-c2edf5fd1597@FreeBSD.org> User-Agent: Mutt/1.10.1 (2018-07-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-Rspamd-Queue-Id: B7D2973905 X-Spamd-Result: default: False [-4.98 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[alt3.gmail-smtp-in.l.google.com,alt4.gmail-smtp-in.l.google.com,gmail-smtp-in.l.google.com,alt2.gmail-smtp-in.l.google.com,alt1.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; IP_SCORE(-1.98)[ip: (-1.83), ipnet: 2001:470::/32(-4.45), asn: 6939(-3.52), country: US(-0.09)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; RCVD_TLS_LAST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 08 Nov 2018 23:24:32 -0000 On Thu, Nov 08, 2018 at 02:35:50PM -0800, John Baldwin wrote: > On 11/8/18 12:12 PM, Konstantin Belousov wrote: > >> Regardless, for the purposes of this sysctl, is there any reason we can't > >> just define it to 1 always now? It is only honored if the architecture > >> is using a shared page to hold the signal trampoline and only has an effect > >> if the pmap honors VM_PROT_EXECUTE. That would at least fix i386 with > >> PAE to DTRT I think. > > > > i386 PAE already handles it, see i386/initcpu.c:754. > > I see. > > > Unconditionally setting the vars to 1 would break any arch that > > 1. does not allow to use shared page > > 2. honors VM_PROT_EXEC in pmap > > 3. not using local hacks for signal trampolines, like sparc64 does. > > We might not have any such architecture now (ia64 certainly was such case). > > 1. is not quite true. We require both nxstack != 0 and sv_shared_obj != NULL > before we honor PT_GNU_STACK. So you'd have to have an arch that was using > the shared page but insisted on not using the copy of the sigcode stored in > the shared page and then 2) honors VM_PROT_EXECUTE. This seems unlikely to > be something we'd do in the future. Still, the sysctl currently resembles the actual behaviour of the system. If it is zero by default, it makes no sense to set it to one, because system does not support nx stacks anyway. Consider it not only as the direction to operate, but also as the information to user. From owner-svn-src-head@freebsd.org Fri Nov 9 00:21:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 3F702110D873; Fri, 9 Nov 2018 00:21:59 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C32D375CF3; Fri, 9 Nov 2018 00:21:58 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A43724616; Fri, 9 Nov 2018 00:21:58 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA90LwtL070607; Fri, 9 Nov 2018 00:21:58 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA90Lwg7070606; Fri, 9 Nov 2018 00:21:58 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811090021.wA90Lwg7070606@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 00:21:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340272 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340272 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C32D375CF3 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.84), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 00:21:59 -0000 Author: brooks Date: Fri Nov 9 00:21:58 2018 New Revision: 340272 URL: https://svnweb.freebsd.org/changeset/base/340272 Log: Make __sysctl follow the freebsd32_foo convention. Sponsored by: DARPA, AFRL Modified: head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/syscalls.master Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Fri Nov 9 00:01:53 2018 (r340271) +++ head/sys/compat/freebsd32/freebsd32_misc.c Fri Nov 9 00:21:58 2018 (r340272) @@ -2260,7 +2260,7 @@ freebsd11_freebsd32_fhstat(struct thread *td, #endif int -freebsd32_sysctl(struct thread *td, struct freebsd32_sysctl_args *uap) +freebsd32___sysctl(struct thread *td, struct freebsd32___sysctl_args *uap) { int error, name[CTL_MAXNAME]; size_t j, oldlen; Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Fri Nov 9 00:01:53 2018 (r340271) +++ head/sys/compat/freebsd32/syscalls.master Fri Nov 9 00:21:58 2018 (r340272) @@ -386,7 +386,7 @@ uint32_t length2); } 201 AUE_FTRUNCATE COMPAT6 { int freebsd32_ftruncate(int fd, int pad, \ uint32_t length1, uint32_t length2); } -202 AUE_SYSCTL STD { int freebsd32_sysctl(int *name, \ +202 AUE_SYSCTL STD { int freebsd32___sysctl(int *name, \ u_int namelen, void *old, \ uint32_t *oldlenp, void *new, \ uint32_t newlen); } From owner-svn-src-head@freebsd.org Fri Nov 9 00:22:48 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E710B110D8F3; Fri, 9 Nov 2018 00:22:47 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6CD0075EBC; Fri, 9 Nov 2018 00:22:47 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4DBD2464D; Fri, 9 Nov 2018 00:22:47 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA90MlQo070707; Fri, 9 Nov 2018 00:22:47 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA90MkJ4070703; Fri, 9 Nov 2018 00:22:46 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811090022.wA90MkJ4070703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 00:22:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340273 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340273 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6CD0075EBC X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.84), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 00:22:48 -0000 Author: brooks Date: Fri Nov 9 00:22:45 2018 New Revision: 340273 URL: https://svnweb.freebsd.org/changeset/base/340273 Log: Regen after 340272: Make __sysctl follow the freebsd32_foo convention Sponsored by: DARPA, AFRL Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 00:21:58 2018 (r340272) +++ head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 00:22:45 2018 (r340273) @@ -162,7 +162,7 @@ struct freebsd32_shmsys_args { char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)]; char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)]; }; -struct freebsd32_sysctl_args { +struct freebsd32___sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)]; @@ -736,7 +736,7 @@ int freebsd32_sysarch(struct thread *, struct freebsd3 int freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *); int freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *); int freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *); -int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); +int freebsd32___sysctl(struct thread *, struct freebsd32___sysctl_args *); int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *); int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *); int freebsd32_msgrcv(struct thread *, struct freebsd32_msgrcv_args *); @@ -1282,7 +1282,7 @@ int freebsd11_freebsd32_mknodat(struct thread *, struc #define FREEBSD32_SYS_AUE_freebsd6_freebsd32_lseek AUE_LSEEK #define FREEBSD32_SYS_AUE_freebsd6_freebsd32_truncate AUE_TRUNCATE #define FREEBSD32_SYS_AUE_freebsd6_freebsd32_ftruncate AUE_FTRUNCATE -#define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL +#define FREEBSD32_SYS_AUE_freebsd32___sysctl AUE_SYSCTL #define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES #define FREEBSD32_SYS_AUE_freebsd7_freebsd32_semctl AUE_SEMCTL #define FREEBSD32_SYS_AUE_freebsd7_freebsd32_msgctl AUE_MSGCTL Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 00:21:58 2018 (r340272) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 00:22:45 2018 (r340273) @@ -188,7 +188,7 @@ /* 199 is freebsd6 freebsd32_lseek */ /* 200 is freebsd6 freebsd32_truncate */ /* 201 is freebsd6 freebsd32_ftruncate */ -#define FREEBSD32_SYS_freebsd32_sysctl 202 +#define FREEBSD32_SYS_freebsd32___sysctl 202 #define FREEBSD32_SYS_mlock 203 #define FREEBSD32_SYS_munlock 204 #define FREEBSD32_SYS_undelete 205 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 00:21:58 2018 (r340272) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 00:22:45 2018 (r340273) @@ -211,7 +211,7 @@ const char *freebsd32_syscallnames[] = { "compat6.freebsd32_lseek", /* 199 = freebsd6 freebsd32_lseek */ "compat6.freebsd32_truncate", /* 200 = freebsd6 freebsd32_truncate */ "compat6.freebsd32_ftruncate", /* 201 = freebsd6 freebsd32_ftruncate */ - "freebsd32_sysctl", /* 202 = freebsd32_sysctl */ + "freebsd32___sysctl", /* 202 = freebsd32___sysctl */ "mlock", /* 203 = mlock */ "munlock", /* 204 = munlock */ "undelete", /* 205 = undelete */ Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 00:21:58 2018 (r340272) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 00:22:45 2018 (r340273) @@ -258,7 +258,7 @@ struct sysent freebsd32_sysent[] = { { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 199 = freebsd6 freebsd32_lseek */ { compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 200 = freebsd6 freebsd32_truncate */ { compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 201 = freebsd6 freebsd32_ftruncate */ - { AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 202 = freebsd32_sysctl */ + { AS(freebsd32___sysctl_args), (sy_call_t *)freebsd32___sysctl, AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 202 = freebsd32___sysctl */ { AS(mlock_args), (sy_call_t *)sys_mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 203 = mlock */ { AS(munlock_args), (sy_call_t *)sys_munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 204 = munlock */ { AS(undelete_args), (sy_call_t *)sys_undelete, AUE_UNDELETE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 205 = undelete */ Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 00:21:58 2018 (r340272) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 00:22:45 2018 (r340273) @@ -935,9 +935,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 0; break; } - /* freebsd32_sysctl */ + /* freebsd32___sysctl */ case 202: { - struct freebsd32_sysctl_args *p = params; + struct freebsd32___sysctl_args *p = params; uarg[0] = (intptr_t) p->name; /* int * */ uarg[1] = p->namelen; /* u_int */ uarg[2] = (intptr_t) p->old; /* void * */ @@ -4755,7 +4755,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d /* nosys */ case 198: break; - /* freebsd32_sysctl */ + /* freebsd32___sysctl */ case 202: switch(ndx) { case 0: @@ -9305,7 +9305,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* nosys */ case 198: - /* freebsd32_sysctl */ + /* freebsd32___sysctl */ case 202: if (ndx == 0 || ndx == 1) p = "int"; From owner-svn-src-head@freebsd.org Fri Nov 9 00:46:12 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 2D586110E1DE; Fri, 9 Nov 2018 00:46:12 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 87476769AF; Fri, 9 Nov 2018 00:46:11 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6396849AE; Fri, 9 Nov 2018 00:46:11 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA90kB80081238; Fri, 9 Nov 2018 00:46:11 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA90kBSD081236; Fri, 9 Nov 2018 00:46:11 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811090046.wA90kBSD081236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 00:46:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340274 - in head/sys: compat/freebsd32 kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 340274 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 87476769AF X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.84), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 00:46:12 -0000 Author: brooks Date: Fri Nov 9 00:46:10 2018 New Revision: 340274 URL: https://svnweb.freebsd.org/changeset/base/340274 Log: Make freebsd32_umtx_op follow the freebsd32_foo convention. Sponsored by: DARPA, AFRL Modified: head/sys/compat/freebsd32/syscalls.master head/sys/kern/kern_umtx.c Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Fri Nov 9 00:22:45 2018 (r340273) +++ head/sys/compat/freebsd32/syscalls.master Fri Nov 9 00:46:10 2018 (r340274) @@ -821,7 +821,7 @@ struct auditinfo_addr *auditinfo_addr, \ u_int length); } 453 AUE_AUDITCTL NOPROTO { int auditctl(const char *path); } -454 AUE_NULL STD { int freebsd32_umtx_op(void *obj, int op,\ +454 AUE_NULL STD { int freebsd32__umtx_op(void *obj, int op,\ u_long val, void *uaddr, \ void *uaddr2); } 455 AUE_THR_NEW STD { int freebsd32_thr_new( \ Modified: head/sys/kern/kern_umtx.c ============================================================================== --- head/sys/kern/kern_umtx.c Fri Nov 9 00:22:45 2018 (r340273) +++ head/sys/kern/kern_umtx.c Fri Nov 9 00:46:10 2018 (r340274) @@ -4351,7 +4351,7 @@ static const _umtx_op_func op_table_compat32[] = { }; int -freebsd32_umtx_op(struct thread *td, struct freebsd32_umtx_op_args *uap) +freebsd32__umtx_op(struct thread *td, struct freebsd32__umtx_op_args *uap) { if ((unsigned)uap->op < nitems(op_table_compat32)) { From owner-svn-src-head@freebsd.org Fri Nov 9 00:46:52 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7DBBA110E238; Fri, 9 Nov 2018 00:46:52 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0D0C576B03; Fri, 9 Nov 2018 00:46:52 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E286149B0; Fri, 9 Nov 2018 00:46:51 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA90kpqQ081308; Fri, 9 Nov 2018 00:46:51 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA90koYN081303; Fri, 9 Nov 2018 00:46:50 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811090046.wA90koYN081303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 00:46:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340275 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340275 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0D0C576B03 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.84), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 00:46:52 -0000 Author: brooks Date: Fri Nov 9 00:46:50 2018 New Revision: 340275 URL: https://svnweb.freebsd.org/changeset/base/340275 Log: Regen after r340274: Make freebsd32_utmx_op follow the freebsd32_foo convention. Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 00:46:10 2018 (r340274) +++ head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 00:46:50 2018 (r340275) @@ -350,7 +350,7 @@ struct freebsd32_ksem_timedwait_args { struct freebsd32_thr_suspend_args { char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; -struct freebsd32_umtx_op_args { +struct freebsd32__umtx_op_args { char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)]; char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; char val_l_[PADL_(u_long)]; u_long val; char val_r_[PADR_(u_long)]; @@ -776,7 +776,7 @@ int freebsd32_setcontext(struct thread *, struct freeb int freebsd32_swapcontext(struct thread *, struct freebsd32_swapcontext_args *); int freebsd32_ksem_timedwait(struct thread *, struct freebsd32_ksem_timedwait_args *); int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); -int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); +int freebsd32__umtx_op(struct thread *, struct freebsd32__umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); int freebsd32_sigqueue(struct thread *, struct freebsd32_sigqueue_args *); int freebsd32_kmq_open(struct thread *, struct freebsd32_kmq_open_args *); @@ -1335,7 +1335,7 @@ int freebsd11_freebsd32_mknodat(struct thread *, struc #define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_ksem_timedwait AUE_SEMWAIT #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL -#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32__umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_THR_NEW #define FREEBSD32_SYS_AUE_freebsd32_sigqueue AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kmq_open AUE_MQ_OPEN Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 00:46:10 2018 (r340274) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 00:46:50 2018 (r340275) @@ -374,7 +374,7 @@ #define FREEBSD32_SYS_getaudit_addr 451 #define FREEBSD32_SYS_setaudit_addr 452 #define FREEBSD32_SYS_auditctl 453 -#define FREEBSD32_SYS_freebsd32_umtx_op 454 +#define FREEBSD32_SYS_freebsd32__umtx_op 454 #define FREEBSD32_SYS_freebsd32_thr_new 455 #define FREEBSD32_SYS_freebsd32_sigqueue 456 #define FREEBSD32_SYS_freebsd32_kmq_open 457 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 00:46:10 2018 (r340274) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 00:46:50 2018 (r340275) @@ -463,7 +463,7 @@ const char *freebsd32_syscallnames[] = { "getaudit_addr", /* 451 = getaudit_addr */ "setaudit_addr", /* 452 = setaudit_addr */ "auditctl", /* 453 = auditctl */ - "freebsd32_umtx_op", /* 454 = freebsd32_umtx_op */ + "freebsd32__umtx_op", /* 454 = freebsd32__umtx_op */ "freebsd32_thr_new", /* 455 = freebsd32_thr_new */ "freebsd32_sigqueue", /* 456 = freebsd32_sigqueue */ "freebsd32_kmq_open", /* 457 = freebsd32_kmq_open */ Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 00:46:10 2018 (r340274) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 00:46:50 2018 (r340275) @@ -510,7 +510,7 @@ struct sysent freebsd32_sysent[] = { { AS(getaudit_addr_args), (sy_call_t *)sys_getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 451 = getaudit_addr */ { AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 452 = setaudit_addr */ { AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 453 = auditctl */ - { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 454 = freebsd32_umtx_op */ + { AS(freebsd32__umtx_op_args), (sy_call_t *)freebsd32__umtx_op, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 454 = freebsd32__umtx_op */ { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 455 = freebsd32_thr_new */ { AS(freebsd32_sigqueue_args), (sy_call_t *)freebsd32_sigqueue, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 456 = freebsd32_sigqueue */ { AS(freebsd32_kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 457 = freebsd32_kmq_open */ Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 00:46:10 2018 (r340274) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 00:46:50 2018 (r340275) @@ -2182,9 +2182,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 1; break; } - /* freebsd32_umtx_op */ + /* freebsd32__umtx_op */ case 454: { - struct freebsd32_umtx_op_args *p = params; + struct freebsd32__umtx_op_args *p = params; uarg[0] = (intptr_t) p->obj; /* void * */ iarg[1] = p->op; /* int */ uarg[2] = p->val; /* u_long */ @@ -6765,7 +6765,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* freebsd32_umtx_op */ + /* freebsd32__umtx_op */ case 454: switch(ndx) { case 0: @@ -10040,7 +10040,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char * if (ndx == 0 || ndx == 1) p = "int"; break; - /* freebsd32_umtx_op */ + /* freebsd32__umtx_op */ case 454: if (ndx == 0 || ndx == 1) p = "int"; From owner-svn-src-head@freebsd.org Fri Nov 9 03:32:58 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D494A1123207; Fri, 9 Nov 2018 03:32:57 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5AE7C7BE88; Fri, 9 Nov 2018 03:32:57 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 38B876604; Fri, 9 Nov 2018 03:32:57 +0000 (UTC) (envelope-from yuripv@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA93WvHJ068439; Fri, 9 Nov 2018 03:32:57 GMT (envelope-from yuripv@FreeBSD.org) Received: (from yuripv@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA93WsYM068423; Fri, 9 Nov 2018 03:32:54 GMT (envelope-from yuripv@FreeBSD.org) Message-Id: <201811090332.wA93WsYM068423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuripv set sender to yuripv@FreeBSD.org using -f From: Yuri Pankov <yuripv@FreeBSD.org> Date: Fri, 9 Nov 2018 03:32:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340276 - in head: contrib/netbsd-tests/lib/libc/locale lib/libc/locale X-SVN-Group: head X-SVN-Commit-Author: yuripv X-SVN-Commit-Paths: in head: contrib/netbsd-tests/lib/libc/locale lib/libc/locale X-SVN-Commit-Revision: 340276 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5AE7C7BE88 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.75)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.84), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 03:32:58 -0000 Author: yuripv Date: Fri Nov 9 03:32:53 2018 New Revision: 340276 URL: https://svnweb.freebsd.org/changeset/base/340276 Log: Reset persistent mbstates when rune locale encoding changes. This was shown to be a problem by side effect of now-enabled test case, which was going through C, en_US.UTF-8, ja_JP.SJIS, and ja_JP.eucJP, and failing eventually as data in mbrtowc's mbstate, that was perfectly correct for en_US.UTF-8 was treated as incorrect for ja_JP.SJIS, failing the entire test case. This makes the persistent mbstates to be per ctype-component, and not per-locale so we could easily reset the mbstates when only LC_CTYPE is changed. Reviewed by: bapt, pfg Approved by: kib (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17796 Modified: head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c head/lib/libc/locale/cXXrtomb_iconv.h head/lib/libc/locale/mblen.c head/lib/libc/locale/mblocal.h head/lib/libc/locale/mbrlen.c head/lib/libc/locale/mbrtocXX_iconv.h head/lib/libc/locale/mbrtowc.c head/lib/libc/locale/mbsnrtowcs.c head/lib/libc/locale/mbsrtowcs.c head/lib/libc/locale/mbtowc.c head/lib/libc/locale/setrunelocale.c head/lib/libc/locale/wcrtomb.c head/lib/libc/locale/wcsnrtombs.c head/lib/libc/locale/wcsrtombs.c head/lib/libc/locale/wctomb.c head/lib/libc/locale/xlocale_private.h Modified: head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c Fri Nov 9 03:32:53 2018 (r340276) @@ -243,9 +243,6 @@ ATF_TC_BODY(mbrtowc_internal, tc) { struct test *t; -#ifdef __FreeBSD__ - atf_tc_expect_fail("ja_* locale fails"); -#endif for (t = &tests[0]; t->data != NULL; ++t) h_ctype2(t, false); } Modified: head/lib/libc/locale/cXXrtomb_iconv.h ============================================================================== --- head/lib/libc/locale/cXXrtomb_iconv.h Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/cXXrtomb_iconv.h Fri Nov 9 03:32:53 2018 (r340276) @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include "../iconv/citrus_hash.h" #include "../iconv/citrus_module.h" #include "../iconv/citrus_iconv.h" -#include "xlocale_private.h" +#include "mblocal.h" typedef struct { bool initialized; @@ -65,7 +65,7 @@ cXXrtomb_l(char * __restrict s, charXX_t c, mbstate_t FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->cXXrtomb; + ps = &(XLOCALE_CTYPE(locale)->cXXrtomb); cs = (_ConversionState *)ps; handle = &cs->iconv; Modified: head/lib/libc/locale/mblen.c ============================================================================== --- head/lib/libc/locale/mblen.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mblen.c Fri Nov 9 03:32:53 2018 (r340276) @@ -47,10 +47,11 @@ mblen_l(const char *s, size_t n, locale_t locale) if (s == NULL) { /* No support for state dependent encodings. */ - locale->mblen = initial; + XLOCALE_CTYPE(locale)->mblen = initial; return (0); } - rval = XLOCALE_CTYPE(locale)->__mbrtowc(NULL, s, n, &locale->mblen); + rval = XLOCALE_CTYPE(locale)->__mbrtowc(NULL, s, n, + &(XLOCALE_CTYPE(locale)->mblen)); if (rval == (size_t)-1 || rval == (size_t)-2) return (-1); return ((int)rval); Modified: head/lib/libc/locale/mblocal.h ============================================================================== --- head/lib/libc/locale/mblocal.h Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mblocal.h Fri Nov 9 03:32:53 2018 (r340276) @@ -60,6 +60,34 @@ struct xlocale_ctype { size_t, size_t, mbstate_t * __restrict); int __mb_cur_max; int __mb_sb_limit; + /** Persistent state used by mblen() calls. */ + __mbstate_t mblen; + /** Persistent state used by mbrlen() calls. */ + __mbstate_t mbrlen; + /** Persistent state used by mbrtoc16() calls. */ + __mbstate_t mbrtoc16; + /** Persistent state used by mbrtoc32() calls. */ + __mbstate_t mbrtoc32; + /** Persistent state used by mbrtowc() calls. */ + __mbstate_t mbrtowc; + /** Persistent state used by mbsnrtowcs() calls. */ + __mbstate_t mbsnrtowcs; + /** Persistent state used by mbsrtowcs() calls. */ + __mbstate_t mbsrtowcs; + /** Persistent state used by mbtowc() calls. */ + __mbstate_t mbtowc; + /** Persistent state used by c16rtomb() calls. */ + __mbstate_t c16rtomb; + /** Persistent state used by c32rtomb() calls. */ + __mbstate_t c32rtomb; + /** Persistent state used by wcrtomb() calls. */ + __mbstate_t wcrtomb; + /** Persistent state used by wcsnrtombs() calls. */ + __mbstate_t wcsnrtombs; + /** Persistent state used by wcsrtombs() calls. */ + __mbstate_t wcsrtombs; + /** Persistent state used by wctomb() calls. */ + __mbstate_t wctomb; }; #define XLOCALE_CTYPE(x) ((struct xlocale_ctype*)(x)->components[XLC_CTYPE]) extern struct xlocale_ctype __xlocale_global_ctype; Modified: head/lib/libc/locale/mbrlen.c ============================================================================== --- head/lib/libc/locale/mbrlen.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mbrlen.c Fri Nov 9 03:32:53 2018 (r340276) @@ -42,7 +42,7 @@ mbrlen_l(const char * __restrict s, size_t n, mbstate_ { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->mbrlen; + ps = &(XLOCALE_CTYPE(locale)->mbrlen); return (XLOCALE_CTYPE(locale)->__mbrtowc(NULL, s, n, ps)); } Modified: head/lib/libc/locale/mbrtocXX_iconv.h ============================================================================== --- head/lib/libc/locale/mbrtocXX_iconv.h Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mbrtocXX_iconv.h Fri Nov 9 03:32:53 2018 (r340276) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include "../iconv/citrus_hash.h" #include "../iconv/citrus_module.h" #include "../iconv/citrus_iconv.h" -#include "xlocale_private.h" +#include "mblocal.h" typedef struct { bool initialized; @@ -68,7 +68,7 @@ mbrtocXX_l(charXX_t * __restrict pc, const char * __re FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->mbrtocXX; + ps = &(XLOCALE_CTYPE(locale)->mbrtocXX); cs = (_ConversionState *)ps; handle = &cs->iconv; Modified: head/lib/libc/locale/mbrtowc.c ============================================================================== --- head/lib/libc/locale/mbrtowc.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mbrtowc.c Fri Nov 9 03:32:53 2018 (r340276) @@ -43,7 +43,7 @@ mbrtowc_l(wchar_t * __restrict pwc, const char * __res { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->mbrtowc; + ps = &(XLOCALE_CTYPE(locale)->mbrtowc); return (XLOCALE_CTYPE(locale)->__mbrtowc(pwc, s, n, ps)); } Modified: head/lib/libc/locale/mbsnrtowcs.c ============================================================================== --- head/lib/libc/locale/mbsnrtowcs.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mbsnrtowcs.c Fri Nov 9 03:32:53 2018 (r340276) @@ -48,7 +48,7 @@ mbsnrtowcs_l(wchar_t * __restrict dst, const char ** _ { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->mbsnrtowcs; + ps = &(XLOCALE_CTYPE(locale)->mbsnrtowcs); return (XLOCALE_CTYPE(locale)->__mbsnrtowcs(dst, src, nms, len, ps)); } size_t Modified: head/lib/libc/locale/mbsrtowcs.c ============================================================================== --- head/lib/libc/locale/mbsrtowcs.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mbsrtowcs.c Fri Nov 9 03:32:53 2018 (r340276) @@ -46,7 +46,7 @@ mbsrtowcs_l(wchar_t * __restrict dst, const char ** __ { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->mbsrtowcs; + ps = &(XLOCALE_CTYPE(locale)->mbsrtowcs); return (XLOCALE_CTYPE(locale)->__mbsnrtowcs(dst, src, SIZE_T_MAX, len, ps)); } size_t Modified: head/lib/libc/locale/mbtowc.c ============================================================================== --- head/lib/libc/locale/mbtowc.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/mbtowc.c Fri Nov 9 03:32:53 2018 (r340276) @@ -48,10 +48,11 @@ mbtowc_l(wchar_t * __restrict pwc, const char * __rest if (s == NULL) { /* No support for state dependent encodings. */ - locale->mbtowc = initial; + XLOCALE_CTYPE(locale)->mbtowc = initial; return (0); } - rval = XLOCALE_CTYPE(locale)->__mbrtowc(pwc, s, n, &locale->mbtowc); + rval = XLOCALE_CTYPE(locale)->__mbrtowc(pwc, s, n, + &(XLOCALE_CTYPE(locale)->mbtowc)); switch (rval) { case (size_t)-2: errno = EILSEQ; Modified: head/lib/libc/locale/setrunelocale.c ============================================================================== --- head/lib/libc/locale/setrunelocale.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/setrunelocale.c Fri Nov 9 03:32:53 2018 (r340276) @@ -160,6 +160,21 @@ __setrunelocale(struct xlocale_ctype *l, const char *e if (ret == 0) { /* Free the old runes if it exists. */ free_runes(saved.runes); + /* Reset the mbstates */ + memset(&l->c16rtomb, 0, sizeof(l->c16rtomb)); + memset(&l->c32rtomb, 0, sizeof(l->c32rtomb)); + memset(&l->mblen, 0, sizeof(l->mblen)); + memset(&l->mbrlen, 0, sizeof(l->mbrlen)); + memset(&l->mbrtoc16, 0, sizeof(l->mbrtoc16)); + memset(&l->mbrtoc32, 0, sizeof(l->mbrtoc32)); + memset(&l->mbrtowc, 0, sizeof(l->mbrtowc)); + memset(&l->mbsnrtowcs, 0, sizeof(l->mbsnrtowcs)); + memset(&l->mbsrtowcs, 0, sizeof(l->mbsrtowcs)); + memset(&l->mbtowc, 0, sizeof(l->mbtowc)); + memset(&l->wcrtomb, 0, sizeof(l->wcrtomb)); + memset(&l->wcsnrtombs, 0, sizeof(l->wcsnrtombs)); + memset(&l->wcsrtombs, 0, sizeof(l->wcsrtombs)); + memset(&l->wctomb, 0, sizeof(l->wctomb)); } else { /* Restore the saved version if this failed. */ memcpy(l, &saved, sizeof(struct xlocale_ctype)); Modified: head/lib/libc/locale/wcrtomb.c ============================================================================== --- head/lib/libc/locale/wcrtomb.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/wcrtomb.c Fri Nov 9 03:32:53 2018 (r340276) @@ -43,7 +43,7 @@ wcrtomb_l(char * __restrict s, wchar_t wc, mbstate_t * { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->wcrtomb; + ps = &(XLOCALE_CTYPE(locale)->wcrtomb); return (XLOCALE_CTYPE(locale)->__wcrtomb(s, wc, ps)); } Modified: head/lib/libc/locale/wcsnrtombs.c ============================================================================== --- head/lib/libc/locale/wcsnrtombs.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/wcsnrtombs.c Fri Nov 9 03:32:53 2018 (r340276) @@ -48,7 +48,7 @@ wcsnrtombs_l(char * __restrict dst, const wchar_t ** _ { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->wcsnrtombs; + ps = &(XLOCALE_CTYPE(locale)->wcsnrtombs); return (XLOCALE_CTYPE(locale)->__wcsnrtombs(dst, src, nwc, len, ps)); } size_t Modified: head/lib/libc/locale/wcsrtombs.c ============================================================================== --- head/lib/libc/locale/wcsrtombs.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/wcsrtombs.c Fri Nov 9 03:32:53 2018 (r340276) @@ -46,7 +46,7 @@ wcsrtombs_l(char * __restrict dst, const wchar_t ** __ { FIX_LOCALE(locale); if (ps == NULL) - ps = &locale->wcsrtombs; + ps = &(XLOCALE_CTYPE(locale)->wcsrtombs); return (XLOCALE_CTYPE(locale)->__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps)); } Modified: head/lib/libc/locale/wctomb.c ============================================================================== --- head/lib/libc/locale/wctomb.c Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/wctomb.c Fri Nov 9 03:32:53 2018 (r340276) @@ -47,10 +47,11 @@ wctomb_l(char *s, wchar_t wchar, locale_t locale) if (s == NULL) { /* No support for state dependent encodings. */ - locale->wctomb = initial; + XLOCALE_CTYPE(locale)->wctomb = initial; return (0); } - if ((rval = XLOCALE_CTYPE(locale)->__wcrtomb(s, wchar, &locale->wctomb)) == (size_t)-1) + if ((rval = XLOCALE_CTYPE(locale)->__wcrtomb(s, wchar, + &(XLOCALE_CTYPE(locale)->wctomb))) == (size_t)-1) return (-1); return ((int)rval); } Modified: head/lib/libc/locale/xlocale_private.h ============================================================================== --- head/lib/libc/locale/xlocale_private.h Fri Nov 9 00:46:50 2018 (r340275) +++ head/lib/libc/locale/xlocale_private.h Fri Nov 9 03:32:53 2018 (r340276) @@ -128,34 +128,6 @@ struct _xlocale { int using_messages_locale; /** The structure to be returned from localeconv_l() for this locale. */ struct lconv lconv; - /** Persistent state used by mblen() calls. */ - __mbstate_t mblen; - /** Persistent state used by mbrlen() calls. */ - __mbstate_t mbrlen; - /** Persistent state used by mbrtoc16() calls. */ - __mbstate_t mbrtoc16; - /** Persistent state used by mbrtoc32() calls. */ - __mbstate_t mbrtoc32; - /** Persistent state used by mbrtowc() calls. */ - __mbstate_t mbrtowc; - /** Persistent state used by mbsnrtowcs() calls. */ - __mbstate_t mbsnrtowcs; - /** Persistent state used by mbsrtowcs() calls. */ - __mbstate_t mbsrtowcs; - /** Persistent state used by mbtowc() calls. */ - __mbstate_t mbtowc; - /** Persistent state used by c16rtomb() calls. */ - __mbstate_t c16rtomb; - /** Persistent state used by c32rtomb() calls. */ - __mbstate_t c32rtomb; - /** Persistent state used by wcrtomb() calls. */ - __mbstate_t wcrtomb; - /** Persistent state used by wcsnrtombs() calls. */ - __mbstate_t wcsnrtombs; - /** Persistent state used by wcsrtombs() calls. */ - __mbstate_t wcsrtombs; - /** Persistent state used by wctomb() calls. */ - __mbstate_t wctomb; /** Buffer used by nl_langinfo_l() */ char *csym; }; From owner-svn-src-head@freebsd.org Fri Nov 9 08:43:42 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5FDEC1129FEE; Fri, 9 Nov 2018 08:43:42 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D283285213; Fri, 9 Nov 2018 08:43:41 +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 B0E0E1190C; Fri, 9 Nov 2018 08:43:41 +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 wA98hflD026232; Fri, 9 Nov 2018 08:43:41 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA98he3j026223; Fri, 9 Nov 2018 08:43:40 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <201811090843.wA98he3j026223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione <vmaffione@FreeBSD.org> Date: Fri, 9 Nov 2018 08:43:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340279 - in head: share/man/man4 tools/tools/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: in head: share/man/man4 tools/tools/netmap X-SVN-Commit-Revision: 340279 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D283285213 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.92), asn: 11403(-3.85), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 08:43:42 -0000 Author: vmaffione Date: Fri Nov 9 08:43:40 2018 New Revision: 340279 URL: https://svnweb.freebsd.org/changeset/base/340279 Log: netmap: add load balancer program Add the lb program, which is able to load-balance input traffic received from a netmap port over M groups, with N netmap pipes in each group. Each received packet is forwarded to one of the pipes chosen from each group (using an L3/L4 connection-consistent hash function). This also adds a man page for lb and some cross-references in related man pages. Reviewed by: bcr, 0mp Approved by: gnn (mentor) Differential Revision: https://reviews.freebsd.org/D17735 Added: head/tools/tools/netmap/lb.8 (contents, props changed) head/tools/tools/netmap/lb.c (contents, props changed) head/tools/tools/netmap/pkt_hash.c (contents, props changed) head/tools/tools/netmap/pkt_hash.h (contents, props changed) Modified: head/share/man/man4/netmap.4 head/tools/tools/netmap/Makefile head/tools/tools/netmap/README head/tools/tools/netmap/bridge.8 head/tools/tools/netmap/ctrs.h Modified: head/share/man/man4/netmap.4 ============================================================================== --- head/share/man/man4/netmap.4 Fri Nov 9 08:15:58 2018 (r340278) +++ head/share/man/man4/netmap.4 Fri Nov 9 08:43:40 2018 (r340279) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 23, 2018 +.Dd October 28, 2018 .Dt NETMAP 4 .Os .Sh NAME @@ -1073,8 +1073,11 @@ Other clients attached to the same switch can now communicate with the network card or the host. .Sh SEE ALSO -.Xr pkt-gen 8 , -.Xr bridge 8 +.Xr vale 4 , +.Xr vale-ctl 4 , +.Xr bridge 8 , +.Xr lb 8 , +.Xr pkt-gen 8 .Pp .Pa http://info.iet.unipi.it/~luigi/netmap/ .Pp Modified: head/tools/tools/netmap/Makefile ============================================================================== --- head/tools/tools/netmap/Makefile Fri Nov 9 08:15:58 2018 (r340278) +++ head/tools/tools/netmap/Makefile Fri Nov 9 08:43:40 2018 (r340279) @@ -3,7 +3,7 @@ # # For multiple programs using a single source file each, # we can just define 'progs' and create custom targets. -PROGS = pkt-gen nmreplay bridge vale-ctl +PROGS = pkt-gen nmreplay bridge vale-ctl lb CLEANFILES = $(PROGS) *.o MAN= @@ -34,3 +34,6 @@ nmreplay: nmreplay.o vale-ctl: vale-ctl.o $(CC) $(CFLAGS) -o vale-ctl vale-ctl.o + +lb: lb.o pkt_hash.o + $(CC) $(CFLAGS) -o lb lb.o pkt_hash.o $(LDFLAGS) Modified: head/tools/tools/netmap/README ============================================================================== --- head/tools/tools/netmap/README Fri Nov 9 08:15:58 2018 (r340278) +++ head/tools/tools/netmap/README Fri Nov 9 08:43:40 2018 (r340279) @@ -1,9 +1,13 @@ $FreeBSD$ -This directory contains examples that use netmap +This directory contains applications that use the netmap API - pkt-gen a packet sink/source using the netmap API + pkt-gen a multi-function packet generator and traffic sink - bridge a two-port jumper wire, also using the native API + bridge a two-port jumper wire, also using the netmap API - vale-ctl the program to control VALE bridges + vale-ctl the program to control and inspect VALE switches + + lb an L3/L4 load balancer + + nmreplay a tool to playback a pcap file to a netmap port Modified: head/tools/tools/netmap/bridge.8 ============================================================================== --- head/tools/tools/netmap/bridge.8 Fri Nov 9 08:15:58 2018 (r340278) +++ head/tools/tools/netmap/bridge.8 Fri Nov 9 08:43:40 2018 (r340279) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 23, 2018 +.Dd October 28, 2018 .Dt BRIDGE 8 .Os .Sh NAME @@ -71,7 +71,8 @@ Disable zero-copy mode. .El .Sh SEE ALSO .Xr netmap 4 , -.Xr pkt-gen 8 +.Xr pkt-gen 8 , +.Xr lb 8 .Sh AUTHORS .An -nosplit .Nm Modified: head/tools/tools/netmap/ctrs.h ============================================================================== --- head/tools/tools/netmap/ctrs.h Fri Nov 9 08:15:58 2018 (r340278) +++ head/tools/tools/netmap/ctrs.h Fri Nov 9 08:43:40 2018 (r340279) @@ -7,30 +7,37 @@ /* counters to accumulate statistics */ struct my_ctrs { - uint64_t pkts, bytes, events, drop; + uint64_t pkts, bytes, events; + uint64_t drop, drop_bytes; uint64_t min_space; struct timeval t; + uint32_t oq_n; /* number of elements in overflow queue (used in lb) */ }; /* very crude code to print a number in normalized form. * Caller has to make sure that the buffer is large enough. */ static const char * -norm2(char *buf, double val, char *fmt) +norm2(char *buf, double val, char *fmt, int normalize) { char *units[] = { "", "K", "M", "G", "T" }; u_int i; - - for (i = 0; val >=1000 && i < sizeof(units)/sizeof(char *) - 1; i++) - val /= 1000; + if (normalize) + for (i = 0; val >=1000 && i < sizeof(units)/sizeof(char *) - 1; i++) + val /= 1000; + else + i=0; sprintf(buf, fmt, val, units[i]); return buf; } static __inline const char * -norm(char *buf, double val) +norm(char *buf, double val, int normalize) { - return norm2(buf, val, "%.3f %s"); + if (normalize) + return norm2(buf, val, "%.3f %s", normalize); + else + return norm2(buf, val, "%.0f %s", normalize); } static __inline int @@ -89,7 +96,7 @@ timespec_sub(struct timespec a, struct timespec b) return ret; } -static uint64_t +static __inline uint64_t wait_for_next_report(struct timeval *prev, struct timeval *cur, int report_interval) { @@ -106,3 +113,4 @@ wait_for_next_report(struct timeval *prev, struct time return delta.tv_sec* 1000000 + delta.tv_usec; } #endif /* CTRS_H_ */ + Added: head/tools/tools/netmap/lb.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/netmap/lb.8 Fri Nov 9 08:43:40 2018 (r340279) @@ -0,0 +1,130 @@ +.\" Copyright (c) 2017 Corelight, Inc. and Universita` di Pisa +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 28, 2018 +.Dt LB 8 +.Os +.Sh NAME +.Nm lb +.Nd netmap-based load balancer +.Sh SYNOPSIS +.Bk -words +.Bl -tag -width "lb" +.It Nm +.Op Fl i Ar port +.Op Fl p Ar pipe-group +.Op Fl B Ar extra-buffers +.Op Fl b Ar batch-size +.Op Fl w Ar wait-link +.El +.Ek +.Sh DESCRIPTION +.Nm +reads packets from an input netmap port and sends them to a number of netmap pipes, +trying to balance the packets received by each pipe. +Packets belonging to the +same connection will always be sent to the same pipe. +.Pp +Command line options are listed below. +.Bl -tag -width Ds +.It Fl i Ar port +Name of a netmap port. +It must be supplied exactly once to identify +the input port. +Any netmap port type (e.g., physical interface, VALE switch, pipe, +monitor port) can be used. +.It Fl p Ar name Ns Cm \&: Ns Ar number | number +Add a new pipe group of the given number of pipes. +The pipe group will receive all the packets read from the input port, balanced +among the available pipes. +The receiving ends of the pipes +will be called +.Dq Ar name Ns Em }0 +to +.Dq Ar name No Ns Em } Ns Aq Ar number No - 1 . +The name is optional and defaults to +the name of the input port (stripped down of any netmap operator). +If the name is omitted, also the colon can be omitted. +.Pp +This option can be supplied multiple times to define a sequence of pipe groups, +each group receiving all the packets in turn. +.Pp +If no +.Fl p +option is given, a single group of two pipes with default name is assumed. +.Pp +It is allowed to use the same name for several groups. +The pipe numbering in each +group will start from were the previous identically-named group had left. +.It Fl B Ar extra-buffers +Try to reserve the given number of extra buffers. +Extra buffers are shared among +all pipes in all groups and work as an extension of the pipe rings. +If a pipe ring is full for whatever reason, +.Nm +tries to use extra buffers before dropping any packets directed to that pipe. +.Pp +If all extra buffers are busy, some are stolen from the pipe with the longest +backlog. +This gives preference to newer packets over old ones, and prevents a +stalled pipe to deplete the pool of extra buffers. +.It Fl b Ar batch-size +Maximum number of packets processed between two read operations from the input port. +Higher values of batch-size improve performance by amortizing read operations, +but increase the risk of filling up the port internal queues. +.It Fl w Ar wait-link +indicates the number of seconds to wait before transmitting. +It defaults to 2, and may be useful when talking to physical +ports to let link negotiation complete before starting transmission. +.El +.Sh LIMITATIONS +The group chaining assumes that the applications on the receiving end of the +pipes are read-only: they must not modify the buffers or the pipe ring slots +in any way. +.Pp +The group naming is currently implemented by creating a persistent VALE port +with the given name. +If +.Nm +does not exit cleanly the ports will not be removed. +Please use +.Xr vale-ctl 4 +to remove any stale persistent VALE port. +.Sh SEE ALSO +.Xr netmap 4 , +.Xr bridge 8 , +.Xr pkt-gen 8 +.Pp +.Pa http://info.iet.unipi.it/~luigi/netmap/ +.Sh AUTHORS +.An -nosplit +.Nm +has been written by +.An Seth Hall +at Corelight, USA. +The facilities related to extra buffers and pipe groups have been added by +.An Giuseppe Lettieri +at University of Pisa, Italy, under contract by Corelight, USA. Added: head/tools/tools/netmap/lb.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/netmap/lb.c Fri Nov 9 08:43:40 2018 (r340279) @@ -0,0 +1,1027 @@ +/* + * Copyright (C) 2017 Corelight, Inc. and Universita` di Pisa. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +/* $FreeBSD$ */ +#include <stdio.h> +#include <string.h> +#include <ctype.h> +#include <stdbool.h> +#include <inttypes.h> +#include <syslog.h> + +#define NETMAP_WITH_LIBS +#include <net/netmap_user.h> +#include <sys/poll.h> + +#include <netinet/in.h> /* htonl */ + +#include <pthread.h> + +#include "pkt_hash.h" +#include "ctrs.h" + + +/* + * use our version of header structs, rather than bringing in a ton + * of platform specific ones + */ +#ifndef ETH_ALEN +#define ETH_ALEN 6 +#endif + +struct compact_eth_hdr { + unsigned char h_dest[ETH_ALEN]; + unsigned char h_source[ETH_ALEN]; + u_int16_t h_proto; +}; + +struct compact_ip_hdr { + u_int8_t ihl:4, version:4; + u_int8_t tos; + u_int16_t tot_len; + u_int16_t id; + u_int16_t frag_off; + u_int8_t ttl; + u_int8_t protocol; + u_int16_t check; + u_int32_t saddr; + u_int32_t daddr; +}; + +struct compact_ipv6_hdr { + u_int8_t priority:4, version:4; + u_int8_t flow_lbl[3]; + u_int16_t payload_len; + u_int8_t nexthdr; + u_int8_t hop_limit; + struct in6_addr saddr; + struct in6_addr daddr; +}; + +#define MAX_IFNAMELEN 64 +#define MAX_PORTNAMELEN (MAX_IFNAMELEN + 40) +#define DEF_OUT_PIPES 2 +#define DEF_EXTRA_BUFS 0 +#define DEF_BATCH 2048 +#define DEF_WAIT_LINK 2 +#define DEF_STATS_INT 600 +#define BUF_REVOKE 100 +#define STAT_MSG_MAXSIZE 1024 + +struct { + char ifname[MAX_IFNAMELEN]; + char base_name[MAX_IFNAMELEN]; + int netmap_fd; + uint16_t output_rings; + uint16_t num_groups; + uint32_t extra_bufs; + uint16_t batch; + int stdout_interval; + int syslog_interval; + int wait_link; + bool busy_wait; +} glob_arg; + +/* + * the overflow queue is a circular queue of buffers + */ +struct overflow_queue { + char name[MAX_IFNAMELEN + 16]; + struct netmap_slot *slots; + uint32_t head; + uint32_t tail; + uint32_t n; + uint32_t size; +}; + +struct overflow_queue *freeq; + +static inline int +oq_full(struct overflow_queue *q) +{ + return q->n >= q->size; +} + +static inline int +oq_empty(struct overflow_queue *q) +{ + return q->n <= 0; +} + +static inline void +oq_enq(struct overflow_queue *q, const struct netmap_slot *s) +{ + if (unlikely(oq_full(q))) { + D("%s: queue full!", q->name); + abort(); + } + q->slots[q->tail] = *s; + q->n++; + q->tail++; + if (q->tail >= q->size) + q->tail = 0; +} + +static inline struct netmap_slot +oq_deq(struct overflow_queue *q) +{ + struct netmap_slot s = q->slots[q->head]; + if (unlikely(oq_empty(q))) { + D("%s: queue empty!", q->name); + abort(); + } + q->n--; + q->head++; + if (q->head >= q->size) + q->head = 0; + return s; +} + +static volatile int do_abort = 0; + +uint64_t dropped = 0; +uint64_t forwarded = 0; +uint64_t received_bytes = 0; +uint64_t received_pkts = 0; +uint64_t non_ip = 0; +uint32_t freeq_n = 0; + +struct port_des { + char interface[MAX_PORTNAMELEN]; + struct my_ctrs ctr; + unsigned int last_sync; + uint32_t last_tail; + struct overflow_queue *oq; + struct nm_desc *nmd; + struct netmap_ring *ring; + struct group_des *group; +}; + +struct port_des *ports; + +/* each group of pipes receives all the packets */ +struct group_des { + char pipename[MAX_IFNAMELEN]; + struct port_des *ports; + int first_id; + int nports; + int last; + int custom_port; +}; + +struct group_des *groups; + +/* statistcs */ +struct counters { + struct timeval ts; + struct my_ctrs *ctrs; + uint64_t received_pkts; + uint64_t received_bytes; + uint64_t non_ip; + uint32_t freeq_n; + int status __attribute__((aligned(64))); +#define COUNTERS_EMPTY 0 +#define COUNTERS_FULL 1 +}; + +struct counters counters_buf; + +static void * +print_stats(void *arg) +{ + int npipes = glob_arg.output_rings; + int sys_int = 0; + (void)arg; + struct my_ctrs cur, prev; + struct my_ctrs *pipe_prev; + + pipe_prev = calloc(npipes, sizeof(struct my_ctrs)); + if (pipe_prev == NULL) { + D("out of memory"); + exit(1); + } + + char stat_msg[STAT_MSG_MAXSIZE] = ""; + + memset(&prev, 0, sizeof(prev)); + while (!do_abort) { + int j, dosyslog = 0, dostdout = 0, newdata; + uint64_t pps = 0, dps = 0, bps = 0, dbps = 0, usec = 0; + struct my_ctrs x; + + counters_buf.status = COUNTERS_EMPTY; + newdata = 0; + memset(&cur, 0, sizeof(cur)); + sleep(1); + if (counters_buf.status == COUNTERS_FULL) { + __sync_synchronize(); + newdata = 1; + cur.t = counters_buf.ts; + if (prev.t.tv_sec || prev.t.tv_usec) { + usec = (cur.t.tv_sec - prev.t.tv_sec) * 1000000 + + cur.t.tv_usec - prev.t.tv_usec; + } + } + + ++sys_int; + if (glob_arg.stdout_interval && sys_int % glob_arg.stdout_interval == 0) + dostdout = 1; + if (glob_arg.syslog_interval && sys_int % glob_arg.syslog_interval == 0) + dosyslog = 1; + + for (j = 0; j < npipes; ++j) { + struct my_ctrs *c = &counters_buf.ctrs[j]; + cur.pkts += c->pkts; + cur.drop += c->drop; + cur.drop_bytes += c->drop_bytes; + cur.bytes += c->bytes; + + if (usec) { + x.pkts = c->pkts - pipe_prev[j].pkts; + x.drop = c->drop - pipe_prev[j].drop; + x.bytes = c->bytes - pipe_prev[j].bytes; + x.drop_bytes = c->drop_bytes - pipe_prev[j].drop_bytes; + pps = (x.pkts*1000000 + usec/2) / usec; + dps = (x.drop*1000000 + usec/2) / usec; + bps = ((x.bytes*1000000 + usec/2) / usec) * 8; + dbps = ((x.drop_bytes*1000000 + usec/2) / usec) * 8; + } + pipe_prev[j] = *c; + + if ( (dosyslog || dostdout) && newdata ) + snprintf(stat_msg, STAT_MSG_MAXSIZE, + "{" + "\"ts\":%.6f," + "\"interface\":\"%s\"," + "\"output_ring\":%" PRIu16 "," + "\"packets_forwarded\":%" PRIu64 "," + "\"packets_dropped\":%" PRIu64 "," + "\"data_forward_rate_Mbps\":%.4f," + "\"data_drop_rate_Mbps\":%.4f," + "\"packet_forward_rate_kpps\":%.4f," + "\"packet_drop_rate_kpps\":%.4f," + "\"overflow_queue_size\":%" PRIu32 + "}", cur.t.tv_sec + (cur.t.tv_usec / 1000000.0), + ports[j].interface, + j, + c->pkts, + c->drop, + (double)bps / 1024 / 1024, + (double)dbps / 1024 / 1024, + (double)pps / 1000, + (double)dps / 1000, + c->oq_n); + + if (dosyslog && stat_msg[0]) + syslog(LOG_INFO, "%s", stat_msg); + if (dostdout && stat_msg[0]) + printf("%s\n", stat_msg); + } + if (usec) { + x.pkts = cur.pkts - prev.pkts; + x.drop = cur.drop - prev.drop; + x.bytes = cur.bytes - prev.bytes; + x.drop_bytes = cur.drop_bytes - prev.drop_bytes; + pps = (x.pkts*1000000 + usec/2) / usec; + dps = (x.drop*1000000 + usec/2) / usec; + bps = ((x.bytes*1000000 + usec/2) / usec) * 8; + dbps = ((x.drop_bytes*1000000 + usec/2) / usec) * 8; + } + + if ( (dosyslog || dostdout) && newdata ) + snprintf(stat_msg, STAT_MSG_MAXSIZE, + "{" + "\"ts\":%.6f," + "\"interface\":\"%s\"," + "\"output_ring\":null," + "\"packets_received\":%" PRIu64 "," + "\"packets_forwarded\":%" PRIu64 "," + "\"packets_dropped\":%" PRIu64 "," + "\"non_ip_packets\":%" PRIu64 "," + "\"data_forward_rate_Mbps\":%.4f," + "\"data_drop_rate_Mbps\":%.4f," + "\"packet_forward_rate_kpps\":%.4f," + "\"packet_drop_rate_kpps\":%.4f," + "\"free_buffer_slots\":%" PRIu32 + "}", cur.t.tv_sec + (cur.t.tv_usec / 1000000.0), + glob_arg.ifname, + received_pkts, + cur.pkts, + cur.drop, + counters_buf.non_ip, + (double)bps / 1024 / 1024, + (double)dbps / 1024 / 1024, + (double)pps / 1000, + (double)dps / 1000, + counters_buf.freeq_n); + + if (dosyslog && stat_msg[0]) + syslog(LOG_INFO, "%s", stat_msg); + if (dostdout && stat_msg[0]) + printf("%s\n", stat_msg); + + prev = cur; + } + + free(pipe_prev); + + return NULL; +} + +static void +free_buffers(void) +{ + int i, tot = 0; + struct port_des *rxport = &ports[glob_arg.output_rings]; + + /* build a netmap free list with the buffers in all the overflow queues */ + for (i = 0; i < glob_arg.output_rings + 1; i++) { + struct port_des *cp = &ports[i]; + struct overflow_queue *q = cp->oq; + + if (!q) + continue; + + while (q->n) { + struct netmap_slot s = oq_deq(q); + uint32_t *b = (uint32_t *)NETMAP_BUF(cp->ring, s.buf_idx); + + *b = rxport->nmd->nifp->ni_bufs_head; + rxport->nmd->nifp->ni_bufs_head = s.buf_idx; + tot++; + } + } + D("added %d buffers to netmap free list", tot); + + for (i = 0; i < glob_arg.output_rings + 1; ++i) { + nm_close(ports[i].nmd); + } +} + + +static void sigint_h(int sig) +{ + (void)sig; /* UNUSED */ + do_abort = 1; + signal(SIGINT, SIG_DFL); +} + +void usage() +{ + printf("usage: lb [options]\n"); + printf("where options are:\n"); + printf(" -h view help text\n"); + printf(" -i iface interface name (required)\n"); + printf(" -p [prefix:]npipes add a new group of output pipes\n"); + printf(" -B nbufs number of extra buffers (default: %d)\n", DEF_EXTRA_BUFS); + printf(" -b batch batch size (default: %d)\n", DEF_BATCH); + printf(" -w seconds wait for link up (default: %d)\n", DEF_WAIT_LINK); + printf(" -W enable busy waiting. this will run your CPU at 100%%\n"); + printf(" -s seconds seconds between syslog stats messages (default: 0)\n"); + printf(" -o seconds seconds between stdout stats messages (default: 0)\n"); + exit(0); +} + +static int +parse_pipes(char *spec) +{ + char *end = index(spec, ':'); + static int max_groups = 0; + struct group_des *g; + + ND("spec %s num_groups %d", spec, glob_arg.num_groups); + if (max_groups < glob_arg.num_groups + 1) { + size_t size = sizeof(*g) * (glob_arg.num_groups + 1); + groups = realloc(groups, size); + if (groups == NULL) { + D("out of memory"); + return 1; + } + } + g = &groups[glob_arg.num_groups]; + memset(g, 0, sizeof(*g)); + + if (end != NULL) { + if (end - spec > MAX_IFNAMELEN - 8) { + D("name '%s' too long", spec); + return 1; + } + if (end == spec) { + D("missing prefix before ':' in '%s'", spec); + return 1; + } + strncpy(g->pipename, spec, end - spec); + g->custom_port = 1; + end++; + } else { + /* no prefix, this group will use the + * name of the input port. + * This will be set in init_groups(), + * since here the input port may still + * be uninitialized + */ + end = spec; + } + if (*end == '\0') { + g->nports = DEF_OUT_PIPES; + } else { + g->nports = atoi(end); + if (g->nports < 1) { + D("invalid number of pipes '%s' (must be at least 1)", end); + return 1; + } + } + glob_arg.output_rings += g->nports; + glob_arg.num_groups++; + return 0; +} + +/* complete the initialization of the groups data structure */ +void init_groups(void) +{ + int i, j, t = 0; + struct group_des *g = NULL; + for (i = 0; i < glob_arg.num_groups; i++) { + g = &groups[i]; + g->ports = &ports[t]; + for (j = 0; j < g->nports; j++) + g->ports[j].group = g; + t += g->nports; + if (!g->custom_port) + strcpy(g->pipename, glob_arg.base_name); + for (j = 0; j < i; j++) { + struct group_des *h = &groups[j]; + if (!strcmp(h->pipename, g->pipename)) + g->first_id += h->nports; + } + } + g->last = 1; +} + +/* push the packet described by slot rs to the group g. + * This may cause other buffers to be pushed down the + * chain headed by g. + * Return a free buffer. + */ +uint32_t forward_packet(struct group_des *g, struct netmap_slot *rs) +{ + uint32_t hash = rs->ptr; + uint32_t output_port = hash % g->nports; + struct port_des *port = &g->ports[output_port]; + struct netmap_ring *ring = port->ring; + struct overflow_queue *q = port->oq; + + /* Move the packet to the output pipe, unless there is + * either no space left on the ring, or there is some + * packet still in the overflow queue (since those must + * take precedence over the new one) + */ + if (ring->head != ring->tail && (q == NULL || oq_empty(q))) { + struct netmap_slot *ts = &ring->slot[ring->head]; + struct netmap_slot old_slot = *ts; + + ts->buf_idx = rs->buf_idx; + ts->len = rs->len; + ts->flags |= NS_BUF_CHANGED; + ts->ptr = rs->ptr; + ring->head = nm_ring_next(ring, ring->head); + port->ctr.bytes += rs->len; + port->ctr.pkts++; + forwarded++; + return old_slot.buf_idx; + } + + /* use the overflow queue, if available */ + if (q == NULL || oq_full(q)) { + /* no space left on the ring and no overflow queue + * available: we are forced to drop the packet + */ + dropped++; + port->ctr.drop++; + port->ctr.drop_bytes += rs->len; + return rs->buf_idx; + } + + oq_enq(q, rs); + + /* + * we cannot continue down the chain and we need to + * return a free buffer now. We take it from the free queue. + */ + if (oq_empty(freeq)) { + /* the free queue is empty. Revoke some buffers + * from the longest overflow queue + */ + uint32_t j; + struct port_des *lp = &ports[0]; + uint32_t max = lp->oq->n; + + /* let lp point to the port with the longest queue */ + for (j = 1; j < glob_arg.output_rings; j++) { + struct port_des *cp = &ports[j]; + if (cp->oq->n > max) { + lp = cp; + max = cp->oq->n; + } + } + + /* move the oldest BUF_REVOKE buffers from the + * lp queue to the free queue + */ + // XXX optimize this cycle + for (j = 0; lp->oq->n && j < BUF_REVOKE; j++) { + struct netmap_slot tmp = oq_deq(lp->oq); + + dropped++; + lp->ctr.drop++; + lp->ctr.drop_bytes += tmp.len; + + oq_enq(freeq, &tmp); + } + + ND(1, "revoked %d buffers from %s", j, lq->name); + } + + return oq_deq(freeq).buf_idx; +} + +int main(int argc, char **argv) +{ + int ch; + uint32_t i; + int rv; + unsigned int iter = 0; + int poll_timeout = 10; /* default */ + + glob_arg.ifname[0] = '\0'; + glob_arg.output_rings = 0; + glob_arg.batch = DEF_BATCH; + glob_arg.wait_link = DEF_WAIT_LINK; + glob_arg.busy_wait = false; + glob_arg.syslog_interval = 0; + glob_arg.stdout_interval = 0; + + while ( (ch = getopt(argc, argv, "hi:p:b:B:s:o:w:W")) != -1) { + switch (ch) { + case 'i': + D("interface is %s", optarg); + if (strlen(optarg) > MAX_IFNAMELEN - 8) { + D("ifname too long %s", optarg); + return 1; + } + if (strncmp(optarg, "netmap:", 7) && strncmp(optarg, "vale", 4)) { + sprintf(glob_arg.ifname, "netmap:%s", optarg); + } else { + strcpy(glob_arg.ifname, optarg); + } + break; + + case 'p': + if (parse_pipes(optarg)) { + usage(); + return 1; + } + break; + + case 'B': + glob_arg.extra_bufs = atoi(optarg); + D("requested %d extra buffers", glob_arg.extra_bufs); + break; + + case 'b': + glob_arg.batch = atoi(optarg); + D("batch is %d", glob_arg.batch); + break; + + case 'w': + glob_arg.wait_link = atoi(optarg); + D("link wait for up time is %d", glob_arg.wait_link); + break; + + case 'W': + glob_arg.busy_wait = true; + break; + + case 'o': + glob_arg.stdout_interval = atoi(optarg); + break; + + case 's': + glob_arg.syslog_interval = atoi(optarg); + break; + + case 'h': + usage(); + return 0; + break; + + default: + D("bad option %c %s", ch, optarg); + usage(); + return 1; + } + } + + if (glob_arg.ifname[0] == '\0') { + D("missing interface name"); + usage(); + return 1; + } + + /* extract the base name */ + char *nscan = strncmp(glob_arg.ifname, "netmap:", 7) ? + glob_arg.ifname : glob_arg.ifname + 7; + strncpy(glob_arg.base_name, nscan, MAX_IFNAMELEN-1); + for (nscan = glob_arg.base_name; *nscan && !index("-*^{}/@", *nscan); nscan++) + ; + *nscan = '\0'; + + if (glob_arg.num_groups == 0) + parse_pipes(""); + + if (glob_arg.syslog_interval) { + setlogmask(LOG_UPTO(LOG_INFO)); + openlog("lb", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1); + } + + uint32_t npipes = glob_arg.output_rings; + + + pthread_t stat_thread; + + ports = calloc(npipes + 1, sizeof(struct port_des)); + if (!ports) { + D("failed to allocate the stats array"); + return 1; + } + struct port_des *rxport = &ports[npipes]; + init_groups(); + + memset(&counters_buf, 0, sizeof(counters_buf)); + counters_buf.ctrs = calloc(npipes, sizeof(struct my_ctrs)); + if (!counters_buf.ctrs) { + D("failed to allocate the counters snapshot buffer"); + return 1; + } + + /* we need base_req to specify pipes and extra bufs */ + struct nmreq base_req; + memset(&base_req, 0, sizeof(base_req)); + + base_req.nr_arg1 = npipes; + base_req.nr_arg3 = glob_arg.extra_bufs; + + rxport->nmd = nm_open(glob_arg.ifname, &base_req, 0, NULL); + + if (rxport->nmd == NULL) { + D("cannot open %s", glob_arg.ifname); + return (1); + } else { + D("successfully opened %s (tx rings: %u)", glob_arg.ifname, + rxport->nmd->req.nr_tx_slots); + } + + uint32_t extra_bufs = rxport->nmd->req.nr_arg3; + struct overflow_queue *oq = NULL; + /* reference ring to access the buffers */ + rxport->ring = NETMAP_RXRING(rxport->nmd->nifp, 0); + + if (!glob_arg.extra_bufs) + goto run; + + D("obtained %d extra buffers", extra_bufs); + if (!extra_bufs) + goto run; + + /* one overflow queue for each output pipe, plus one for the + * free extra buffers + */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Fri Nov 9 13:47:08 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E23641130A74; Fri, 9 Nov 2018 13:47:07 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 22DFC7B80C; Fri, 9 Nov 2018 13:47:07 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 EFCB914B1A; Fri, 9 Nov 2018 13:47:06 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9Dl6Dd078954; Fri, 9 Nov 2018 13:47:06 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9Dl6Bn078952; Fri, 9 Nov 2018 13:47:06 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <201811091347.wA9Dl6Bn078952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 9 Nov 2018 13:47:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340283 - in head: usr.bin/nohup usr.sbin/daemon X-SVN-Group: head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head: usr.bin/nohup usr.sbin/daemon X-SVN-Commit-Revision: 340283 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 22DFC7B80C X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 13:47:08 -0000 Author: 0mp (ports committer) Date: Fri Nov 9 13:47:06 2018 New Revision: 340283 URL: https://svnweb.freebsd.org/changeset/base/340283 Log: Cross-reference nohup(1) and daemon(8). Reviewed by: bcr Approved by: krion (mentor, implicit), mat (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D17920 Modified: head/usr.bin/nohup/nohup.1 head/usr.sbin/daemon/daemon.8 Modified: head/usr.bin/nohup/nohup.1 ============================================================================== --- head/usr.bin/nohup/nohup.1 Fri Nov 9 09:26:10 2018 (r340282) +++ head/usr.bin/nohup/nohup.1 Fri Nov 9 13:47:06 2018 (r340283) @@ -31,7 +31,7 @@ .\" @(#)nohup.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd July 19, 2001 +.Dd November 9, 2018 .Dt NOHUP 1 .Os .Sh NAME @@ -107,7 +107,8 @@ will be that of .Sh SEE ALSO .Xr builtin 1 , .Xr csh 1 , -.Xr signal 3 +.Xr signal 3 , +.Xr daemon 8 .Sh STANDARDS The .Nm Modified: head/usr.sbin/daemon/daemon.8 ============================================================================== --- head/usr.sbin/daemon/daemon.8 Fri Nov 9 09:26:10 2018 (r340282) +++ head/usr.sbin/daemon/daemon.8 Fri Nov 9 13:47:06 2018 (r340283) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 15, 2018 +.Dd November 9, 2018 .Dt DAEMON 8 .Os .Sh NAME @@ -212,6 +212,7 @@ The exact behavior depends on the logging parameters a .Fl f flag. .Sh SEE ALSO +.Xr nohup 1 , .Xr setregid 2 , .Xr setreuid 2 , .Xr daemon 3 , From owner-svn-src-head@freebsd.org Fri Nov 9 14:58:26 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 583B41131C30; Fri, 9 Nov 2018 14:58:26 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D20D17D88A; Fri, 9 Nov 2018 14:58:25 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 AF777156A4; Fri, 9 Nov 2018 14:58:25 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9EwPcn014829; Fri, 9 Nov 2018 14:58:25 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9EwOAj014822; Fri, 9 Nov 2018 14:58:24 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <201811091458.wA9EwOAj014822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker <jilles@FreeBSD.org> Date: Fri, 9 Nov 2018 14:58:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340284 - head/bin/sh X-SVN-Group: head X-SVN-Commit-Author: jilles X-SVN-Commit-Paths: head/bin/sh X-SVN-Commit-Revision: 340284 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D20D17D88A X-Spamd-Result: default: False [-106.87 / 200.00]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 14:58:26 -0000 Author: jilles Date: Fri Nov 9 14:58:24 2018 New Revision: 340284 URL: https://svnweb.freebsd.org/changeset/base/340284 Log: sh: Unify EXERROR and EXEXEC The difference between EXERROR and EXEXEC was that EXEXEC passed along exitstatus and EXERROR set exitstatus to 2 in the handling code. By changing the places that raised EXERROR to set exitstatus to 2, the handling of EXERROR and EXEXEC becomes the same. Modified: head/bin/sh/TOUR head/bin/sh/error.c head/bin/sh/error.h head/bin/sh/eval.c head/bin/sh/exec.c head/bin/sh/jobs.c head/bin/sh/main.c Modified: head/bin/sh/TOUR ============================================================================== --- head/bin/sh/TOUR Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/TOUR Fri Nov 9 14:58:24 2018 (r340284) @@ -35,7 +35,7 @@ EXCEPTIONS: Code for dealing with exceptions appears exceptions.c. The C language doesn't include exception handling, so I implement it using setjmp and longjmp. The global variable exception contains the type of exception. EXERROR is raised by -calling error. EXINT is an interrupt. +calling error or errorwithstatus. EXINT is an interrupt. INTERRUPTS: In an interactive shell, an interrupt will cause an EXINT exception to return to the main command loop. (Exception: Modified: head/bin/sh/error.c ============================================================================== --- head/bin/sh/error.c Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/error.c Fri Nov 9 14:58:24 2018 (r340284) @@ -67,7 +67,7 @@ volatile sig_atomic_t suppressint; volatile sig_atomic_t intpending; -static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; +static void verrorwithstatus(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we @@ -154,7 +154,7 @@ warning(const char *msg, ...) * formatting. It then raises the error exception. */ static void -exverror(int cond, const char *msg, va_list ap) +verrorwithstatus(int status, const char *msg, va_list ap) { /* * An interrupt trumps an error. Certain places catch error @@ -168,14 +168,17 @@ exverror(int cond, const char *msg, va_list ap) #ifdef DEBUG if (msg) - TRACE(("exverror(%d, \"%s\") pid=%d\n", cond, msg, getpid())); + TRACE(("verrorwithstatus(%d, \"%s\") pid=%d\n", + status, msg, getpid())); else - TRACE(("exverror(%d, NULL) pid=%d\n", cond, getpid())); + TRACE(("verrorwithstatus(%d, NULL) pid=%d\n", + status, getpid())); #endif if (msg) vwarning(msg, ap); flushall(); - exraise(cond); + exitstatus = status; + exraise(EXERROR); } @@ -184,16 +187,16 @@ error(const char *msg, ...) { va_list ap; va_start(ap, msg); - exverror(EXERROR, msg, ap); + verrorwithstatus(2, msg, ap); va_end(ap); } void -exerror(int cond, const char *msg, ...) +errorwithstatus(int status, const char *msg, ...) { va_list ap; va_start(ap, msg); - exverror(cond, msg, ap); + verrorwithstatus(status, msg, ap); va_end(ap); } Modified: head/bin/sh/error.h ============================================================================== --- head/bin/sh/error.h Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/error.h Fri Nov 9 14:58:24 2018 (r340284) @@ -55,9 +55,8 @@ extern volatile sig_atomic_t exception; /* exceptions */ #define EXINT 0 /* SIGINT received */ -#define EXERROR 1 /* a generic error */ -#define EXEXEC 2 /* command execution failed */ -#define EXEXIT 3 /* call exitshell(exitstatus) */ +#define EXERROR 1 /* a generic error with exitstatus */ +#define EXEXIT 2 /* call exitshell(exitstatus) */ /* @@ -83,7 +82,7 @@ void exraise(int) __dead2; void onint(void) __dead2; void warning(const char *, ...) __printflike(1, 2); void error(const char *, ...) __printf0like(1, 2) __dead2; -void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; +void errorwithstatus(int, const char *, ...) __printf0like(2, 3) __dead2; /* Modified: head/bin/sh/eval.c ============================================================================== --- head/bin/sh/eval.c Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/eval.c Fri Nov 9 14:58:24 2018 (r340284) @@ -466,13 +466,9 @@ evalredir(union node *n, int flags) handler = savehandler; e = exception; popredir(); - if (e == EXERROR || e == EXEXEC) { - if (in_redirect) { - if (e == EXERROR) - exitstatus = 2; - FORCEINTON; - return; - } + if (e == EXERROR && in_redirect) { + FORCEINTON; + return; } longjmp(handler->loc, 1); } else { @@ -506,7 +502,7 @@ exphere(union node *redir, struct arglist *fn) forcelocal++; savehandler = handler; if (setjmp(jmploc.loc)) - need_longjmp = exception != EXERROR && exception != EXEXEC; + need_longjmp = exception != EXERROR; else { handler = &jmploc; expandarg(redir->nhere.doc, fn, 0); @@ -671,8 +667,6 @@ evalbackcmd(union node *n, struct backcmd *result) savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXERROR) - exitstatus = 2; - else if (exception == EXEXEC) /* nothing */; else if (exception != 0) { handler = savehandler; @@ -1092,8 +1086,6 @@ evalcommand(union node *cmd, int flags, struct backcmd e = exception; if (e == EXINT) exitstatus = SIGINT+128; - else if (e != EXEXEC && e != EXEXIT) - exitstatus = 2; goto cmddone; } handler = &jmploc; @@ -1142,8 +1134,7 @@ cmddone: if (cmdentry.u.index != EXECCMD) popredir(); if (e != -1) { - if ((e != EXERROR && e != EXEXEC) - || cmdentry.special) + if (e != EXERROR || cmdentry.special) exraise(e); popfilesupto(savetopfile); if (flags != EV_BACKCMD) Modified: head/bin/sh/exec.c ============================================================================== --- head/bin/sh/exec.c Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/exec.c Fri Nov 9 14:58:24 2018 (r340284) @@ -133,13 +133,10 @@ shellexec(char **argv, char **envp, const char *path, } /* Map to POSIX errors */ - if (e == ENOENT || e == ENOTDIR) { - exitstatus = 127; - exerror(EXEXEC, "%s: not found", argv[0]); - } else { - exitstatus = 126; - exerror(EXEXEC, "%s: %s", argv[0], strerror(e)); - } + if (e == ENOENT || e == ENOTDIR) + errorwithstatus(127, "%s: not found", argv[0]); + else + errorwithstatus(126, "%s: %s", argv[0], strerror(e)); } Modified: head/bin/sh/jobs.c ============================================================================== --- head/bin/sh/jobs.c Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/jobs.c Fri Nov 9 14:58:24 2018 (r340284) @@ -1006,7 +1006,7 @@ vforkexecshell(struct job *jp, char **argv, char **env if (pid == 0) { TRACE(("Child shell %d\n", (int)getpid())); if (setjmp(jmploc.loc)) - _exit(exception == EXEXEC ? exitstatus : 2); + _exit(exitstatus); if (pip != NULL) { close(pip[0]); if (pip[1] != 1) { Modified: head/bin/sh/main.c ============================================================================== --- head/bin/sh/main.c Fri Nov 9 13:47:06 2018 (r340283) +++ head/bin/sh/main.c Fri Nov 9 14:58:24 2018 (r340284) @@ -105,15 +105,6 @@ main(int argc, char *argv[]) initcharset(); state = 0; if (setjmp(main_handler.loc)) { - switch (exception) { - case EXERROR: - exitstatus = 2; - break; - - default: - break; - } - if (state == 0 || iflag == 0 || ! rootshell || exception == EXEXIT) exitshell(exitstatus); From owner-svn-src-head@freebsd.org Fri Nov 9 15:02:54 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 963121131E31; Fri, 9 Nov 2018 15:02:54 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 229957DC94; Fri, 9 Nov 2018 15:02:54 +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 037AF15834; Fri, 9 Nov 2018 15:02: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 wA9F2rDE019751; Fri, 9 Nov 2018 15:02:53 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9F2rrD019750; Fri, 9 Nov 2018 15:02:53 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091502.wA9F2rrD019750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 15:02:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340285 - head/usr.sbin/kldxref X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/usr.sbin/kldxref X-SVN-Commit-Revision: 340285 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 229957DC94 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 15:02:54 -0000 Author: emaste Date: Fri Nov 9 15:02:53 2018 New Revision: 340285 URL: https://svnweb.freebsd.org/changeset/base/340285 Log: kldxref: use appropriate Elf_Off type for offsets Submitted by: Mitchell Horne <mhorne063@gmail.com> Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D13957 Modified: head/usr.sbin/kldxref/ef.c Modified: head/usr.sbin/kldxref/ef.c ============================================================================== --- head/usr.sbin/kldxref/ef.c Fri Nov 9 14:58:24 2018 (r340284) +++ head/usr.sbin/kldxref/ef.c Fri Nov 9 15:02:53 2018 (r340285) @@ -80,7 +80,7 @@ struct ef_file { }; static void ef_print_phdr(Elf_Phdr *); -static u_long ef_get_offset(elf_file_t, Elf_Off); +static Elf_Off ef_get_offset(elf_file_t, Elf_Off); static int ef_parse_dynamic(elf_file_t); static int ef_get_type(elf_file_t ef); @@ -126,16 +126,17 @@ ef_print_phdr(Elf_Phdr *phdr) { if ((phdr->p_flags & PF_W) == 0) { - printf("text=0x%lx ", (long)phdr->p_filesz); + printf("text=0x%jx ", (uintmax_t)phdr->p_filesz); } else { - printf("data=0x%lx", (long)phdr->p_filesz); + printf("data=0x%jx", (uintmax_t)phdr->p_filesz); if (phdr->p_filesz < phdr->p_memsz) - printf("+0x%lx", (long)(phdr->p_memsz - phdr->p_filesz)); + printf("+0x%jx", + (uintmax_t)(phdr->p_memsz - phdr->p_filesz)); printf(" "); } } -static u_long +static Elf_Off ef_get_offset(elf_file_t ef, Elf_Off off) { Elf_Phdr *ph; @@ -292,8 +293,8 @@ ef_parse_dynamic(elf_file_t ef) error = ef_read(ef, ef_get_offset(ef, dp->d_un.d_ptr), sizeof(hashhdr), hashhdr); if (error != 0) { - warnx("can't read hash header (%lx)", - ef_get_offset(ef, dp->d_un.d_ptr)); + warnx("can't read hash header (%jx)", + (uintmax_t)ef_get_offset(ef, dp->d_un.d_ptr)); return (error); } ef->ef_nbuckets = hashhdr[0]; @@ -365,8 +366,8 @@ ef_parse_dynamic(elf_file_t ef) ef->ef_nchains * sizeof(Elf_Sym), (void **)&ef->ef_symtab) != 0) { if (ef->ef_verbose) - warnx("%s: can't load .dynsym section (0x%lx)", - ef->ef_name, (long)ef->ef_symoff); + warnx("%s: can't load .dynsym section (0x%jx)", + ef->ef_name, (uintmax_t)ef->ef_symoff); return (EIO); } if (ef_read_entry(ef, ef_get_offset(ef, ef->ef_stroff), ef->ef_strsz, @@ -461,13 +462,13 @@ ef_read_entry(elf_file_t ef, Elf_Off offset, size_t le static int ef_seg_read(elf_file_t ef, Elf_Off offset, size_t len, void *dest) { - u_long ofs; + Elf_Off ofs; ofs = ef_get_offset(ef, offset); if (ofs == 0) { if (ef->ef_verbose) - warnx("ef_seg_read(%s): zero offset (%lx:%ld)", - ef->ef_name, (long)offset, ofs); + warnx("ef_seg_read(%s): zero offset (%jx:%ju)", + ef->ef_name, (uintmax_t)offset, (uintmax_t)ofs); return (EFAULT); } return (ef_read(ef, ofs, len, dest)); @@ -476,7 +477,7 @@ ef_seg_read(elf_file_t ef, Elf_Off offset, size_t len, static int ef_seg_read_rel(elf_file_t ef, Elf_Off offset, size_t len, void *dest) { - u_long ofs; + Elf_Off ofs; const Elf_Rela *a; const Elf_Rel *r; int error; @@ -484,8 +485,8 @@ ef_seg_read_rel(elf_file_t ef, Elf_Off offset, size_t ofs = ef_get_offset(ef, offset); if (ofs == 0) { if (ef->ef_verbose) - warnx("ef_seg_read_rel(%s): zero offset (%lx:%ld)", - ef->ef_name, (long)offset, ofs); + warnx("ef_seg_read_rel(%s): zero offset (%jx:%ju)", + ef->ef_name, (uintmax_t)offset, (uintmax_t)ofs); return (EFAULT); } if ((error = ef_read(ef, ofs, len, dest)) != 0) @@ -509,14 +510,14 @@ ef_seg_read_rel(elf_file_t ef, Elf_Off offset, size_t static int ef_seg_read_string(elf_file_t ef, Elf_Off offset, size_t len, char *dest) { - u_long ofs; + Elf_Off ofs; ssize_t r; ofs = ef_get_offset(ef, offset); if (ofs == 0 || ofs == (Elf_Off)-1) { if (ef->ef_verbose) - warnx("ef_seg_read_string(%s): bad offset (%lx:%ld)", - ef->ef_name, (long)offset, ofs); + warnx("ef_seg_read_string(%s): bad offset (%jx:%ju)", + ef->ef_name, (uintmax_t)offset, (uintmax_t)ofs); return (EFAULT); } From owner-svn-src-head@freebsd.org Fri Nov 9 15:24:26 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 11F7711326AF; Fri, 9 Nov 2018 15:24:26 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 949DD7E8BB; Fri, 9 Nov 2018 15:24:25 +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 7175715BBE; Fri, 9 Nov 2018 15:24:25 +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 wA9FOPFQ030129; Fri, 9 Nov 2018 15:24:25 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9FOPM9030128; Fri, 9 Nov 2018 15:24:25 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201811091524.wA9FOPM9030128@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu <lwhsu@FreeBSD.org> Date: Fri, 9 Nov 2018 15:24:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340286 - head/tests/sys/netpfil/pf X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/tests/sys/netpfil/pf X-SVN-Commit-Revision: 340286 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 949DD7E8BB X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 15:24:26 -0000 Author: lwhsu Date: Fri Nov 9 15:24:24 2018 New Revision: 340286 URL: https://svnweb.freebsd.org/changeset/base/340286 Log: Fix test: sys.netpfil.pf.pass_block.noalias Replace hard-coded epair0b with the variable holds the real epair interface used for testing. Reviewed by: kp Approved by: emaste, markj (mentors) MFC with: r339836 Sponsored by: The FreeBSD Foundation Modified: head/tests/sys/netpfil/pf/pass_block.sh Modified: head/tests/sys/netpfil/pf/pass_block.sh ============================================================================== --- head/tests/sys/netpfil/pf/pass_block.sh Fri Nov 9 15:02:53 2018 (r340285) +++ head/tests/sys/netpfil/pf/pass_block.sh Fri Nov 9 15:24:24 2018 (r340286) @@ -111,14 +111,14 @@ noalias_body() atf_check -s exit:0 -o ignore ping6 -c 1 -x 1 ${linklocaladdr}%${epair}a jexec alcatraz pfctl -e - pft_set_rules alcatraz "block out inet6 from (epair0b:0) to any" + pft_set_rules alcatraz "block out inet6 from (${epair}b:0) to any" atf_check -s exit:2 -o ignore ping6 -c 1 -x 1 2001:db8:42::2 # We should still be able to ping the link-local address atf_check -s exit:0 -o ignore ping6 -c 1 -x 1 ${linklocaladdr}%${epair}a - pft_set_rules alcatraz "block out inet6 from (epair0b) to any" + pft_set_rules alcatraz "block out inet6 from (${epair}b) to any" # We cannot ping to the link-local address atf_check -s exit:2 -o ignore ping6 -c 1 -x 1 ${linklocaladdr}%${epair}a From owner-svn-src-head@freebsd.org Fri Nov 9 15:27:42 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 94ACF11327A7; Fri, 9 Nov 2018 15:27:42 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 11B537EABA; Fri, 9 Nov 2018 15:27:42 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E57AA15BC4; Fri, 9 Nov 2018 15:27:41 +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 wA9FRfbJ030305; Fri, 9 Nov 2018 15:27:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9FRfFW030304; Fri, 9 Nov 2018 15:27:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091527.wA9FRfFW030304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 15:27:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340287 - head/tools/build/mk X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/tools/build/mk X-SVN-Commit-Revision: 340287 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 11B537EABA X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 15:27:42 -0000 Author: emaste Date: Fri Nov 9 15:27:41 2018 New Revision: 340287 URL: https://svnweb.freebsd.org/changeset/base/340287 Log: Consolidate gcov entries in OptionalObsoleteFiles Sponsored by: The FreeBSD Foundation Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 9 15:24:24 2018 (r340286) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 9 15:27:41 2018 (r340287) @@ -2420,7 +2420,6 @@ OLD_FILES+=usr/share/man/man8/unstr.8.gz .if ${MK_GCC} == no OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/bin/gcc -OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/bin/gcpp OLD_FILES+=usr/bin/gperf .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" @@ -2457,13 +2456,12 @@ OLD_FILES+=usr/libexec/cc1 OLD_FILES+=usr/libexec/cc1plus OLD_FILES+=usr/share/man/man1/g++.1.gz OLD_FILES+=usr/share/man/man1/gcc.1.gz -OLD_FILES+=usr/share/man/man1/gcov.1.gz OLD_FILES+=usr/share/man/man1/gcpp.1.gz OLD_FILES+=usr/share/man/man1/gperf.1.gz OLD_FILES+=usr/share/man/man1/gperf.7.gz .endif -.if ${MK_GCOV} == no +.if ${MK_GCC} == no || ${MK_GCOV} == no OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz .endif From owner-svn-src-head@freebsd.org Fri Nov 9 17:39:58 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 48B101102639; Fri, 9 Nov 2018 17:39:58 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C2DBD84812; Fri, 9 Nov 2018 17:39: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 9E51C17131; Fri, 9 Nov 2018 17:39:57 +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 wA9Hdvav099606; Fri, 9 Nov 2018 17:39:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9Hdvch099605; Fri, 9 Nov 2018 17:39:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091739.wA9Hdvch099605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 17:39:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340288 - head/contrib/nvi/vi X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/contrib/nvi/vi X-SVN-Commit-Revision: 340288 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C2DBD84812 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 17:39:58 -0000 Author: emaste Date: Fri Nov 9 17:39:57 2018 New Revision: 340288 URL: https://svnweb.freebsd.org/changeset/base/340288 Log: nvi: remove superfluous space before ^\ This fixes alignment in vi's 'viusage' command and has been fixed upstream and in OpenBSD. Submitted by: Raf Czlonka (github:rjc) MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd/pull/122 Modified: head/contrib/nvi/vi/v_cmd.c Modified: head/contrib/nvi/vi/v_cmd.c ============================================================================== --- head/contrib/nvi/vi/v_cmd.c Fri Nov 9 15:27:41 2018 (r340287) +++ head/contrib/nvi/vi/v_cmd.c Fri Nov 9 17:39:57 2018 (r340288) @@ -130,7 +130,7 @@ VIKEYS const vikeys [MAXVIKEY + 1] = { /* 034 ^\ */ {v_exmode, 0, "^\\", - " ^\\ switch to ex mode"}, + "^\\ switch to ex mode"}, /* 035 ^] */ {v_tagpush, V_ABS|V_KEYW|VM_RCM_SET, "^]", From owner-svn-src-head@freebsd.org Fri Nov 9 17:43:20 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 AA4B3110283C; Fri, 9 Nov 2018 17:43:20 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2951784C64; Fri, 9 Nov 2018 17:43:20 +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 0B534172C6; Fri, 9 Nov 2018 17:43:20 +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 wA9HhJnq004335; Fri, 9 Nov 2018 17:43:19 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9HhJSR004334; Fri, 9 Nov 2018 17:43:19 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091743.wA9HhJSR004334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 17:43:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340289 - in head: tools/build/mk usr.bin/clang/llvm-cov X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: tools/build/mk usr.bin/clang/llvm-cov X-SVN-Commit-Revision: 340289 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2951784C64 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 17:43:20 -0000 Author: emaste Date: Fri Nov 9 17:43:19 2018 New Revision: 340289 URL: https://svnweb.freebsd.org/changeset/base/340289 Log: llvm-cov: also install as gcov (if GNU gcov is disabled) llvm-cov provides a gcov-compatible interface when invoked as gcov. Reviewed by: dim, markj MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17923 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/clang/llvm-cov/Makefile Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 9 17:39:57 2018 (r340288) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 9 17:43:19 2018 (r340289) @@ -2461,7 +2461,7 @@ OLD_FILES+=usr/share/man/man1/gperf.1.gz OLD_FILES+=usr/share/man/man1/gperf.7.gz .endif -.if ${MK_GCC} == no || ${MK_GCOV} == no +.if (${MK_GCOV} == no || ${MK_GCC} == no) && ${MK_LLVM_COV} == no OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz .endif Modified: head/usr.bin/clang/llvm-cov/Makefile ============================================================================== --- head/usr.bin/clang/llvm-cov/Makefile Fri Nov 9 17:39:57 2018 (r340288) +++ head/usr.bin/clang/llvm-cov/Makefile Fri Nov 9 17:43:19 2018 (r340289) @@ -1,6 +1,12 @@ # $FreeBSD$ +.include <src.opts.mk> + PROG_CXX= llvm-cov +.if ${MK_GCOV} == "no" +LINKS= ${BINDIR}/llvm-cov ${BINDIR}/gcov +MLINKS= llvm-cov.1 gcov.1 +.endif SRCDIR= tools/llvm-cov SRCS+= CodeCoverage.cpp From owner-svn-src-head@freebsd.org Fri Nov 9 18:03:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6D8A81103182; Fri, 9 Nov 2018 18:03:02 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CE65785FEE; Fri, 9 Nov 2018 18:03:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B10EC1761F; Fri, 9 Nov 2018 18:03:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9I31Yf014904; Fri, 9 Nov 2018 18:03:01 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9I31ie014903; Fri, 9 Nov 2018 18:03:01 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811091803.wA9I31ie014903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 18:03:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340294 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340294 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CE65785FEE X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 18:03:02 -0000 Author: brooks Date: Fri Nov 9 18:03:01 2018 New Revision: 340294 URL: https://svnweb.freebsd.org/changeset/base/340294 Log: Fix a number of bugs in freebsd32's capabilities.conf. Bugs range from failure to update after changing syscall implementaion names to using the wrong name. Somewhat confusingly, the name in capabilities.conf is exactly the string that appears in syscalls.master, not the name with a COMPAT* prefix which is the actual function name. Found while making a change to use the default capabilities.conf. Fixes: r335177, r336980, r340272, r340274, others Reviewed by: kib, emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17925 Modified: head/sys/compat/freebsd32/capabilities.conf Modified: head/sys/compat/freebsd32/capabilities.conf ============================================================================== --- head/sys/compat/freebsd32/capabilities.conf Fri Nov 9 18:02:39 2018 (r340293) +++ head/sys/compat/freebsd32/capabilities.conf Fri Nov 9 18:03:01 2018 (r340294) @@ -47,14 +47,14 @@ __mac_get_fd __mac_get_proc __mac_set_fd __mac_set_proc -freebsd32_sysctl -freebsd32_umtx_op +freebsd32___sysctl +freebsd32__umtx_op abort2 accept accept4 aio_cancel freebsd32_aio_error -aio_fsync +freebsd32_aio_fsync freebsd32_aio_read freebsd32_aio_return freebsd32_aio_suspend @@ -94,17 +94,18 @@ freebsd32_fexecve flock fork fpathconf -freebsd11_freebsd32_fstat -freebsd11_freebsd32_fstatat -freebsd11_freebsd32_getdirentries -freebsd11_freebsd32_fstatfs -freebsd11_freebsd32_mknodat -freebsd6_freebsd32_ftruncate -freebsd6_freebsd32_lseek -freebsd6_freebsd32_mmap -freebsd6_freebsd32_pread -freebsd6_freebsd32_pwrite freebsd32_fstat +freebsd32_fstatat +freebsd32_getdirentries +freebsd32_fstatfs +freebsd32_mknodat +freebsd32_ftruncate +freebsd32_lseek +freebsd32_mmap +mmap +freebsd32_pread +freebsd32_pwrite +freebsd32_fstat fstatfs fsync ftruncate @@ -115,7 +116,7 @@ getaudit getaudit_addr getauid freebsd32_getcontext -getdents +freebsd32_getdents freebsd32_getdirentries getdirentries getdomainname @@ -178,7 +179,7 @@ freebsd32_nanosleep ntp_gettime freebsd6_freebsd32_aio_read freebsd6_freebsd32_aio_write -obreak +break freebsd6_freebsd32_lio_listio chflagsat faccessat @@ -223,7 +224,7 @@ sched_get_priority_max sched_get_priority_min sched_getparam sched_getscheduler -sched_rr_get_interval +freebsd32_sched_rr_get_interval sched_setparam sched_setscheduler sched_yield @@ -260,11 +261,15 @@ freebsd32_sigaction freebsd32_sigaltstack freebsd32_sigblock freebsd32_sigpending +sigpending +freebsd32_sigprocmask sigprocmask +freebsd32_sigqueue sigqueue freebsd32_sigreturn freebsd32_sigsetmask -ofreebsd32_sigstack +freebsd32_sigstack +freebsd32_sigsuspend sigsuspend freebsd32_sigtimedwait freebsd32_sigvec From owner-svn-src-head@freebsd.org Fri Nov 9 18:06:26 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5236C110336C; Fri, 9 Nov 2018 18:06:26 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C0694862BE; Fri, 9 Nov 2018 18:06:25 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82FEE17625; Fri, 9 Nov 2018 18:06:25 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9I6PY3015090; Fri, 9 Nov 2018 18:06:25 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9I6PQ9015089; Fri, 9 Nov 2018 18:06:25 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811091806.wA9I6PQ9015089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 18:06:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340295 - head/sys/compat/freebsd32 X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/compat/freebsd32 X-SVN-Commit-Revision: 340295 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C0694862BE X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 18:06:26 -0000 Author: brooks Date: Fri Nov 9 18:06:25 2018 New Revision: 340295 URL: https://svnweb.freebsd.org/changeset/base/340295 Log: Regen after r340294: Fix a number of bugs in freebsd32's capabilities.conf. Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17925 Modified: head/sys/compat/freebsd32/freebsd32_sysent.c Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 18:03:01 2018 (r340294) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 18:06:25 2018 (r340295) @@ -73,7 +73,7 @@ struct sysent freebsd32_sysent[] = { { compat11(AS(freebsd11_freebsd32_mknod_args),freebsd32_mknod), AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = freebsd11 freebsd32_mknod */ { AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 15 = chmod */ { AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 16 = chown */ - { AS(break_args), (sy_call_t *)sys_break, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 17 = break */ + { AS(break_args), (sy_call_t *)sys_break, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 17 = break */ { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 18 = freebsd4 freebsd32_getfsstat */ { compat(AS(ofreebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 19 = old freebsd32_lseek */ { 0, (sy_call_t *)sys_getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 20 = getpid */ @@ -104,7 +104,7 @@ struct sysent freebsd32_sysent[] = { { AS(ktrace_args), (sy_call_t *)sys_ktrace, AUE_KTRACE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 45 = ktrace */ { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 46 = old freebsd32_sigaction */ { 0, (sy_call_t *)sys_getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 47 = getgid */ - { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 48 = old freebsd32_sigprocmask */ + { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 48 = old freebsd32_sigprocmask */ { AS(getlogin_args), (sy_call_t *)sys_getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 49 = getlogin */ { AS(setlogin_args), (sy_call_t *)sys_setlogin, AUE_SETLOGIN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)sys_acct, AUE_ACCT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 51 = acct */ @@ -127,7 +127,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 68 = obsolete vwrite */ { AS(sbrk_args), (sy_call_t *)sys_sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 69 = sbrk */ { AS(sstk_args), (sy_call_t *)sys_sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 70 = sstk */ - { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, 0, SY_THR_STATIC }, /* 71 = old mmap */ + { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 71 = old mmap */ { compat11(AS(freebsd11_vadvise_args),vadvise), AUE_O_VADVISE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 72 = freebsd11 vadvise */ { AS(munmap_args), (sy_call_t *)sys_munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 73 = munmap */ { AS(freebsd32_mprotect_args), (sy_call_t *)freebsd32_mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 74 = freebsd32_mprotect */ @@ -167,8 +167,8 @@ struct sysent freebsd32_sysent[] = { { compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 108 = old freebsd32_sigvec */ { compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 109 = old freebsd32_sigblock */ { compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 110 = old freebsd32_sigsetmask */ - { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND, NULL, 0, 0, 0, SY_THR_STATIC }, /* 111 = old freebsd32_sigsuspend */ - { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 112 = old freebsd32_sigstack */ + { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 111 = old freebsd32_sigsuspend */ + { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 112 = old freebsd32_sigstack */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 113 = obsolete orecvmsg */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 114 = obsolete osendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 115 = obsolete vtrace */ @@ -214,7 +214,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 155 = nfssvc */ { compat(AS(ofreebsd32_getdirentries_args),freebsd32_getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 156 = old freebsd32_getdirentries */ { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 157 = freebsd4 freebsd32_statfs */ - { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 158 = freebsd4 freebsd32_fstatfs */ + { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 158 = freebsd4 freebsd32_fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 159 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 160 = lgetfh */ { AS(getfh_args), (sy_call_t *)sys_getfh, AUE_NFS_GETFH, NULL, 0, 0, 0, SY_THR_STATIC }, /* 161 = getfh */ @@ -258,7 +258,7 @@ struct sysent freebsd32_sysent[] = { { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 199 = freebsd6 freebsd32_lseek */ { compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 200 = freebsd6 freebsd32_truncate */ { compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 201 = freebsd6 freebsd32_ftruncate */ - { AS(freebsd32___sysctl_args), (sy_call_t *)freebsd32___sysctl, AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 202 = freebsd32___sysctl */ + { AS(freebsd32___sysctl_args), (sy_call_t *)freebsd32___sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 202 = freebsd32___sysctl */ { AS(mlock_args), (sy_call_t *)sys_mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 203 = mlock */ { AS(munlock_args), (sy_call_t *)sys_munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 204 = munlock */ { AS(undelete_args), (sy_call_t *)sys_undelete, AUE_UNDELETE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 205 = undelete */ @@ -328,7 +328,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 269 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 270 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 271 = nosys */ - { compat11(AS(freebsd11_freebsd32_getdents_args),freebsd32_getdents), AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = freebsd11 freebsd32_getdents */ + { compat11(AS(freebsd11_freebsd32_getdents_args),freebsd32_getdents), AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 272 = freebsd11 freebsd32_getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)sys_lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = lchmod */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 275 = obsolete netbsd_lchown */ @@ -390,7 +390,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)sys_sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 331 = sched_yield */ { AS(sched_get_priority_max_args), (sy_call_t *)sys_sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 332 = sched_get_priority_max */ { AS(sched_get_priority_min_args), (sy_call_t *)sys_sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 333 = sched_get_priority_min */ - { AS(freebsd32_sched_rr_get_interval_args), (sy_call_t *)freebsd32_sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 334 = freebsd32_sched_rr_get_interval */ + { AS(freebsd32_sched_rr_get_interval_args), (sy_call_t *)freebsd32_sched_rr_get_interval, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 334 = freebsd32_sched_rr_get_interval */ { AS(utrace_args), (sy_call_t *)sys_utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 335 = utrace */ { compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 336 = freebsd4 freebsd32_sendfile */ { AS(kldsym_args), (sy_call_t *)sys_kldsym, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 337 = kldsym */ @@ -399,7 +399,7 @@ struct sysent freebsd32_sysent[] = { { AS(sigprocmask_args), (sy_call_t *)sys_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 340 = sigprocmask */ { AS(sigsuspend_args), (sy_call_t *)sys_sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 341 = sigsuspend */ { compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 342 = freebsd4 freebsd32_sigaction */ - { AS(sigpending_args), (sy_call_t *)sys_sigpending, AUE_SIGPENDING, NULL, 0, 0, 0, SY_THR_STATIC }, /* 343 = sigpending */ + { AS(sigpending_args), (sy_call_t *)sys_sigpending, AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 343 = sigpending */ { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 344 = freebsd4 freebsd32_sigreturn */ { AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 345 = freebsd32_sigtimedwait */ { AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 346 = freebsd32_sigwaitinfo */ @@ -510,9 +510,9 @@ struct sysent freebsd32_sysent[] = { { AS(getaudit_addr_args), (sy_call_t *)sys_getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 451 = getaudit_addr */ { AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 452 = setaudit_addr */ { AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 453 = auditctl */ - { AS(freebsd32__umtx_op_args), (sy_call_t *)freebsd32__umtx_op, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 454 = freebsd32__umtx_op */ + { AS(freebsd32__umtx_op_args), (sy_call_t *)freebsd32__umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 454 = freebsd32__umtx_op */ { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 455 = freebsd32_thr_new */ - { AS(freebsd32_sigqueue_args), (sy_call_t *)freebsd32_sigqueue, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 456 = freebsd32_sigqueue */ + { AS(freebsd32_sigqueue_args), (sy_call_t *)freebsd32_sigqueue, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 456 = freebsd32_sigqueue */ { AS(freebsd32_kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 457 = freebsd32_kmq_open */ { AS(freebsd32_kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT }, /* 458 = freebsd32_kmq_setattr */ { AS(freebsd32_kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT }, /* 459 = freebsd32_kmq_timedreceive */ @@ -521,7 +521,7 @@ struct sysent freebsd32_sysent[] = { { AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 462 = kmq_unlink */ { AS(abort2_args), (sy_call_t *)sys_abort2, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)sys_thr_set_name, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 464 = thr_set_name */ - { AS(freebsd32_aio_fsync_args), (sy_call_t *)freebsd32_aio_fsync, AUE_AIO_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 465 = freebsd32_aio_fsync */ + { AS(freebsd32_aio_fsync_args), (sy_call_t *)freebsd32_aio_fsync, AUE_AIO_FSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 465 = freebsd32_aio_fsync */ { AS(rtprio_thread_args), (sy_call_t *)sys_rtprio_thread, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 466 = rtprio_thread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 467 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 468 = nosys */ @@ -567,7 +567,7 @@ struct sysent freebsd32_sysent[] = { { AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 495 = linkat */ { AS(mkdirat_args), (sy_call_t *)sys_mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 496 = mkdirat */ { AS(mkfifoat_args), (sy_call_t *)sys_mkfifoat, AUE_MKFIFOAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 497 = mkfifoat */ - { compat11(AS(freebsd11_freebsd32_mknodat_args),freebsd32_mknodat), AUE_MKNODAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 498 = freebsd11 freebsd32_mknodat */ + { compat11(AS(freebsd11_freebsd32_mknodat_args),freebsd32_mknodat), AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 498 = freebsd11 freebsd32_mknodat */ { AS(openat_args), (sy_call_t *)sys_openat, AUE_OPENAT_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 499 = openat */ { AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 500 = readlinkat */ { AS(renameat_args), (sy_call_t *)sys_renameat, AUE_RENAMEAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 501 = renameat */ From owner-svn-src-head@freebsd.org Fri Nov 9 18:19:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 1AAAF1103BFF; Fri, 9 Nov 2018 18:19:10 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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 4527186EE3; Fri, 9 Nov 2018 18:19:09 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id D27743C475F; Fri, 9 Nov 2018 18:19:01 +0000 (UTC) Date: Fri, 9 Nov 2018 18:19:01 +0000 From: Brooks Davis <brooks@freebsd.org> To: Brooks Davis <brooks@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340294 - head/sys/compat/freebsd32 Message-ID: <20181109181901.GA61841@spindle.one-eyed-alien.net> References: <201811091803.wA9I31ie014903@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="liOOAslEiF7prFVr" Content-Disposition: inline In-Reply-To: <201811091803.wA9I31ie014903@repo.freebsd.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4527186EE3 X-Spamd-Result: default: False [-0.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.90)[-0.900,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.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-0.94)[-0.943,0]; IP_SCORE(-0.77)[asn: 36236(-3.78), country: US(-0.09)]; MX_GOOD(-0.01)[spindle.one-eyed-alien.net]; MX_MISSING(3.50)[requested record is not found]; NEURAL_HAM_SHORT(-0.83)[-0.829,0]; R_SPF_NA(0.00)[]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 18:19:10 -0000 --liOOAslEiF7prFVr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 09, 2018 at 06:03:01PM +0000, Brooks Davis wrote: > Author: brooks > Date: Fri Nov 9 18:03:01 2018 > New Revision: 340294 > URL: https://svnweb.freebsd.org/changeset/base/340294 >=20 > Log: > Fix a number of bugs in freebsd32's capabilities.conf. > =20 > Bugs range from failure to update after changing syscall implementaion > names to using the wrong name. Somewhat confusingly, the name in > capabilities.conf is exactly the string that appears in syscalls.master, > not the name with a COMPAT* prefix which is the actual function name. > =20 > Found while making a change to use the default capabilities.conf. > =20 > Fixes: r335177, r336980, r340272, r340274, others > Reviewed by: kib, emaste > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D17925 Arg, I forgot: MFC After: 3 days --liOOAslEiF7prFVr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJb5c+VAAoJEKzQXbSebgfAydoIAJqAhhAmSNppoJ3TH437Zom5 emdnQcLeebX947uWJw0kV3x8UVDx2xMWajV7OUkvft/7S2eP2yyGELF2puKXTTRz AJQkHm8/iwVscLglCNG27GlfUhM0gpP6ZzoXHd8fuc525MmclKHFhTtV7vwjXOyg Tefy+hUWtUqMiK08eDOyHnfKrNxhCqheQaPY2hDhA/JoB57/90D80lmosGXl2DzN ZbTkqJU7UaJDrNUntzgiUmGFq2UGDsVHjuUQyo+Y0pl65AbeXSXuzq8lKGP94KzZ L2Posjng0BOQMSLI3w7sUHf0ZkOEOb8liA4LpDcGyG7UfX0IM+X99tMn0VW0Ea0= =v8DZ -----END PGP SIGNATURE----- --liOOAslEiF7prFVr-- From owner-svn-src-head@freebsd.org Fri Nov 9 18:35:10 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 BA5F81104373; Fri, 9 Nov 2018 18:35:10 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46AAA88424; Fri, 9 Nov 2018 18:35:10 +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 264FE17B03; Fri, 9 Nov 2018 18:35:10 +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 wA9IZA93030429; Fri, 9 Nov 2018 18:35:10 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9IZ9ON030427; Fri, 9 Nov 2018 18:35:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091835.wA9IZ9ON030427@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 18:35:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340296 - in head: tools/build/mk usr.bin/clang X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: tools/build/mk usr.bin/clang X-SVN-Commit-Revision: 340296 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 46AAA88424 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 18:35:11 -0000 Author: emaste Date: Fri Nov 9 18:35:09 2018 New Revision: 340296 URL: https://svnweb.freebsd.org/changeset/base/340296 Log: Move llvm-profdata build into MK_LLVM_COV block llvm-profdata is used with llvm-cov for code coverage (although llvm-cov can also operate independently in a gcov-compatible mode). Although llvm-profdata can be used independently of llvm-cov it makes sense to group these under one option. Also handle these in OptionalObsoleteFiles.inc while here. Sponsored by: The FreeBSD Foundation Modified: head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/clang/Makefile Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 9 18:06:25 2018 (r340295) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Nov 9 18:35:09 2018 (r340296) @@ -2466,6 +2466,12 @@ OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz .endif +.if ${MK_LLVM_COV} == no +OLD_FILES+=usr/bin/llvm-cov +OLD_FILES+=usr/bin/llvm-profdata +OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz +.endif + .if ${MK_GDB} == no || ${MK_GDB_LIBEXEC} == yes OLD_FILES+=usr/bin/gdb OLD_FILES+=usr/bin/gdbserver Modified: head/usr.bin/clang/Makefile ============================================================================== --- head/usr.bin/clang/Makefile Fri Nov 9 18:06:25 2018 (r340295) +++ head/usr.bin/clang/Makefile Fri Nov 9 18:35:09 2018 (r340296) @@ -31,7 +31,6 @@ SUBDIR+= llvm-modextract SUBDIR+= llvm-nm SUBDIR+= llvm-objcopy SUBDIR+= llvm-pdbutil -SUBDIR+= llvm-profdata SUBDIR+= llvm-rtdyld SUBDIR+= llvm-symbolizer SUBDIR+= llvm-xray @@ -46,6 +45,7 @@ SUBDIR+= lldb .endif .if ${MK_LLVM_COV} != "no" SUBDIR+= llvm-cov +SUBDIR+= llvm-profdata .endif .endif # TOOLS_PREFIX From owner-svn-src-head@freebsd.org Fri Nov 9 18:56:42 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 AD43F1104B20; Fri, 9 Nov 2018 18:56:42 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B84B88F6F; Fri, 9 Nov 2018 18:56:42 +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 D2D7817E27; Fri, 9 Nov 2018 18:56:41 +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 wA9IufMA042533; Fri, 9 Nov 2018 18:56:41 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9IufSO042531; Fri, 9 Nov 2018 18:56:41 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811091856.wA9IufSO042531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans <kevans@FreeBSD.org> Date: Fri, 9 Nov 2018 18:56:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340297 - in head/sys: conf tools/fdt X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/sys: conf tools/fdt X-SVN-Commit-Revision: 340297 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1B84B88F6F X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 18:56:42 -0000 Author: kevans Date: Fri Nov 9 18:56:40 2018 New Revision: 340297 URL: https://svnweb.freebsd.org/changeset/base/340297 Log: Use ${ECHO} in dtb/dtbo build, pass in from dtb.mk for -s Reported by: sbruno MFC after: 3 days Modified: head/sys/conf/dtb.mk head/sys/tools/fdt/make_dtb.sh head/sys/tools/fdt/make_dtbo.sh Modified: head/sys/conf/dtb.mk ============================================================================== --- head/sys/conf/dtb.mk Fri Nov 9 18:35:09 2018 (r340296) +++ head/sys/conf/dtb.mk Fri Nov 9 18:56:40 2018 (r340297) @@ -58,8 +58,8 @@ all: ${DTB} ${DTBO} .export DTC .for _dts in ${DTS} ${_dts:R:S/$/.dtb/}: ${_dts} ${OP_META} - @echo Generating ${.TARGET} from ${_dts} - @${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${_dts} ${.OBJDIR} + @${ECHO} Generating ${.TARGET} from ${_dts} + @env ECHO=${ECHO} ${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${_dts} ${.OBJDIR} CLEANFILES+=${_dts:R:S/$/.dtb/} .endfor .endif @@ -68,8 +68,8 @@ CLEANFILES+=${_dts:R:S/$/.dtb/} .export DTC .for _dtso in ${DTSO} ${_dtso:R:S/$/.dtbo/}: ${_dtso} ${OP_META} - @echo Generating ${.TARGET} from ${_dtso} - @${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} overlays/${_dtso} ${.OBJDIR} + @${ECHO} Generating ${.TARGET} from ${_dtso} + @env ECHO=${ECHO} ${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} overlays/${_dtso} ${.OBJDIR} CLEANFILES+=${_dtso:R:S/$/.dtbo/} .endfor .endif Modified: head/sys/tools/fdt/make_dtb.sh ============================================================================== --- head/sys/tools/fdt/make_dtb.sh Fri Nov 9 18:35:09 2018 (r340296) +++ head/sys/tools/fdt/make_dtb.sh Fri Nov 9 18:56:40 2018 (r340297) @@ -17,10 +17,11 @@ if [ -z "${MACHINE}" ]; then fi : ${DTC:=dtc} +: ${ECHO:=echo} for d in ${dts}; do dtb=${dtb_path}/`basename $d .dts`.dtb - echo "converting $d -> $dtb" + ${ECHO} "converting $d -> $dtb" cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I $S/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -I $S/gnu/dts/ -include $d /dev/null | ${DTC} -@ -O dtb -o $dtb -b 0 -p 1024 -i $S/dts/${MACHINE} -i $S/gnu/dts/${MACHINE} -i $S/gnu/dts/ done Modified: head/sys/tools/fdt/make_dtbo.sh ============================================================================== --- head/sys/tools/fdt/make_dtbo.sh Fri Nov 9 18:35:09 2018 (r340296) +++ head/sys/tools/fdt/make_dtbo.sh Fri Nov 9 18:56:40 2018 (r340297) @@ -17,10 +17,11 @@ if [ -z "${MACHINE}" ]; then fi : ${DTC:=dtc} +: ${ECHO:=echo} for d in ${dtso}; do dtb=${dtbo_path}/`basename $d .dtso`.dtbo - echo "converting $d -> $dtb" + ${ECHO} "converting $d -> $dtb" cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I $S/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null | ${DTC} -@ -O dtb -o $dtb -i $S/dts/${MACHINE} -i $S/gnu/dts/${MACHINE} done From owner-svn-src-head@freebsd.org Fri Nov 9 19:16:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6C4F41105091; Fri, 9 Nov 2018 19:16:02 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CFAED8983C; Fri, 9 Nov 2018 19:16:01 +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 ACEC318169; Fri, 9 Nov 2018 19:16:01 +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 wA9JG122052973; Fri, 9 Nov 2018 19:16:01 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9JG1Xl052972; Fri, 9 Nov 2018 19:16:01 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091916.wA9JG1Xl052972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 19:16:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340298 - head/sys/arm/freescale/imx X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/arm/freescale/imx X-SVN-Commit-Revision: 340298 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CFAED8983C X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 19:16:02 -0000 Author: emaste Date: Fri Nov 9 19:16:01 2018 New Revision: 340298 URL: https://svnweb.freebsd.org/changeset/base/340298 Log: use -m ${LD_EMULATION} for binary->elf link invocation r306041 changed ld invocations for converting binary files to kernel ELF objects to pass -m, but missed bespoke ld invocations in a pair of arm file configs (one of which has since been removed). This is needed to support some external toolchains and lld. Sponsored by: The FreeBSD Foundation Modified: head/sys/arm/freescale/imx/files.imx6 Modified: head/sys/arm/freescale/imx/files.imx6 ============================================================================== --- head/sys/arm/freescale/imx/files.imx6 Fri Nov 9 18:56:40 2018 (r340297) +++ head/sys/arm/freescale/imx/files.imx6 Fri Nov 9 19:16:01 2018 (r340298) @@ -64,7 +64,7 @@ sdma_fw.c optional sdma_fw \ clean "sdma_fw.c" sdma-imx6q-to1.fwo optional sdma_fw \ dependency "sdma-imx6q-to1.bin" \ - compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} sdma-imx6q-to1.bin" \ + compile-with "${LD} -m ${LD_EMULATION} -b binary -d -warn-common -r -d -o ${.TARGET} sdma-imx6q-to1.bin" \ no-implicit-rule \ clean "sdma-imx6q-to1.fwo" sdma-imx6q-to1.bin optional sdma_fw \ From owner-svn-src-head@freebsd.org Fri Nov 9 19:17:26 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 76C9F110515A; Fri, 9 Nov 2018 19:17:26 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ED83689A21; Fri, 9 Nov 2018 19:17:25 +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 CE2601816B; Fri, 9 Nov 2018 19:17:25 +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 wA9JHPOW053091; Fri, 9 Nov 2018 19:17:25 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9JHPrk053090; Fri, 9 Nov 2018 19:17:25 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091917.wA9JHPrk053090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 19:17:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340299 - head/sys/contrib/octeon-sdk X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/contrib/octeon-sdk X-SVN-Commit-Revision: 340299 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ED83689A21 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 19:17:26 -0000 Author: emaste Date: Fri Nov 9 19:17:25 2018 New Revision: 340299 URL: https://svnweb.freebsd.org/changeset/base/340299 Log: Octeon SDK: avoid use of uninitialized variable Reported by: Clang MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/sys/contrib/octeon-sdk/cvmx-pip.h Modified: head/sys/contrib/octeon-sdk/cvmx-pip.h ============================================================================== --- head/sys/contrib/octeon-sdk/cvmx-pip.h Fri Nov 9 19:16:01 2018 (r340298) +++ head/sys/contrib/octeon-sdk/cvmx-pip.h Fri Nov 9 19:17:25 2018 (r340299) @@ -684,6 +684,7 @@ static inline int cvmx_pip_get_bsel_table_index(cvmx_w bsel_cfg.u64 = cvmx_read_csr(CVMX_PIP_BSEL_EXT_CFGX(bit)); bsel_pos.u64 = cvmx_read_csr(CVMX_PIP_BSEL_EXT_POSX(bit)); + index = 0; for (y = 0; y < 8; y++) { char *ptr = (char *)cvmx_phys_to_ptr(work->packet_ptr.s.addr); From owner-svn-src-head@freebsd.org Fri Nov 9 19:51:27 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 878D61106027; Fri, 9 Nov 2018 19:51: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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 177F28B166; Fri, 9 Nov 2018 19:51:27 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDEEF1879B; Fri, 9 Nov 2018 19:51: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 wA9JpQmo069752; Fri, 9 Nov 2018 19:51:26 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9JpQ4G069751; Fri, 9 Nov 2018 19:51:26 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811091951.wA9JpQ4G069751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 19:51:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340300 - head/lib/clang/libllvm X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/lib/clang/libllvm X-SVN-Commit-Revision: 340300 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 177F28B166 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 19:51:27 -0000 Author: emaste Date: Fri Nov 9 19:51:26 2018 New Revision: 340300 URL: https://svnweb.freebsd.org/changeset/base/340300 Log: libllvm: Move SampleProfWriter to SRCS_MIN It is required by llvm-profdata, now built by default under the LLVM_COV knob. The additional complexity that would come from avoiding building it if CLANG_EXTRAS and LLVM_COV are both disabled is not worth the small savings in build time. Sponsored by: The FreeBSD Foundation Modified: head/lib/clang/libllvm/Makefile Modified: head/lib/clang/libllvm/Makefile ============================================================================== --- head/lib/clang/libllvm/Makefile Fri Nov 9 19:17:25 2018 (r340299) +++ head/lib/clang/libllvm/Makefile Fri Nov 9 19:51:26 2018 (r340300) @@ -683,7 +683,7 @@ SRCS_MIN+= ProfileData/InstrProfWriter.cpp SRCS_MIN+= ProfileData/ProfileSummaryBuilder.cpp SRCS_MIN+= ProfileData/SampleProf.cpp SRCS_MIN+= ProfileData/SampleProfReader.cpp -SRCS_EXT+= ProfileData/SampleProfWriter.cpp +SRCS_MIN+= ProfileData/SampleProfWriter.cpp SRCS_MIN+= Support/APFloat.cpp SRCS_MIN+= Support/APInt.cpp SRCS_MIN+= Support/APSInt.cpp From owner-svn-src-head@freebsd.org Fri Nov 9 20:33:39 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 64D26110738B; Fri, 9 Nov 2018 20:33:39 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D04DC8C9DF; Fri, 9 Nov 2018 20:33:38 +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 B1BBE18E85; Fri, 9 Nov 2018 20:33:38 +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 wA9KXcVB099064; Fri, 9 Nov 2018 20:33:38 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9KXcha099063; Fri, 9 Nov 2018 20:33:38 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811092033.wA9KXcha099063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Fri, 9 Nov 2018 20:33:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340301 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 340301 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D04DC8C9DF X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 20:33:39 -0000 Author: emaste Date: Fri Nov 9 20:33:38 2018 New Revision: 340301 URL: https://svnweb.freebsd.org/changeset/base/340301 Log: Add comment to explain kernel ldscript 0x200000 constant Reported by: linimon Modified: head/sys/conf/ldscript.amd64 Modified: head/sys/conf/ldscript.amd64 ============================================================================== --- head/sys/conf/ldscript.amd64 Fri Nov 9 19:51:26 2018 (r340300) +++ head/sys/conf/ldscript.amd64 Fri Nov 9 20:33:38 2018 (r340301) @@ -6,7 +6,7 @@ SEARCH_DIR("/usr/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ - kernphys = 0x200000; + kernphys = 0x200000; /* 2MB superpage size */ . = kernbase + kernphys + SIZEOF_HEADERS; /* * Use the AT keyword in order to set the right LMA that contains From owner-svn-src-head@freebsd.org Fri Nov 9 21:01:18 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 34B0D1107C5E; Fri, 9 Nov 2018 21:01:18 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B53468D6A8; Fri, 9 Nov 2018 21:01:17 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 964F2191FC; Fri, 9 Nov 2018 21:01:17 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9L1HdU012713; Fri, 9 Nov 2018 21:01:17 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9L1GnW012710; Fri, 9 Nov 2018 21:01:16 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811092101.wA9L1GnW012710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 21:01:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340302 - in head/sys: compat/freebsd32 kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 kern X-SVN-Commit-Revision: 340302 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B53468D6A8 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 21:01:18 -0000 Author: brooks Date: Fri Nov 9 21:01:16 2018 New Revision: 340302 URL: https://svnweb.freebsd.org/changeset/base/340302 Log: Fix freebsd32 mknod(at). As dev_t is now a 64-bit integer, it requires special handling as a system call argument. 64-bit arguments are split between two 64-bit integers due to the way arguments are promoted to allow reuse of most system call implementations. They must be reassembled before use. Further, 64-bit arguments at an odd offset (counting from zero) are padded and slid to the next slot on powerpc and mips. Fix the non-COMPAT11 system call by adding a freebsd32_mknodat() and appropriately padded declerations. The COMPAT11 system calls are fully compatible with the 64-bit implementations so remove the freebsd32_ versions. Use uint32_t consistently as the type of the old dev_t. This matches the old definition. Reviewed by: kib MFC after: 3 days Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17928 Modified: head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/syscalls.master head/sys/kern/syscalls.master Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Fri Nov 9 20:33:38 2018 (r340301) +++ head/sys/compat/freebsd32/freebsd32_misc.c Fri Nov 9 21:01:16 2018 (r340302) @@ -463,25 +463,14 @@ freebsd32_fexecve(struct thread *td, struct freebsd32_ return (error); } -#if defined(COMPAT_FREEBSD11) -int -freebsd11_freebsd32_mknod(struct thread *td, - struct freebsd11_freebsd32_mknod_args *uap) -{ - return (kern_mknodat(td, AT_FDCWD, uap->path, UIO_USERSPACE, uap->mode, - uap->dev)); -} - int -freebsd11_freebsd32_mknodat(struct thread *td, - struct freebsd11_freebsd32_mknodat_args *uap) +freebsd32_mknodat(struct thread *td, struct freebsd32_mknodat_args *uap) { - return (kern_mknodat(td, uap->fd, uap->path, UIO_USERSPACE, uap->mode, - uap->dev)); + return (kern_mknodat(td, uap->fd, uap->path, UIO_USERSPACE, + uap->mode, PAIR32TO64(dev_t, uap->dev))); } -#endif /* COMPAT_FREEBSD11 */ int freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap) Modified: head/sys/compat/freebsd32/syscalls.master ============================================================================== --- head/sys/compat/freebsd32/syscalls.master Fri Nov 9 20:33:38 2018 (r340301) +++ head/sys/compat/freebsd32/syscalls.master Fri Nov 9 21:01:16 2018 (r340302) @@ -84,8 +84,8 @@ 11 AUE_NULL OBSOL execv 12 AUE_CHDIR NOPROTO { int chdir(const char *path); } 13 AUE_FCHDIR NOPROTO { int fchdir(int fd); } -14 AUE_MKNOD COMPAT11 { int freebsd32_mknod(const char *path, \ - int mode, int dev); } +14 AUE_MKNOD COMPAT11|NOPROTO { int mknod(const char *path, \ + int mode, uint32_t dev); } 15 AUE_CHMOD NOPROTO { int chmod(const char *path, mode_t mode); } 16 AUE_CHOWN NOPROTO { int chown(const char *path, int uid, int gid); } 17 AUE_NULL NOPROTO { void *break(char *nsize); } @@ -958,7 +958,7 @@ mode_t mode); } 497 AUE_MKFIFOAT NOPROTO { int mkfifoat(int fd, const char *path, \ mode_t mode); } -498 AUE_MKNODAT COMPAT11 { int freebsd32_mknodat(int fd, \ +498 AUE_MKNODAT COMPAT11|NOPROTO { int mknodat(int fd, \ const char *path, mode_t mode, \ uint32_t dev); } 499 AUE_OPENAT_RWTC NOPROTO { int openat(int fd, const char *path, \ @@ -1113,8 +1113,15 @@ long bufsize, int mode); } 558 AUE_FHSTATFS NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \ struct statfs32 *buf); } -559 AUE_MKNODAT NOPROTO { int mknodat(int fd, const char *path, \ - mode_t mode, dev_t dev); } +#ifdef PAD64_REQUIRED +559 AUE_MKNODAT STD { int freebsd32_mknodat(int fd, \ + const char *path, mode_t mode, \ + int pad, uint32_t dev1, uint32_t dev2); } +#else +559 AUE_MKNODAT STD { int freebsd32_mknodat(int fd, \ + const char *path, mode_t mode, \ + uint32_t dev1, uint32_t dev2); } +#endif 560 AUE_KEVENT STD { int freebsd32_kevent(int fd, \ const struct kevent32 *changelist, \ int nchanges, \ Modified: head/sys/kern/syscalls.master ============================================================================== --- head/sys/kern/syscalls.master Fri Nov 9 20:33:38 2018 (r340301) +++ head/sys/kern/syscalls.master Fri Nov 9 21:01:16 2018 (r340302) @@ -163,7 +163,7 @@ int mknod( _In_z_ const char *path, int mode, - int dev + uint32_t dev ); } 15 AUE_CHMOD STD { From owner-svn-src-head@freebsd.org Fri Nov 9 21:02:09 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 568301107CC5; Fri, 9 Nov 2018 21:02:09 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E455B8D994; Fri, 9 Nov 2018 21:02:08 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C686A19334; Fri, 9 Nov 2018 21:02:08 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9L28VZ014422; Fri, 9 Nov 2018 21:02:08 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9L27Ft014415; Fri, 9 Nov 2018 21:02:07 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201811092102.wA9L27Ft014415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis <brooks@FreeBSD.org> Date: Fri, 9 Nov 2018 21:02:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340303 - in head/sys: compat/freebsd32 sys X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/sys: compat/freebsd32 sys X-SVN-Commit-Revision: 340303 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E455B8D994 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.995,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 21:02:09 -0000 Author: brooks Date: Fri Nov 9 21:02:07 2018 New Revision: 340303 URL: https://svnweb.freebsd.org/changeset/base/340303 Log: Regen after r340302: Fix freebsd32 mknod(at). Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17928 Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c head/sys/sys/sysproto.h Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 21:01:16 2018 (r340302) +++ head/sys/compat/freebsd32/freebsd32_proto.h Fri Nov 9 21:02:07 2018 (r340303) @@ -684,6 +684,24 @@ struct freebsd32_fhstat_args { char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; char sb_l_[PADL_(struct stat32 *)]; struct stat32 * sb; char sb_r_[PADR_(struct stat32 *)]; }; +#ifdef PAD64_REQUIRED +struct freebsd32_mknodat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char dev1_l_[PADL_(uint32_t)]; uint32_t dev1; char dev1_r_[PADR_(uint32_t)]; + char dev2_l_[PADL_(uint32_t)]; uint32_t dev2; char dev2_r_[PADR_(uint32_t)]; +}; +#else +struct freebsd32_mknodat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; + char dev1_l_[PADL_(uint32_t)]; uint32_t dev1; char dev1_r_[PADR_(uint32_t)]; + char dev2_l_[PADL_(uint32_t)]; uint32_t dev2; char dev2_r_[PADR_(uint32_t)]; +}; +#endif struct freebsd32_kevent_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char changelist_l_[PADL_(const struct kevent32 *)]; const struct kevent32 * changelist; char changelist_r_[PADR_(const struct kevent32 *)]; @@ -839,6 +857,11 @@ int freebsd32_utimensat(struct thread *, struct freebs int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *); int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *); int freebsd32_fhstat(struct thread *, struct freebsd32_fhstat_args *); +#ifdef PAD64_REQUIRED +int freebsd32_mknodat(struct thread *, struct freebsd32_mknodat_args *); +#else +int freebsd32_mknodat(struct thread *, struct freebsd32_mknodat_args *); +#endif int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); int freebsd32_cpuset_getdomain(struct thread *, struct freebsd32_cpuset_getdomain_args *); int freebsd32_cpuset_setdomain(struct thread *, struct freebsd32_cpuset_setdomain_args *); @@ -916,6 +939,9 @@ struct ofreebsd32_getdirentries_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int ofreebsd32_lseek(struct thread *, struct ofreebsd32_lseek_args *); int ofreebsd32_stat(struct thread *, struct ofreebsd32_stat_args *); int ofreebsd32_lstat(struct thread *, struct ofreebsd32_lstat_args *); @@ -987,6 +1013,9 @@ struct freebsd4_freebsd32_sigreturn_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd4_freebsd32_getfsstat(struct thread *, struct freebsd4_freebsd32_getfsstat_args *); int freebsd4_freebsd32_statfs(struct thread *, struct freebsd4_freebsd32_statfs_args *); int freebsd4_freebsd32_fstatfs(struct thread *, struct freebsd4_freebsd32_fstatfs_args *); @@ -1072,6 +1101,9 @@ struct freebsd6_freebsd32_lio_listio_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd6_freebsd32_pread(struct thread *, struct freebsd6_freebsd32_pread_args *); int freebsd6_freebsd32_pwrite(struct thread *, struct freebsd6_freebsd32_pwrite_args *); int freebsd6_freebsd32_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *); @@ -1118,6 +1150,9 @@ struct freebsd7_freebsd32_shmctl_args { #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_args *); int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *); int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *); @@ -1142,6 +1177,9 @@ int freebsd7_freebsd32_shmctl(struct thread *, struct #ifdef PAD64_REQUIRED #else #endif +#ifdef PAD64_REQUIRED +#else +#endif int freebsd10_freebsd32_pipe(struct thread *, struct freebsd10_freebsd32_pipe_args *); #endif /* COMPAT_FREEBSD10 */ @@ -1152,11 +1190,6 @@ int freebsd10_freebsd32_pipe(struct thread *, struct f #if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__)) #define PAD64_REQUIRED #endif -struct freebsd11_freebsd32_mknod_args { - char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; - char dev_l_[PADL_(int)]; int dev; char dev_r_[PADR_(int)]; -}; struct freebsd11_freebsd32_stat_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char ub_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 * ub; char ub_r_[PADR_(struct freebsd11_stat32 *)]; @@ -1204,19 +1237,15 @@ struct freebsd11_freebsd32_fstatat_args { char buf_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 * buf; char buf_r_[PADR_(struct freebsd11_stat32 *)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; -struct freebsd11_freebsd32_mknodat_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; - char dev_l_[PADL_(uint32_t)]; uint32_t dev; char dev_r_[PADR_(uint32_t)]; -}; #ifdef PAD64_REQUIRED #else #endif #ifdef PAD64_REQUIRED #else #endif -int freebsd11_freebsd32_mknod(struct thread *, struct freebsd11_freebsd32_mknod_args *); +#ifdef PAD64_REQUIRED +#else +#endif int freebsd11_freebsd32_stat(struct thread *, struct freebsd11_freebsd32_stat_args *); int freebsd11_freebsd32_fstat(struct thread *, struct freebsd11_freebsd32_fstat_args *); int freebsd11_freebsd32_lstat(struct thread *, struct freebsd11_freebsd32_lstat_args *); @@ -1225,12 +1254,10 @@ int freebsd11_freebsd32_getdents(struct thread *, stru int freebsd11_freebsd32_fhstat(struct thread *, struct freebsd11_freebsd32_fhstat_args *); int freebsd11_freebsd32_kevent(struct thread *, struct freebsd11_freebsd32_kevent_args *); int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fstatat_args *); -int freebsd11_freebsd32_mknodat(struct thread *, struct freebsd11_freebsd32_mknodat_args *); #endif /* COMPAT_FREEBSD11 */ #define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 -#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_mknod AUE_MKNOD #define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT #define FREEBSD32_SYS_AUE_ofreebsd32_lseek AUE_LSEEK #define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG @@ -1364,7 +1391,6 @@ int freebsd11_freebsd32_mknodat(struct thread *, struc #define FREEBSD32_SYS_AUE_freebsd32_fexecve AUE_FEXECVE #define FREEBSD32_SYS_AUE_freebsd11_freebsd32_fstatat AUE_FSTATAT #define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT -#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_mknodat AUE_MKNODAT #define FREEBSD32_SYS_AUE_freebsd32_jail_get AUE_JAIL_GET #define FREEBSD32_SYS_AUE_freebsd32_jail_set AUE_JAIL_SET #define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL @@ -1388,6 +1414,8 @@ int freebsd11_freebsd32_mknodat(struct thread *, struc #define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT #define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT #define FREEBSD32_SYS_AUE_freebsd32_fhstat AUE_FHSTAT +#define FREEBSD32_SYS_AUE_freebsd32_mknodat AUE_MKNODAT +#define FREEBSD32_SYS_AUE_freebsd32_mknodat AUE_MKNODAT #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_KEVENT #define FREEBSD32_SYS_AUE_freebsd32_cpuset_getdomain AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_cpuset_setdomain AUE_NULL Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 21:01:16 2018 (r340302) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Fri Nov 9 21:02:07 2018 (r340303) @@ -19,7 +19,7 @@ /* 11 is obsolete execv */ #define FREEBSD32_SYS_chdir 12 #define FREEBSD32_SYS_fchdir 13 -#define FREEBSD32_SYS_freebsd11_freebsd32_mknod 14 +#define FREEBSD32_SYS_freebsd11_mknod 14 #define FREEBSD32_SYS_chmod 15 #define FREEBSD32_SYS_chown 16 #define FREEBSD32_SYS_break 17 @@ -421,7 +421,7 @@ #define FREEBSD32_SYS_linkat 495 #define FREEBSD32_SYS_mkdirat 496 #define FREEBSD32_SYS_mkfifoat 497 -#define FREEBSD32_SYS_freebsd11_freebsd32_mknodat 498 +#define FREEBSD32_SYS_freebsd11_mknodat 498 #define FREEBSD32_SYS_openat 499 #define FREEBSD32_SYS_readlinkat 500 #define FREEBSD32_SYS_renameat 501 @@ -484,7 +484,8 @@ #define FREEBSD32_SYS_fstatfs 556 #define FREEBSD32_SYS_getfsstat 557 #define FREEBSD32_SYS_fhstatfs 558 -#define FREEBSD32_SYS_mknodat 559 +#define FREEBSD32_SYS_freebsd32_mknodat 559 +#define FREEBSD32_SYS_freebsd32_mknodat 559 #define FREEBSD32_SYS_freebsd32_kevent 560 #define FREEBSD32_SYS_freebsd32_cpuset_getdomain 561 #define FREEBSD32_SYS_freebsd32_cpuset_setdomain 562 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 21:01:16 2018 (r340302) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Nov 9 21:02:07 2018 (r340303) @@ -23,7 +23,7 @@ const char *freebsd32_syscallnames[] = { "obs_execv", /* 11 = obsolete execv */ "chdir", /* 12 = chdir */ "fchdir", /* 13 = fchdir */ - "compat11.freebsd32_mknod", /* 14 = freebsd11 freebsd32_mknod */ + "compat11.mknod", /* 14 = freebsd11 mknod */ "chmod", /* 15 = chmod */ "chown", /* 16 = chown */ "break", /* 17 = break */ @@ -520,7 +520,7 @@ const char *freebsd32_syscallnames[] = { "linkat", /* 495 = linkat */ "mkdirat", /* 496 = mkdirat */ "mkfifoat", /* 497 = mkfifoat */ - "compat11.freebsd32_mknodat", /* 498 = freebsd11 freebsd32_mknodat */ + "compat11.mknodat", /* 498 = freebsd11 mknodat */ "openat", /* 499 = openat */ "readlinkat", /* 500 = readlinkat */ "renameat", /* 501 = renameat */ @@ -591,7 +591,11 @@ const char *freebsd32_syscallnames[] = { "fstatfs", /* 556 = fstatfs */ "getfsstat", /* 557 = getfsstat */ "fhstatfs", /* 558 = fhstatfs */ - "mknodat", /* 559 = mknodat */ +#ifdef PAD64_REQUIRED + "freebsd32_mknodat", /* 559 = freebsd32_mknodat */ +#else + "freebsd32_mknodat", /* 559 = freebsd32_mknodat */ +#endif "freebsd32_kevent", /* 560 = freebsd32_kevent */ "freebsd32_cpuset_getdomain", /* 561 = freebsd32_cpuset_getdomain */ "freebsd32_cpuset_setdomain", /* 562 = freebsd32_cpuset_setdomain */ Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 21:01:16 2018 (r340302) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri Nov 9 21:02:07 2018 (r340303) @@ -70,7 +70,7 @@ struct sysent freebsd32_sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 11 = obsolete execv */ { AS(chdir_args), (sy_call_t *)sys_chdir, AUE_CHDIR, NULL, 0, 0, 0, SY_THR_STATIC }, /* 12 = chdir */ { AS(fchdir_args), (sy_call_t *)sys_fchdir, AUE_FCHDIR, NULL, 0, 0, 0, SY_THR_STATIC }, /* 13 = fchdir */ - { compat11(AS(freebsd11_freebsd32_mknod_args),freebsd32_mknod), AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = freebsd11 freebsd32_mknod */ + { compat11(AS(freebsd11_mknod_args),mknod), AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = freebsd11 mknod */ { AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 15 = chmod */ { AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 16 = chown */ { AS(break_args), (sy_call_t *)sys_break, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 17 = break */ @@ -567,7 +567,7 @@ struct sysent freebsd32_sysent[] = { { AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 495 = linkat */ { AS(mkdirat_args), (sy_call_t *)sys_mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 496 = mkdirat */ { AS(mkfifoat_args), (sy_call_t *)sys_mkfifoat, AUE_MKFIFOAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 497 = mkfifoat */ - { compat11(AS(freebsd11_freebsd32_mknodat_args),freebsd32_mknodat), AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 498 = freebsd11 freebsd32_mknodat */ + { compat11(AS(freebsd11_mknodat_args),mknodat), AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 498 = freebsd11 mknodat */ { AS(openat_args), (sy_call_t *)sys_openat, AUE_OPENAT_RWTC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 499 = openat */ { AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 500 = readlinkat */ { AS(renameat_args), (sy_call_t *)sys_renameat, AUE_RENAMEAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 501 = renameat */ @@ -638,7 +638,11 @@ struct sysent freebsd32_sysent[] = { { AS(fstatfs_args), (sy_call_t *)sys_fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 556 = fstatfs */ { AS(getfsstat_args), (sy_call_t *)sys_getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 557 = getfsstat */ { AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 558 = fhstatfs */ - { AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 559 = mknodat */ +#ifdef PAD64_REQUIRED + { AS(freebsd32_mknodat_args), (sy_call_t *)freebsd32_mknodat, AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 559 = freebsd32_mknodat */ +#else + { AS(freebsd32_mknodat_args), (sy_call_t *)freebsd32_mknodat, AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 559 = freebsd32_mknodat */ +#endif { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_KEVENT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 560 = freebsd32_kevent */ { AS(freebsd32_cpuset_getdomain_args), (sy_call_t *)freebsd32_cpuset_getdomain, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 561 = freebsd32_cpuset_getdomain */ { AS(freebsd32_cpuset_setdomain_args), (sy_call_t *)freebsd32_cpuset_setdomain, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 562 = freebsd32_cpuset_setdomain */ Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 21:01:16 2018 (r340302) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Nov 9 21:02:07 2018 (r340303) @@ -3201,16 +3201,32 @@ systrace_args(int sysnum, void *params, uint64_t *uarg *n_args = 2; break; } - /* mknodat */ +#ifdef PAD64_REQUIRED + /* freebsd32_mknodat */ case 559: { - struct mknodat_args *p = params; + struct freebsd32_mknodat_args *p = params; iarg[0] = p->fd; /* int */ uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* mode_t */ - iarg[3] = p->dev; /* dev_t */ - *n_args = 4; + iarg[3] = p->pad; /* int */ + uarg[4] = p->dev1; /* uint32_t */ + uarg[5] = p->dev2; /* uint32_t */ + *n_args = 6; break; } +#else + /* freebsd32_mknodat */ + case 559: { + struct freebsd32_mknodat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* const char * */ + iarg[2] = p->mode; /* mode_t */ + uarg[3] = p->dev1; /* uint32_t */ + uarg[4] = p->dev2; /* uint32_t */ + *n_args = 5; + break; + } +#endif /* freebsd32_kevent */ case 560: { struct freebsd32_kevent_args *p = params; @@ -8642,7 +8658,8 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; }; break; - /* mknodat */ +#ifdef PAD64_REQUIRED + /* freebsd32_mknodat */ case 559: switch(ndx) { case 0: @@ -8655,12 +8672,42 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d p = "mode_t"; break; case 3: - p = "dev_t"; + p = "int"; break; + case 4: + p = "uint32_t"; + break; + case 5: + p = "uint32_t"; + break; default: break; }; break; +#else + /* freebsd32_mknodat */ + case 559: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "mode_t"; + break; + case 3: + p = "uint32_t"; + break; + case 4: + p = "uint32_t"; + break; + default: + break; + }; + break; +#endif /* freebsd32_kevent */ case 560: switch(ndx) { @@ -10574,11 +10621,19 @@ systrace_return_setargdesc(int sysnum, int ndx, char * if (ndx == 0 || ndx == 1) p = "int"; break; - /* mknodat */ +#ifdef PAD64_REQUIRED + /* freebsd32_mknodat */ case 559: if (ndx == 0 || ndx == 1) p = "int"; break; +#else + /* freebsd32_mknodat */ + case 559: + if (ndx == 0 || ndx == 1) + p = "int"; + break; +#endif /* freebsd32_kevent */ case 560: if (ndx == 0 || ndx == 1) Modified: head/sys/sys/sysproto.h ============================================================================== --- head/sys/sys/sysproto.h Fri Nov 9 21:01:16 2018 (r340302) +++ head/sys/sys/sysproto.h Fri Nov 9 21:02:07 2018 (r340303) @@ -2487,7 +2487,7 @@ int freebsd10_pipe(struct thread *, struct freebsd10_p struct freebsd11_mknod_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; - char dev_l_[PADL_(int)]; int dev; char dev_r_[PADR_(int)]; + char dev_l_[PADL_(uint32_t)]; uint32_t dev; char dev_r_[PADR_(uint32_t)]; }; struct freebsd11_vadvise_args { char anom_l_[PADL_(int)]; int anom; char anom_r_[PADR_(int)]; From owner-svn-src-head@freebsd.org Fri Nov 9 21:16:46 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 720B61108458; Fri, 9 Nov 2018 21:16:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFA388E26F; Fri, 9 Nov 2018 21:16:45 +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 9C54F194F9; Fri, 9 Nov 2018 21:16:45 +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 wA9LGj99019735; Fri, 9 Nov 2018 21:16:45 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9LGj17019734; Fri, 9 Nov 2018 21:16:45 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201811092116.wA9LGj17019734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin <jhb@FreeBSD.org> Date: Fri, 9 Nov 2018 21:16:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340304 - head/sys/dev/cxgbe/tom X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/cxgbe/tom X-SVN-Commit-Revision: 340304 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BFA388E26F X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 21:16:46 -0000 Author: jhb Date: Fri Nov 9 21:16:45 2018 New Revision: 340304 URL: https://svnweb.freebsd.org/changeset/base/340304 Log: Use tcp_state_change() in the cxgbe(4) TOE module. r254889 added tcp_state_change() as a centralized place to log state changes in TCP connections for DTrace. r294869 and r296881 took advantage of this central location to manage per-state counters. However, TOE sockets were still performing some (but not all) state change updates via direct assignments to t_state. This resulted in state counters underflowing when TOE was in use. Fix by using tcp_state_change() when changing a TOE connection's state. Reviewed by: np, markj MFC after: 1 month Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D17915 Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Nov 9 21:02:07 2018 (r340303) +++ head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Nov 9 21:16:45 2018 (r340304) @@ -396,7 +396,7 @@ make_established(struct toepcb *toep, uint32_t snd_isn CTR6(KTR_CXGBE, "%s: tid %d, so %p, inp %p, tp %p, toep %p", __func__, toep->tid, so, inp, tp, toep); - tp->t_state = TCPS_ESTABLISHED; + tcp_state_change(tp, TCPS_ESTABLISHED); tp->t_starttime = ticks; TCPSTAT_INC(tcps_connects); @@ -1303,11 +1303,11 @@ do_peer_close(struct sge_iq *iq, const struct rss_head /* FALLTHROUGH */ case TCPS_ESTABLISHED: - tp->t_state = TCPS_CLOSE_WAIT; + tcp_state_change(tp, TCPS_CLOSE_WAIT); break; case TCPS_FIN_WAIT_1: - tp->t_state = TCPS_CLOSING; + tcp_state_change(tp, TCPS_CLOSING); break; case TCPS_FIN_WAIT_2: @@ -1389,7 +1389,7 @@ release: case TCPS_FIN_WAIT_1: if (so->so_rcv.sb_state & SBS_CANTRCVMORE) soisdisconnected(so); - tp->t_state = TCPS_FIN_WAIT_2; + tcp_state_change(tp, TCPS_FIN_WAIT_2); break; default: From owner-svn-src-head@freebsd.org Fri Nov 9 22:18:44 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 6733F1109E7B; Fri, 9 Nov 2018 22:18:44 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E8C7A6A2D9; Fri, 9 Nov 2018 22:18:43 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD91719F04; Fri, 9 Nov 2018 22:18:43 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9MIhLQ050986; Fri, 9 Nov 2018 22:18:43 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9MIh2c050984; Fri, 9 Nov 2018 22:18:43 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201811092218.wA9MIh2c050984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd <shurd@FreeBSD.org> Date: Fri, 9 Nov 2018 22:18:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340310 - head/sys/dev/e1000 X-SVN-Group: head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: head/sys/dev/e1000 X-SVN-Commit-Revision: 340310 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E8C7A6A2D9 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 09 Nov 2018 22:18:44 -0000 Author: shurd Date: Fri Nov 9 22:18:43 2018 New Revision: 340310 URL: https://svnweb.freebsd.org/changeset/base/340310 Log: Fix first-packet completion The first packet after the ring is initialized was never completed as isc_txd_credits_update() would not include it in the count of completed packets. This caused netmap to never complete a batch. See PR 233022 for more details. PR: 233022 Reported by: lev Reviewed by: lev MFC after: 3 days Sponsored by: Limelight Networks Differential Revision: https://reviews.freebsd.org/D17931 Modified: head/sys/dev/e1000/em_txrx.c head/sys/dev/e1000/igb_txrx.c Modified: head/sys/dev/e1000/em_txrx.c ============================================================================== --- head/sys/dev/e1000/em_txrx.c Fri Nov 9 21:45:42 2018 (r340309) +++ head/sys/dev/e1000/em_txrx.c Fri Nov 9 22:18:43 2018 (r340310) @@ -458,7 +458,13 @@ em_isc_txd_credits_update(void *arg, uint16_t txqid, b ntxd = scctx->isc_ntxd[0]; do { delta = (int32_t)cur - (int32_t)prev; + /* + * XXX This appears to be a hack for first-packet. + * A correct fix would prevent prev == cur in the first place. + */ MPASS(prev == 0 || delta != 0); + if (prev == 0 && cur == 0) + delta += 1; if (delta < 0) delta += ntxd; DPRINTF(iflib_get_dev(adapter->ctx), Modified: head/sys/dev/e1000/igb_txrx.c ============================================================================== --- head/sys/dev/e1000/igb_txrx.c Fri Nov 9 21:45:42 2018 (r340309) +++ head/sys/dev/e1000/igb_txrx.c Fri Nov 9 22:18:43 2018 (r340310) @@ -333,7 +333,13 @@ igb_isc_txd_credits_update(void *arg, uint16_t txqid, ntxd = scctx->isc_ntxd[0]; do { delta = (int32_t)cur - (int32_t)prev; + /* + * XXX This appears to be a hack for first-packet. + * A correct fix would prevent prev == cur in the first place. + */ MPASS(prev == 0 || delta != 0); + if (prev == 0 && cur == 0) + delta += 1; if (delta < 0) delta += ntxd; From owner-svn-src-head@freebsd.org Sat Nov 10 01:58:38 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 27B65110FE4C; Sat, 10 Nov 2018 01:58:38 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA97971895; Sat, 10 Nov 2018 01:58:37 +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 8D2DE1C61A; Sat, 10 Nov 2018 01:58:37 +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 wAA1wbRQ064911; Sat, 10 Nov 2018 01:58:37 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAA1wbY7064910; Sat, 10 Nov 2018 01:58:37 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201811100158.wAA1wbY7064910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin <mav@FreeBSD.org> Date: Sat, 10 Nov 2018 01:58:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340311 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Commit-Revision: 340311 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AA97971895 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 01:58:38 -0000 Author: mav Date: Sat Nov 10 01:58:37 2018 New Revision: 340311 URL: https://svnweb.freebsd.org/changeset/base/340311 Log: Do not ignore arc_adjust() return value. This covers scenario when ARC may not shrink as fast as it could: 1. arc_size < arc_c and arc_adjust() does not evict anything, returning zero to arc_reclaim_thread(); 2. arc_available_memory() reports memory pressure, which can not be satisfied by arc_kmem_reap_now(); 3. arc_shrink() reduces arc_c and calls arc_adjust(), return of which is ignored; 4. even if the last arc_adjust() could not satisfy arc_size < arc_c, arc_reclaim_thread() will still go to sleep, since the first one returned zero. Reviewed by: allanjude, markj, sef MFC after: 2 weeks Sponsored by: iXsystems, Inc. Differential Revision: https://reviews.freebsd.org/D17927 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Nov 9 22:18:43 2018 (r340310) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Nov 10 01:58:37 2018 (r340311) @@ -4565,7 +4565,7 @@ arc_flush(spa_t *spa, boolean_t retry) (void) arc_flush_state(arc_mfu_ghost, guid, ARC_BUFC_METADATA, retry); } -void +uint64_t arc_shrink(int64_t to_free) { uint64_t asize = aggsum_value(&arc_size); @@ -4593,8 +4593,9 @@ arc_shrink(int64_t to_free) if (asize > arc_c) { DTRACE_PROBE2(arc__shrink_adjust, uint64_t, asize, uint64_t, arc_c); - (void) arc_adjust(); + return (arc_adjust()); } + return (0); } typedef enum free_memory_reason_t { @@ -4917,7 +4918,7 @@ arc_reclaim_thread(void *unused __unused) to_free = MAX(to_free, ptob(needfree)); #endif #endif - arc_shrink(to_free); + evicted += arc_shrink(to_free); } } else if (free_memory < arc_c >> arc_no_grow_shift) { arc_no_grow = B_TRUE; From owner-svn-src-head@freebsd.org Sat Nov 10 02:37:57 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 CE89F11221DB; Sat, 10 Nov 2018 02:37:57 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E7E572C87; Sat, 10 Nov 2018 02:37:57 +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 3F80E1CCEB; Sat, 10 Nov 2018 02:37:57 +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 wAA2bvJ6085067; Sat, 10 Nov 2018 02:37:57 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAA2bvdT085066; Sat, 10 Nov 2018 02:37:57 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201811100237.wAA2bvdT085066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits <jhibbits@FreeBSD.org> Date: Sat, 10 Nov 2018 02:37:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340312 - head/sys/powerpc/aim X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/aim X-SVN-Commit-Revision: 340312 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5E7E572C87 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 02:37:58 -0000 Author: jhibbits Date: Sat Nov 10 02:37:56 2018 New Revision: 340312 URL: https://svnweb.freebsd.org/changeset/base/340312 Log: powerpc: Use MAX() macro instead of max() inline function to calculate Maxmem Maxmem is the highest address for physical memory in the system. It's measured in pages which, since max() returns a u_int, should allow for up to 2^44 bytes of memory addressable by the system. However, on POWER9 systems at least, memory addressed by additional socketed CPUs begins at addresses far above the 2^44 mark, causing issues with memory accesses and DMA, when memory is addressed on the auxiliary CPUs. Use the MAX() macro instead, which doesn't convert arguments, so retains Maxmem and all calculations as its defined long type (64-bit on powerpc64), keeping the maximum address correct. Submitted by: mmacy Modified: head/sys/powerpc/aim/mmu_oea64.c Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Sat Nov 10 01:58:37 2018 (r340311) +++ head/sys/powerpc/aim/mmu_oea64.c Sat Nov 10 02:37:56 2018 (r340312) @@ -939,7 +939,7 @@ moea64_late_bootstrap(mmu_t mmup, vm_offset_t kernelst */ Maxmem = 0; for (i = 0; phys_avail[i + 2] != 0; i += 2) - Maxmem = max(Maxmem, powerpc_btop(phys_avail[i + 1])); + Maxmem = MAX(Maxmem, powerpc_btop(phys_avail[i + 1])); /* * Initialize MMU. From owner-svn-src-head@freebsd.org Sat Nov 10 03:00:37 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0E2AC1122C9B; Sat, 10 Nov 2018 03:00:37 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9109773725; Sat, 10 Nov 2018 03:00:36 +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 71FDD1D01E; Sat, 10 Nov 2018 03:00:36 +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 wAA30a78095618; Sat, 10 Nov 2018 03:00:36 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAA30awQ095617; Sat, 10 Nov 2018 03:00:36 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811100300.wAA30awQ095617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Sat, 10 Nov 2018 03:00:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340313 - head/sys/netinet X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/netinet X-SVN-Commit-Revision: 340313 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9109773725 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 03:00:37 -0000 Author: markj Date: Sat Nov 10 03:00:36 2018 New Revision: 340313 URL: https://svnweb.freebsd.org/changeset/base/340313 Log: Ensure that IP fragments do not extend beyond IP_MAXPACKET. Such fragments are obviously invalid, and when processed may end up violating the sort order (by offset) of fragments of a given packet. This doesn't appear to be exploitable, however. Reviewed by: emaste Discussed with: jtl MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17914 Modified: head/sys/netinet/ip_reass.c Modified: head/sys/netinet/ip_reass.c ============================================================================== --- head/sys/netinet/ip_reass.c Sat Nov 10 02:37:56 2018 (r340312) +++ head/sys/netinet/ip_reass.c Sat Nov 10 03:00:36 2018 (r340313) @@ -228,6 +228,16 @@ ip_reass(struct mbuf *m) ip->ip_off = htons(ntohs(ip->ip_off) << 3); /* + * Make sure the fragment lies within a packet of valid size. + */ + if (ntohs(ip->ip_len) + ntohs(ip->ip_off) > IP_MAXPACKET) { + IPSTAT_INC(ips_toolong); + IPSTAT_INC(ips_fragdropped); + m_freem(m); + return (NULL); + } + + /* * Attempt reassembly; if it succeeds, proceed. * ip_reass() will return a different mbuf. */ From owner-svn-src-head@freebsd.org Sat Nov 10 03:10:23 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 42F341123351; Sat, 10 Nov 2018 03:10:23 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0ECC741F6; Sat, 10 Nov 2018 03:10:22 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E3F21D257; Sat, 10 Nov 2018 03:10:22 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAA3AMg1001558; Sat, 10 Nov 2018 03:10:22 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAA3AM2O001557; Sat, 10 Nov 2018 03:10:22 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201811100310.wAA3AM2O001557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers <asomers@FreeBSD.org> Date: Sat, 10 Nov 2018 03:10:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340314 - head/lib/libjail X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/lib/libjail X-SVN-Commit-Revision: 340314 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B0ECC741F6 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.985,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 03:10:23 -0000 Author: asomers Date: Sat Nov 10 03:10:22 2018 New Revision: 340314 URL: https://svnweb.freebsd.org/changeset/base/340314 Log: libjail: fix handling of allow.mount.fusefs in jailparam_init fusefs is inconsistently named. The kernel module is named "fuse", but the mount helper is named "mount_fusefs" and the jail(8) parameter is named "allow.mount.fusefs". Special case it in libjail. Reviewed by: jamie MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D17929 Modified: head/lib/libjail/jail.c Modified: head/lib/libjail/jail.c ============================================================================== --- head/lib/libjail/jail.c Sat Nov 10 03:00:36 2018 (r340313) +++ head/lib/libjail/jail.c Sat Nov 10 03:10:22 2018 (r340314) @@ -1050,10 +1050,18 @@ kldload_param(const char *name) kl = kldload(name); else if (strncmp(name, "allow.mount.", 12) == 0) { /* Load the matching filesystem */ - kl = kldload(name + 12); + const char *modname; + + if (strcmp("fusefs", name + 12) == 0 || + strcmp("nofusefs", name + 12) == 0) { + modname = "fuse"; + } else { + modname = name + 12; + } + kl = kldload(modname); if (kl < 0 && errno == ENOENT && - strncmp(name + 12, "no", 2) == 0) - kl = kldload(name + 14); + strncmp(modname, "no", 2) == 0) + kl = kldload(modname + 2); } else { errno = ENOENT; return (-1); From owner-svn-src-head@freebsd.org Sat Nov 10 08:18:41 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 BE10A112C98A for <svn-src-head@mailman.ysv.freebsd.org>; Sat, 10 Nov 2018 08:18:41 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-yw1-xc2e.google.com (mail-yw1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BEA987F3E1 for <svn-src-head@freebsd.org>; Sat, 10 Nov 2018 08:18:40 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by mail-yw1-xc2e.google.com with SMTP id p18-v6so2527775ywg.12 for <svn-src-head@freebsd.org>; Sat, 10 Nov 2018 00:18:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ft+zNFwmeu7u8Qxx+QKlyz82Qf3SRb+WnRBxsDwsetc=; b=bH8VvnzSar5aX56USYZbvKwdJPv54PeGBDpActfdRU8nNoiFrc0650KlwwLOjlVpMk 01SUDfkD939EVKa8ytxC3+Cy552qfGBfKSHhGlKISgRVpp9JKTgV2P7YUNYNXw3tGrL5 O4caH5YqKswd5S007DfOPvcwoK/hcqbjpKs/4= 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=Ft+zNFwmeu7u8Qxx+QKlyz82Qf3SRb+WnRBxsDwsetc=; b=aENDawxwRb0KKoMNTzeq43ysT52iS4FfxtqiVVCAzlEuLEq4U4oz9YrWlE6+7cC1mS AHK4SsKZDfYHB48FDbdD/cJRIZi3uPVrtGWUTROiVUtiBofkag5ujOuGNTH1wgbVx1ln IDUyCPRlzvS4koRxAul1Py+6vF1ZmzNHnbH9v3oH7qI2NiHOkSPOjYtDtGpkyIoLdI94 BCYY+ZdJwn86sqpf4baweIyX9wpxKM0bHw/upSkai2uk2+lbdWOtszCpVhly+VJvKDVD OFGziPqMkgCtwMXHNf7pMdUzJx1yQbOfZq3nm0dAkEzSmtgRZvi7iHAgmI3X9ksVrfCM V6cQ== X-Gm-Message-State: AGRZ1gJ3aUhyMwOaCdoUVQdclLZ/oHziMM5ZuBhbvEsjZBhlLN6aKV7D Hd2KmMFIscaz9TvjXTPMAefhw/Ri6ICgimUJ6hDPVw== X-Google-Smtp-Source: AJdET5dNSzKdw0wzkbc9+dfUIZribV4TrLlhL593plwo5dmT5BHC5RnA8XMCy80SQYuWv/TzqEIoBy6x821Pq6SmCus= X-Received: by 2002:a81:7257:: with SMTP id n84-v6mr11710488ywc.277.1541837919726; Sat, 10 Nov 2018 00:18:39 -0800 (PST) MIME-Version: 1.0 References: <201811091803.wA9I31ie014903@repo.freebsd.org> <20181109181901.GA61841@spindle.one-eyed-alien.net> In-Reply-To: <20181109181901.GA61841@spindle.one-eyed-alien.net> From: Eitan Adler <lists@eitanadler.com> Date: Sat, 10 Nov 2018 00:18:13 -0800 Message-ID: <CAF6rxgmjGQz+1wgE+UKzm+7K-wJHBNTaTEUaPgHsRN5eB256PQ@mail.gmail.com> Subject: Re: svn commit: r340294 - head/sys/compat/freebsd32 To: Brooks Davis <brooks@freebsd.org> Cc: src-committers <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: BEA987F3E1 X-Spamd-Result: default: False [-4.42 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[eitanadler.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[eitanadler.com]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[eitanadler.com:+]; MX_GOOD(-0.01)[ASPMX2.GOOGLEMAIL.com,ALT2.ASPMX.L.GOOGLE.com,ASPMX.L.GOOGLE.com,ALT1.ASPMX.L.GOOGLE.com,ASPMX3.GOOGLEMAIL.com]; RCVD_IN_DNSWL_NONE(0.00)[e.2.c.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.92)[-0.925,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.99)[ipnet: 2607:f8b0::/32(-2.92), asn: 15169(-1.92), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 08:18:42 -0000 On Fri, 9 Nov 2018 at 10:19, Brooks Davis <brooks@freebsd.org> wrote: > > On Fri, Nov 09, 2018 at 06:03:01PM +0000, Brooks Davis wrote: > > Author: brooks > > Date: Fri Nov 9 18:03:01 2018 > > New Revision: 340294 > > URL: https://svnweb.freebsd.org/changeset/base/340294 > > > > Log: > > Fix a number of bugs in freebsd32's capabilities.conf. > > > > Bugs range from failure to update after changing syscall implementaion > > names to using the wrong name. Somewhat confusingly, the name in > > capabilities.conf is exactly the string that appears in syscalls.master, > > not the name with a COMPAT* prefix which is the actual function name. > > > > Found while making a change to use the default capabilities.conf. Is there any automated way to detect this in the future? Can we add some test that detect non-existent syscalls or the like? -- Eitan Adler From owner-svn-src-head@freebsd.org Sat Nov 10 10:46:40 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 22008112FF86; Sat, 10 Nov 2018 10:46:40 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9B21F8454B; Sat, 10 Nov 2018 10:46:39 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 6176421D52; Sat, 10 Nov 2018 10:46:39 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAAkdgO041623; Sat, 10 Nov 2018 10:46:39 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAAkdPs041621; Sat, 10 Nov 2018 10:46:39 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201811101046.wAAAkdPs041621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods <woodsb02@FreeBSD.org> Date: Sat, 10 Nov 2018 10:46:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340318 - head/usr.sbin/newsyslog X-SVN-Group: head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: head/usr.sbin/newsyslog X-SVN-Commit-Revision: 340318 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9B21F8454B X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 10:46:40 -0000 Author: woodsb02 (ports committer) Date: Sat Nov 10 10:46:38 2018 New Revision: 340318 URL: https://svnweb.freebsd.org/changeset/base/340318 Log: newsyslog.conf: Restrict included files in default config to [!.]*.conf The new default config will only include files from the following directories which end with '.conf' and do not beginning with a '.' character: - /etc/newsyslog.conf.d/ - /usr/local/etc/newsyslog.conf.d/ This matches the syslog.conf(5) functionality, and also prevents '.sample' or '.pkgnew' files being included. This is important for ports which install files in /usr/local/etc/newsyslog.conf.d/ and also for pkgbase. Approved by: eadler Approved by: bapt Relnotes: yes Differential Revision: https://reviews.freebsd.org/D17086 Modified: head/usr.sbin/newsyslog/newsyslog.8 head/usr.sbin/newsyslog/newsyslog.conf Modified: head/usr.sbin/newsyslog/newsyslog.8 ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:32:55 2018 (r340317) +++ head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:46:38 2018 (r340318) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd July 19, 2018 +.Dd November 10, 2018 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -268,10 +268,12 @@ will examine all files listed in the configuration fil .Nm configuration file .It Pa /etc/newsyslog.conf.d -Each file in this directory will be included by the default +By default each file in this directory ending in '.conf' and not beginning with +a '.' will be included by the default .Pa newsyslog.conf . .It Pa /usr/local/etc/newsyslog.conf.d -Each file in this directory will be included by the default +By default each file in this directory ending in '.conf' and not beginning with +a '.' will be included by the default .Pa newsyslog.conf . .El .Sh COMPATIBILITY Modified: head/usr.sbin/newsyslog/newsyslog.conf ============================================================================== --- head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:32:55 2018 (r340317) +++ head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:46:38 2018 (r340318) @@ -31,5 +31,5 @@ /var/log/utx.log 644 3 * @01T05 B /var/log/weekly.log 640 5 * $W6D0 JN -<include> /etc/newsyslog.conf.d/* -<include> /usr/local/etc/newsyslog.conf.d/* +<include> /etc/newsyslog.conf.d/[!.]*.conf +<include> /usr/local/etc/newsyslog.conf.d/[!.]*.conf From owner-svn-src-head@freebsd.org Sat Nov 10 12:03:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0408C1131EBF; Sat, 10 Nov 2018 12:03:59 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 86D7B86BD4; Sat, 10 Nov 2018 12:03:58 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 6172722AB8; Sat, 10 Nov 2018 12:03:58 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAC3wtq082261; Sat, 10 Nov 2018 12:03:58 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAC3vov082259; Sat, 10 Nov 2018 12:03:57 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811101203.wAAC3vov082259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sat, 10 Nov 2018 12:03:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340319 - head/usr.sbin/jail X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/jail X-SVN-Commit-Revision: 340319 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 86D7B86BD4 X-Spamd-Result: default: False [-106.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.987,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 12:03:59 -0000 Author: eugen Date: Sat Nov 10 12:03:57 2018 New Revision: 340319 URL: https://svnweb.freebsd.org/changeset/base/340319 Log: jail(8): introduce new command option -e to exhibit a list of configured non-wildcard jails with their parameters, no matter running or not. The option -e takes separator argument that is used to separate printed parameters. It will be used with following additions to system periodic scripts to differentiate parts of directory tree belonging jails as opposed to host's. MFC after: 1 month Modified: head/usr.sbin/jail/jail.8 head/usr.sbin/jail/jail.c head/usr.sbin/jail/jailp.h Modified: head/usr.sbin/jail/jail.8 ============================================================================== --- head/usr.sbin/jail/jail.8 Sat Nov 10 10:46:38 2018 (r340318) +++ head/usr.sbin/jail/jail.8 Sat Nov 10 12:03:57 2018 (r340319) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 17, 2018 +.Dd November 10, 2018 .Dt JAIL 8 .Os .Sh NAME @@ -49,6 +49,7 @@ .Nm .Op Fl qv .Op Fl f Ar conf_file +.Op Fl e Ar separator .Op Fl rR .Op Cm * | Ar jail ... .Nm @@ -63,6 +64,7 @@ The .Nm utility creates new jails, or modifies or removes existing jails. +It can also print a list of configured jails and their parameters. A jail .Pq or Dq prison is specified via parameters on the command line, or in the @@ -71,6 +73,7 @@ file. .Pp At least one of the options .Fl c , +.Fl e , .Fl m or .Fl r @@ -86,6 +89,15 @@ and .Va name parameters (if specified on the command line) must not refer to an existing jail. +.It Fl e Ar separator +Exhibit a list of all configured non-wildcard jails and their parameters. +No jail creation, modification or removal performed if this option is used. +The +.Ar separator +string is used to separate parameters. +Use +.Xr jls 8 +utility to list running jails. .It Fl m Modify an existing jail. One of the Modified: head/usr.sbin/jail/jail.c ============================================================================== --- head/usr.sbin/jail/jail.c Sat Nov 10 10:46:38 2018 (r340318) +++ head/usr.sbin/jail/jail.c Sat Nov 10 12:03:57 2018 (r340319) @@ -60,6 +60,7 @@ const char *cfname; int iflag; int note_remove; int verbose; +const char *separator = "\t"; static void clear_persist(struct cfjail *j); static int update_jail(struct cfjail *j); @@ -69,8 +70,9 @@ static void jail_quoted_warnx(const struct cfjail *j, const char *noname_msg); static int jailparam_set_note(const struct cfjail *j, struct jailparam *jp, unsigned njp, int flags); -static void print_jail(FILE *fp, struct cfjail *j, int oldcl); +static void print_jail(FILE *fp, struct cfjail *j, int oldcl, int running); static void print_param(FILE *fp, const struct cfparam *p, int sep, int doname); +static void show_jails(void); static void quoted_print(FILE *fp, char *str); static void usage(void); @@ -151,7 +153,7 @@ main(int argc, char **argv) cfname = CONF_FILE; JidFile = NULL; - while ((ch = getopt(argc, argv, "cdf:hiJ:lmn:p:qrRs:u:U:v")) != -1) { + while ((ch = getopt(argc, argv, "cde:f:hiJ:lmn:p:qrRs:u:U:v")) != -1) { switch (ch) { case 'c': op |= JF_START; @@ -159,6 +161,10 @@ main(int argc, char **argv) case 'd': dflag = 1; break; + case 'e': + op |= JF_SHOW; + separator = optarg; + break; case 'f': cfname = optarg; break; @@ -276,7 +282,13 @@ main(int argc, char **argv) ? NULL : "false"); } } - } else if (op == JF_STOP) { + } else if (op == JF_STOP || op == JF_SHOW) { + /* Just print list of all configured non-wildcard jails */ + if (op == JF_SHOW) { + load_config(); + show_jails(); + exit(0); + } /* Jail remove, perhaps using the config file */ if (!docf || argc == 0) usage(); @@ -439,7 +451,7 @@ main(int argc, char **argv) jail_create_done: clear_persist(j); if (jfp != NULL) - print_jail(jfp, j, oldcl); + print_jail(jfp, j, oldcl, 1); dep_done(j, 0); break; @@ -918,16 +930,18 @@ jailparam_set_note(const struct cfjail *j, struct jail * Print a jail record. */ static void -print_jail(FILE *fp, struct cfjail *j, int oldcl) +print_jail(FILE *fp, struct cfjail *j, int oldcl, int running) { struct cfparam *p; + int printsep; if (oldcl) { - fprintf(fp, "%d\t", j->jid); + if (running) + fprintf(fp, "%d%s", j->jid, separator); print_param(fp, j->intparams[KP_PATH], ',', 0); - putc('\t', fp); + fputs(separator, fp); print_param(fp, j->intparams[KP_HOST_HOSTNAME], ',', 0); - putc('\t', fp); + fputs(separator, fp); #ifdef INET print_param(fp, j->intparams[KP_IP4_ADDR], ',', 0); #ifdef INET6 @@ -941,13 +955,20 @@ print_jail(FILE *fp, struct cfjail *j, int oldcl) #ifdef INET6 print_param(fp, j->intparams[KP_IP6_ADDR], ',', 0); #endif - putc('\t', fp); + fputs(separator, fp); print_param(fp, j->intparams[IP_COMMAND], ' ', 0); } else { - fprintf(fp, "jid=%d", j->jid); + printsep = 0; + if (running) { + fprintf(fp, "jid=%d", j->jid); + printsep = 1; + } TAILQ_FOREACH(p, &j->params, tq) if (strcmp(p->name, "jid")) { - putc(' ', fp); + if (printsep) + fputs(separator, fp); + else + printsep = 1; print_param(fp, p, ',', 1); } } @@ -955,6 +976,18 @@ print_jail(FILE *fp, struct cfjail *j, int oldcl) } /* + * Exhibit list of all configured non-wildcard jails + */ +static void +show_jails(void) +{ + struct cfjail *j; + + TAILQ_FOREACH(j, &cfjails, tq) + print_jail(stdout, j, 0, 0); +} + +/* * Print a parameter value, or a name=value pair. */ static void @@ -1007,7 +1040,7 @@ usage(void) (void)fprintf(stderr, "usage: jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n" " -[cmr] param=value ... [command=command ...]\n" - " jail [-dqv] [-f file] -[cmr] [jail]\n" + " jail [-dqv] [-f file] [-e separator] -[cmr] [jail]\n" " jail [-qv] [-f file] -[rR] ['*' | jail ...]\n" " jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n" " [-n jailname] [-s securelevel]\n" Modified: head/usr.sbin/jail/jailp.h ============================================================================== --- head/usr.sbin/jail/jailp.h Sat Nov 10 10:46:38 2018 (r340318) +++ head/usr.sbin/jail/jailp.h Sat Nov 10 12:03:57 2018 (r340319) @@ -67,6 +67,7 @@ #define JF_TIMEOUT 0x0200 /* A command (or process kill) timed out */ #define JF_SLEEPQ 0x0400 /* Waiting on a command and/or timeout */ #define JF_FROM_RUNQ 0x0800 /* Has already been on the run queue */ +#define JF_SHOW 0x1000 /* -e Exhibit list of configured jails */ #define JF_OP_MASK (JF_START | JF_SET | JF_STOP) #define JF_RESTART (JF_START | JF_STOP) From owner-svn-src-head@freebsd.org Sat Nov 10 12:12:47 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 EE4961132345; Sat, 10 Nov 2018 12:12:46 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id DA53487236; Sat, 10 Nov 2018 12:12:45 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 575718D4A24D; Sat, 10 Nov 2018 12:12:38 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id AF0D9D1F7F2; Sat, 10 Nov 2018 12:12:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id WcyG_-Dhx7jR; Sat, 10 Nov 2018 12:12:36 +0000 (UTC) Received: from [192.168.1.88] (fresh-ayiya.sbone.de [IPv6:fde9:577b:c1a9:f001::2]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id D8672D1F7F0; Sat, 10 Nov 2018 12:12:35 +0000 (UTC) From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: "Eugene Grosbein" <eugen@FreeBSD.org>, "James Gritton" <jamie@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340319 - head/usr.sbin/jail Date: Sat, 10 Nov 2018 12:12:44 +0000 X-Mailer: MailMate (2.0BETAr6126) Message-ID: <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> In-Reply-To: <201811101203.wAAC3vov082259@repo.freebsd.org> References: <201811101203.wAAC3vov082259@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DA53487236 X-Spamd-Result: default: False [-3.81 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:195.201.62.131]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[zabbadoz.net]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; RCPT_COUNT_FIVE(0.00)[5]; IP_SCORE(-0.61)[asn: 24940(-3.02), country: DE(-0.02)]; MX_GOOD(-0.01)[cross.sbone.de]; NEURAL_HAM_SHORT(-0.90)[-0.897,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:195.201.0.0/16, country:DE]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 12:12:47 -0000 On 10 Nov 2018, at 12:03, Eugene Grosbein wrote: > Author: eugen > Date: Sat Nov 10 12:03:57 2018 > New Revision: 340319 > URL: https://svnweb.freebsd.org/changeset/base/340319 > > Log: > jail(8): introduce new command option -e to exhibit > a list of configured non-wildcard jails with their parameters, > no matter running or not. > > The option -e takes separator argument that is used > to separate printed parameters. It will be used with following > additions to system periodic scripts to differentiate parts > of directory tree belonging jails as opposed to host's. From reading this and the man page changes I have a hard time to understand what this does. What is a “wildcard jail†or a “non-wildcard jailâ€? Usually also jls is the command which will give information (compared to actions) on jails, would that not fit there? /bz From owner-svn-src-head@freebsd.org Sat Nov 10 12:33:32 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 921F11132E2A; Sat, 10 Nov 2018 12:33:32 +0000 (UTC) (envelope-from eugen@freebsd.org) 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 DB1186A0C8; Sat, 10 Nov 2018 12:33:30 +0000 (UTC) (envelope-from eugen@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 wAACXMKa066132 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 10 Nov 2018 13:33:23 +0100 (CET) (envelope-from eugen@freebsd.org) X-Envelope-From: eugen@freebsd.org X-Envelope-To: bzeeb-lists@lists.zabbadoz.net Received: from [10.58.0.4] (dadv@[10.58.0.4]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id wAACXKpF084806 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Sat, 10 Nov 2018 19:33:21 +0700 (+07) (envelope-from eugen@freebsd.org) Subject: Re: svn commit: r340319 - head/usr.sbin/jail To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>, James Gritton <jamie@freebsd.org> References: <201811101203.wAAC3vov082259@repo.freebsd.org> <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Eugene Grosbein <eugen@freebsd.org> Message-ID: <882c5796-6e36-8acc-95ba-af90b9ee3bf8@freebsd.org> Date: Sat, 10 Nov 2018 19:33:19 +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: <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,SPF_SOFTFAIL 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.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: DB1186A0C8 X-Spamd-Result: default: False [-104.30 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-1.19)[ipnet: 2a01:4f8::/29(-2.92), asn: 24940(-3.02), country: DE(-0.02)]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 12:33:32 -0000 10.11.2018 19:12, Bjoern A. Zeeb wrote: >> Author: eugen >> Date: Sat Nov 10 12:03:57 2018 >> New Revision: 340319 >> URL: https://svnweb.freebsd.org/changeset/base/340319 >> >> Log: >> jail(8): introduce new command option -e to exhibit >> a list of configured non-wildcard jails with their parameters, >> no matter running or not. >> >> The option -e takes separator argument that is used >> to separate printed parameters. It will be used with following >> additions to system periodic scripts to differentiate parts >> of directory tree belonging jails as opposed to host's. > > From reading this and the man page changes I have a hard time to understand what this does. > > What is a “wildcard jail†or a “non-wildcard jailâ€? Modern jail configuration style assumes usage of jail.conf file and jail.conf(5) manual page documents it: A jail definition with a name of "*" is used to define wildcard parameters. Feel free to fix wording of my changes to the manual as English is not my native language, I will appreciate any help. > Usually also jls is the command which will give information (compared to actions) on jails, would that not fit there? The jls utility lists all active jails (from its manual). jail -e exhibits all configured jails, no matter active (running) or not. From owner-svn-src-head@freebsd.org Sat Nov 10 13:04:03 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 514081133890; Sat, 10 Nov 2018 13:04:03 +0000 (UTC) (envelope-from eugen@freebsd.org) 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 ACFD36B055; Sat, 10 Nov 2018 13:04:02 +0000 (UTC) (envelope-from eugen@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 wAAD3swC066310 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 10 Nov 2018 14:03:55 +0100 (CET) (envelope-from eugen@freebsd.org) X-Envelope-From: eugen@freebsd.org X-Envelope-To: bzeeb-lists@lists.zabbadoz.net Received: from [10.58.0.4] ([10.58.0.4]) by eg.sd.rdtc.ru (8.15.2/8.15.2) with ESMTPS id wAAD3rPI084977 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Sat, 10 Nov 2018 20:03:54 +0700 (+07) (envelope-from eugen@freebsd.org) Subject: Re: svn commit: r340319 - head/usr.sbin/jail To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>, James Gritton <jamie@freebsd.org> References: <201811101203.wAAC3vov082259@repo.freebsd.org> <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Eugene Grosbein <eugen@freebsd.org> Message-ID: <357a85c0-6552-080f-183c-a1d0d331cfe7@freebsd.org> Date: Sat, 10 Nov 2018 20:03:46 +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: <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,SPF_SOFTFAIL 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.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: ACFD36B055 X-Spamd-Result: default: False [-106.06 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; IP_SCORE(-2.95)[ip: (-8.76), ipnet: 2a01:4f8::/29(-2.98), asn: 24940(-3.01), country: DE(-0.02)]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 13:04:03 -0000 10.11.2018 19:12, Bjoern A. Zeeb wrote: > Usually also jls is the command which will give information (compared to actions) on jails, would that not fit there? jls(8) currently does not parse /etc/jail.conf and I'd like to avoid code duplication between jail(8) and jls(8). From owner-svn-src-head@freebsd.org Sat Nov 10 13:10:37 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 EA9B21133B51; Sat, 10 Nov 2018 13:10:36 +0000 (UTC) (envelope-from h.schmalzbauer@omnilan.de) Received: from mx0.gentlemail.de (mx0.gentlemail.de [IPv6:2a00:e10:2800::a130]) (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 BAAAA6B534; Sat, 10 Nov 2018 13:10:30 +0000 (UTC) (envelope-from h.schmalzbauer@omnilan.de) Received: from mh0.gentlemail.de (mh0.gentlemail.de [78.138.80.135]) by mx0.gentlemail.de (8.14.5/8.14.5) with ESMTP id wAADASq2047720; Sat, 10 Nov 2018 14:10:28 +0100 (CET) (envelope-from h.schmalzbauer@omnilan.de) Received: from titan.inop.mo1.omnilan.net (s1.omnilan.de [217.91.127.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mh0.gentlemail.de (Postfix) with ESMTPSA id C384621A; Sat, 10 Nov 2018 14:10:27 +0100 (CET) Subject: Re: svn commit: r340319 - head/usr.sbin/jail To: Eugene Grosbein <eugen@freebsd.org>, "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>, James Gritton <jamie@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org References: <201811101203.wAAC3vov082259@repo.freebsd.org> <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> <882c5796-6e36-8acc-95ba-af90b9ee3bf8@freebsd.org> From: "H. Schmalzbauer - OmniLAN" <h.schmalzbauer@omnilan.de> Message-ID: <7c4c38c5-1eb0-6e3b-adce-f5caf482281e@omnilan.de> Date: Sat, 10 Nov 2018 14:10:27 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <882c5796-6e36-8acc-95ba-af90b9ee3bf8@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Greylist: ACL 130 matched, not delayed by milter-greylist-4.2.7 (mx0.gentlemail.de [78.138.80.130]); Sat, 10 Nov 2018 14:10:28 +0100 (CET) X-Milter: Spamilter (Reciever: mx0.gentlemail.de; Sender-ip: 78.138.80.135; Sender-helo: mh0.gentlemail.de; ) X-Rspamd-Queue-Id: BAAAA6B534 X-Spamd-Result: default: False [-6.18 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[omnilan.de]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[mx0.gentlemail.de]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; IP_SCORE(-2.93)[ip: (-7.69), ipnet: 2a00:e10:2800::/38(-3.85), asn: 25074(-3.08), country: DE(-0.02)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:25074, ipnet:2a00:e10:2800::/38, country:DE]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 13:10:37 -0000 Am 10.11.2018 um 13:33 schrieb Eugene Grosbein: > 10.11.2018 19:12, Bjoern A. Zeeb wrote: > >>> Author: eugen >>> Date: Sat Nov 10 12:03:57 2018 >>> New Revision: 340319 >>> URL: https://svnweb.freebsd.org/changeset/base/340319 >>> >>> Log: >>> jail(8): introduce new command option -e to exhibit >>> a list of configured non-wildcard jails with their parameters, >>> no matter running or not. >>> >>> The option -e takes separator argument that is used >>> to separate printed parameters. It will be used with following >>> additions to system periodic scripts to differentiate parts >>> of directory tree belonging jails as opposed to host's. >> From reading this and the man page changes I have a hard time to understand what this does. >> >> What is a “wildcard jail†or a “non-wildcard jailâ€? > Modern jail configuration style assumes usage of jail.conf file I was quiet unhappy with the single jail.conf(5) in /etc, so I extended jail rc(8) to support /etc/jail.conf.d/ Probably some others would welcome jail.conf.d/ too.  Unfortunately I don't have enough time to stay focused with one feature, so all my extensions are somewhat hackish. In this case, it's part of a jail setup script (I'm aware that there are many ports out ther which claim to ease jail management, but all to much more and nothing I could get a start point with satisfaction, so I wrote my own, wich _only_ utilizes base tools). Essentialy, it's about +++ /etc/rc.d/jail    2017-09-28 13:55:35.109528000 +0000 @@ -127,6 +128,9 @@          if [ -r "$_jconf" ]; then              _conf="$_jconf"              return 0 +        elif [ -r /etc/jail.conf.d/${_j} ]; then +            _conf="/etc/jail.conf.d/${_j}" +            return 0          elif [ -r "$jail_conf" ]; then              _conf="$jail_conf"              return 0'   fi Do you think that jail.conf.d/ should be considered as future extension? The setup script itself is also a handler for mounted md_images, so in case it's found, the diff is a little bigger in order to take care to attach/detach md(4).  Here's the correspondig rc-patch function - happy to mail the whole script on request: patch_rc_jail(){   :verbosemsg "patch_rc_jail() ${1:+called with $@}"   local PATCH line patchfile   PATCH=$(which patch 2>/dev/null)   [ -n "${PATCH}" ] || return   patchfile="$(mktemp)"   if [ -x /usr/sbin/jailsetup ]; then     abtvar='--- /etc/rc.d/jail.orig    2017-09-28 13:45:35.213478000 +0000 +++ /etc/rc.d/jail    2017-09-28 13:55:35.109528000 +0000 @@ -26,6 +26,7 @@  : ${jail_consolecmd:=/usr/bin/login -f root}  : ${jail_jexec:=/usr/sbin/jexec}  : ${jail_jls:=/usr/sbin/jls} +: ${jail_setup:=/usr/sbin/jailsetup}  need_dad_wait= @@ -127,6 +128,9 @@          if [ -r "$_jconf" ]; then              _conf="$_jconf"              return 0 +        elif [ -r /etc/jail.conf.d/${_j} ]; then +            _conf="/etc/jail.conf.d/${_j}" +            return 0          elif [ -r "$jail_conf" ]; then              _conf="$jail_conf"              return 0 @@ -476,6 +480,7 @@          # jail_parallel_start is YES.          #          for _j in $@; do +            [ -x $jail_setup ] && $jail_setup mdattach -n ${_j}              _j=$(echo $_j | tr /. _)              _jv=$(echo -n $_j | tr -c '"'"[:alnum:]"'"' _)              parse_options $_j $_jv || continue @@ -504,6 +509,7 @@          # Start jails one-by-one when jail_parallel_start is NO.          #          for _j in $@; do +            [ -x $jail_setup ] && $jail_setup mdattach -n ${_j}              _j=$(echo $_j | tr /. _)              _jv=$(echo -n $_j | tr -c '"'"[:alnum:]"'"' _)              parse_options $_j $_jv || continue @@ -556,6 +562,7 @@              fi              rm -f $_tmp          done +        [ -x $jail_setup ] && $jail_setup mddetach          echo '"'"."'"'          return      ;; @@ -578,6 +585,7 @@              rm -f /var/run/jail_${_j}.id          fi          rm -f $_tmp +        [ -x $jail_setup ] && $jail_setup mddetach -n ${_j}      done      echo '"'"."'"'  }'   else     abtvar='--- /etc/rc.d/jail.orig    2017-09-28 13:45:35.213478000 +0000 +++ /etc/rc.d/jail    2017-09-28 13:55:35.109528000 +0000 @@ -127,6 +128,9 @@          if [ -r "$_jconf" ]; then              _conf="$_jconf"              return 0 +        elif [ -r /etc/jail.conf.d/${_j} ]; then +            _conf="/etc/jail.conf.d/${_j}" +            return 0          elif [ -r "$jail_conf" ]; then              _conf="$jail_conf"              return 0'   fi   echo "${abtvar}" > "${patchfile}"   ${PATCH} -p 0 -C -i "${patchfile}" >/dev/null 2>&1 || return   ${PATCH} -p 0 -i "${patchfile}" >/dev/null 2>&1 &&     cp /etc/rc.d/jail.orig /var/backups 2>/dev/null   [ -e /etc/rc.d/jail.rej ] && unlink /etc/rc.d/jail.rej   rm /etc/rc.d/jail.orig "${patchfile}" 2>/dev/null } #patch_rc_jail From owner-svn-src-head@freebsd.org Sat Nov 10 14:11:59 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D94DC1134F95; Sat, 10 Nov 2018 14:11:58 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 641ED6D8B9; Sat, 10 Nov 2018 14:11:58 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 7FA0623FD0; Sat, 10 Nov 2018 14:11:55 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAEBtin047675; Sat, 10 Nov 2018 14:11:55 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAEBtlk047673; Sat, 10 Nov 2018 14:11:55 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811101411.wAAEBtlk047673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sat, 10 Nov 2018 14:11:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340321 - in head/libexec/rc: . rc.d X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head/libexec/rc: . rc.d X-SVN-Commit-Revision: 340321 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 641ED6D8B9 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 14:11:59 -0000 Author: eugen Date: Sat Nov 10 14:11:54 2018 New Revision: 340321 URL: https://svnweb.freebsd.org/changeset/base/340321 Log: Move definition of $jail_conf variable to /etc/defaults/rc.conf from jail startup script so it can be successfully queried with the command "sysrc jail_conf". MFC after: 1 month Modified: head/libexec/rc/rc.conf head/libexec/rc/rc.d/jail Modified: head/libexec/rc/rc.conf ============================================================================== --- head/libexec/rc/rc.conf Sat Nov 10 13:16:54 2018 (r340320) +++ head/libexec/rc/rc.conf Sat Nov 10 14:11:54 2018 (r340321) @@ -703,6 +703,7 @@ iovctl_files="" # Config files for iovctl(8) ### Jail Configuration (see rc.conf(5) manual page) ########## ############################################################## jail_enable="NO" # Set to NO to disable starting of any jails +jail_conf="/etc/jail.conf" # Configuration file for jail(8) jail_confwarn="YES" # Prevent warning about obsolete per-jail configuration jail_parallel_start="NO" # Start jails in the background jail_list="" # Space separated list of names of jails Modified: head/libexec/rc/rc.d/jail ============================================================================== --- head/libexec/rc/rc.d/jail Sat Nov 10 13:16:54 2018 (r340320) +++ head/libexec/rc/rc.d/jail Sat Nov 10 14:11:54 2018 (r340321) @@ -21,7 +21,6 @@ config_cmd="jail_config" console_cmd="jail_console" status_cmd="jail_status" extra_commands="config console status" -: ${jail_conf:=/etc/jail.conf} : ${jail_program:=/usr/sbin/jail} : ${jail_consolecmd:=/usr/bin/login -f root} : ${jail_jexec:=/usr/sbin/jexec} From owner-svn-src-head@freebsd.org Sat Nov 10 14:18:35 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D40AA11001EA; Sat, 10 Nov 2018 14:18:34 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E0936DB1F; Sat, 10 Nov 2018 14:18:33 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 713578D4A24D; Sat, 10 Nov 2018 14:18:31 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 6DDA6D1F7F2; Sat, 10 Nov 2018 14:18:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id s77PZS_BT9_W; Sat, 10 Nov 2018 14:18:28 +0000 (UTC) Received: from [10.9.40.57] (fresh-ayiya.sbone.de [IPv6:fde9:577b:c1a9:f001::2]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 05704D1F7F0; Sat, 10 Nov 2018 14:18:27 +0000 (UTC) From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: "H. Schmalzbauer - OmniLAN" <h.schmalzbauer@omnilan.de> Cc: "Eugene Grosbein" <eugen@freebsd.org>, "James Gritton" <jamie@freebsd.org>, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r340319 - head/usr.sbin/jail Date: Sat, 10 Nov 2018 14:18:38 +0000 X-Mailer: MailMate (2.0BETAr6126) Message-ID: <8E0E6030-C77F-4F80-8DAF-7545256A7616@lists.zabbadoz.net> In-Reply-To: <7c4c38c5-1eb0-6e3b-adce-f5caf482281e@omnilan.de> References: <201811101203.wAAC3vov082259@repo.freebsd.org> <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> <882c5796-6e36-8acc-95ba-af90b9ee3bf8@freebsd.org> <7c4c38c5-1eb0-6e3b-adce-f5caf482281e@omnilan.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1E0936DB1F X-Spamd-Result: default: False [-4.46 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:13b:39f::9f:25]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[zabbadoz.net]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: cross.sbone.de]; NEURAL_HAM_SHORT(-0.94)[-0.937,0]; IP_SCORE(-1.21)[ipnet: 2a01:4f8::/29(-3.01), asn: 24940(-3.02), country: DE(-0.02)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 14:18:35 -0000 On 10 Nov 2018, at 13:10, H. Schmalzbauer - OmniLAN wrote: > I was quiet unhappy with the single jail.conf(5) in /etc, so I > extended jail rc(8) to support /etc/jail.conf.d/ > > Probably some others would welcome jail.conf.d/ too.  Unfortunately I > don't have enough time to stay focused with one feature, so all my > extensions are somewhat hackish. > In this case, it's part of a jail setup script (I'm aware that there > are many ports out ther which claim to ease jail management, but all > to much more and nothing I could get a start point with satisfaction, > so I wrote my own, wich _only_ utilizes base tools). > > Essentialy, it's about > +++ /etc/rc.d/jail    2017-09-28 13:55:35.109528000 +0000 > @@ -127,6 +128,9 @@ >          if [ -r "$_jconf" ]; then >              _conf="$_jconf" >              return 0 > +        elif [ -r /etc/jail.conf.d/${_j} ]; then > +            _conf="/etc/jail.conf.d/${_j}" > +            return 0 >          elif [ -r "$jail_conf" ]; then >              _conf="$jail_conf" >              return 0' >   fi > > Do you think that jail.conf.d/ should be considered as future > extension? I am working around this currently with (random example): jail_NAME_conf=“/usr/local/etc/jail.NAME.conf" for each jail. Works fine. Not having to do that anymore and “assuming†NAME can be a distinct config file as well in a directory (I can control, e.g. is not /etc/) would be helpful. /bz From owner-svn-src-head@freebsd.org Sat Nov 10 14:21:27 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 299AA11002FE; Sat, 10 Nov 2018 14:21:27 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC0016DD58; Sat, 10 Nov 2018 14:21:26 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 8B3A724043; Sat, 10 Nov 2018 14:21:26 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAELQqj049690; Sat, 10 Nov 2018 14:21:26 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAELQOB049689; Sat, 10 Nov 2018 14:21:26 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811101421.wAAELQOB049689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sat, 10 Nov 2018 14:21:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340322 - head/usr.sbin/periodic/etc/weekly X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/periodic/etc/weekly X-SVN-Commit-Revision: 340322 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AC0016DD58 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 14:21:27 -0000 Author: eugen Date: Sat Nov 10 14:21:26 2018 New Revision: 340322 URL: https://svnweb.freebsd.org/changeset/base/340322 Log: Prevent periodic/etc/weekly/340.noid from descending into root directories of jails. Jails have their own user/group databases and this script can produce multiple false warnings, not to mention significant extra load in case of large jailed subtrees. Leave this check for jailed invocations of the same script. MFC after: 1 month Modified: head/usr.sbin/periodic/etc/weekly/340.noid Modified: head/usr.sbin/periodic/etc/weekly/340.noid ============================================================================== --- head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 14:11:54 2018 (r340321) +++ head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 14:21:26 2018 (r340322) @@ -16,8 +16,26 @@ case "$weekly_noid_enable" in echo "" echo "Check for files with an unknown user or group:" + # Host should not test jailed subtrees as jails have their own + # databases of users and groups. Leave them for jailed invocations + # of this script. + + exclude='' + if [ $(sysctl -n security.jail.jailed) = 0 ]; then + sep=: + OIFS="$IFS" + IFS="$sep" + for param in $(jail -f "`syscrc jail_conf`" -e "$sep") + do + case "$param" in + path=*) exclude="$exclude -path ${param#path=} -prune -or" + esac + done + IFS="$OIFS" + fi + rc=$(find -H ${weekly_noid_dirs:-/} \ - \( ! -fstype local -prune -or -name \* \) -and \ + \( $exclude ! -fstype local -prune -or -name \* \) -and \ \( -nogroup -o -nouser \) -print | sed 's/^/ /' | tee /dev/stderr | wc -l) [ $rc -gt 1 ] && rc=1 From owner-svn-src-head@freebsd.org Sat Nov 10 14:25:39 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 063F61100582; Sat, 10 Nov 2018 14:25:39 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6F8856E128; Sat, 10 Nov 2018 14:25:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 4866224197; Sat, 10 Nov 2018 14:25:38 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAEPcX1054325; Sat, 10 Nov 2018 14:25:38 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAEPcJM054324; Sat, 10 Nov 2018 14:25:38 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811101425.wAAEPcJM054324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sat, 10 Nov 2018 14:25:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340323 - head/usr.sbin/periodic/etc/weekly X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/periodic/etc/weekly X-SVN-Commit-Revision: 340323 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6F8856E128 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 14:25:39 -0000 Author: eugen Date: Sat Nov 10 14:25:37 2018 New Revision: 340323 URL: https://svnweb.freebsd.org/changeset/base/340323 Log: Fix breakage after r340322: add missing "-n" to invocation of sysrc. MFH: 1 month Modified: head/usr.sbin/periodic/etc/weekly/340.noid Modified: head/usr.sbin/periodic/etc/weekly/340.noid ============================================================================== --- head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 14:21:26 2018 (r340322) +++ head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 14:25:37 2018 (r340323) @@ -25,7 +25,7 @@ case "$weekly_noid_enable" in sep=: OIFS="$IFS" IFS="$sep" - for param in $(jail -f "`syscrc jail_conf`" -e "$sep") + for param in $(jail -f "`syscrc -n jail_conf`" -e "$sep") do case "$param" in path=*) exclude="$exclude -path ${param#path=} -prune -or" From owner-svn-src-head@freebsd.org Sat Nov 10 14:35:14 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 2AF75110086E; Sat, 10 Nov 2018 14:35:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A97A26E5F9; Sat, 10 Nov 2018 14:35:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 869CE2433E; Sat, 10 Nov 2018 14:35:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAEZDLK059645; Sat, 10 Nov 2018 14:35:13 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAEZDlK059644; Sat, 10 Nov 2018 14:35:13 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811101435.wAAEZDlK059644@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sat, 10 Nov 2018 14:35:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340324 - head/usr.sbin/periodic/etc/weekly X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/periodic/etc/weekly X-SVN-Commit-Revision: 340324 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A97A26E5F9 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 14:35:14 -0000 Author: eugen Date: Sat Nov 10 14:35:12 2018 New Revision: 340324 URL: https://svnweb.freebsd.org/changeset/base/340324 Log: Sigh... Fix another breakage after r340322: spell "sysrc" correctly. MFC after: 1 month Modified: head/usr.sbin/periodic/etc/weekly/340.noid Modified: head/usr.sbin/periodic/etc/weekly/340.noid ============================================================================== --- head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 14:25:37 2018 (r340323) +++ head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 14:35:12 2018 (r340324) @@ -25,7 +25,7 @@ case "$weekly_noid_enable" in sep=: OIFS="$IFS" IFS="$sep" - for param in $(jail -f "`syscrc -n jail_conf`" -e "$sep") + for param in $(jail -f "`sysrc -n jail_conf`" -e "$sep") do case "$param" in path=*) exclude="$exclude -path ${param#path=} -prune -or" From owner-svn-src-head@freebsd.org Sat Nov 10 15:10:24 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 5A0231101592; Sat, 10 Nov 2018 15:10:24 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C16896F78E; Sat, 10 Nov 2018 15:10:23 +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 93FFD24814; Sat, 10 Nov 2018 15:10:23 +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 wAAFANrq075383; Sat, 10 Nov 2018 15:10:23 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAFANVB075381; Sat, 10 Nov 2018 15:10:23 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <201811101510.wAAFANVB075381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione <vmaffione@FreeBSD.org> Date: Sat, 10 Nov 2018 15:10:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340325 - head/tools/tools/netmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/tools/tools/netmap X-SVN-Commit-Revision: 340325 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C16896F78E X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 15:10:24 -0000 Author: vmaffione Date: Sat Nov 10 15:10:22 2018 New Revision: 340325 URL: https://svnweb.freebsd.org/changeset/base/340325 Log: netmap: pkt-gen: several updates from upstream Various improvements to the netmap pkt-gen program: - indentation fixes - support for IPV6 - fixes to checksum computation - support for NS_MOREFRAG - rate limiting in ping mode Reviewed by: bcr, 0mp Approved by: gnn (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D17698 Modified: head/tools/tools/netmap/pkt-gen.8 head/tools/tools/netmap/pkt-gen.c Modified: head/tools/tools/netmap/pkt-gen.8 ============================================================================== --- head/tools/tools/netmap/pkt-gen.8 Sat Nov 10 14:35:12 2018 (r340324) +++ head/tools/tools/netmap/pkt-gen.8 Sat Nov 10 15:10:22 2018 (r340325) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 23, 2018 +.Dd October 31, 2018 .Dt PKT-GEN 8 .Os .Sh NAME @@ -36,96 +36,215 @@ .Bl -item -compact .It .Nm +.Op Fl h46XzZNIWvrAB .Op Fl i Ar interface .Op Fl f Ar function .Op Fl n Ar count -.Op Fl t Ar pkts_to_send -.Op Fl r Ar pkts_to_receive .Op Fl l Ar pkt_size +.Op Fl b Ar burst_size .Op Fl d Ar dst_ip[:port[-dst_ip:port]] .Op Fl s Ar src_ip[:port[-src_ip:port]] -.Op Fl D Ar dst-mac -.Op Fl S Ar src-mac +.Op Fl D Ar dst_mac +.Op Fl S Ar src_mac .Op Fl a Ar cpu_id -.Op Fl b Ar burst size -.Op Fl c Ar cores +.Op Fl c Ar cpus .Op Fl p Ar threads .Op Fl T Ar report_ms -.Op Fl P +.Op Fl P Ar file .Op Fl w Ar wait_for_link_time .Op Fl R Ar rate -.Op Fl X .Op Fl H Ar len -.Op Fl P Ar xfile -.Op Fl z -.Op Fl Z +.Op Fl F Ar num_frags +.Op Fl M Ar frag_size +.Op Fl C Ar port_config +.El .Sh DESCRIPTION .Nm -generates and receives raw network packets using -.Xr netmap 4 . +leverages +.Xr netmap 4 +to generate and receive raw network packets in batches. The arguments are as follows: -.Pp .Bl -tag -width Ds +.It Fl h +Show program usage and exit. .It Fl i Ar interface -Network interface name. -.It Fl f Ar function tx rx ping pong -Set the function to transmit, receive of ping/pong. -.It Fl n count -Number of iterations (can be 0). -.It Fl t pkts_to_send -Number of packets to send. Also forces transmit mode. -.It Fl r Ar pkts_to_receive -Number of packets to receive. Also forces rx mode. +Name of the network interface that +.Nm +operates on. +It can be a system network interface (e.g., em0), +the name of a +.Xr vale 4 +port (e.g., valeSSS:PPP), the name of a netmap pipe or monitor, +or any valid netmap port name accepted by the +.Ar nm_open +library function, as documented in +.Xr netmap 4 +(NIOCREGIF section). +.It Fl f Ar function +The function to be executed by +.Nm . +Specify +.Cm tx +for transmission, +.Cm rx +for reception, +.Cm ping +for client-side ping-pong operation, and +.Cm pong +for server-side ping-pong operation. +.It Fl n Ar count +Number of iterations of the +.Nm +function, with 0 meaning infinite). +In case of +.Cm tx +or +.Cm rx , +.Ar count +is the number of packets to receive or transmit. +In case of +.Cm ping +or +.Cm pong , +.Ar count +is the number of ping-pong transactions. .It Fl l Ar pkt_size Packet size in bytes excluding CRC. +If passed a second time, use random sizes larger or equal than the +second one and lower than the first one. +.It Fl b Ar burst_size +Transmit or receive up to +.Ar burst_size +packets at a time. +.It Fl 4 +Use IPv4 addresses. +.It Fl 6 +Use IPv6 addresses. .It Fl d Ar dst_ip[:port[-dst_ip:port]] -Destination IPv4 address and port, single or range. +Destination IPv4/IPv6 address and port, single or range. .It Fl s Ar src_ip[:port[-src_ip:port]] -Source IPv4 address and port, single or range. -.It Fl D Ar dst-mac -Destination MAC address in colon notation. -.It Fl S Ar src-mac +Source IPv4/IPv6 address and port, single or range. +.It Fl D Ar dst_mac +Destination MAC address in colon notation (e.g., aa:bb:cc:dd:ee:00). +.It Fl S Ar src_mac Source MAC address in colon notation. .It Fl a Ar cpu_id -Tie +Pin the first thread of .Nm -to a particular CPU core using -.Xr setaffinity 2. -.It Fl b Ar burst size -Set the size of a burst of packets. -.It Fl c Ar cores -Number of cores to use. +to a particular CPU using +.Xr pthread_setaffinity_np 3 . +If more threads are used, they are pinned to the subsequent CPUs, +one per thread. +.It Fl c Ar cpus +Maximum number of CPUs to use (0 means to use all the available ones). .It Fl p Ar threads Number of threads to use. +By default, only a single thread is used +to handle all the netmap rings. +If +.Ar threads +is larger than one, each thread handles a single TX ring (in +.Cm tx +mode), a single RX ring (in +.Cm rx +mode), or a TX/RX ring couple. +The number of +.Ar threads +must be less or equal than the number of TX (or RX) ring available +in the device specified by +.Ar interface . .It Fl T Ar report_ms Number of milliseconds between reports. -.It Fl P -Use libpcap instead of netmap for reading or writing. .It Fl w Ar wait_for_link_time -Number of seconds to wait to make sure that the network link is up. A -network device driver may take some time to create a new -transmit/receive ring pair when +Number of seconds to wait before starting the +.Nm +function, useuful to make sure that the network link is up. +A network device driver may take some time to enter netmap mode, or +to create a new transmit/receive ring pair when .Xr netmap 4 requests one. .It Fl R Ar rate -Packet transmission rate. Not setting the packet transmission rate tells +Packet transmission rate. +Not setting the packet transmission rate tells .Nm -to transmit packets as quickly as possible. On servers from 2010 on-wards +to transmit packets as quickly as possible. +On servers from 2010 on-wards .Xr netmap 4 is able to completely use all of the bandwidth of a 10 or 40Gbps link, so this option should be used unless your intention is to saturate the link. .It Fl X -Dump payload transmitted or received. +Dump payload of each packet transmitted or received. .It Fl H Ar len -Add empty virtio-net-header with size 'len'. This option is only use -with Virtual Machine technologies that use virtio as a network interface. +Add empty virtio-net-header with size +.Ar len . +Valid sizes are 0, 10 and 12. +This option is only used with Virtual Machine technologies that use virtio +as a network interface. .It Fl P Ar file -Load the packet from a pcap file rather than constructing it inside of -.Nm +Load the packet to be transmitted from a pcap file rather than constructing +it within +.Nm . .It Fl z -Use random IPv4 src address/port +Use random IPv4/IPv6 src address/port. .It Fl Z -Use random IPv4 dst address/port +Use random IPv4/IPv6 dst address/port. +.It Fl N +Do not normalize units (i.e., use bps, pps instead of Mbps, Kpps, etc.). +.It Fl F Ar num_frags +Send multi-slot packets, each one with +.Ar num_frags +fragments. +A multi-slot packet is represented by two or more consecutive netmap slots +with the +.Ar NS_MOREFRAG +flag set (except for the last slot). +This is useful to transmit or receive packets larger than the netmap +buffer size. +.It Fl M Ar frag_size +In multi-slot mode, +.Ar frag_size +specifies the size of each fragment, if smaller than the packet length +divided by +.Ar num_frags . +.It Fl I +Use indirect buffers. +It is only valid for transmitting on VALE ports, +and it is implemented by setting the +.Ar NS_INDIRECT +flag in the netmap slots. +.It Fl W +Exit immediately if all the RX rings are empty the first time they are +examined. +.It Fl v +Increase the verbosity level. +.It Fl r +In +.Cm tx +mode, do not initialize packets, but send whatever the content of +the uninitialized netmap buffers is (rubbish mode). +.It Fl A +Compute mean and standard deviation (over a sliding window) for the +transmit or receive rate. +.It Fl B +Take Ethernet framing and CRC into account when computing the average bps. +This adds 4 bytes of CRC and 20 bytes of framing to each packet. +.It Fl C Ar tx_slots Ns Oo Cm \&, Ns Ar rx_slots Ns Oo Cm \&, Ns Ar tx_rings Ns Oo Cm \&, Ns Ar rx_rings Oc Oc Oc +Configuration in terms of number of rings and slots to be used when +opening the netmap port. +Such configuration has effect on software ports +created on the fly, such as VALE ports and netmap pipes. +The configuration may consist of 1 to 4 numbers separated by commas: +.Dq tx_slots,rx_slots,tx_rings,rx_rings . +Missing numbers or zeroes stand for default values. +As an additional convenience, if exactly one number is specified, +then this is assigned to both +.Ar tx_slots +and +.Ar rx_slots . +If there is no fourth number, then the third one is assigned to both +.Ar tx_rings +and +.Ar rx_rings . .El .Pp .Nm @@ -133,7 +252,7 @@ is a raw packet generator that can utilize either .Xr netmap 4 or .Xr bpf 4 -but which is most often uses with +but which is most often used with .Xr netmap 4 . The .Ar interface name @@ -146,7 +265,8 @@ system to balance traffic across the interface. .Nm can peel off one or more of the transmit or receive rings for its own use without interfering with packets that might otherwise be destined -for the host. For example on a system with a Chelsio Network +for the host. +For example on a system with a Chelsio Network Interface Card (NIC) the interface specification of .Ar -i netmap:ncxl0 gives @@ -156,20 +276,20 @@ the more commonly known cxl0 interface, which is used system's TCP/IP stack. .Sh EXAMPLES Capture and count all packets arriving on the operating system's cxl0 -interface. Using this will block packets from reaching the operating +interface. +Using this will block packets from reaching the operating system's network stack. -.Dl +.Bd -literal -offset indent +pkt-gen -i cxl0 -f rx +.Ed .Pp -.Nm --i cxl0 -f rx -.Pp Send a stream of fake DNS packets between two hosts with a packet -length of 128 bytes. You must set the destination MAC address for +length of 128 bytes. +You must set the destination MAC address for packets to be received by the target host. -.Pp -.Dl -.Nm --i netmap:ncxl0 -f tx -s 172.16.0.1:53 -d 172.16.1.3:53 -D 00:07:43:29:2a:e0 +.Bd -literal -offset intent +pkt-gen -i netmap:ncxl0 -f tx -s 172.16.0.1:53 -d 172.16.1.3:53 -D 00:07:43:29:2a:e0 +.Ed .Sh SEE ALSO .Xr netmap 4 , .Xr bridge 8 Modified: head/tools/tools/netmap/pkt-gen.c ============================================================================== --- head/tools/tools/netmap/pkt-gen.c Sat Nov 10 14:35:12 2018 (r340324) +++ head/tools/tools/netmap/pkt-gen.c Sat Nov 10 15:10:22 2018 (r340325) @@ -55,6 +55,11 @@ #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/udp.h> +#include <netinet/ip6.h> +#ifdef linux +#define IPV6_VERSION 0x60 +#define IPV6_DEFHLIM 64 +#endif #include <assert.h> #include <math.h> @@ -66,16 +71,18 @@ #include "ctrs.h" +static void usage(int); + #ifdef _WIN32 #define cpuset_t DWORD_PTR //uint64_t static inline void CPU_ZERO(cpuset_t *p) { - *p = 0; + *p = 0; } static inline void CPU_SET(uint32_t i, cpuset_t *p) { - *p |= 1<< (i & 0x3f); + *p |= 1<< (i & 0x3f); } #define pthread_setaffinity_np(a, b, c) !SetThreadAffinityMask(a, *c) //((void)a, 0) @@ -155,12 +162,12 @@ ether_ntoa(const struct ether_addr *n) #define cpuset_t uint64_t // XXX static inline void CPU_ZERO(cpuset_t *p) { - *p = 0; + *p = 0; } static inline void CPU_SET(uint32_t i, cpuset_t *p) { - *p |= 1<< (i & 0x3f); + *p |= 1<< (i & 0x3f); } #define pthread_setaffinity_np(a, b, c) ((void)a, 0) @@ -169,7 +176,7 @@ static inline void CPU_SET(uint32_t i, cpuset_t *p) #define IFF_PPROMISC IFF_PROMISC #include <net/if_dl.h> /* LLADDR */ #define clock_gettime(a,b) \ - do {struct timespec t0 = {0,0}; *(b) = t0; } while (0) + do {struct timespec t0 = {0,0}; *(b) = t0; } while (0) #endif /* __APPLE__ */ const char *default_payload="netmap pkt-gen DIRECT payload\n" @@ -179,10 +186,8 @@ const char *indirect_payload="netmap pkt-gen indirect "http://info.iet.unipi.it/~luigi/netmap/ "; int verbose = 0; +int normalize = 1; -#define SKIP_PAYLOAD 1 /* do not check payload. XXX unused */ - - #define VIRT_HDR_1 10 /* length of a base vnet-hdr */ #define VIRT_HDR_2 12 /* length of the extenede vnet-hdr */ #define VIRT_HDR_MAX VIRT_HDR_2 @@ -195,14 +200,34 @@ struct virt_header { struct pkt { struct virt_header vh; struct ether_header eh; - struct ip ip; - struct udphdr udp; - uint8_t body[MAX_BODYSIZE]; // XXX hardwired + union { + struct { + struct ip ip; + struct udphdr udp; + uint8_t body[MAX_BODYSIZE]; /* hardwired */ + } ipv4; + struct { + struct ip6_hdr ip; + struct udphdr udp; + uint8_t body[MAX_BODYSIZE]; /* hardwired */ + } ipv6; + }; } __attribute__((__packed__)); +#define PKT(p, f, af) \ + ((af) == AF_INET ? (p)->ipv4.f: (p)->ipv6.f) + struct ip_range { char *name; - uint32_t start, end; /* same as struct in_addr */ + union { + struct { + uint32_t start, end; /* same as struct in_addr */ + } ipv4; + struct { + struct in6_addr start, end; + uint8_t sgroup, egroup; + } ipv6; + }; uint16_t port0, port1; }; @@ -227,15 +252,18 @@ struct tstamp { */ struct glob_arg { + int af; /* address family AF_INET/AF_INET6 */ struct ip_range src_ip; struct ip_range dst_ip; struct mac_range dst_mac; struct mac_range src_mac; int pkt_size; + int pkt_min_size; int burst; int forever; uint64_t npackets; /* total packets to send */ - int frags; /* fragments per packet */ + int frags; /* fragments per packet */ + u_int mtu; /* size of each fragment */ int nthreads; int cpus; /* cpus used for running */ int system_cpus; /* cpus on the system */ @@ -271,12 +299,12 @@ struct glob_arg { char *nmr_config; int dummy_send; int virt_header; /* send also the virt_header */ - int extra_bufs; /* goes in nr_arg3 */ - int extra_pipes; /* goes in nr_arg1 */ char *packet_file; /* -P option */ #define STATS_WIN 15 int win_idx; int64_t win[STATS_WIN]; + int wait_link; + int framing; /* #bits of framing (for bw output) */ }; enum dev_type { DEV_NONE, DEV_NETMAP, DEV_PCAP, DEV_TAP }; @@ -304,79 +332,166 @@ struct targ { struct pkt pkt; void *frame; + uint16_t seed[3]; + u_int frags; + u_int frag_size; }; +static __inline uint16_t +cksum_add(uint16_t sum, uint16_t a) +{ + uint16_t res; + res = sum + a; + return (res + (res < a)); +} + +static void +extract_ipv4_addr(char *name, uint32_t *addr, uint16_t *port) +{ + struct in_addr a; + char *pp; + + pp = strchr(name, ':'); + if (pp != NULL) { /* do we have ports ? */ + *pp++ = '\0'; + *port = (uint16_t)strtol(pp, NULL, 0); + } + + inet_pton(AF_INET, name, &a); + *addr = ntohl(a.s_addr); +} + +static void +extract_ipv6_addr(char *name, struct in6_addr *addr, uint16_t *port, + uint8_t *group) +{ + char *pp; + + /* + * We accept IPv6 address in the following form: + * group@[2001:DB8::1001]:port (w/ brackets and port) + * group@[2001:DB8::1] (w/ brackets and w/o port) + * group@2001:DB8::1234 (w/o brackets and w/o port) + */ + pp = strchr(name, '@'); + if (pp != NULL) { + *pp++ = '\0'; + *group = (uint8_t)strtol(name, NULL, 0); + if (*group > 7) + *group = 7; + name = pp; + } + if (name[0] == '[') + name++; + pp = strchr(name, ']'); + if (pp != NULL) + *pp++ = '\0'; + if (pp != NULL && *pp != ':') + pp = NULL; + if (pp != NULL) { /* do we have ports ? */ + *pp++ = '\0'; + *port = (uint16_t)strtol(pp, NULL, 0); + } + inet_pton(AF_INET6, name, addr); +} /* * extract the extremes from a range of ipv4 addresses. * addr_lo[-addr_hi][:port_lo[-port_hi]] */ -static void -extract_ip_range(struct ip_range *r) +static int +extract_ip_range(struct ip_range *r, int af) { - char *ap, *pp; + char *name, *ap, start[INET6_ADDRSTRLEN]; + char end[INET6_ADDRSTRLEN]; struct in_addr a; + uint32_t tmp; if (verbose) D("extract IP range from %s", r->name); - r->port0 = r->port1 = 0; - r->start = r->end = 0; + name = strdup(r->name); + if (name == NULL) { + D("strdup failed"); + usage(-1); + } /* the first - splits start/end of range */ - ap = index(r->name, '-'); /* do we have ports ? */ - if (ap) { + ap = strchr(name, '-'); + if (ap != NULL) *ap++ = '\0'; - } - /* grab the initial values (mandatory) */ - pp = index(r->name, ':'); - if (pp) { - *pp++ = '\0'; - r->port0 = r->port1 = strtol(pp, NULL, 0); - }; - inet_aton(r->name, &a); - r->start = r->end = ntohl(a.s_addr); - if (ap) { - pp = index(ap, ':'); - if (pp) { - *pp++ = '\0'; - if (*pp) - r->port1 = strtol(pp, NULL, 0); + r->port0 = 1234; /* default port */ + if (af == AF_INET6) { + r->ipv6.sgroup = 7; /* default group */ + extract_ipv6_addr(name, &r->ipv6.start, &r->port0, + &r->ipv6.sgroup); + } else + extract_ipv4_addr(name, &r->ipv4.start, &r->port0); + + r->port1 = r->port0; + if (af == AF_INET6) { + if (ap != NULL) { + r->ipv6.egroup = r->ipv6.sgroup; + extract_ipv6_addr(ap, &r->ipv6.end, &r->port1, + &r->ipv6.egroup); + } else { + r->ipv6.end = r->ipv6.start; + r->ipv6.egroup = r->ipv6.sgroup; } - if (*ap) { - inet_aton(ap, &a); - r->end = ntohl(a.s_addr); - } + } else { + if (ap != NULL) { + extract_ipv4_addr(ap, &r->ipv4.end, &r->port1); + if (r->ipv4.start > r->ipv4.end) { + tmp = r->ipv4.end; + r->ipv4.end = r->ipv4.start; + r->ipv4.start = tmp; + } + } else + r->ipv4.end = r->ipv4.start; } + if (r->port0 > r->port1) { - uint16_t tmp = r->port0; + tmp = r->port0; r->port0 = r->port1; r->port1 = tmp; } - if (r->start > r->end) { - uint32_t tmp = r->start; - r->start = r->end; - r->end = tmp; + if (af == AF_INET) { + a.s_addr = htonl(r->ipv4.start); + inet_ntop(af, &a, start, sizeof(start)); + a.s_addr = htonl(r->ipv4.end); + inet_ntop(af, &a, end, sizeof(end)); + } else { + inet_ntop(af, &r->ipv6.start, start, sizeof(start)); + inet_ntop(af, &r->ipv6.end, end, sizeof(end)); } - { - struct in_addr a; - char buf1[16]; // one ip address + if (af == AF_INET) + D("range is %s:%d to %s:%d", start, r->port0, end, r->port1); + else + D("range is %d@[%s]:%d to %d@[%s]:%d", r->ipv6.sgroup, + start, r->port0, r->ipv6.egroup, end, r->port1); - a.s_addr = htonl(r->end); - strncpy(buf1, inet_ntoa(a), sizeof(buf1)); - a.s_addr = htonl(r->start); - if (1) - D("range is %s:%d to %s:%d", - inet_ntoa(a), r->port0, buf1, r->port1); - } + free(name); + if (r->port0 != r->port1 || + (af == AF_INET && r->ipv4.start != r->ipv4.end) || + (af == AF_INET6 && + !IN6_ARE_ADDR_EQUAL(&r->ipv6.start, &r->ipv6.end))) + return (OPT_COPY); + return (0); } -static void +static int extract_mac_range(struct mac_range *r) { + struct ether_addr *e; if (verbose) D("extract MAC range from %s", r->name); - bcopy(ether_aton(r->name), &r->start, 6); - bcopy(ether_aton(r->name), &r->end, 6); + + e = ether_aton(r->name); + if (e == NULL) { + D("invalid MAC address '%s'", r->name); + return 1; + } + bcopy(e, &r->start, 6); + bcopy(e, &r->end, 6); #if 0 bcopy(targ->src_mac, eh->ether_shost, 6); p = index(targ->g->src_mac, '-'); @@ -391,6 +506,7 @@ extract_mac_range(struct mac_range *r) #endif if (verbose) D("%s starts at %s", r->name, ether_ntoa(&r->start)); + return 0; } static struct targ *targs; @@ -456,7 +572,7 @@ system_ncpus(void) /* * parse the vale configuration in conf and put it in nmr. * Return the flag set if necessary. - * The configuration may consist of 0 to 4 numbers separated + * The configuration may consist of 1 to 4 numbers separated * by commas: #tx-slots,#rx-slots,#tx-rings,#rx-rings. * Missing numbers or zeroes stand for default values. * As an additional convenience, if exactly one number @@ -500,7 +616,7 @@ parse_nmr_config(const char* conf, struct nmreq *nmr) nmr->nr_rx_rings, nmr->nr_rx_slots); free(w); return (nmr->nr_tx_rings || nmr->nr_tx_slots || - nmr->nr_rx_rings || nmr->nr_rx_slots) ? + nmr->nr_rx_rings || nmr->nr_rx_slots) ? NM_OPEN_RING_CFG : 0; } @@ -513,7 +629,6 @@ static int source_hwaddr(const char *ifname, char *buf) { struct ifaddrs *ifaphead, *ifap; - int l = sizeof(ifap->ifa_name); if (getifaddrs(&ifaphead) != 0) { D("getifaddrs %s failed", ifname); @@ -527,7 +642,7 @@ source_hwaddr(const char *ifname, char *buf) if (!sdl || sdl->sdl_family != AF_LINK) continue; - if (strncmp(ifap->ifa_name, ifname, l) != 0) + if (strncmp(ifap->ifa_name, ifname, IFNAMSIZ) != 0) continue; mac = (uint8_t *)LLADDR(sdl); sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", @@ -562,19 +677,20 @@ setaffinity(pthread_t me, int i) return 0; } + /* Compute the checksum of the given ip header. */ -static uint16_t +static uint32_t checksum(const void *data, uint16_t len, uint32_t sum) { - const uint8_t *addr = data; + const uint8_t *addr = data; uint32_t i; - /* Checksum all the pairs of bytes first... */ - for (i = 0; i < (len & ~1U); i += 2) { - sum += (u_int16_t)ntohs(*((u_int16_t *)(addr + i))); - if (sum > 0xFFFF) - sum -= 0xFFFF; - } + /* Checksum all the pairs of bytes first... */ + for (i = 0; i < (len & ~1U); i += 2) { + sum += (u_int16_t)ntohs(*((u_int16_t *)(addr + i))); + if (sum > 0xFFFF) + sum -= 0xFFFF; + } /* * If there's a single byte left over, checksum it, too. * Network byte order is big-endian, so the remaining byte is @@ -588,8 +704,8 @@ checksum(const void *data, uint16_t len, uint32_t sum) return sum; } -static u_int16_t -wrapsum(u_int32_t sum) +static uint16_t +wrapsum(uint32_t sum) { sum = ~sum & 0xFFFF; return (htons(sum)); @@ -637,64 +753,198 @@ dump_payload(const char *_p, int len, struct netmap_ri #define uh_sum check #endif /* linux */ -/* - * increment the addressed in the packet, - * starting from the least significant field. - * DST_IP DST_PORT SRC_IP SRC_PORT - */ static void -update_addresses(struct pkt *pkt, struct glob_arg *g) +update_ip(struct pkt *pkt, struct targ *t) { - uint32_t a; - uint16_t p; - struct ip *ip = &pkt->ip; - struct udphdr *udp = &pkt->udp; + struct glob_arg *g = t->g; + struct ip ip; + struct udphdr udp; + uint32_t oaddr, naddr; + uint16_t oport, nport; + uint16_t ip_sum, udp_sum; - do { - /* XXX for now it doesn't handle non-random src, random dst */ - if (g->options & OPT_RANDOM_SRC) { - udp->uh_sport = random(); - ip->ip_src.s_addr = random(); - } else { - p = ntohs(udp->uh_sport); - if (p < g->src_ip.port1) { /* just inc, no wrap */ - udp->uh_sport = htons(p + 1); + memcpy(&ip, &pkt->ipv4.ip, sizeof(ip)); + memcpy(&udp, &pkt->ipv4.udp, sizeof(udp)); + do { + ip_sum = udp_sum = 0; + naddr = oaddr = ntohl(ip.ip_src.s_addr); + nport = oport = ntohs(udp.uh_sport); + if (g->options & OPT_RANDOM_SRC) { + ip.ip_src.s_addr = nrand48(t->seed); + udp.uh_sport = nrand48(t->seed); + naddr = ntohl(ip.ip_src.s_addr); + nport = ntohs(udp.uh_sport); break; } - udp->uh_sport = htons(g->src_ip.port0); - - a = ntohl(ip->ip_src.s_addr); - if (a < g->src_ip.end) { /* just inc, no wrap */ - ip->ip_src.s_addr = htonl(a + 1); + if (oport < g->src_ip.port1) { + nport = oport + 1; + udp.uh_sport = htons(nport); break; } - ip->ip_src.s_addr = htonl(g->src_ip.start); - - udp->uh_sport = htons(g->src_ip.port0); + nport = g->src_ip.port0; + udp.uh_sport = htons(nport); + if (oaddr < g->src_ip.ipv4.end) { + naddr = oaddr + 1; + ip.ip_src.s_addr = htonl(naddr); + break; + } + naddr = g->src_ip.ipv4.start; + ip.ip_src.s_addr = htonl(naddr); + } while (0); + /* update checksums if needed */ + if (oaddr != naddr) { + ip_sum = cksum_add(ip_sum, ~oaddr >> 16); + ip_sum = cksum_add(ip_sum, ~oaddr & 0xffff); + ip_sum = cksum_add(ip_sum, naddr >> 16); + ip_sum = cksum_add(ip_sum, naddr & 0xffff); } - - if (g->options & OPT_RANDOM_DST) { - udp->uh_dport = random(); - ip->ip_dst.s_addr = random(); - } else { - p = ntohs(udp->uh_dport); - if (p < g->dst_ip.port1) { /* just inc, no wrap */ - udp->uh_dport = htons(p + 1); + if (oport != nport) { + udp_sum = cksum_add(udp_sum, ~oport); + udp_sum = cksum_add(udp_sum, nport); + } + do { + naddr = oaddr = ntohl(ip.ip_dst.s_addr); + nport = oport = ntohs(udp.uh_dport); + if (g->options & OPT_RANDOM_DST) { + ip.ip_dst.s_addr = nrand48(t->seed); + udp.uh_dport = nrand48(t->seed); + naddr = ntohl(ip.ip_dst.s_addr); + nport = ntohs(udp.uh_dport); break; } - udp->uh_dport = htons(g->dst_ip.port0); - - a = ntohl(ip->ip_dst.s_addr); - if (a < g->dst_ip.end) { /* just inc, no wrap */ - ip->ip_dst.s_addr = htonl(a + 1); + if (oport < g->dst_ip.port1) { + nport = oport + 1; + udp.uh_dport = htons(nport); break; } + nport = g->dst_ip.port0; + udp.uh_dport = htons(nport); + if (oaddr < g->dst_ip.ipv4.end) { + naddr = oaddr + 1; + ip.ip_dst.s_addr = htonl(naddr); + break; + } + naddr = g->dst_ip.ipv4.start; + ip.ip_dst.s_addr = htonl(naddr); + } while (0); + /* update checksums */ + if (oaddr != naddr) { + ip_sum = cksum_add(ip_sum, ~oaddr >> 16); + ip_sum = cksum_add(ip_sum, ~oaddr & 0xffff); + ip_sum = cksum_add(ip_sum, naddr >> 16); + ip_sum = cksum_add(ip_sum, naddr & 0xffff); } - ip->ip_dst.s_addr = htonl(g->dst_ip.start); - } while (0); - // update checksum + if (oport != nport) { + udp_sum = cksum_add(udp_sum, ~oport); + udp_sum = cksum_add(udp_sum, nport); + } + if (udp_sum != 0) + udp.uh_sum = ~cksum_add(~udp.uh_sum, htons(udp_sum)); + if (ip_sum != 0) { + ip.ip_sum = ~cksum_add(~ip.ip_sum, htons(ip_sum)); + udp.uh_sum = ~cksum_add(~udp.uh_sum, htons(ip_sum)); + } + memcpy(&pkt->ipv4.ip, &ip, sizeof(ip)); + memcpy(&pkt->ipv4.udp, &udp, sizeof(udp)); } +#ifndef s6_addr16 +#define s6_addr16 __u6_addr.__u6_addr16 +#endif +static void +update_ip6(struct pkt *pkt, struct targ *t) +{ + struct glob_arg *g = t->g; + struct ip6_hdr ip6; + struct udphdr udp; + uint16_t udp_sum; + uint16_t oaddr, naddr; + uint16_t oport, nport; + uint8_t group; + + memcpy(&ip6, &pkt->ipv6.ip, sizeof(ip6)); + memcpy(&udp, &pkt->ipv6.udp, sizeof(udp)); + do { + udp_sum = 0; + group = g->src_ip.ipv6.sgroup; + naddr = oaddr = ntohs(ip6.ip6_src.s6_addr16[group]); + nport = oport = ntohs(udp.uh_sport); + if (g->options & OPT_RANDOM_SRC) { + ip6.ip6_src.s6_addr16[group] = nrand48(t->seed); + udp.uh_sport = nrand48(t->seed); + naddr = ntohs(ip6.ip6_src.s6_addr16[group]); + nport = ntohs(udp.uh_sport); + break; + } + if (oport < g->src_ip.port1) { + nport = oport + 1; + udp.uh_sport = htons(nport); + break; + } + nport = g->src_ip.port0; + udp.uh_sport = htons(nport); + if (oaddr < ntohs(g->src_ip.ipv6.end.s6_addr16[group])) { + naddr = oaddr + 1; + ip6.ip6_src.s6_addr16[group] = htons(naddr); + break; + } + naddr = ntohs(g->src_ip.ipv6.start.s6_addr16[group]); + ip6.ip6_src.s6_addr16[group] = htons(naddr); + } while (0); + /* update checksums if needed */ + if (oaddr != naddr) + udp_sum = cksum_add(~oaddr, naddr); + if (oport != nport) + udp_sum = cksum_add(udp_sum, + cksum_add(~oport, nport)); + do { + group = g->dst_ip.ipv6.egroup; + naddr = oaddr = ntohs(ip6.ip6_dst.s6_addr16[group]); + nport = oport = ntohs(udp.uh_dport); + if (g->options & OPT_RANDOM_DST) { + ip6.ip6_dst.s6_addr16[group] = nrand48(t->seed); + udp.uh_dport = nrand48(t->seed); + naddr = ntohs(ip6.ip6_dst.s6_addr16[group]); + nport = ntohs(udp.uh_dport); + break; + } + if (oport < g->dst_ip.port1) { + nport = oport + 1; + udp.uh_dport = htons(nport); + break; + } + nport = g->dst_ip.port0; + udp.uh_dport = htons(nport); + if (oaddr < ntohs(g->dst_ip.ipv6.end.s6_addr16[group])) { + naddr = oaddr + 1; + ip6.ip6_dst.s6_addr16[group] = htons(naddr); + break; + } + naddr = ntohs(g->dst_ip.ipv6.start.s6_addr16[group]); + ip6.ip6_dst.s6_addr16[group] = htons(naddr); + } while (0); + /* update checksums */ + if (oaddr != naddr) + udp_sum = cksum_add(udp_sum, + cksum_add(~oaddr, naddr)); + if (oport != nport) + udp_sum = cksum_add(udp_sum, + cksum_add(~oport, nport)); + if (udp_sum != 0) + udp.uh_sum = ~cksum_add(~udp.uh_sum, udp_sum); + memcpy(&pkt->ipv6.ip, &ip6, sizeof(ip6)); + memcpy(&pkt->ipv6.udp, &udp, sizeof(udp)); +} + +static void +update_addresses(struct pkt *pkt, struct targ *t) +{ + + if (t->g->af == AF_INET) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sat Nov 10 16:23:49 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C532E1103195; Sat, 10 Nov 2018 16:23:48 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38B0D71A7F; Sat, 10 Nov 2018 16:23:48 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wAAGNkT8016455; Sat, 10 Nov 2018 08:23:46 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wAAGNkp3016454; Sat, 10 Nov 2018 08:23:46 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811101623.wAAGNkp3016454@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340318 - head/usr.sbin/newsyslog In-Reply-To: <201811101046.wAAAkdPs041621@repo.freebsd.org> To: Ben Woods <woodsb02@freebsd.org> Date: Sat, 10 Nov 2018 08:23:46 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 38B0D71A7F X-Spamd-Result: default: False [1.71 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; 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)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.43)[0.428,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; NEURAL_SPAM_SHORT(0.38)[0.377,0]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.03)[0.035,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 16:23:49 -0000 > Author: woodsb02 (ports committer) > Date: Sat Nov 10 10:46:38 2018 > New Revision: 340318 > URL: https://svnweb.freebsd.org/changeset/base/340318 > > Log: > newsyslog.conf: Restrict included files in default config to [!.]*.conf > > The new default config will only include files from the following > directories which end with '.conf' and do not beginning with a '.' > character: > - /etc/newsyslog.conf.d/ > - /usr/local/etc/newsyslog.conf.d/ > > This matches the syslog.conf(5) functionality, and also prevents '.sample' or > '.pkgnew' files being included. This is important for ports which install files > in /usr/local/etc/newsyslog.conf.d/ and also for pkgbase. > > Approved by: eadler > Approved by: bapt > Relnotes: yes > Differential Revision: https://reviews.freebsd.org/D17086 This is going to cause people who are doing binary updates to 12.0 silent breakage in that any file not named by these rules well suddenly and silently be ignored when they update. My normal mode to disable files in directories of this nature is to create a off/ directory and mv the files to there rather than rename the file in place and depend on special rules like this to deal with it. If we need a palce for examples I would support a examples/ subdirectory for them, which would de-clutter the working directory in actual use at the same time. > > Modified: > head/usr.sbin/newsyslog/newsyslog.8 > head/usr.sbin/newsyslog/newsyslog.conf > > Modified: head/usr.sbin/newsyslog/newsyslog.8 > ============================================================================== > --- head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:32:55 2018 (r340317) > +++ head/usr.sbin/newsyslog/newsyslog.8 Sat Nov 10 10:46:38 2018 (r340318) > @@ -17,7 +17,7 @@ > .\" the suitability of this software for any purpose. It is > .\" provided "as is" without express or implied warranty. > .\" > -.Dd July 19, 2018 > +.Dd November 10, 2018 > .Dt NEWSYSLOG 8 > .Os > .Sh NAME > @@ -268,10 +268,12 @@ will examine all files listed in the configuration fil > .Nm > configuration file > .It Pa /etc/newsyslog.conf.d > -Each file in this directory will be included by the default > +By default each file in this directory ending in '.conf' and not beginning with > +a '.' will be included by the default > .Pa newsyslog.conf . > .It Pa /usr/local/etc/newsyslog.conf.d > -Each file in this directory will be included by the default > +By default each file in this directory ending in '.conf' and not beginning with > +a '.' will be included by the default > .Pa newsyslog.conf . > .El > .Sh COMPATIBILITY > > Modified: head/usr.sbin/newsyslog/newsyslog.conf > ============================================================================== > --- head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:32:55 2018 (r340317) > +++ head/usr.sbin/newsyslog/newsyslog.conf Sat Nov 10 10:46:38 2018 (r340318) > @@ -31,5 +31,5 @@ > /var/log/utx.log 644 3 * @01T05 B > /var/log/weekly.log 640 5 * $W6D0 JN > > -<include> /etc/newsyslog.conf.d/* > -<include> /usr/local/etc/newsyslog.conf.d/* > +<include> /etc/newsyslog.conf.d/[!.]*.conf > +<include> /usr/local/etc/newsyslog.conf.d/[!.]*.conf > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sat Nov 10 16:58:09 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 412021104029; Sat, 10 Nov 2018 16:58:09 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B256C72E9E; Sat, 10 Nov 2018 16:58:08 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 8A40325A25; Sat, 10 Nov 2018 16:58:08 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAGw8xS032025; Sat, 10 Nov 2018 16:58:08 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAGw8Zd032024; Sat, 10 Nov 2018 16:58:08 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201811101658.wAAGw8Zd032024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods <woodsb02@FreeBSD.org> Date: Sat, 10 Nov 2018 16:58:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340326 - head X-SVN-Group: head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340326 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B256C72E9E X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 16:58:09 -0000 Author: woodsb02 (ports committer) Date: Sat Nov 10 16:58:07 2018 New Revision: 340326 URL: https://svnweb.freebsd.org/changeset/base/340326 Log: Add UPDATING entry for newsyslog.conf changes introduced by r340318 Approved by: cem Differential Revision: https://reviews.freebsd.org/D17936 Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Nov 10 15:10:22 2018 (r340325) +++ head/UPDATING Sat Nov 10 16:58:07 2018 (r340326) @@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20181110: + The default newsyslog.conf(5) file has been changed to only include + files in /etc/newsyslog.conf.d/ and /usr/local/etc/newsyslog.conf.d/ if + the filenames end in '.conf' and do not begin with a '.'. + + You should check the configuration files in these two directories match + this naming convention. You can verify which configuration files are + being included using the command: + $ newsyslog -Nrv + 20181015: Ports for the DRM modules have been simplified. Now, amd64 users should just install the drm-kmod port. All others should install From owner-svn-src-head@freebsd.org Sat Nov 10 17:49:20 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D4BCC110521F; Sat, 10 Nov 2018 17:49:20 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61A9F745D8; Sat, 10 Nov 2018 17:49:20 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 43EB126267; Sat, 10 Nov 2018 17:49:20 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAHnKkL058564; Sat, 10 Nov 2018 17:49:20 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAHnKjv058563; Sat, 10 Nov 2018 17:49:20 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201811101749.wAAHnKjv058563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein <eugen@FreeBSD.org> Date: Sat, 10 Nov 2018 17:49:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340327 - head/usr.sbin/periodic/etc/weekly X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/periodic/etc/weekly X-SVN-Commit-Revision: 340327 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 61A9F745D8 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 17:49:21 -0000 Author: eugen Date: Sat Nov 10 17:49:19 2018 New Revision: 340327 URL: https://svnweb.freebsd.org/changeset/base/340327 Log: weekly/340.noid: suppress warning on non-existent jail.conf MFC after: 1 month Modified: head/usr.sbin/periodic/etc/weekly/340.noid Modified: head/usr.sbin/periodic/etc/weekly/340.noid ============================================================================== --- head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 16:58:07 2018 (r340326) +++ head/usr.sbin/periodic/etc/weekly/340.noid Sat Nov 10 17:49:19 2018 (r340327) @@ -25,7 +25,7 @@ case "$weekly_noid_enable" in sep=: OIFS="$IFS" IFS="$sep" - for param in $(jail -f "`sysrc -n jail_conf`" -e "$sep") + for param in $(jail -f "`sysrc -n jail_conf`" -e "$sep" 2>/dev/null) do case "$param" in path=*) exclude="$exclude -path ${param#path=} -prune -or" From owner-svn-src-head@freebsd.org Sat Nov 10 18:43:24 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 4D4CB110691B; Sat, 10 Nov 2018 18:43:24 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BE0F761E6; Sat, 10 Nov 2018 18:43:23 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id wAAIhKVe016962; Sat, 10 Nov 2018 10:43:20 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id wAAIhKrg016961; Sat, 10 Nov 2018 10:43:20 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> Message-Id: <201811101843.wAAIhKrg016961@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r340326 - head In-Reply-To: <201811101658.wAAGw8Zd032024@repo.freebsd.org> To: Ben Woods <woodsb02@freebsd.org> Date: Sat, 10 Nov 2018 10:43:20 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 5BE0F761E6 X-Spamd-Result: default: False [1.46 / 200.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[rgrimes@freebsd.org]; 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)[dnsmgr.net]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.42)[0.425,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-0.02)[country: US(-0.09)]; NEURAL_SPAM_SHORT(0.13)[0.128,0]; MX_GOOD(-0.01)[cached: pdx.rh.CN85.dnsmgr.net]; NEURAL_SPAM_LONG(0.04)[0.039,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 18:43:24 -0000 > Author: woodsb02 (ports committer) > Date: Sat Nov 10 16:58:07 2018 > New Revision: 340326 > URL: https://svnweb.freebsd.org/changeset/base/340326 > > Log: > Add UPDATING entry for newsyslog.conf changes introduced by r340318 > > Approved by: cem > Differential Revision: https://reviews.freebsd.org/D17936 If your going to bother with a differential, and invite people to it you should give them at least 24 hours, and preferably 72 hours to respond to the new review. Reviews that last < 4 hours are not code reviews. > Modified: > head/UPDATING > > Modified: head/UPDATING > ============================================================================== > --- head/UPDATING Sat Nov 10 15:10:22 2018 (r340325) > +++ head/UPDATING Sat Nov 10 16:58:07 2018 (r340326) > @@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: > disable the most expensive debugging functionality run > "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20181110: > + The default newsyslog.conf(5) file has been changed to only include > + files in /etc/newsyslog.conf.d/ and /usr/local/etc/newsyslog.conf.d/ if > + the filenames end in '.conf' and do not begin with a '.'. > + > + You should check the configuration files in these two directories match > + this naming convention. You can verify which configuration files are > + being included using the command: > + $ newsyslog -Nrv > + > 20181015: > Ports for the DRM modules have been simplified. Now, amd64 users should > just install the drm-kmod port. All others should install > > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-head@freebsd.org Sat Nov 10 19:09:49 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 B4D4B1107636; Sat, 10 Nov 2018 19:09:49 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F01077737B; Sat, 10 Nov 2018 19:09:48 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 D2B6026F93; Sat, 10 Nov 2018 19:09:48 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAJ9maB008397; Sat, 10 Nov 2018 19:09:48 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAJ9mo8008396; Sat, 10 Nov 2018 19:09:48 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <201811101909.wAAJ9mo8008396@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen <vangyzen@FreeBSD.org> Date: Sat, 10 Nov 2018 19:09:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340328 - head X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 340328 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F01077737B X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 19:09:49 -0000 Author: vangyzen Date: Sat Nov 10 19:09:48 2018 New Revision: 340328 URL: https://svnweb.freebsd.org/changeset/base/340328 Log: Update comment about 'universe' disk usage It's 167 GB now (or 81 GB with ZFS lz4). MFC after: 2 weeks Sponsored by: Dell EMC Isilon Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Sat Nov 10 17:49:19 2018 (r340327) +++ head/Makefile Sat Nov 10 19:09:48 2018 (r340328) @@ -62,9 +62,10 @@ # Most of the user-driven targets (as listed above) are implemented in # Makefile.inc1. The exceptions are universe, tinderbox and targets. # -# If you want to build your system from source be sure that /usr/obj has -# at least 6GB of diskspace available. A complete 'universe' build requires -# about 100GB of space. +# If you want to build your system from source, be sure that /usr/obj has +# at least 6 GB of disk space available. A complete 'universe' build of +# r340283 (2018-11) required 167 GB of space. ZFS lz4 compression +# achieved a 2.18x ratio, reducing actual space to 81 GB. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: From owner-svn-src-head@freebsd.org Sat Nov 10 19:32:07 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 C9303110832D; Sat, 10 Nov 2018 19:32:07 +0000 (UTC) (envelope-from jamie@freebsd.org) Received: from gritton.org (gritton.org [199.192.165.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gritton.org", Issuer "Let's Encrypt Authority X3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 29896784FF; Sat, 10 Nov 2018 19:32:07 +0000 (UTC) (envelope-from jamie@freebsd.org) Received: from gritton.org ([127.0.0.131]) by gritton.org (8.15.2/8.15.2) with ESMTP id wAAJAT4V048974; Sat, 10 Nov 2018 12:10:29 -0700 (MST) (envelope-from jamie@freebsd.org) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 10 Nov 2018 12:10:29 -0700 From: James Gritton <jamie@freebsd.org> To: Eugene Grosbein <eugen@freebsd.org> Cc: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r340319 - head/usr.sbin/jail In-Reply-To: <357a85c0-6552-080f-183c-a1d0d331cfe7@freebsd.org> References: <201811101203.wAAC3vov082259@repo.freebsd.org> <871CB649-7A64-490B-A81E-F68A575A8BA4@lists.zabbadoz.net> <357a85c0-6552-080f-183c-a1d0d331cfe7@freebsd.org> Message-ID: <116562006a741fa51ae63d8e9a94419d@freebsd.org> X-Sender: jamie@freebsd.org User-Agent: Roundcube Webmail/1.3.6 X-Rspamd-Queue-Id: 29896784FF X-Spamd-Result: default: False [-103.13 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: mx66.freebsd.org]; NEURAL_HAM_SHORT(-1.00)[-0.997,0]; IP_SCORE(-0.02)[country: US(-0.09)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:30247, ipnet:199.192.164.0/22, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 19:32:08 -0000 On 2018-11-10 06:03, Eugene Grosbein wrote: > 10.11.2018 19:12, Bjoern A. Zeeb wrote: > >> Usually also jls is the command which will give information (compared >> to actions) on jails, would that not fit there? > > jls(8) currently does not parse /etc/jail.conf and I'd like to avoid > code duplication > between jail(8) and jls(8). It's probably time to work on combining the code base for those, and jexec(8) as well. There's been a desire to have jexec work with the jail's fib which is (currently) only in the config and not in the resulting jail itself. - Jamie From owner-svn-src-head@freebsd.org Sat Nov 10 20:26:20 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 61F651109500; Sat, 10 Nov 2018 20:26:20 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DD3A07A61A; Sat, 10 Nov 2018 20:26: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 B3B7B27CE2; Sat, 10 Nov 2018 20:26: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 wAAKQJYm053732; Sat, 10 Nov 2018 20:26:19 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAKQJUL053731; Sat, 10 Nov 2018 20:26:19 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201811102026.wAAKQJUL053731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste <emaste@FreeBSD.org> Date: Sat, 10 Nov 2018 20:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340329 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 340329 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DD3A07A61A X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 20:26:20 -0000 Author: emaste Date: Sat Nov 10 20:26:19 2018 New Revision: 340329 URL: https://svnweb.freebsd.org/changeset/base/340329 Log: build(7): clarify buildenv target can be used for non-cross builds make buildenv can be used for building for the same architecture as the host (perhaps this is a degenerate case of cross-building). TARGET and TARGET_ARCH do not need to be set in this case. Reviewed by: bdrewery MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D10759 Modified: head/share/man/man7/build.7 Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Sat Nov 10 19:09:48 2018 (r340328) +++ head/share/man/man7/build.7 Sat Nov 10 20:26:19 2018 (r340329) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 16, 2018 +.Dd November 10, 2018 .Dt BUILD 7 .Os .Sh NAME @@ -168,16 +168,16 @@ are: .Bl -tag -width ".Cm distributeworld" .It Cm buildenv Spawn an interactive shell with environment variables set up for -cross-building the system. -The target architecture needs to be specified with +building the system or individual components. +For cross-building the target architecture needs to be specified with .Xr make 1 variables .Va TARGET_ARCH and .Va TARGET . .Pp -This target is only useful after a complete cross-toolchain including -the compiler, linker, assembler, headers and libraries has been +This target is only useful after a complete toolchain (including +the compiler, linker, assembler, headers and libraries) has been built; see the .Cm toolchain target below. From owner-svn-src-head@freebsd.org Sat Nov 10 20:26:57 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 27427110956D; Sat, 10 Nov 2018 20:26:57 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E9747A786; Sat, 10 Nov 2018 20:26:56 +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 407C727CF5; Sat, 10 Nov 2018 20:26:56 +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 wAAKQuWT053797; Sat, 10 Nov 2018 20:26:56 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAKQts3053795; Sat, 10 Nov 2018 20:26:55 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201811102026.wAAKQts3053795@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer <cem@FreeBSD.org> Date: Sat, 10 Nov 2018 20:26:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340330 - head/bin/rm X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/bin/rm X-SVN-Commit-Revision: 340330 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5E9747A786 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 20:26:57 -0000 Author: cem Date: Sat Nov 10 20:26:55 2018 New Revision: 340330 URL: https://svnweb.freebsd.org/changeset/base/340330 Log: rm(1): Formalize non-functional status of -P flag -P was introduced in 4.4BSD-Lite2 around 1994. It overwrote file contents with a pass of 0xff, 0x00, then 0xff, in a low effort attempt to "really delete" files. It has no user-visible effect; at the end of the day, the file is unlinked via the filesystem. Furthermore, the utility of overwriting files with patterned data is extremely limited due to caveats at every layer of the stack[0] and therefore mostly futile. At the least, three passes is likely wasteful on modern hardware[1]. It could also be seen as a violation of the "Unix Philosophy" to do one thing per tiny, composable program. Since 1994, FreeBSD has left it alone; OpenBSD replaced it with a single pass of arc4random(3) output in 2012[2]; and NetBSD implemented partial, but explicitly incomplete support for U.S. DoD 5220.22-M, "National Industrial Security Program Operating Manual" in 2004[3]. NetBSD's enhanced comment above rm_overwrite makes a strong case for removing the flag entirely: > This is an expensive way to keep people from recovering files from your > non-snapshotted FFS filesystems using fsdb(8). Really. No more. > > It is impossible to actually conform to the exact procedure given in > [NISPOM] if one is overwriting a file, not an entire disk, because the > procedure requires examination and comparison of the disk's defect lists. > Any program that claims to securely erase *files* while conforming to the > standard, then, is not correct. > > Furthermore, the presence of track caches, disk and controller write > caches, and so forth make it extremely difficult to ensure that data have > actually been written to the disk, particularly when one tries to repeatedly > overwrite the same sectors in quick succession. We call fsync(), but > controllers with nonvolatile cache, as well as IDE disks that just plain lie > about the stable storage of data, will defeat this. > > [NISPOM] requires physical media destruction, rather than any technique of > the sort attempted here, for secret data. As a first step towards evental removal, make it a placebo. It's not like it was serving any security function. It is not defined in or mentioned by POSIX. If you are security conscious and need to erase your files, use a woodchipper. At a minimum, the entire disk needs to be overwritten, not just one file. [0]: https://www.ru.nl/publish/pages/909282/draft-paper.pdf [1]: https://commons.erau.edu/cgi/viewcontent.cgi?article=1131&context=jdfsl [2]: https://github.com/openbsd/src/commit/7c5c57ba81b5fe8ff2d4899ff643af18c [3]: https://github.com/NetBSD/src/commit/fdf0a7a25e59af958fca1e2159921562cd Reviewed by: markj, Daniel O'Connor <darius AT dons.net.au> (previous version) Differential Revision: https://reviews.freebsd.org/D17906 Modified: head/bin/rm/rm.1 head/bin/rm/rm.c Modified: head/bin/rm/rm.1 ============================================================================== --- head/bin/rm/rm.1 Sat Nov 10 20:26:19 2018 (r340329) +++ head/bin/rm/rm.1 Sat Nov 10 20:26:55 2018 (r340330) @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd September 12, 2018 +.Dd November 10, 2018 .Dt RM 1 .Os .Sh NAME @@ -42,7 +42,7 @@ .Sh SYNOPSIS .Nm .Op Fl f | i -.Op Fl dIPRrvWx +.Op Fl dIRrvWx .Ar .Nm unlink .Op Fl - @@ -86,26 +86,9 @@ This is a far less intrusive option than .Fl i yet provides almost the same level of protection against mistakes. .It Fl P -Overwrite regular files before deleting them. -Files are overwritten three times, first with the byte pattern 0xff, -then 0x00, and then 0xff again, before they are deleted. -Files with multiple links will not be overwritten nor deleted -and a warning will be issued. -If the -.Fl f -option is specified, files with multiple links will also be overwritten -and deleted. -No warning will be issued. -.Pp -Specifying this flag for a read only file will cause -.Nm -to generate an error message and exit. -The file will not be removed or overwritten. -.Pp -N.B.: The -.Fl P -flag is not considered a security feature -.Pq see Sx BUGS . +This flag has no effect. +It is kept only for backwards compatibility with +.Bx 4.4 Lite2 . .It Fl R Attempt to remove the file hierarchy rooted in each .Ar file @@ -192,12 +175,6 @@ For example: .Pp .Dl "rm /home/user/-filename" .Dl "rm ./-filename" -.Pp -When -.Fl P -is specified with -.Fl f -the file will be overwritten and removed even if it has hard links. .Sh EXAMPLES Recursively remove all files contained within the .Pa foobar @@ -227,6 +204,12 @@ Also, historical .Bx implementations prompted on the standard output, not the standard error output. +.Pp +The +.Fl P +option does not have any effect as of +.Fx 13 +and may be removed in the future. .Sh SEE ALSO .Xr chflags 1 , .Xr rmdir 1 , @@ -250,15 +233,3 @@ A .Nm command appeared in .At v1 . -.Sh BUGS -The -.Fl P -option assumes that the underlying storage overwrites file blocks -when data is written to an existing offset. -Several factors including the file system and its backing store could defeat -this assumption. -This includes, but is not limited to file systems that use a -Copy-On-Write strategy (e.g. ZFS or UFS when snapshots are being used), Flash -media that are using a wear leveling algorithm, or when the backing datastore -does journaling, etc. -In addition, only regular files are overwritten, other types of files are not. Modified: head/bin/rm/rm.c ============================================================================== --- head/bin/rm/rm.c Sat Nov 10 20:26:19 2018 (r340329) +++ head/bin/rm/rm.c Sat Nov 10 20:26:55 2018 (r340330) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include <sysexits.h> #include <unistd.h> -static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +static int dflag, eval, fflag, iflag, vflag, Wflag, stdin_ok; static int rflag, Iflag, xflag; static uid_t uid; static volatile sig_atomic_t info; @@ -71,7 +71,6 @@ static int check2(char **); static void checkdot(char **); static void checkslash(char **); static void rm_file(char **); -static int rm_overwrite(const char *, struct stat *); static void rm_tree(char **); static void siginfo(int __unused); static void usage(void); @@ -110,7 +109,7 @@ main(int argc, char *argv[]) exit(eval); } - Pflag = rflag = xflag = 0; + rflag = xflag = 0; while ((ch = getopt(argc, argv, "dfiIPRrvWx")) != -1) switch(ch) { case 'd': @@ -128,7 +127,7 @@ main(int argc, char *argv[]) Iflag = 1; break; case 'P': - Pflag = 1; + /* Compatibility no-op. */ break; case 'R': case 'r': /* Compatibility. */ @@ -313,12 +312,6 @@ rm_tree(char **argv) case FTS_F: case FTS_NSOK: - if (Pflag) - if (!rm_overwrite(p->fts_accpath, p->fts_info == - FTS_NSOK ? NULL : p->fts_statp)) - continue; - /* FALLTHROUGH */ - default: rval = unlink(p->fts_accpath); if (rval == 0 || (fflag && errno == ENOENT)) { @@ -389,12 +382,8 @@ rm_file(char **argv) rval = undelete(f); else if (S_ISDIR(sb.st_mode)) rval = rmdir(f); - else { - if (Pflag) - if (!rm_overwrite(f, &sb)) - continue; + else rval = unlink(f); - } } if (rval && (!fflag || errno != ENOENT)) { warn("%s", f); @@ -409,85 +398,7 @@ rm_file(char **argv) } } -/* - * rm_overwrite -- - * Overwrite the file 3 times with varying bit patterns. - * - * XXX - * This is a cheap way to *really* delete files. Note that only regular - * files are deleted, directories (and therefore names) will remain. - * Also, this assumes a fixed-block file system (like FFS, or a V7 or a - * System V file system). In a logging or COW file system, you'll have to - * have kernel support. - */ static int -rm_overwrite(const char *file, struct stat *sbp) -{ - struct stat sb, sb2; - struct statfs fsb; - off_t len; - int bsize, fd, wlen; - char *buf = NULL; - - fd = -1; - if (sbp == NULL) { - if (lstat(file, &sb)) - goto err; - sbp = &sb; - } - if (!S_ISREG(sbp->st_mode)) - return (1); - if (sbp->st_nlink > 1 && !fflag) { - warnx("%s (inode %ju): not overwritten due to multiple links", - file, (uintmax_t)sbp->st_ino); - return (0); - } - if ((fd = open(file, O_WRONLY|O_NONBLOCK|O_NOFOLLOW, 0)) == -1) - goto err; - if (fstat(fd, &sb2)) - goto err; - if (sb2.st_dev != sbp->st_dev || sb2.st_ino != sbp->st_ino || - !S_ISREG(sb2.st_mode)) { - errno = EPERM; - goto err; - } - if (fstatfs(fd, &fsb) == -1) - goto err; - bsize = MAX(fsb.f_iosize, 1024); - if ((buf = malloc(bsize)) == NULL) - err(1, "%s: malloc", file); - -#define PASS(byte) { \ - memset(buf, byte, bsize); \ - for (len = sbp->st_size; len > 0; len -= wlen) { \ - wlen = len < bsize ? len : bsize; \ - if (write(fd, buf, wlen) != wlen) \ - goto err; \ - } \ -} - PASS(0xff); - if (fsync(fd) || lseek(fd, (off_t)0, SEEK_SET)) - goto err; - PASS(0x00); - if (fsync(fd) || lseek(fd, (off_t)0, SEEK_SET)) - goto err; - PASS(0xff); - if (!fsync(fd) && !close(fd)) { - free(buf); - return (1); - } - -err: eval = 1; - if (buf) - free(buf); - if (fd != -1) - close(fd); - warn("%s", file); - return (0); -} - - -static int check(const char *path, const char *name, struct stat *sp) { int ch, first; @@ -511,10 +422,6 @@ check(const char *path, const char *name, struct stat strmode(sp->st_mode, modep); if ((flagsp = fflagstostr(sp->st_flags)) == NULL) err(1, "fflagstostr"); - if (Pflag) - errx(1, - "%s: -P was specified, but file is not writable", - path); (void)fprintf(stderr, "override %s%s%s/%s %s%sfor %s? ", modep + 1, modep[10] == ' ' ? "" : " ", user_from_uid(sp->st_uid, 0), From owner-svn-src-head@freebsd.org Sat Nov 10 20:33:09 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 8B7B51109A11; Sat, 10 Nov 2018 20:33:09 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1916E7AD04; Sat, 10 Nov 2018 20:33:09 +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 EEF4027EAF; Sat, 10 Nov 2018 20:33:08 +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 wAAKX8up058557; Sat, 10 Nov 2018 20:33:08 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAKX8Q9058556; Sat, 10 Nov 2018 20:33:08 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201811102033.wAAKX8Q9058556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston <markj@FreeBSD.org> Date: Sat, 10 Nov 2018 20:33:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340331 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 340331 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1916E7AD04 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 20:33:09 -0000 Author: markj Date: Sat Nov 10 20:33:08 2018 New Revision: 340331 URL: https://svnweb.freebsd.org/changeset/base/340331 Log: Re-apply r336984, reverting r339934. r336984 exposed the bug fixed in r340241, leading to the initial revert while the bug was being hunted down. Now that the bug is fixed, we can revert the revert. Discussed with: alc MFC after: 3 days Modified: head/sys/vm/vm_object.c Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Sat Nov 10 20:26:55 2018 (r340330) +++ head/sys/vm/vm_object.c Sat Nov 10 20:33:08 2018 (r340331) @@ -2143,8 +2143,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset next_size >>= PAGE_SHIFT; next_pindex = OFF_TO_IDX(prev_offset) + prev_size; - if ((prev_object->ref_count > 1) && - (prev_object->size != next_pindex)) { + if (prev_object->ref_count > 1 && + prev_object->size != next_pindex && + (prev_object->flags & OBJ_ONEMAPPING) == 0) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } From owner-svn-src-head@freebsd.org Sat Nov 10 20:42:31 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 0EA3B1109E4B; Sat, 10 Nov 2018 20:42:31 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 93D707B458; Sat, 10 Nov 2018 20:42:30 +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 7665D5B; Sat, 10 Nov 2018 20:42:30 +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 wAAKgUeK063817; Sat, 10 Nov 2018 20:42:30 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAKgUMY063816; Sat, 10 Nov 2018 20:42:30 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811102042.wAAKgUMY063816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans <kevans@FreeBSD.org> Date: Sat, 10 Nov 2018 20:42:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340334 - head/lib/libbe X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/lib/libbe X-SVN-Commit-Revision: 340334 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 93D707B458 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 20:42:31 -0000 Author: kevans Date: Sat Nov 10 20:42:29 2018 New Revision: 340334 URL: https://svnweb.freebsd.org/changeset/base/340334 Log: libbe(3): Set canmount properly when activating a new BE The previously activated BE should have canmount=noauto set on it upon activation of the new BE, but we previously did not touch canmount on either old or new BE. PR: 233113 MFC after: 3 days Modified: head/lib/libbe/be.c Modified: head/lib/libbe/be.c ============================================================================== --- head/lib/libbe/be.c Sat Nov 10 20:36:48 2018 (r340333) +++ head/lib/libbe/be.c Sat Nov 10 20:42:29 2018 (r340334) @@ -922,7 +922,22 @@ be_set_nextboot(libbe_handle_t *lbh, nvlist_t *config, return (0); } +/* + * Deactivate old BE dataset; currently just sets canmount=noauto + */ +static int +be_deactivate(libbe_handle_t *lbh, const char *ds) +{ + zfs_handle_t *zfs; + if ((zfs = zfs_open(lbh->lzh, ds, ZFS_TYPE_DATASET)) == NULL) + return (1); + if (zfs_prop_set(zfs, "canmount", "noauto") != 0) + return (1); + zfs_close(zfs); + return (0); +} + int be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary) { @@ -961,6 +976,9 @@ be_activate(libbe_handle_t *lbh, const char *bootenv, return (be_set_nextboot(lbh, vdevs, pool_guid, buf)); } else { + if (be_deactivate(lbh, lbh->bootfs) != 0) + return (-1); + /* Obtain bootenv zpool */ err = zpool_set_prop(lbh->active_phandle, "bootfs", be_path); if (err) From owner-svn-src-head@freebsd.org Sat Nov 10 21:02:35 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 A8ED2110A763; Sat, 10 Nov 2018 21:02:34 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 31DB37C1EB; Sat, 10 Nov 2018 21:02:34 +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 124363E2; Sat, 10 Nov 2018 21:02:34 +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 wAAL2XJ4074661; Sat, 10 Nov 2018 21:02:33 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAL2W8x074653; Sat, 10 Nov 2018 21:02:32 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201811102102.wAAL2W8x074653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot <manu@FreeBSD.org> Date: Sat, 10 Nov 2018 21:02:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340337 - in head/sys/gnu/dts: arm arm64/allwinner arm64/altera arm64/amlogic arm64/arm arm64/broadcom/northstar2 arm64/broadcom/stingray arm64/exynos arm64/freescale arm64/hisilicon ar... 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/broadcom/northstar2 arm64/broadcom/stingray arm64/exynos arm64/freescale arm64/hisilicon arm64/marvell arm64/mediate... X-SVN-Commit-Revision: 340337 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 31DB37C1EB X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 21:02:35 -0000 Author: manu Date: Sat Nov 10 21:02:32 2018 New Revision: 340337 URL: https://svnweb.freebsd.org/changeset/base/340337 Log: Update our devicetree to 4.19 for arm and arm64 MFC after: 2 months Added: head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/am335x-osd3358-sm-red.dts head/sys/gnu/dts/arm/am335x-sancloud-bbe.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/am335x-sancloud-bbe.dts head/sys/gnu/dts/arm/armada-388-helios4.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/armada-388-helios4.dts head/sys/gnu/dts/arm/at91-dvk_som60.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-dvk_som60.dts head/sys/gnu/dts/arm/at91-dvk_su60_somc.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-dvk_su60_somc.dtsi head/sys/gnu/dts/arm/at91-dvk_su60_somc_lcm.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-dvk_su60_somc_lcm.dtsi head/sys/gnu/dts/arm/at91-gatwick.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-gatwick.dts head/sys/gnu/dts/arm/at91-som60.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-som60.dtsi head/sys/gnu/dts/arm/at91-wb45n.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-wb45n.dts head/sys/gnu/dts/arm/at91-wb45n.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-wb45n.dtsi head/sys/gnu/dts/arm/at91-wb50n.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-wb50n.dts head/sys/gnu/dts/arm/at91-wb50n.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/at91-wb50n.dtsi head/sys/gnu/dts/arm/bcm2835-rpi-cm1-io1.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/bcm2835-rpi-cm1-io1.dts head/sys/gnu/dts/arm/bcm2835-rpi-cm1.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/bcm2835-rpi-cm1.dtsi head/sys/gnu/dts/arm/gemini-sl93512r.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/gemini-sl93512r.dts head/sys/gnu/dts/arm/gr-peach-audiocamerashield.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/gr-peach-audiocamerashield.dtsi head/sys/gnu/dts/arm/imx31-lite.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx31-lite.dts head/sys/gnu/dts/arm/imx51-zii-scu2-mezz.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx51-zii-scu2-mezz.dts head/sys/gnu/dts/arm/imx51-zii-scu3-esb.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx51-zii-scu3-esb.dts head/sys/gnu/dts/arm/imx53-kp-ddc.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx53-kp-ddc.dts head/sys/gnu/dts/arm/imx53-kp-hsc.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx53-kp-hsc.dts head/sys/gnu/dts/arm/imx53-kp.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx53-kp.dtsi head/sys/gnu/dts/arm/imx6dl-icore-mipi.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx6dl-icore-mipi.dts head/sys/gnu/dts/arm/imx6sll-evk.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx6sll-evk.dts head/sys/gnu/dts/arm/imx6sll-pinfunc.h - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx6sll-pinfunc.h head/sys/gnu/dts/arm/imx6sll.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx6sll.dtsi head/sys/gnu/dts/arm/imx6ul-ccimx6ulsbcexpress.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx6ul-ccimx6ulsbcexpress.dts head/sys/gnu/dts/arm/imx6ul-ccimx6ulsom.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/imx6ul-ccimx6ulsom.dtsi head/sys/gnu/dts/arm/keystone-k2g-netcp.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/keystone-k2g-netcp.dtsi head/sys/gnu/dts/arm/omap4-l4.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/omap4-l4.dtsi head/sys/gnu/dts/arm/r9a06g032-rzn1d400-db.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/r9a06g032-rzn1d400-db.dts head/sys/gnu/dts/arm/r9a06g032.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/r9a06g032.dtsi head/sys/gnu/dts/arm/s5pv210-aries.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/s5pv210-aries.dtsi head/sys/gnu/dts/arm/s5pv210-fascinate4g.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/s5pv210-fascinate4g.dts head/sys/gnu/dts/arm/s5pv210-galaxys.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/s5pv210-galaxys.dts head/sys/gnu/dts/arm/tegra20-colibri-iris.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/tegra20-colibri-iris.dts head/sys/gnu/dts/arm/tegra20-colibri.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm/tegra20-colibri.dtsi head/sys/gnu/dts/arm/vf610-zii-cfu1.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/vf610-zii-cfu1.dts head/sys/gnu/dts/arm/vf610-zii-ssmb-spu3.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/vf610-zii-ssmb-spu3.dts head/sys/gnu/dts/arm/zynq-zturn.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm/zynq-zturn.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-amarula-relic.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/allwinner/sun50i-a64-amarula-relic.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-pinebook.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/allwinner/sun50i-a64-pinebook.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s805x-p241.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/amlogic/meson-gxl-s805x-p241.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905w-p281.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/amlogic/meson-gxl-s905w-p281.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905w-tx3-mini.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/amlogic/meson-gxl-s905w-tx3-mini.dts head/sys/gnu/dts/arm64/broadcom/stingray/bcm958802a802x.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/broadcom/stingray/bcm958802a802x.dts head/sys/gnu/dts/arm64/broadcom/stingray/stingray-board-base.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/broadcom/stingray/stingray-board-base.dtsi head/sys/gnu/dts/arm64/broadcom/stingray/stingray-pcie.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/broadcom/stingray/stingray-pcie.dtsi head/sys/gnu/dts/arm64/mediatek/mt6797-x20-dev.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/mediatek/mt6797-x20-dev.dts head/sys/gnu/dts/arm64/qcom/pm8005.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/qcom/pm8005.dtsi head/sys/gnu/dts/arm64/qcom/pm8998.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/qcom/pm8998.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-ficus.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/rockchip/rk3399-ficus.dts head/sys/gnu/dts/arm64/rockchip/rk3399-gru-bob.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/rockchip/rk3399-gru-bob.dts head/sys/gnu/dts/arm64/rockchip/rk3399-gru-chromebook.dtsi - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/rockchip/rk3399-gru-chromebook.dtsi head/sys/gnu/dts/arm64/ti/ - copied from r340335, vendor/device-tree/dist/src/arm64/ti/ head/sys/gnu/dts/arm64/xilinx/avnet-ultra96-rev1.dts - copied unchanged from r340335, vendor/device-tree/dist/src/arm64/xilinx/avnet-ultra96-rev1.dts Deleted: head/sys/gnu/dts/arm/exynos4412-tmu-sensor-conf.dtsi head/sys/gnu/dts/arm/exynos5420-tmu-sensor-conf.dtsi head/sys/gnu/dts/arm/mt7623n-rfb-nand.dts head/sys/gnu/dts/arm/mt7623n-rfb.dtsi head/sys/gnu/dts/arm/tegra20-colibri-512.dtsi head/sys/gnu/dts/arm/tegra20-iris-512.dts head/sys/gnu/dts/arm64/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi head/sys/gnu/dts/arm64/exynos/exynos5433-tmu-sensor-conf.dtsi head/sys/gnu/dts/arm64/exynos/exynos7-tmu-sensor-conf.dtsi head/sys/gnu/dts/arm64/xilinx/zynqmp-ep108-clk.dtsi head/sys/gnu/dts/arm64/xilinx/zynqmp-ep108.dts Modified: head/sys/gnu/dts/arm/am335x-baltos.dtsi head/sys/gnu/dts/arm/am335x-evm.dts head/sys/gnu/dts/arm/am335x-evmsk.dts head/sys/gnu/dts/arm/am335x-sl50.dts head/sys/gnu/dts/arm/am33xx.dtsi head/sys/gnu/dts/arm/am3517-evm.dts head/sys/gnu/dts/arm/am3517-som.dtsi head/sys/gnu/dts/arm/am4372.dtsi head/sys/gnu/dts/arm/am437x-gp-evm.dts head/sys/gnu/dts/arm/am571x-idk.dts head/sys/gnu/dts/arm/am572x-idk-common.dtsi head/sys/gnu/dts/arm/am57xx-idk-common.dtsi head/sys/gnu/dts/arm/armada-388-clearfog-base.dts head/sys/gnu/dts/arm/armada-388-clearfog-pro.dts head/sys/gnu/dts/arm/armada-388-clearfog.dts head/sys/gnu/dts/arm/armada-388-clearfog.dtsi head/sys/gnu/dts/arm/armada-38x-solidrun-microsom.dtsi head/sys/gnu/dts/arm/aspeed-ast2500-evb.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-opp-zaius.dts head/sys/gnu/dts/arm/aspeed-g4.dtsi head/sys/gnu/dts/arm/aspeed-g5.dtsi head/sys/gnu/dts/arm/at91-sama5d2_ptc_ek.dts head/sys/gnu/dts/arm/at91sam9261.dtsi head/sys/gnu/dts/arm/at91sam9263.dtsi head/sys/gnu/dts/arm/at91sam9rl.dtsi head/sys/gnu/dts/arm/at91sam9x5.dtsi head/sys/gnu/dts/arm/bcm-cygnus.dtsi head/sys/gnu/dts/arm/bcm2837.dtsi head/sys/gnu/dts/arm/bcm283x.dtsi head/sys/gnu/dts/arm/bcm4708-asus-rt-ac56u.dts head/sys/gnu/dts/arm/bcm4708-asus-rt-ac68u.dts head/sys/gnu/dts/arm/bcm4708-buffalo-wzr-1750dhp.dts head/sys/gnu/dts/arm/bcm4708-linksys-ea6300-v1.dts head/sys/gnu/dts/arm/bcm4708-luxul-xap-1510.dts head/sys/gnu/dts/arm/bcm4708-luxul-xwc-1000.dts head/sys/gnu/dts/arm/bcm4708-netgear-r6250.dts head/sys/gnu/dts/arm/bcm4708-netgear-r6300-v2.dts head/sys/gnu/dts/arm/bcm4708-smartrg-sr400ac.dts head/sys/gnu/dts/arm/bcm47081-asus-rt-n18u.dts head/sys/gnu/dts/arm/bcm47081-buffalo-wzr-600dhp2.dts head/sys/gnu/dts/arm/bcm47081-buffalo-wzr-900dhp.dts head/sys/gnu/dts/arm/bcm47081-luxul-xap-1410.dts head/sys/gnu/dts/arm/bcm47081-luxul-xwr-1200.dts head/sys/gnu/dts/arm/bcm47081-tplink-archer-c5-v2.dts head/sys/gnu/dts/arm/bcm4709-asus-rt-ac87u.dts head/sys/gnu/dts/arm/bcm4709-buffalo-wxr-1900dhp.dts head/sys/gnu/dts/arm/bcm4709-linksys-ea9200.dts head/sys/gnu/dts/arm/bcm4709-netgear-r7000.dts head/sys/gnu/dts/arm/bcm4709-netgear-r8000.dts head/sys/gnu/dts/arm/bcm4709-tplink-archer-c9-v1.dts head/sys/gnu/dts/arm/bcm47094-dlink-dir-885l.dts head/sys/gnu/dts/arm/bcm47094-linksys-panamera.dts head/sys/gnu/dts/arm/bcm47094-luxul-abr-4500.dts head/sys/gnu/dts/arm/bcm47094-luxul-xbr-4500.dts head/sys/gnu/dts/arm/bcm47094-luxul-xwr-3100.dts head/sys/gnu/dts/arm/bcm47094-netgear-r8500.dts head/sys/gnu/dts/arm/bcm47094.dtsi 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/bcm94708.dts head/sys/gnu/dts/arm/bcm94709.dts head/sys/gnu/dts/arm/bcm953012er.dts head/sys/gnu/dts/arm/bcm953012hr.dts head/sys/gnu/dts/arm/bcm953012k.dts head/sys/gnu/dts/arm/berlin2.dtsi head/sys/gnu/dts/arm/berlin2q.dtsi head/sys/gnu/dts/arm/da850-enbw-cmc.dts head/sys/gnu/dts/arm/da850-evm.dts head/sys/gnu/dts/arm/da850-lcdk.dts head/sys/gnu/dts/arm/da850-lego-ev3.dts head/sys/gnu/dts/arm/da850.dtsi head/sys/gnu/dts/arm/dra7-evm-common.dtsi head/sys/gnu/dts/arm/dra7-evm.dts head/sys/gnu/dts/arm/dra7.dtsi head/sys/gnu/dts/arm/dra71-evm.dts head/sys/gnu/dts/arm/dra72-evm-common.dtsi head/sys/gnu/dts/arm/dra74x.dtsi head/sys/gnu/dts/arm/dra76-evm.dts head/sys/gnu/dts/arm/dra76x.dtsi head/sys/gnu/dts/arm/emev2-kzm9d.dts head/sys/gnu/dts/arm/emev2.dtsi head/sys/gnu/dts/arm/exynos3250.dtsi head/sys/gnu/dts/arm/exynos4.dtsi head/sys/gnu/dts/arm/exynos4210.dtsi head/sys/gnu/dts/arm/exynos4412-midas.dtsi head/sys/gnu/dts/arm/exynos4412.dtsi head/sys/gnu/dts/arm/exynos5.dtsi head/sys/gnu/dts/arm/exynos5250.dtsi head/sys/gnu/dts/arm/exynos5410.dtsi head/sys/gnu/dts/arm/exynos5420-cpus.dtsi head/sys/gnu/dts/arm/exynos5420.dtsi head/sys/gnu/dts/arm/exynos5422-cpus.dtsi head/sys/gnu/dts/arm/gemini-dlink-dir-685.dts head/sys/gnu/dts/arm/gemini-sq201.dts head/sys/gnu/dts/arm/highbank.dts head/sys/gnu/dts/arm/imx23-evk.dts head/sys/gnu/dts/arm/imx28-evk.dts head/sys/gnu/dts/arm/imx31.dtsi head/sys/gnu/dts/arm/imx50-evk.dts head/sys/gnu/dts/arm/imx50-pinfunc.h head/sys/gnu/dts/arm/imx50.dtsi head/sys/gnu/dts/arm/imx51-babbage.dts head/sys/gnu/dts/arm/imx51-eukrea-mbimxsd51-baseboard.dts head/sys/gnu/dts/arm/imx51-zii-rdu1.dts head/sys/gnu/dts/arm/imx51.dtsi head/sys/gnu/dts/arm/imx53-ppd.dts head/sys/gnu/dts/arm/imx53-qsb-common.dtsi head/sys/gnu/dts/arm/imx53.dtsi head/sys/gnu/dts/arm/imx6dl-colibri-eval-v3.dts head/sys/gnu/dts/arm/imx6dl-mamoj.dts head/sys/gnu/dts/arm/imx6dl-nit6xlite.dts head/sys/gnu/dts/arm/imx6dl-nitrogen6x.dts head/sys/gnu/dts/arm/imx6dl-riotboard.dts head/sys/gnu/dts/arm/imx6dl.dtsi head/sys/gnu/dts/arm/imx6q-apalis-eval.dts head/sys/gnu/dts/arm/imx6q-apalis-ixora-v1.1.dts head/sys/gnu/dts/arm/imx6q-apalis-ixora.dts head/sys/gnu/dts/arm/imx6q-cm-fx6.dts head/sys/gnu/dts/arm/imx6q-icore-mipi.dts head/sys/gnu/dts/arm/imx6q-nitrogen6_max.dts head/sys/gnu/dts/arm/imx6q-nitrogen6_som2.dts head/sys/gnu/dts/arm/imx6q-nitrogen6x.dts head/sys/gnu/dts/arm/imx6q-var-dt6customboard.dts head/sys/gnu/dts/arm/imx6q.dtsi head/sys/gnu/dts/arm/imx6qdl-apalis.dtsi head/sys/gnu/dts/arm/imx6qdl-colibri.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-sabreauto.dtsi head/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi head/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi head/sys/gnu/dts/arm/imx6qdl-zii-rdu2.dtsi head/sys/gnu/dts/arm/imx6qdl.dtsi head/sys/gnu/dts/arm/imx6qp-nitrogen6_max.dts head/sys/gnu/dts/arm/imx6qp-nitrogen6_som2.dts head/sys/gnu/dts/arm/imx6sl-evk.dts head/sys/gnu/dts/arm/imx6sl.dtsi head/sys/gnu/dts/arm/imx6sx-nitrogen6sx.dts head/sys/gnu/dts/arm/imx6sx-sdb-reva.dts head/sys/gnu/dts/arm/imx6sx.dtsi head/sys/gnu/dts/arm/imx6ul-pico-hobbit.dts head/sys/gnu/dts/arm/imx6ul.dtsi head/sys/gnu/dts/arm/imx6ull-colibri-wifi.dtsi head/sys/gnu/dts/arm/imx6ull.dtsi head/sys/gnu/dts/arm/imx7d-nitrogen7.dts head/sys/gnu/dts/arm/imx7d-sdb.dts head/sys/gnu/dts/arm/imx7d.dtsi head/sys/gnu/dts/arm/imx7s.dtsi head/sys/gnu/dts/arm/iwg20d-q7-common.dtsi head/sys/gnu/dts/arm/iwg20d-q7-dbcm-ca.dtsi head/sys/gnu/dts/arm/keystone-k2e-netcp.dtsi head/sys/gnu/dts/arm/keystone-k2g-evm.dts head/sys/gnu/dts/arm/keystone-k2g-ice.dts head/sys/gnu/dts/arm/keystone-k2g.dtsi head/sys/gnu/dts/arm/keystone-k2hk-netcp.dtsi head/sys/gnu/dts/arm/keystone-k2l-netcp.dtsi head/sys/gnu/dts/arm/logicpd-som-lv.dtsi head/sys/gnu/dts/arm/logicpd-torpedo-37xx-devkit.dts head/sys/gnu/dts/arm/ls1021a.dtsi head/sys/gnu/dts/arm/mt7623.dtsi head/sys/gnu/dts/arm/mt7623n-bananapi-bpi-r2.dts head/sys/gnu/dts/arm/omap3-cm-t3517.dts head/sys/gnu/dts/arm/omap3-cm-t3730.dts head/sys/gnu/dts/arm/omap3-evm-common.dtsi head/sys/gnu/dts/arm/omap3-igep0020-rev-f.dts head/sys/gnu/dts/arm/omap3-igep0030-rev-g.dts head/sys/gnu/dts/arm/omap3-zoom3.dts head/sys/gnu/dts/arm/omap4-droid4-xt894.dts head/sys/gnu/dts/arm/omap4-duovero-parlor.dts head/sys/gnu/dts/arm/omap4-duovero.dtsi head/sys/gnu/dts/arm/omap4-panda-common.dtsi head/sys/gnu/dts/arm/omap4-panda-es.dts head/sys/gnu/dts/arm/omap4-sdp.dts head/sys/gnu/dts/arm/omap4-var-som-om44-wlan.dtsi head/sys/gnu/dts/arm/omap4.dtsi head/sys/gnu/dts/arm/omap4460.dtsi head/sys/gnu/dts/arm/omap5-board-common.dtsi head/sys/gnu/dts/arm/omap5.dtsi head/sys/gnu/dts/arm/pxa2xx.dtsi head/sys/gnu/dts/arm/pxa3xx.dtsi head/sys/gnu/dts/arm/qcom-ipq4019.dtsi head/sys/gnu/dts/arm/qcom-ipq8064.dtsi head/sys/gnu/dts/arm/qcom-msm8974-lge-nexus5-hammerhead.dts head/sys/gnu/dts/arm/r7s72100-genmai.dts head/sys/gnu/dts/arm/r7s72100-gr-peach.dts head/sys/gnu/dts/arm/r7s72100-rskrza1.dts head/sys/gnu/dts/arm/r7s72100.dtsi head/sys/gnu/dts/arm/r8a73a4-ape6evm.dts head/sys/gnu/dts/arm/r8a73a4.dtsi head/sys/gnu/dts/arm/r8a7740-armadillo800eva.dts head/sys/gnu/dts/arm/r8a7740.dtsi head/sys/gnu/dts/arm/r8a7743-iwg20d-q7-dbcm-ca.dts head/sys/gnu/dts/arm/r8a7743-iwg20d-q7.dts head/sys/gnu/dts/arm/r8a7743-iwg20m.dtsi head/sys/gnu/dts/arm/r8a7743-sk-rzg1m.dts head/sys/gnu/dts/arm/r8a7743.dtsi head/sys/gnu/dts/arm/r8a7745-iwg22d-sodimm-dbhd-ca.dts head/sys/gnu/dts/arm/r8a7745-iwg22d-sodimm.dts head/sys/gnu/dts/arm/r8a7745-iwg22m.dtsi head/sys/gnu/dts/arm/r8a7745-sk-rzg1e.dts head/sys/gnu/dts/arm/r8a7745.dtsi head/sys/gnu/dts/arm/r8a77470.dtsi head/sys/gnu/dts/arm/r8a7778-bockw.dts head/sys/gnu/dts/arm/r8a7778.dtsi head/sys/gnu/dts/arm/r8a7779-marzen.dts head/sys/gnu/dts/arm/r8a7779.dtsi head/sys/gnu/dts/arm/r8a7790-lager.dts head/sys/gnu/dts/arm/r8a7790.dtsi head/sys/gnu/dts/arm/r8a7791-koelsch.dts head/sys/gnu/dts/arm/r8a7791-porter.dts head/sys/gnu/dts/arm/r8a7791.dtsi head/sys/gnu/dts/arm/r8a7792-blanche.dts head/sys/gnu/dts/arm/r8a7792-wheat.dts head/sys/gnu/dts/arm/r8a7792.dtsi head/sys/gnu/dts/arm/r8a7793-gose.dts head/sys/gnu/dts/arm/r8a7793.dtsi head/sys/gnu/dts/arm/r8a7794-alt.dts head/sys/gnu/dts/arm/r8a7794-silk.dts head/sys/gnu/dts/arm/r8a7794.dtsi head/sys/gnu/dts/arm/r8a77xx-aa104xd12-panel.dtsi head/sys/gnu/dts/arm/r8a77xx-aa121td01-panel.dtsi head/sys/gnu/dts/arm/rk3036-evb.dts head/sys/gnu/dts/arm/rk3036-kylin.dts head/sys/gnu/dts/arm/rk3036.dtsi head/sys/gnu/dts/arm/rk3066a-bqcurie2.dts head/sys/gnu/dts/arm/rk3066a-marsboard.dts head/sys/gnu/dts/arm/rk3066a-mk808.dts head/sys/gnu/dts/arm/rk3066a-rayeager.dts 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/rk3228-evb.dts head/sys/gnu/dts/arm/rk3229-evb.dts head/sys/gnu/dts/arm/rk3229.dtsi head/sys/gnu/dts/arm/rk322x.dtsi head/sys/gnu/dts/arm/rk3288-evb-act8846.dts head/sys/gnu/dts/arm/rk3288-evb-rk808.dts head/sys/gnu/dts/arm/rk3288-evb.dtsi head/sys/gnu/dts/arm/rk3288-fennec.dts head/sys/gnu/dts/arm/rk3288-firefly-beta.dts head/sys/gnu/dts/arm/rk3288-firefly-reload-core.dtsi head/sys/gnu/dts/arm/rk3288-firefly-reload.dts head/sys/gnu/dts/arm/rk3288-firefly.dts head/sys/gnu/dts/arm/rk3288-firefly.dtsi head/sys/gnu/dts/arm/rk3288-miqi.dts head/sys/gnu/dts/arm/rk3288-phycore-rdk.dts head/sys/gnu/dts/arm/rk3288-phycore-som.dtsi head/sys/gnu/dts/arm/rk3288-popmetal.dts head/sys/gnu/dts/arm/rk3288-r89.dts head/sys/gnu/dts/arm/rk3288-rock2-som.dtsi head/sys/gnu/dts/arm/rk3288-rock2-square.dts head/sys/gnu/dts/arm/rk3288-tinker.dts head/sys/gnu/dts/arm/rk3288-veyron-analog-audio.dtsi head/sys/gnu/dts/arm/rk3288-veyron-brain.dts head/sys/gnu/dts/arm/rk3288-veyron-chromebook.dtsi head/sys/gnu/dts/arm/rk3288-veyron-jaq.dts head/sys/gnu/dts/arm/rk3288-veyron-jerry.dts head/sys/gnu/dts/arm/rk3288-veyron-mickey.dts head/sys/gnu/dts/arm/rk3288-veyron-minnie.dts head/sys/gnu/dts/arm/rk3288-veyron-pinky.dts head/sys/gnu/dts/arm/rk3288-veyron-sdmmc.dtsi head/sys/gnu/dts/arm/rk3288-veyron-speedy.dts head/sys/gnu/dts/arm/rk3288-veyron.dtsi head/sys/gnu/dts/arm/rk3288-vyasa.dts head/sys/gnu/dts/arm/rk3288.dtsi head/sys/gnu/dts/arm/rk3xxx.dtsi head/sys/gnu/dts/arm/rv1108-evb.dts head/sys/gnu/dts/arm/rv1108.dtsi head/sys/gnu/dts/arm/s5pv210-pinctrl.dtsi head/sys/gnu/dts/arm/sama5d2-pinfunc.h head/sys/gnu/dts/arm/sama5d3.dtsi head/sys/gnu/dts/arm/sama5d3_emac.dtsi head/sys/gnu/dts/arm/sama5d4.dtsi head/sys/gnu/dts/arm/sh73a0-kzm9g.dts head/sys/gnu/dts/arm/sh73a0.dtsi head/sys/gnu/dts/arm/socfpga_arria10.dtsi head/sys/gnu/dts/arm/ste-nomadik-stn8815.dtsi head/sys/gnu/dts/arm/stm32f429.dtsi head/sys/gnu/dts/arm/stm32f746.dtsi head/sys/gnu/dts/arm/stm32mp157-pinctrl.dtsi head/sys/gnu/dts/arm/stm32mp157c-ed1.dts head/sys/gnu/dts/arm/stm32mp157c-ev1.dts head/sys/gnu/dts/arm/stm32mp157c.dtsi head/sys/gnu/dts/arm/sun4i-a10-inet97fv2.dts head/sys/gnu/dts/arm/sun4i-a10.dtsi head/sys/gnu/dts/arm/sun5i.dtsi head/sys/gnu/dts/arm/sun6i-a31.dtsi head/sys/gnu/dts/arm/sun7i-a20.dtsi head/sys/gnu/dts/arm/sun8i-a23-a33.dtsi head/sys/gnu/dts/arm/sun8i-a33.dtsi head/sys/gnu/dts/arm/sun8i-a83t-allwinner-h8homlet-v2.dts 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.dtsi head/sys/gnu/dts/arm/sun8i-h2-plus-bananapi-m2-zero.dts head/sys/gnu/dts/arm/sun8i-h3-beelink-x2.dts head/sys/gnu/dts/arm/sun8i-h3.dtsi head/sys/gnu/dts/arm/sun8i-r40-bananapi-m2-ultra.dts head/sys/gnu/dts/arm/sun8i-r40.dtsi head/sys/gnu/dts/arm/sunxi-h3-h5.dtsi head/sys/gnu/dts/arm/sunxi-libretech-all-h3-cc.dtsi head/sys/gnu/dts/arm/tegra114-dalmore.dts head/sys/gnu/dts/arm/tegra114-roth.dts head/sys/gnu/dts/arm/tegra114-tn7.dts head/sys/gnu/dts/arm/tegra114.dtsi head/sys/gnu/dts/arm/tegra124-apalis-v1.2.dtsi head/sys/gnu/dts/arm/tegra124-apalis.dtsi head/sys/gnu/dts/arm/tegra124-jetson-tk1.dts head/sys/gnu/dts/arm/tegra124-nyan.dtsi head/sys/gnu/dts/arm/tegra124-venice2.dts head/sys/gnu/dts/arm/tegra124.dtsi head/sys/gnu/dts/arm/tegra20-harmony.dts head/sys/gnu/dts/arm/tegra20-paz00.dts head/sys/gnu/dts/arm/tegra20-seaboard.dts head/sys/gnu/dts/arm/tegra20-tamonten.dtsi head/sys/gnu/dts/arm/tegra20-trimslice.dts head/sys/gnu/dts/arm/tegra20-ventana.dts head/sys/gnu/dts/arm/tegra20.dtsi head/sys/gnu/dts/arm/tegra30-apalis.dtsi head/sys/gnu/dts/arm/tegra30-beaver.dts head/sys/gnu/dts/arm/tegra30-cardhu.dtsi head/sys/gnu/dts/arm/tegra30-colibri.dtsi head/sys/gnu/dts/arm/tegra30.dtsi head/sys/gnu/dts/arm/uniphier-pxs2.dtsi head/sys/gnu/dts/arm/zynq-cc108.dts head/sys/gnu/dts/arm/zynq-microzed.dts head/sys/gnu/dts/arm/zynq-parallella.dts head/sys/gnu/dts/arm/zynq-zc702.dts head/sys/gnu/dts/arm/zynq-zc706.dts head/sys/gnu/dts/arm/zynq-zc770-xm010.dts head/sys/gnu/dts/arm/zynq-zc770-xm011.dts head/sys/gnu/dts/arm/zynq-zc770-xm012.dts head/sys/gnu/dts/arm/zynq-zc770-xm013.dts head/sys/gnu/dts/arm/zynq-zed.dts head/sys/gnu/dts/arm/zynq-zybo-z7.dts head/sys/gnu/dts/arm/zynq-zybo.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-bananapi-m64.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-nanopi-a64.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-olinuxino.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-sopine-baseboard.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64-sopine.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-a64-teres-i.dts head/sys/gnu/dts/arm64/allwinner/sun50i-a64.dtsi head/sys/gnu/dts/arm64/allwinner/sun50i-h5-orangepi-pc2.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/altera/socfpga_stratix10_socdk.dts 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-gxbb-nanopi-k2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-p230.dts head/sys/gnu/dts/arm64/amlogic/meson-gxl-s905d-p231.dts head/sys/gnu/dts/arm64/amlogic/meson-gxm-khadas-vim2.dts head/sys/gnu/dts/arm64/amlogic/meson-gxm-q200.dts head/sys/gnu/dts/arm64/amlogic/meson-gxm-q201.dts head/sys/gnu/dts/arm64/arm/juno-r1.dts head/sys/gnu/dts/arm64/arm/juno-r2.dts head/sys/gnu/dts/arm64/arm/juno.dts head/sys/gnu/dts/arm64/broadcom/northstar2/ns2.dtsi head/sys/gnu/dts/arm64/broadcom/stingray/bcm958742-base.dtsi head/sys/gnu/dts/arm64/broadcom/stingray/stingray-clock.dtsi head/sys/gnu/dts/arm64/broadcom/stingray/stingray.dtsi head/sys/gnu/dts/arm64/exynos/exynos5433.dtsi head/sys/gnu/dts/arm64/exynos/exynos7.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1012a-frdm.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1012a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1012a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1012a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1043-post.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1043a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1043a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1043a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls1046-post.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-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1088a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls1088a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls2080a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls2080a-rdb.dts head/sys/gnu/dts/arm64/freescale/fsl-ls2080a-simu.dts head/sys/gnu/dts/arm64/freescale/fsl-ls2080a.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls2088a-qds.dts head/sys/gnu/dts/arm64/freescale/fsl-ls2088a-rdb.dts 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-rdb.dtsi head/sys/gnu/dts/arm64/freescale/fsl-ls208xa.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-bman-portals.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-10g-0.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-10g-1.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-1g-0.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-1g-1.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-1g-2.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-1g-3.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-1g-4.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0-1g-5.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-fman3-0.dtsi head/sys/gnu/dts/arm64/freescale/qoriq-qman-portals.dtsi head/sys/gnu/dts/arm64/hisilicon/hi3660-hikey960.dts head/sys/gnu/dts/arm64/hisilicon/hi3660.dtsi head/sys/gnu/dts/arm64/hisilicon/hi6220-hikey.dts head/sys/gnu/dts/arm64/hisilicon/hi6220.dtsi head/sys/gnu/dts/arm64/hisilicon/hip07.dtsi head/sys/gnu/dts/arm64/marvell/armada-37xx.dtsi head/sys/gnu/dts/arm64/marvell/armada-8040-mcbin.dts head/sys/gnu/dts/arm64/marvell/armada-cp110.dtsi head/sys/gnu/dts/arm64/mediatek/mt2712e.dtsi head/sys/gnu/dts/arm64/mediatek/mt7622-rfb1.dts head/sys/gnu/dts/arm64/mediatek/mt7622.dtsi head/sys/gnu/dts/arm64/mediatek/mt8173.dtsi head/sys/gnu/dts/arm64/nvidia/tegra194-p2888.dtsi head/sys/gnu/dts/arm64/nvidia/tegra194.dtsi head/sys/gnu/dts/arm64/qcom/apq8016-sbc.dtsi head/sys/gnu/dts/arm64/qcom/apq8096-db820c.dtsi head/sys/gnu/dts/arm64/qcom/msm8916.dtsi head/sys/gnu/dts/arm64/qcom/msm8996.dtsi head/sys/gnu/dts/arm64/qcom/sdm845-mtp.dts head/sys/gnu/dts/arm64/qcom/sdm845.dtsi head/sys/gnu/dts/arm64/renesas/r8a7795-es1-h3ulcb-kf.dts head/sys/gnu/dts/arm64/renesas/r8a7795-es1-h3ulcb.dts 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-h3ulcb-kf.dts head/sys/gnu/dts/arm64/renesas/r8a7795-h3ulcb.dts 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-m3ulcb-kf.dts head/sys/gnu/dts/arm64/renesas/r8a7796-m3ulcb.dts head/sys/gnu/dts/arm64/renesas/r8a7796-salvator-x.dts head/sys/gnu/dts/arm64/renesas/r8a7796-salvator-xs.dts head/sys/gnu/dts/arm64/renesas/r8a7796.dtsi head/sys/gnu/dts/arm64/renesas/r8a77965.dtsi head/sys/gnu/dts/arm64/renesas/r8a77970-eagle.dts head/sys/gnu/dts/arm64/renesas/r8a77970-v3msk.dts head/sys/gnu/dts/arm64/renesas/r8a77970.dtsi head/sys/gnu/dts/arm64/renesas/r8a77980-condor.dts head/sys/gnu/dts/arm64/renesas/r8a77980-v3hsk.dts 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/salvator-x.dtsi head/sys/gnu/dts/arm64/renesas/salvator-xs.dtsi head/sys/gnu/dts/arm64/renesas/ulcb-kf.dtsi head/sys/gnu/dts/arm64/renesas/ulcb.dtsi head/sys/gnu/dts/arm64/rockchip/rk3328-evb.dts head/sys/gnu/dts/arm64/rockchip/rk3328-rock64.dts head/sys/gnu/dts/arm64/rockchip/rk3328.dtsi head/sys/gnu/dts/arm64/rockchip/rk3368-evb-act8846.dts head/sys/gnu/dts/arm64/rockchip/rk3368-evb.dtsi head/sys/gnu/dts/arm64/rockchip/rk3368-geekbox.dts head/sys/gnu/dts/arm64/rockchip/rk3368-orion-r68-meta.dts head/sys/gnu/dts/arm64/rockchip/rk3368-px5-evb.dts head/sys/gnu/dts/arm64/rockchip/rk3368-r88.dts head/sys/gnu/dts/arm64/rockchip/rk3368.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-evb.dts head/sys/gnu/dts/arm64/rockchip/rk3399-firefly.dts 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-op1-opp.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-opp.dtsi head/sys/gnu/dts/arm64/rockchip/rk3399-puma-haikou.dts head/sys/gnu/dts/arm64/rockchip/rk3399-puma.dtsi 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-ld11-global.dts head/sys/gnu/dts/arm64/socionext/uniphier-ld20-global.dts head/sys/gnu/dts/arm64/socionext/uniphier-ld20.dtsi head/sys/gnu/dts/arm64/sprd/sc2731.dtsi head/sys/gnu/dts/arm64/sprd/sc9860.dtsi head/sys/gnu/dts/arm64/sprd/whale2.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 Directory Properties: head/sys/gnu/dts/arm/ (props changed) head/sys/gnu/dts/arm64/ (props changed) Modified: head/sys/gnu/dts/arm/am335x-baltos.dtsi ============================================================================== --- head/sys/gnu/dts/arm/am335x-baltos.dtsi Sat Nov 10 20:45:29 2018 (r340336) +++ head/sys/gnu/dts/arm/am335x-baltos.dtsi Sat Nov 10 21:02:32 2018 (r340337) @@ -396,7 +396,7 @@ compatible = "ti,wl1835"; reg = <2>; interrupt-parent = <&gpio3>; - interrupts = <7 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <7 IRQ_TYPE_EDGE_RISING>; }; }; Modified: head/sys/gnu/dts/arm/am335x-evm.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-evm.dts Sat Nov 10 20:45:29 2018 (r340336) +++ head/sys/gnu/dts/arm/am335x-evm.dts Sat Nov 10 21:02:32 2018 (r340337) @@ -778,7 +778,7 @@ compatible = "ti,wl1835"; reg = <2>; interrupt-parent = <&gpio3>; - interrupts = <17 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <17 IRQ_TYPE_EDGE_RISING>; }; }; Modified: head/sys/gnu/dts/arm/am335x-evmsk.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-evmsk.dts Sat Nov 10 20:45:29 2018 (r340336) +++ head/sys/gnu/dts/arm/am335x-evmsk.dts Sat Nov 10 21:02:32 2018 (r340337) @@ -690,7 +690,7 @@ compatible = "ti,wl1271"; reg = <2>; interrupt-parent = <&gpio0>; - interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ + interrupts = <31 IRQ_TYPE_EDGE_RISING>; /* gpio 31 */ ref-clock-frequency = <38400000>; }; }; Copied: head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts (from r340335, vendor/device-tree/dist/src/arm/am335x-osd3358-sm-red.dts) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/gnu/dts/arm/am335x-osd3358-sm-red.dts Sat Nov 10 21:02:32 2018 (r340337, copy of r340335, vendor/device-tree/dist/src/arm/am335x-osd3358-sm-red.dts) @@ -0,0 +1,457 @@ +//SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2018 Octavo Systems LLC - http://www.octavosystems.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +#include "am33xx.dtsi" +#include "am335x-osd335x-common.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> + +#include <dt-bindings/display/tda998x.h> + +/ { + model = "Octavo Systems OSD3358-SM-RED"; + compatible = "oct,osd3358-sm-refdesign", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; +}; + +&ldo3_reg { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; +}; + +&mmc1 { + vmmc-supply = <&vmmcsd_fixed>; +}; + +&mmc2 { + vmmc-supply = <&vmmcsd_fixed>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins>; + bus-width = <8>; + status = "okay"; +}; + +&am33xx_pinmux { + nxp_hdmi_bonelt_pins: nxp-hdmi-bonelt-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ + AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */ + AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */ + AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */ + AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */ + AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */ + AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */ + AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */ + AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */ + AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */ + AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */ + AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */ + AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */ + AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */ + AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */ + AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */ + AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */ + AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_vsync.lcd_vsync */ + AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_hsync.lcd_hsync */ + AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_pclk.lcd_pclk */ + AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */ + >; + }; + + nxp_hdmi_bonelt_off_pins: nxp-hdmi-bonelt-off-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */ + >; + }; + + mcasp0_pins: mcasp0-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ + AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/ + AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ + AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ + AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */ + >; + }; + + flash_enable: flash-enable { + pinctrl-single,pins = < + AM33XX_IOPAD(0x944, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* rmii1_ref_clk.gpio0_29 */ + >; + }; + + imu_interrupt: imu-interrupt { + pinctrl-single,pins = < + AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE7) /* mii1_rx_er.gpio3_2 */ + >; + }; + + ethernet_interrupt: ethernet-interrupt{ + pinctrl-single,pins = < + AM33XX_IOPAD(0x908, PIN_INPUT_PULLDOWN | MUX_MODE7) /* mii1_col.gpio3_0 */ + >; + }; +}; + +&lcdc { + status = "okay"; + + /* If you want to get 24 bit RGB and 16 BGR mode instead of + * current 16 bit RGB and 24 BGR modes, set the propety + * below to "crossed" and uncomment the video-ports -property + * in tda19988 node. + * AM335x errata for wiring: + * http://www.ti.com/lit/er/sprz360i/sprz360i.pdf + */ + + blue-and-red-wiring = "straight"; + + port { + lcdc_0: endpoint { + remote-endpoint = <&hdmi_0>; + }; + }; +}; + +&i2c0 { + tda19988: hdmi-encoder@70 { + compatible = "nxp,tda998x"; + reg = <0x70>; + + pinctrl-names = "default", "off"; + pinctrl-0 = <&nxp_hdmi_bonelt_pins>; + pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; + + /* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */ + /* video-ports = <0x234501>; */ + + #sound-dai-cells = <0>; + audio-ports = < TDA998x_I2S 0x03>; + + port { + hdmi_0: endpoint { + remote-endpoint = <&lcdc_0>; + }; + }; + }; + + mpu9250: imu@68 { + compatible = "invensense,mpu6050"; + reg = <0x68>; + interrupt-parent = <&gpio3>; + interrupts = <21 IRQ_TYPE_EDGE_RISING>; + i2c-gate { + #address-cells = <1>; + #size-cells = <0>; + ax8975@c { + compatible = "ak,ak8975"; + reg = <0x0c>; + }; + }; + /*invensense,int_config = <0x10>; + invensense,level_shifter = <0>; + invensense,orientation = [01 00 00 00 01 00 00 00 01]; + invensense,sec_slave_type = <0>; + invensense,key = [4e cc 7e eb f6 1e 35 22 00 34 0d 65 32 e9 94 89];*/ + }; + + bmp280: pressure@78 { + compatible = "bosch,bmp280"; + reg = <0x76>; + }; +}; + +&rtc { + system-power-controller; +}; + +&mcasp0 { + #sound-dai-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&mcasp0_pins>; + status = "okay"; + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 0 0 1 0 + >; + tx-num-evt = <32>; + rx-num-evt = <32>; +}; + +/ { + clk_mcasp0_fixed: clk-mcasp0-fixed { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24576000>; + }; + + clk_mcasp0: clk-mcasp0 { + #clock-cells = <0>; + compatible = "gpio-gate-clock"; + clocks = <&clk_mcasp0_fixed>; + enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */ + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "TI BeagleBone Black"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink0_master>; + simple-audio-card,frame-master = <&dailink0_master>; + + dailink0_master: simple-audio-card,cpu { + sound-dai = <&mcasp0>; + clocks = <&clk_mcasp0>; + }; + + simple-audio-card,codec { + sound-dai = <&tda19988>; + }; + }; + + chosen { + stdout-path = &uart0; + }; + + leds { + pinctrl-names = "default"; + pinctrl-0 = <&user_leds_s0>; + + compatible = "gpio-leds"; + + led2 { + label = "beaglebone:green:usr0"; + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + + led3 { + label = "beaglebone:green:usr1"; + gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc0"; + default-state = "off"; + }; + + led4 { + label = "beaglebone:green:usr2"; + gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu0"; + default-state = "off"; + }; + + led5 { + label = "beaglebone:green:usr3"; + gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc1"; + default-state = "off"; + }; + }; + + vmmcsd_fixed: fixedregulator0 { + compatible = "regulator-fixed"; + regulator-name = "vmmcsd_fixed"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; + +&am33xx_pinmux { + pinctrl-names = "default"; + pinctrl-0 = <&clkout2_pin>; + + user_leds_s0: user-leds-s0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */ + AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */ + AM33XX_IOPAD(0x85c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */ + AM33XX_IOPAD(0x860, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */ + >; + }; + + i2c2_pins: pinmux-i2c2-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x978, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_ctsn.i2c2_sda */ + AM33XX_IOPAD(0x97c, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_rtsn.i2c2_scl */ + >; + }; + + uart0_pins: pinmux-uart0-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ + AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ + >; + }; + + clkout2_pin: pinmux-clkout2-pin { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ + >; + }; + + cpsw_default: cpsw-default { + pinctrl-single,pins = < + /* Slave 1 */ + AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */ + AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */ + AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_txd3 */ + AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_txd2 */ + AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_txd1 */ + AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_txd0 */ + AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_txclk */ + AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rxclk */ + AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rxd3 */ + AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rxd2 */ + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rxd1 */ + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rxd0 */ + >; + }; + + cpsw_sleep: cpsw-sleep { + pinctrl-single,pins = < + /* Slave 1 reset value */ + AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x91c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x920, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x92c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + davinci_mdio_default: davinci-mdio-default { + pinctrl-single,pins = < + /* MDIO */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ + AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; + + davinci_mdio_sleep: davinci-mdio-sleep { + pinctrl-single,pins = < + /* MDIO reset value */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + mmc1_pins: pinmux-mmc1-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* (C15) spi0_cs1.gpio0[6] */ + AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP | MUX_MODE0) /* (G16) mmc0_dat0.mmc0_dat0 */ + AM33XX_IOPAD(0x8f8, PIN_INPUT_PULLUP | MUX_MODE0) /* (G15) mmc0_dat1.mmc0_dat1 */ + AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0) /* (F18) mmc0_dat2.mmc0_dat2 */ + AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0) /* (F17) mmc0_dat3.mmc0_dat3 */ + AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP | MUX_MODE0) /* (G18) mmc0_cmd.mmc0_cmd */ + AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP | MUX_MODE0) /* (G17) mmc0_clk.mmc0_clk */ + >; + }; + + emmc_pins: pinmux-emmc-pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */ + AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */ + AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */ + AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */ + AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */ + AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */ + AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */ + AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */ + AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */ + AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */ + >; + }; +}; + + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + + status = "okay"; +}; + +&usb { + status = "okay"; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb0_phy { + status = "okay"; +}; + +&usb1_phy { + status = "okay"; +}; + +&usb0 { + status = "okay"; + dr_mode = "peripheral"; + interrupts-extended = <&intc 18 &tps 0>; + interrupt-names = "mc", "vbus"; +}; + +&usb1 { + status = "okay"; + dr_mode = "host"; +}; + +&cppi41dma { + status = "okay"; +}; + +&i2c2 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pins>; + status = "okay"; + clock-frequency = <100000>; +}; + +&cpsw_emac0 { + phy_id = <&davinci_mdio>, <4>; + phy-mode = "rgmii-txid"; +}; + +&mac { + slaves = <1>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cpsw_default>; + pinctrl-1 = <&cpsw_sleep>; + status = "okay"; +}; + +&davinci_mdio { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&davinci_mdio_default>; + pinctrl-1 = <&davinci_mdio_sleep>; + status = "okay"; +}; + +&mmc1 { + status = "okay"; + bus-width = <0x4>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; +}; + +&rtc { + clocks = <&clk_32768_ck>, <&l4_per_clkctrl AM3_CLKDIV32K_CLKCTRL 0>; + clock-names = "ext-clk", "int-clk"; +}; Copied: head/sys/gnu/dts/arm/am335x-sancloud-bbe.dts (from r340335, vendor/device-tree/dist/src/arm/am335x-sancloud-bbe.dts) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/gnu/dts/arm/am335x-sancloud-bbe.dts Sat Nov 10 21:02:32 2018 (r340337, copy of r340335, vendor/device-tree/dist/src/arm/am335x-sancloud-bbe.dts) @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +/dts-v1/; + +#include "am33xx.dtsi" +#include "am335x-bone-common.dtsi" +#include "am335x-boneblack-common.dtsi" +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + model = "SanCloud BeagleBone Enhanced"; + compatible = "sancloud,am335x-boneenhanced", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; +}; + +&am33xx_pinmux { + pinctrl-names = "default"; + + cpsw_default: cpsw_default { + pinctrl-single,pins = < + /* Slave 1 */ + AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */ + AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */ + AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */ + AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */ + AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */ + AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */ + AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */ + AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */ + AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */ + AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */ + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */ + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */ + >; + }; + + cpsw_sleep: cpsw_sleep { + pinctrl-single,pins = < + /* Slave 1 reset value */ + AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x91c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x920, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x92c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + davinci_mdio_default: davinci_mdio_default { + pinctrl-single,pins = < + /* MDIO */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ + AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; + + davinci_mdio_sleep: davinci_mdio_sleep { + pinctrl-single,pins = < + /* MDIO reset value */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + usb_hub_ctrl: usb_hub_ctrl { + pinctrl-single,pins = < + AM33XX_IOPAD(0x944, PIN_OUTPUT_PULLUP | MUX_MODE7) /* rmii1_refclk.gpio0_29 */ + >; + }; + + mpu6050_pins: pinmux_mpu6050_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x968, PIN_INPUT | MUX_MODE7) /* uart0_ctsn.gpio1_8 */ + >; + }; + + lps3331ap_pins: pinmux_lps3331ap_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x868, PIN_INPUT | MUX_MODE7) /* gpmc_a10.gpio1_26 */ + >; + }; +}; + +&mac { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cpsw_default>; + pinctrl-1 = <&cpsw_sleep>; + status = "okay"; +}; + +&davinci_mdio { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&davinci_mdio_default>; + pinctrl-1 = <&davinci_mdio_sleep>; + status = "okay"; +}; + +&cpsw_emac0 { + phy_id = <&davinci_mdio>, <0>; + phy-mode = "rgmii-txid"; +}; + +&i2c0 { + lps331ap: barometer@5c { + compatible = "st,lps331ap-press"; + st,drdy-int-pin = <1>; + reg = <0x5c>; + interrupt-parent = <&gpio1>; + interrupts = <26 IRQ_TYPE_EDGE_RISING>; + }; + + mpu6050: accelerometer@68 { + compatible = "invensense,mpu6050"; + reg = <0x68>; + interrupt-parent = <&gpio0>; + interrupts = <2 IRQ_TYPE_EDGE_RISING>; + orientation = <0xff 0 0 0 1 0 0 0 0xff>; + }; + + usb2512b: usb-hub@2c { + compatible = "microchip,usb2512b"; + reg = <0x2c>; + reset-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + /* wifi on port 4 */ + }; +}; Modified: head/sys/gnu/dts/arm/am335x-sl50.dts ============================================================================== --- head/sys/gnu/dts/arm/am335x-sl50.dts Sat Nov 10 20:45:29 2018 (r340336) +++ head/sys/gnu/dts/arm/am335x-sl50.dts Sat Nov 10 21:02:32 2018 (r340337) @@ -8,6 +8,8 @@ /dts-v1/; #include "am33xx.dtsi" +#include <dt-bindings/pwm/pwm.h> +#include <dt-bindings/interrupt-controller/irq.h> / { model = "Toby Churchill SL50 Series"; @@ -34,25 +36,25 @@ pinctrl-0 = <&led_pins>; led0 { - label = "sl50:green:usr0"; + label = "sl50:red:usr0"; gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; default-state = "off"; }; led1 { - label = "sl50:red:usr1"; + label = "sl50:green:usr1"; gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; default-state = "off"; }; led2 { - label = "sl50:green:usr2"; + label = "sl50:red:usr2"; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; default-state = "off"; }; led3 { - label = "sl50:red:usr3"; + label = "sl50:green:usr3"; gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; default-state = "off"; }; @@ -60,16 +62,44 @@ backlight0: disp0 { compatible = "pwm-backlight"; - pwms = <&ehrpwm1 0 500000 0>; - brightness-levels = <0 10 20 30 40 50 60 70 80 90 99>; - default-brightness-level = <6>; + pinctrl-names = "default"; + pinctrl-0 = <&backlight0_pins>; + pwms = <&ehrpwm1 0 500000 PWM_POLARITY_INVERTED>; + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + enable-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; + power-supply = <&vdd_sys_reg>; }; backlight1: disp1 { compatible = "pwm-backlight"; - pwms = <&ehrpwm1 1 500000 0>; - brightness-levels = <0 10 20 30 40 50 60 70 80 90 99>; - default-brightness-level = <6>; + pinctrl-names = "default"; + pinctrl-0 = <&backlight1_pins>; + pwms = <&ehrpwm1 1 500000 PWM_POLARITY_INVERTED>; + brightness-levels = < 0 1 2 3 4 5 6 7 8 9 + 10 11 12 13 14 15 16 17 18 19 + 20 21 22 23 24 25 26 27 28 29 + 30 31 32 33 34 35 36 37 38 39 + 40 41 42 43 44 45 46 47 48 49 + 50 51 52 53 54 55 56 57 58 59 + 60 61 62 63 64 65 66 67 68 69 + 70 71 72 73 74 75 76 77 78 79 + 80 81 82 83 84 85 86 87 88 89 + 90 91 92 93 94 95 96 97 98 99 + 100>; + default-brightness-level = <50>; + enable-gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; + power-supply = <&vdd_sys_reg>; }; clocks { @@ -78,27 +108,85 @@ #size-cells = <0>; /* audio external oscillator */ - tlv320aic3x_mclk: oscillator@0 { + audio_mclk_fixed: oscillator@0 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <24576000>; /* 24.576MHz */ }; + + audio_mclk: audio_mclk_gate@0 { + compatible = "gpio-gate-clock"; + #clock-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&audio_mclk_pins>; + clocks = <&audio_mclk_fixed>; + enable-gpios = <&gpio1 27 0>; + }; }; + panel: lcd_panel { + compatible = "ti,tilcdc,panel"; + pinctrl-names = "default"; + pinctrl-0 = <&lcd_pins>; + + panel-info { + ac-bias = <255>; + ac-bias-intrpt = <0>; + dma-burst-sz = <16>; + bpp = <16>; + fdd = <0x80>; + tft-alt-mode = <0>; + mono-8bit-mode = <0>; + sync-edge = <0>; + sync-ctrl = <1>; + raster-order = <0>; + fifo-th = <0>; + }; + + display-timings { + native-mode = <&timing0>; + timing0: 960x128 { + clock-frequency = <18000000>; + hactive = <960>; + vactive = <272>; + + hback-porch = <40>; + hfront-porch = <16>; + hsync-len = <24>; + hsync-active = <0>; + + vback-porch = <3>; + vfront-porch = <8>; + vsync-len = <4>; + vsync-active = <0>; + }; + }; + }; + sound { - compatible = "ti,da830-evm-audio"; - ti,model = "AM335x-SL50"; - ti,audio-codec = <&audio_codec>; - ti,mcasp-controller = <&mcasp0>; + compatible = "audio-graph-card"; + label = "sound-card"; + pinctrl-names = "default"; + pinctrl-0 = <&audio_pa_pins>; - clocks = <&tlv320aic3x_mclk>; - clock-names = "mclk"; + widgets = "Headphone", "Headphone Jack", + "Speaker", "Speaker External", + "Line", "Line In", + "Microphone", "Microphone Jack"; - ti,audio-routing = - "Headphone Jack", "HPLOUT", - "Headphone Jack", "HPROUT", - "LINE1R", "Line In", - "LINE1L", "Line In"; + routing = "Headphone Jack", "HPLOUT", + "Headphone Jack", "HPROUT", + "Amplifier", "MONO_LOUT", + "Speaker External", "Amplifier", + "LINE1R", "Line In", + "LINE1L", "Line In", + "MIC3L", "Microphone Jack", + "MIC3R", "Microphone Jack", + "Microphone Jack", "Mic Bias"; + + dais = <&cpu_port>; + + pa-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; }; emmc_pwrseq: pwrseq@0 { @@ -108,6 +196,14 @@ reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; }; + vdd_sys_reg: regulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vdd_sys_reg"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + vmmcsd_fixed: fixedregulator0 { compatible = "regulator-fixed"; regulator-name = "vmmcsd_fixed"; @@ -120,6 +216,65 @@ pinctrl-names = "default"; pinctrl-0 = <&lwb_pins>; + audio_pins: pinmux_audio_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ + AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ + AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ + AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */ + AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */ + >; + }; + + audio_pa_pins: pinmux_audio_pa_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9a0, PIN_INPUT_PULLDOWN | MUX_MODE7) /* SoundPA_en - mcasp0_aclkr.gpio3_18 */ + >; + }; + + audio_mclk_pins: pinmux_audio_mclk_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.gpio1_27 */ + >; + }; + + backlight0_pins: pinmux_backlight0_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x898, PIN_OUTPUT | MUX_MODE7) /* gpmc_wen.gpio2_4 */ + >; + }; + + backlight1_pins: pinmux_backlight1_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x828, PIN_OUTPUT | MUX_MODE7) /* gpmc_ad10.gpio0_26 */ + >; + }; + + lcd_pins: pinmux_lcd_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */ + AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */ + AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */ + AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */ + AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */ + AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */ + AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */ + AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */ + AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */ + AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */ + AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */ + AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */ + AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */ + AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */ + AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */ + AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */ + AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_vsync.lcd_vsync */ + AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_hsync.lcd_hsync */ + AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_pclk.lcd_pclk */ + AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */ + >; + }; + led_pins: pinmux_led_pins { pinctrl-single,pins = < AM33XX_IOPAD(0x854, PIN_OUTPUT | MUX_MODE7) /* gpmc_a5.gpio1_21 */ @@ -207,6 +362,8 @@ /* MDIO */ AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + /* Ethernet */ + AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE7) /* Ethernet_nRST - gpmc_ad14.gpio1_14 */ >; }; @@ -245,20 +402,16 @@ >; }; - audio_pins: pinmux_audio_pins { + ehrpwm1_pins: pinmux_ehrpwm1a_pins { pinctrl-single,pins = < - AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ - AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */ - AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */ - AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */ - AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2 */ + AM33XX_IOPAD(0x848, PIN_OUTPUT | MUX_MODE6) /* gpmc_a2.ehrpwm1a */ + AM33XX_IOPAD(0x84c, PIN_OUTPUT | MUX_MODE6) /* gpmc_a3.ehrpwm1b */ >; }; - ehrpwm1_pins: pinmux_ehrpwm1a_pins { + rtc0_irq_pins: pinmux_rtc0_irq_pins { pinctrl-single,pins = < - AM33XX_IOPAD(0x848, PIN_OUTPUT | MUX_MODE6) /* gpmc_a2.ehrpwm1a */ - AM33XX_IOPAD(0x84c, PIN_OUTPUT | MUX_MODE6) /* gpmc_a3.ehrpwm1b */ + AM33XX_IOPAD(0x824, PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_ad9.gpio0_23 */ >; }; @@ -274,15 +427,18 @@ lwb_pins: pinmux_lwb_pins { pinctrl-single,pins = < - AM33XX_IOPAD(0x9a4, PIN_OUTPUT | MUX_MODE7) /* SoundPA_en - mcasp0_fsr.gpio3_19 */ - AM33XX_IOPAD(0x828, PIN_OUTPUT | MUX_MODE7) /* nKbdOnC - gpmc_ad10.gpio0_26 */ AM33XX_IOPAD(0x830, PIN_INPUT_PULLUP | MUX_MODE7) /* nKbdInt - gpmc_ad12.gpio1_12 */ AM33XX_IOPAD(0x834, PIN_INPUT_PULLUP | MUX_MODE7) /* nKbdReset - gpmc_ad13.gpio1_13 */ - AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE7) /* nDispReset - gpmc_ad14.gpio1_14 */ AM33XX_IOPAD(0x844, PIN_INPUT_PULLUP | MUX_MODE7) /* USB1_enPower - gpmc_a1.gpio1_17 */ /* PDI Bus - Battery system */ AM33XX_IOPAD(0x840, PIN_INPUT_PULLUP | MUX_MODE7) /* nBattReset gpmc_a0.gpio1_16 */ AM33XX_IOPAD(0x83c, PIN_INPUT_PULLUP | MUX_MODE7) /* BattPDIData gpmc_ad15.gpio1_15 */ + /* FPGA */ + AM33XX_IOPAD(0x820, PIN_INPUT_PULLUP | MUX_MODE7) /* FPGA_DONE - gpmc_ad8.gpio0_22 */ + AM33XX_IOPAD(0x840, PIN_INPUT_PULLUP | MUX_MODE7) /* FPGA_NRST - gpmc_a0.gpio1_16 */ + AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE7) /* FPGA_RUN - gpmc_a1.gpio1_17 */ + AM33XX_IOPAD(0x864, PIN_INPUT_PULLUP | MUX_MODE7) /* ENFPGA - gpmc_a9.gpio1_25 */ + AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE7) /* FPGA_PROGRAM - gpmc_a10.gpio1_26 */ >; }; }; @@ -298,9 +454,14 @@ reg = <0x24>; }; - bq32000: rtc@68 { - compatible = "ti,bq32000"; - trickle-resistor-ohms = <1120>; + rtc0: rtc@68 { + compatible = "dallas,ds1339"; + pinctrl-names = "default"; + pinctrl-0 = <&rtc0_irq_pins>; + interrupt-parent = <&gpio0>; + interrupts = <23 IRQ_TYPE_EDGE_FALLING>; /* gpio 23 */ + wakeup-source; + trickle-resistor-ohms = <2000>; reg = <0x68>; }; @@ -326,12 +487,21 @@ audio_codec: tlv320aic3106@1b { status = "okay"; compatible = "ti,tlv320aic3106"; + #sound-dai-cells = <0>; reg = <0x1b>; + ai3x-micbias-vg = <2>; /* 2.5V */ AVDD-supply = <&ldo4_reg>; IOVDD-supply = <&ldo4_reg>; DRVDD-supply = <&ldo4_reg>; DVDD-supply = <&ldo3_reg>; + + codec_port: port { + codec_endpoint: endpoint { + remote-endpoint = <&cpu_endpoint>; + clocks = <&audio_mclk>; + }; + }; }; /* Ambient Light Sensor */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@freebsd.org Sat Nov 10 22:14:11 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 2AB93110C531; Sat, 10 Nov 2018 22:14:11 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB3357E57B; Sat, 10 Nov 2018 22:14:10 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1: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 8C689FAA; Sat, 10 Nov 2018 22:14:10 +0000 (UTC) (envelope-from wulf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAMEAAo011625; Sat, 10 Nov 2018 22:14:10 GMT (envelope-from wulf@FreeBSD.org) Received: (from wulf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAMEA3h011623; Sat, 10 Nov 2018 22:14:10 GMT (envelope-from wulf@FreeBSD.org) Message-Id: <201811102214.wAAMEA3h011623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wulf set sender to wulf@FreeBSD.org using -f From: Vladimir Kondratyev <wulf@FreeBSD.org> Date: Sat, 10 Nov 2018 22:14:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340338 - head/sys/dev/usb/input X-SVN-Group: head X-SVN-Commit-Author: wulf X-SVN-Commit-Paths: head/sys/dev/usb/input X-SVN-Commit-Revision: 340338 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AB3357E57B X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 22:14:11 -0000 Author: wulf Date: Sat Nov 10 22:14:09 2018 New Revision: 340338 URL: https://svnweb.freebsd.org/changeset/base/340338 Log: wmt(4): Add PNP record so it could be picked by devd/devmatch. Fix uhid(4) conflict with blacklisting of multitouch HID-usages in uhid(4) probe handler. Reviewed by: imp No objections from: hps MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D17689 Modified: head/sys/dev/usb/input/uhid.c head/sys/dev/usb/input/wmt.c Modified: head/sys/dev/usb/input/uhid.c ============================================================================== --- head/sys/dev/usb/input/uhid.c Sat Nov 10 21:02:32 2018 (r340337) +++ head/sys/dev/usb/input/uhid.c Sat Nov 10 22:14:09 2018 (r340338) @@ -675,6 +675,8 @@ uhid_probe(device_t dev) { struct usb_attach_arg *uaa = device_get_ivars(dev); int error; + void *buf; + uint16_t len; DPRINTFN(11, "\n"); @@ -700,6 +702,25 @@ uhid_probe(device_t dev) ((uaa->info.bInterfaceProtocol == UIPROTO_MOUSE) && !usb_test_quirk(uaa, UQ_UMS_IGNORE)))) return (ENXIO); + + /* Check for mandatory multitouch usages to give wmt(4) a chance */ + if (!usb_test_quirk(uaa, UQ_WMT_IGNORE)) { + error = usbd_req_get_hid_desc(uaa->device, NULL, + &buf, &len, M_USBDEV, uaa->info.bIfaceIndex); + /* Let HID decscriptor-less devices to be handled at attach */ + if (!error) { + if (hid_locate(buf, len, + HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACT_MAX), + hid_feature, 0, NULL, NULL, NULL) && + hid_locate(buf, len, + HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACTID), + hid_input, 0, NULL, NULL, NULL)) { + free(buf, M_USBDEV); + return (ENXIO); + } + free(buf, M_USBDEV); + } + } return (BUS_PROBE_GENERIC); } Modified: head/sys/dev/usb/input/wmt.c ============================================================================== --- head/sys/dev/usb/input/wmt.c Sat Nov 10 21:02:32 2018 (r340337) +++ head/sys/dev/usb/input/wmt.c Sat Nov 10 22:14:09 2018 (r340338) @@ -856,6 +856,12 @@ wmt_cont_max_parse(struct wmt_softc *sc, const void *r } } +static const STRUCT_USB_HOST_ID wmt_devs[] = { + /* generic HID class w/o boot interface */ + {USB_IFACE_CLASS(UICLASS_HID), + USB_IFACE_SUBCLASS(0),}, +}; + static devclass_t wmt_devclass; static device_method_t wmt_methods[] = { @@ -876,3 +882,4 @@ DRIVER_MODULE(wmt, uhub, wmt_driver, wmt_devclass, NUL MODULE_DEPEND(wmt, usb, 1, 1, 1); MODULE_DEPEND(wmt, evdev, 1, 1, 1); MODULE_VERSION(wmt, 1); +USB_PNP_HOST_INFO(wmt_devs); From owner-svn-src-head@freebsd.org Sat Nov 10 22:44:04 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 E3304110D279; Sat, 10 Nov 2018 22:44:03 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from shxd.cx (mail.shxd.cx [64.201.244.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 6CFB27FC95; Sat, 10 Nov 2018 22:44:03 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [64.201.244.132] (port=54562 helo=[10.0.0.105]) by shxd.cx with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from <devin@shxd.cx>) id 1gLbyl-000CZw-MA; Sat, 10 Nov 2018 22:43:47 +0000 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r340321 - in head/libexec/rc: . rc.d From: Devin Teske <dteske@FreeBSD.org> In-Reply-To: <201811101411.wAAEBtlk047673@repo.freebsd.org> Date: Sat, 10 Nov 2018 14:44:00 -0800 Cc: Devin Teske <dteske@FreeBSD.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2DB908B9-5A1D-49CA-BD3C-6F5D356C6F3C@FreeBSD.org> References: <201811101411.wAAEBtlk047673@repo.freebsd.org> To: Eugene Grosbein <eugen@FreeBSD.org> X-Mailer: Apple Mail (2.3445.9.1) Sender: devin@shxd.cx X-Rspamd-Queue-Id: 6CFB27FC95 X-Spamd-Result: default: False [1.14 / 200.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.21)[0.211,0]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-0.71)[-0.707,0]; MX_GOOD(-0.01)[cached: mail.shxd.cx]; NEURAL_HAM_SHORT(-0.04)[-0.039,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[dteske@FreeBSD.org,devin@shxd.cx]; R_DKIM_NA(0.00)[]; IP_SCORE(-0.02)[country: US(-0.09)]; ASN(0.00)[asn:36734, ipnet:64.201.240.0/20, country:US]; FROM_NEQ_ENVFROM(0.00)[dteske@FreeBSD.org,devin@shxd.cx]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 22:44:04 -0000 This also allows "sysrc -d jail_conf" to print "Configuration file for = jail(8)" Thanks. --=20 Cheers, Devin > On Nov 10, 2018, at 6:11 AM, Eugene Grosbein <eugen@FreeBSD.org> = wrote: >=20 > Author: eugen > Date: Sat Nov 10 14:11:54 2018 > New Revision: 340321 > URL: https://svnweb.freebsd.org/changeset/base/340321 >=20 > Log: > Move definition of $jail_conf variable to /etc/defaults/rc.conf > from jail startup script so it can be successfully queried > with the command "sysrc jail_conf". >=20 > MFC after: 1 month >=20 > Modified: > head/libexec/rc/rc.conf > head/libexec/rc/rc.d/jail >=20 > Modified: head/libexec/rc/rc.conf > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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.conf Sat Nov 10 13:16:54 2018 = (r340320) > +++ head/libexec/rc/rc.conf Sat Nov 10 14:11:54 2018 = (r340321) > @@ -703,6 +703,7 @@ iovctl_files=3D"" # Config files for = iovctl(8) > ### Jail Configuration (see rc.conf(5) manual page) ########## > ############################################################## > jail_enable=3D"NO" # Set to NO to disable starting of any jails > +jail_conf=3D"/etc/jail.conf" # Configuration file for jail(8) > jail_confwarn=3D"YES" # Prevent warning about obsolete per-jail = configuration > jail_parallel_start=3D"NO" # Start jails in the background > jail_list=3D"" # Space separated list of names of jails >=20 > Modified: head/libexec/rc/rc.d/jail > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/jail Sat Nov 10 13:16:54 2018 = (r340320) > +++ head/libexec/rc/rc.d/jail Sat Nov 10 14:11:54 2018 = (r340321) > @@ -21,7 +21,6 @@ config_cmd=3D"jail_config" > console_cmd=3D"jail_console" > status_cmd=3D"jail_status" > extra_commands=3D"config console status" > -: ${jail_conf:=3D/etc/jail.conf} > : ${jail_program:=3D/usr/sbin/jail} > : ${jail_consolecmd:=3D/usr/bin/login -f root} > : ${jail_jexec:=3D/usr/sbin/jexec} >=20 From owner-svn-src-head@freebsd.org Sat Nov 10 23:07:48 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 D3E73110DEFE; Sat, 10 Nov 2018 23:07:47 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F25580924; Sat, 10 Nov 2018 23:07:47 +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 2415217F8; Sat, 10 Nov 2018 23:07:47 +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 wAAN7kip037506; Sat, 10 Nov 2018 23:07:46 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAN7kka037505; Sat, 10 Nov 2018 23:07:46 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201811102307.wAAN7kka037505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala <trasz@FreeBSD.org> Date: Sat, 10 Nov 2018 23:07:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340339 - in head: lib/libc/net share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head: lib/libc/net share/man/man5 X-SVN-Commit-Revision: 340339 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5F25580924 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 23:07:48 -0000 Author: trasz Date: Sat Nov 10 23:07:46 2018 New Revision: 340339 URL: https://svnweb.freebsd.org/changeset/base/340339 Log: Don't call stat(2) on nsswitch.conf(5) every time nsdispatch(3) and dependent functions (eg getpwname(3)) get called. This can improve performance of binaries that perform a lot of name lookups, such as gssd(8). It also matches documented behaviour of Linux and Solaris. The old code is left in place, should anyone need it, guarded by #ifdef NS_REREAD_CONF. Reviewed by: imp, bcr MFC after: 2 weeks Relnotes: yes Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D17934 Modified: head/lib/libc/net/nsdispatch.c head/share/man/man5/nsswitch.conf.5 Modified: head/lib/libc/net/nsdispatch.c ============================================================================== --- head/lib/libc/net/nsdispatch.c Sat Nov 10 22:14:09 2018 (r340338) +++ head/lib/libc/net/nsdispatch.c Sat Nov 10 23:07:46 2018 (r340339) @@ -335,6 +335,7 @@ static int nss_configure(void) { static time_t confmod; + static int already_initialized = 0; struct stat statbuf; int result, isthreaded; const char *path; @@ -352,6 +353,16 @@ nss_configure(void) if (path == NULL) #endif path = _PATH_NS_CONF; +#ifndef NS_REREAD_CONF + /* + * Define NS_REREAD_CONF to have nsswitch notice changes + * to nsswitch.conf(5) during runtime. This involves calling + * stat(2) every time, which can result in performance hit. + */ + if (already_initialized) + return (0); + already_initialized = 1; +#endif /* NS_REREAD_CONF */ if (stat(path, &statbuf) != 0) return (0); if (statbuf.st_mtime <= confmod) Modified: head/share/man/man5/nsswitch.conf.5 ============================================================================== --- head/share/man/man5/nsswitch.conf.5 Sat Nov 10 22:14:09 2018 (r340338) +++ head/share/man/man5/nsswitch.conf.5 Sat Nov 10 23:07:46 2018 (r340339) @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 6, 2016 +.Dd November 10, 2018 .Dt NSSWITCH.CONF 5 .Os .Sh NAME @@ -340,6 +340,12 @@ sets a policy of "if the user is notfound in nis, do n This treats nis as the authoritative source of information, except when the server is down. .Sh NOTES +The +.Nm +file is parsed by each program only once. +Subsequent changes will not be applied until the program +is restarted. +.Pp If system got compiled with .Va WITHOUT_NIS you have to remove From owner-svn-src-head@freebsd.org Sat Nov 10 23:17:39 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 A0725110E3C5; Sat, 10 Nov 2018 23:17:39 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: from mail-ua1-x930.google.com (mail-ua1-x930.google.com [IPv6:2607:f8b0:4864:20::930]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B80FB80F9E; Sat, 10 Nov 2018 23:17:38 +0000 (UTC) (envelope-from woodsb02@gmail.com) Received: by mail-ua1-x930.google.com with SMTP id z24so1882429ual.8; Sat, 10 Nov 2018 15:17:38 -0800 (PST) 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=pHwn6mzznwWvGz2bkmZSpDVdxq3HqFOKkbArIHfmx80=; b=fTkMUp6PU91cd++j8xiugXH6wHEK9RJfmKZZKRM4m6QgZxMuIIctcPGsWWY2ZaIWmP 8WNxX18pYEGoucud18aqPgSthyNICe7ECoL9U8Q3rX54ARwHsxYCt6JpzFmcRn3vU63H T6leirKGnod6nasHblmzWh4F60V7u1h6VXF1I+DfoFnSf+B2f9TFOrWal/o9laS/nYG8 QQYrF7sUCmXQNnUWyTCZkH+3q7/Jng0192JlY1DTFGidAQQ0YPEc8b5UX3FreSxbJFsl wJzuhCxjNN4WtfxeF3cttFM9RvCATU336BJ6iSEGJjRKXdOe518NGvxab+ajMpLx/sOX mYUg== 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=pHwn6mzznwWvGz2bkmZSpDVdxq3HqFOKkbArIHfmx80=; b=oYIpzhzIDsviwLmX6cKiwDR1zdhQPsGCBj1URMe8oP/+PGDpqbhj2FLknItXBdBx3N hJEBixV/Pt+niCa0EG+Eoz1tlF1PWZgAF8lWwyqY/mnxo/hfvIgawwSb+OKmImwrxAa8 es5jy7bT8FloGzV+TTw+ERZgFSwHAzSUmxnPYDZLNvhW/ZShsT/paIRWxA8wrVjM9Gks cbHjXxvqR6bwBTsFZGIV1AX69a6/Mg8dLfOA8xROGFXzwCFMAU+AfqmDPPLOt8l1M2UV UlYRZEEPiSCXK2jwCuYl43OV+5R7g1WyG2v1bdjVzg9yJT/YwrNJjWoVWCVWmzzc21N9 4Nlg== X-Gm-Message-State: AGRZ1gKL60IA7F8r5PsStIp5Bk5iNslZpX1TfOZDwIS6bZGadTk/q298 PKeWDqQjINp96SI0E4VuhbFNWAuIjjE3p5FYdYHvqw== X-Google-Smtp-Source: AJdET5d0nUEL8nAFNfUFJRhb8JvtOlJ9809kPVC2dE6heebur0CFuC9SynDm8D873YMtu1SH+TxTlNaRLEDdJafTHDo= X-Received: by 2002:a9f:386c:: with SMTP id q41mr6311304uad.27.1541891857902; Sat, 10 Nov 2018 15:17:37 -0800 (PST) MIME-Version: 1.0 References: <201811101658.wAAGw8Zd032024@repo.freebsd.org> <201811101843.wAAIhKrg016961@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201811101843.wAAIhKrg016961@pdx.rh.CN85.dnsmgr.net> From: Ben Woods <woodsb02@gmail.com> Date: Sun, 11 Nov 2018 07:17:27 +0800 Message-ID: <CAOc73CCSTx1RMm0B-kBQ7f3TQRe6v=5vr4EgQjAvRUM6KcKTnA@mail.gmail.com> Subject: Re: svn commit: r340326 - head To: rgrimes@freebsd.org Cc: Ben Woods <woodsb02@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: B80FB80F9E X-Spamd-Result: default: False [-4.86 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[gmail.com]; 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]; RCPT_COUNT_FIVE(0.00)[5]; IP_SCORE(-0.98)[ipnet: 2607:f8b0::/32(-2.89), asn: 15169(-1.93), country: US(-0.09)]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[0.3.9.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]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.86)[-0.863,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 23:17:39 -0000 On Sun, 11 Nov 2018 at 2:43 am, Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > If your going to bother with a differential, and invite people to > it you should give them at least 24 hours, and preferably 72 hours > to respond to the new review. Reviews that last < 4 hours are not > code reviews. > > -- > Rod Grimes > rgrimes@freebsd.org > Hi Rod, Sorry. The main reason I submitted the code review is because I do not have my src commit bit, so needed to seek approval to commit. I felt the need to commit the UPDATING entry was time sensitive, given the change it was notifying users of had already been committed. Regards, Ben -- -- From: Benjamin Woods woodsb02@gmail.com From owner-svn-src-head@freebsd.org Sat Nov 10 23:49:02 2018 Return-Path: <owner-svn-src-head@freebsd.org> 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 7C144110F127; Sat, 10 Nov 2018 23:49:02 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0DA1A82837; Sat, 10 Nov 2018 23:49:02 +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 DE5FF1E92; Sat, 10 Nov 2018 23:49:01 +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 wAANn1mE058066; Sat, 10 Nov 2018 23:49:01 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAANn1HR058065; Sat, 10 Nov 2018 23:49:01 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201811102349.wAANn1HR058065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala <trasz@FreeBSD.org> Date: Sat, 10 Nov 2018 23:49:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340342 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 340342 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0DA1A82837 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.999,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org 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 <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 10 Nov 2018 23:49:02 -0000 Author: trasz Date: Sat Nov 10 23:49:01 2018 New Revision: 340342 URL: https://svnweb.freebsd.org/changeset/base/340342 Log: Random tweaks to ddb(4) manual page. MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/share/man/man4/ddb.4 Modified: head/share/man/man4/ddb.4 ============================================================================== --- head/share/man/man4/ddb.4 Sat Nov 10 23:43:03 2018 (r340341) +++ head/share/man/man4/ddb.4 Sat Nov 10 23:49:01 2018 (r340342) @@ -60,7 +60,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 21, 2018 +.Dd November 10, 2018 .Dt DDB 4 .Os .Sh NAME @@ -108,7 +108,9 @@ If linked into the running kernel, it can be invoked locally with the .Ql debug .Xr keymap 5 -action. +action, or by setting setting the +.Dv debug.kdb.enter +sysctl to 1. The debugger is also invoked on kernel .Xr panic 9 if the @@ -261,9 +263,9 @@ Non-printing characters are displayed as octal escapes display in unsigned hex with character dump at the end of each line. The location is also displayed in hex at the beginning of each line. .It Cm i -display as an instruction +display as a disassembled instruction .It Cm I -display as an instruction with possible alternate formats depending on the +display as an disassembled instruction with possible alternate formats depending on the machine. On i386, this selects the alternate format for the instruction decoding (16 bits in a 32-bit code segment and vice versa).