From owner-svn-soc-all@FreeBSD.ORG Sun Jun 21 07:48:01 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9099F73 for ; Sun, 21 Jun 2015 07:48:01 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D55723BF for ; Sun, 21 Jun 2015 07:48:01 +0000 (UTC) (envelope-from pratiksinghal@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L7m1nv047285 for ; Sun, 21 Jun 2015 07:48:01 GMT (envelope-from pratiksinghal@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5L7m1VS047282 for svn-soc-all@FreeBSD.org; Sun, 21 Jun 2015 07:48:01 GMT (envelope-from pratiksinghal@FreeBSD.org) Date: Sun, 21 Jun 2015 07:48:01 GMT Message-Id: <201506210748.t5L7m1VS047282@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to pratiksinghal@FreeBSD.org using -f From: pratiksinghal@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287418 - soc2015/pratiksinghal/cubie-head/sys/arm/allwinner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 07:48:02 -0000 Author: pratiksinghal Date: Sun Jun 21 07:48:00 2015 New Revision: 287418 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287418 Log: Cleaned up code Replaced: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c (contents, props changed) - copied, changed from r287417, mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.c Copied and modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c (from r287417, mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.c) ============================================================================== --- mirror/FreeBSD/head/sys/arm/allwinner/a10_mmc.c Sun Jun 21 06:57:40 2015 (r287417, copy source) +++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c Sun Jun 21 07:48:00 2015 (r287418) @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -48,12 +49,21 @@ #include #include + #include #include #define A10_MMC_MEMRES 0 #define A10_MMC_IRQRES 1 #define A10_MMC_RESSZ 2 +#define A10_MMC_NDESC 16 +#define A10_DMA_NSEGS 16 +#define A10_DMA_BUFF_SIZE 0x2000 +#define A10_DMA_MAX_SIZE 0x20000 +#define A10_MMC_DMA_FTRGLEVEL_A20 0x20070008 +#define A10_MMC_DMA_FTRGLEVEL_A10 0x00070208 +#define A10_MMC_DMA_MAXLEN (A10_DMA_MAX_SIZE) +#define A10_MMC_DMA_MINLEN 512 struct a10_mmc_softc { bus_space_handle_t a10_bsh; @@ -69,8 +79,22 @@ struct mtx a10_mtx; struct resource * a10_res[A10_MMC_RESSZ]; uint32_t a10_intr; + uint32_t a10_idst ; uint32_t a10_intr_wait; void * a10_intrhand; + int a10_use_dma ; + + /* Fields required for DMA access */ + bus_addr_t a10_dma_cb_arg ; + bus_dmamap_t a10_dma_map ; + bus_dma_tag_t a10_dma_tag ; + void* a10_dma_desc ; + bus_dma_tag_t a10_dma_buff_tag ; + bus_dmamap_t a10_dma_buff_map ; + bus_addr_t a10_dma_buff_addrs[A10_DMA_NSEGS] ; + bus_size_t a10_dma_buff_sizes[A10_DMA_NSEGS] ; + uint32_t a10_dma_nsegs ; + }; static struct resource_spec a10_mmc_res_spec[] = { @@ -81,11 +105,16 @@ static int a10_mmc_probe(device_t); static int a10_mmc_attach(device_t); +static int a10_mmc_setup_dma(struct a10_mmc_softc*, device_t) ; +static int a10_mmc_prepare_dma(struct a10_mmc_softc*) ; +static int a10_mmc_can_do_dma(struct mmc_request*) ; +static void a10_dma_buff_cb(void*, bus_dma_segment_t*, int, int) ; static int a10_mmc_detach(device_t); static int a10_mmc_reset(struct a10_mmc_softc *); static void a10_mmc_intr(void *); static int a10_mmc_update_clock(struct a10_mmc_softc *); +static void a10_dma_cb(void*, bus_dma_segment_t*, int, int) ; static int a10_mmc_update_ios(device_t, device_t); static int a10_mmc_request(device_t, device_t, struct mmc_request *); static int a10_mmc_get_ro(device_t, device_t); @@ -98,6 +127,12 @@ bus_space_read_4((_sc)->a10_bst, (_sc)->a10_bsh, _reg) #define A10_MMC_WRITE_4(_sc, _reg, _value) \ bus_space_write_4((_sc)->a10_bst, (_sc)->a10_bsh, _reg, _value) +#define A10_MMC_READ_2(_sc, _reg) \ + bus_space_read_2((_sc)->a10_bst, (_sc)->a10_bsh, _reg) +#define A10_MMC_WRITE_2(_sc, _reg, _value) \ + bus_space_write_2((_sc)->a10_bst, (_sc)->a10_bsh, _reg, _value) + + static int a10_mmc_probe(device_t dev) @@ -121,6 +156,7 @@ struct sysctl_oid_list *tree; sc = device_get_softc(dev); + sc->a10_use_dma = 1 ; sc->a10_dev = dev; sc->a10_req = NULL; sc->a10_id = device_get_unit(dev); @@ -183,6 +219,17 @@ goto fail; } + if (sc->a10_use_dma == 1) { + if (a10_mmc_setup_dma(sc,dev) != 0) { + device_printf(sc->a10_dev, "Couldn't setup DMA!\n") ; + sc->a10_use_dma = 0 ; + } + } + //device_printf(sc->a10_dev, "The address of desc is %p\n",sc->a10_dma_desc) ; + sc->a10_dma_nsegs = 0 ; +#ifdef DEBUG + device_printf(sc->a10_dev, "DMA status %d\n", sc->a10_use_dma) ; +#endif return (0); fail: @@ -195,6 +242,154 @@ } static int +a10_mmc_setup_dma(struct a10_mmc_softc* sc, device_t dev) +{ + uint32_t a10_dma_size = sizeof(struct a10_mmc_dma_desc)*(A10_MMC_NDESC); + + uint32_t error ; + error = bus_dma_tag_create(bus_get_dma_tag(dev),1, + a10_dma_size,BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, + NULL,NULL,a10_dma_size, + 1,a10_dma_size,0, + NULL,NULL,&sc->a10_dma_tag) ; + if (error) + return (error) ; + error = bus_dmamem_alloc(sc->a10_dma_tag,&sc->a10_dma_desc,BUS_DMA_WAITOK|BUS_DMA_ZERO,&sc->a10_dma_map) ; + if (error) + return (error) ; + + error = bus_dmamap_load(sc->a10_dma_tag, sc->a10_dma_map,sc->a10_dma_desc,a10_dma_size,a10_dma_cb, &sc->a10_dma_cb_arg,0) ; + + if ((error != 0)&&(error != EINPROGRESS)) + return (error) ; + error = bus_dma_tag_create(bus_get_dma_tag(dev),1, + 0,BUS_SPACE_MAXADDR_32BIT,BUS_SPACE_MAXADDR, + NULL,NULL,A10_DMA_MAX_SIZE, + A10_DMA_NSEGS,A10_DMA_BUFF_SIZE,0, + NULL,NULL,&sc->a10_dma_buff_tag) ; + if (error) + return (error) ; + + error = bus_dmamap_create(sc->a10_dma_buff_tag,0,&sc->a10_dma_buff_map) ; + if (error) + return (error) ; + + return(0) ; + +} + +static int +a10_mmc_prepare_dma(struct a10_mmc_softc* sc) +{ + + struct a10_mmc_dma_desc* dma = sc->a10_dma_desc ; + struct mmc_command* cmd = sc->a10_req->cmd ; + bus_addr_t desc_paddr = sc->a10_dma_cb_arg ; + int desc, rem ; + uint32_t val; + desc = 0 ; + rem = min(A10_MMC_DMA_MAXLEN,cmd->data->len) ; + uint32_t error = bus_dmamap_load(sc->a10_dma_buff_tag, sc->a10_dma_buff_map, + cmd->data->data,rem,a10_dma_buff_cb, + sc,0) ; + if (error == EINPROGRESS) { + for( ; sc->a10_dma_nsegs == 0 ; ) { } + } + else if (error != 0) { + device_printf(sc->a10_dev, "DMA transaction failed due to insufficient resources! error = %u\n",error) ; + return EIO ; + } + + dma[0].config |= htole32(A10_MMC_DMA_CONFIG_FD) ; + while (desc < A10_MMC_NDESC) { + dma[desc].buff_size = htole32(sc->a10_dma_buff_sizes[desc]) ; + dma[desc].buff_addr = htole32(sc->a10_dma_buff_addrs[desc]) ; + dma[desc].config = htole32(A10_MMC_DMA_CONFIG_CH|A10_MMC_DMA_CONFIG_OWN) ; + rem -= sc->a10_dma_buff_sizes[desc] ; + cmd->data->len -= sc->a10_dma_buff_sizes[desc] ; + if (rem > 0) { + dma[desc].config |= htole32(A10_MMC_DMA_CONFIG_DIC) ; + dma[desc].next = htole32(desc_paddr + ((desc+1)*sizeof(struct a10_mmc_dma_desc))) ; + } + else { + dma[desc].config |= htole32(A10_MMC_DMA_CONFIG_LD | A10_MMC_DMA_CONFIG_ER) ; + dma[desc].next = 0 ; + break ; + } + desc++ ; + } + if (rem > 0) { + device_printf(sc->a10_dev, "Couldn't find enough descriptors for DMA transfer!, rem = %d\n", rem); + return EIO ; + } + + if (sc->a10_req->cmd->data->flags & MMC_DATA_WRITE) + bus_dmamap_sync(sc->a10_dma_buff_tag, sc->a10_dma_buff_map, BUS_DMASYNC_PREWRITE) ; + else + bus_dmamap_sync(sc->a10_dma_buff_tag, sc->a10_dma_buff_map, BUS_DMASYNC_PREREAD) ; + + bus_dmamap_sync(sc->a10_dma_tag, sc->a10_dma_map, BUS_DMASYNC_PREWRITE) ; + + val = A10_MMC_READ_4(sc, A10_MMC_GCTRL) ; + val |= A10_MMC_DMA_ENABLE ; + val |= A10_MMC_INT_ENABLE ; + A10_MMC_WRITE_4(sc, A10_MMC_GCTRL,val) ; + val |= A10_MMC_DMA_RESET ; + A10_MMC_WRITE_4(sc, A10_MMC_GCTRL,val) ; + A10_MMC_WRITE_4(sc, A10_MMC_DMAC,A10_MMC_IDMAC_SOFT_RST) ; + A10_MMC_WRITE_4(sc, A10_MMC_DMAC,A10_MMC_IDMAC_IDMA_ON | A10_MMC_IDMAC_FIX_BURST) ; + val = A10_MMC_READ_4(sc,A10_MMC_IDIE) ; + val &= ~(A10_MMC_IDMAC_RECEIVE_INT | A10_MMC_IDMAC_TRANSMIT_INT) ; + A10_MMC_WRITE_4(sc,A10_MMC_IDIE, val) ; + if (sc->a10_req->cmd->data->flags & MMC_DATA_WRITE) + val |= A10_MMC_IDMAC_TRANSMIT_INT ; + else + val |= A10_MMC_IDMAC_RECEIVE_INT ; + A10_MMC_WRITE_4(sc, A10_MMC_IDIE,val) ; + A10_MMC_WRITE_4(sc, A10_MMC_DLBA,desc_paddr) ; + A10_MMC_WRITE_4(sc, A10_MMC_FTRGL,A10_MMC_DMA_FTRGLEVEL_A10) ; + + return (0) ; +} + + +static int +a10_mmc_can_do_dma(struct mmc_request* req) +{ + if (req->cmd->data->len >= A10_MMC_DMA_MAXLEN) + //if ((req->cmd->data->len > A10_MMC_DMA_MAXLEN) || (req->cmd->data->len <= A10_MMC_DMA_MINLEN)) + return (0) ; + else + return (1) ; +} +static void +a10_dma_cb(void* arg, bus_dma_segment_t* segs, int nsegs, int error) +{ + if (error) { + printf("a10_mmc: Error in a10_dma_callback function, code = %d\n",error) ; + return ; + } + + *(bus_addr_t*)arg = segs[0].ds_addr ; +} + +static void +a10_dma_buff_cb(void* arg, bus_dma_segment_t* segs, int nsegs, int error) +{ + if (error) { + printf("a10_mmc: Error in a10_dma_buff_callback function, code = %d\n", error) ; + return ; + } + int i ; + struct a10_mmc_softc* sc = (struct a10_mmc_softc*) arg ; + sc->a10_dma_nsegs = nsegs ; + for(i=0; ia10_dma_buff_addrs[i] = segs[i].ds_addr ; + sc->a10_dma_buff_sizes[i] = segs[i].ds_len ; + } +} + +static int a10_mmc_detach(device_t dev) { @@ -217,21 +412,18 @@ if (timeout == 0) return (ETIMEDOUT); - /* Set the timeout. */ A10_MMC_WRITE_4(sc, A10_MMC_TIMEOUT, 0xffffffff); - - /* Clear pending interrupts. */ A10_MMC_WRITE_4(sc, A10_MMC_RINTR, 0xffffffff); + A10_MMC_WRITE_4(sc, A10_MMC_IDST, 0xffffffff) ; /* Unmask interrupts. */ A10_MMC_WRITE_4(sc, A10_MMC_IMASK, A10_MMC_CMD_DONE | A10_MMC_INT_ERR_BIT | A10_MMC_DATA_OVER | A10_MMC_AUTOCMD_DONE | A10_MMC_RX_DATA_REQ | A10_MMC_TX_DATA_REQ); + uint32_t temp_val = A10_MMC_READ_4(sc, A10_MMC_GCTRL) | A10_MMC_INT_ENABLE | A10_MMC_ACCESS_BY_AHB ; + temp_val = temp_val & (~A10_MMC_DMA_ENABLE) ; /* Enable interrupts and AHB access. */ - A10_MMC_WRITE_4(sc, A10_MMC_GCTRL, - A10_MMC_READ_4(sc, A10_MMC_GCTRL) | - A10_MMC_INT_ENABLE | A10_MMC_ACCESS_BY_AHB); - + A10_MMC_WRITE_4(sc, A10_MMC_GCTRL,temp_val) ; return (0); } @@ -256,7 +448,9 @@ sc->a10_req = NULL; sc->a10_intr = 0; sc->a10_resid = 0; + sc->a10_idst = 0 ; sc->a10_intr_wait = 0; + sc->a10_dma_nsegs = 0 ; req->done(req); } @@ -295,7 +489,7 @@ a10_mmc_req_done(sc); } -static void +static void a10_mmc_timeout(void *arg) { struct a10_mmc_softc *sc; @@ -337,48 +531,80 @@ { struct a10_mmc_softc *sc; struct mmc_data *data; - uint32_t imask, rint; + uint32_t imask, rint,idst; sc = (struct a10_mmc_softc *)arg; A10_MMC_LOCK(sc); rint = A10_MMC_READ_4(sc, A10_MMC_RINTR); imask = A10_MMC_READ_4(sc, A10_MMC_IMASK); - if (imask == 0 && rint == 0) { + idst = A10_MMC_READ_4(sc, A10_MMC_IDST) ; + + if (imask == 0 && rint == 0 && idst == 0 ) { A10_MMC_UNLOCK(sc); return; } -#ifdef DEBUG - device_printf(sc->a10_dev, "imask: %#x, rint: %#x\n", imask, rint); -#endif + + A10_MMC_WRITE_4(sc, A10_MMC_RINTR, rint) ; + A10_MMC_WRITE_4(sc, A10_MMC_IDST, idst) ; + A10_MMC_WRITE_4(sc, A10_MMC_IMASK, imask) ; + //device_printf(sc->a10_dev, "imask: %#x, rint: %#x, idst: %#x, gctrl: %#x\n", imask, rint,idst, A10_MMC_READ_4(sc, A10_MMC_GCTRL)); if (sc->a10_req == NULL) { device_printf(sc->a10_dev, "Spurious interrupt - no active request, rint: 0x%08X\n", rint); - A10_MMC_WRITE_4(sc, A10_MMC_RINTR, rint); A10_MMC_UNLOCK(sc); return; } + + sc->a10_intr |= rint; if (rint & A10_MMC_INT_ERR_BIT) { device_printf(sc->a10_dev, "error rint: 0x%08X\n", rint); - if (rint & A10_MMC_RESP_TIMEOUT) + if (rint & A10_MMC_RESP_TIMEOUT) { sc->a10_req->cmd->error = MMC_ERR_TIMEOUT; + } else sc->a10_req->cmd->error = MMC_ERR_FAILED; - A10_MMC_WRITE_4(sc, A10_MMC_RINTR, rint); a10_mmc_req_done(sc); A10_MMC_UNLOCK(sc); return; } - sc->a10_intr |= rint; + if (idst & A10_MMC_IDMAC_ERROR) { + device_printf(sc->a10_dev, "error idst: 0x%08x\n", idst) ; + sc->a10_req->cmd->error = MMC_ERR_FAILED ; + a10_mmc_req_done(sc) ; + A10_MMC_UNLOCK(sc) ; + return ; + } + + if ((idst & A10_MMC_IDMAC_COMPLETE) && ((sc->a10_intr & sc->a10_intr_wait) == sc->a10_intr_wait)) { + if (sc->a10_req->cmd->data->flags & MMC_DATA_WRITE) + bus_dmamap_sync(sc->a10_dma_buff_tag, sc->a10_dma_buff_map, BUS_DMASYNC_POSTWRITE) ; + else + bus_dmamap_sync(sc->a10_dma_buff_tag, sc->a10_dma_buff_map, BUS_DMASYNC_POSTREAD) ; + bus_dmamap_sync(sc->a10_dma_tag, sc->a10_dma_map, BUS_DMASYNC_POSTWRITE) ; + bus_dmamap_unload(sc->a10_dma_buff_tag, sc->a10_dma_buff_map) ; + a10_mmc_req_ok(sc) ; + A10_MMC_UNLOCK(sc) ; + return ; + } + + if ((idst)&&(!(idst & A10_MMC_IDMAC_COMPLETE))) { + device_printf(sc->a10_dev, "DMA timeout error!\n") ; + sc->a10_req->cmd->error = MMC_ERR_TIMEOUT ; + a10_mmc_req_done(sc) ; + A10_MMC_UNLOCK(sc) ; + return ; + } + data = sc->a10_req->cmd->data; + if (data != NULL && (rint & (A10_MMC_DATA_OVER | A10_MMC_RX_DATA_REQ | A10_MMC_TX_DATA_REQ)) != 0) - a10_mmc_pio_transfer(sc, data); + a10_mmc_pio_transfer(sc, data); if ((sc->a10_intr & sc->a10_intr_wait) == sc->a10_intr_wait) a10_mmc_req_ok(sc); - A10_MMC_WRITE_4(sc, A10_MMC_RINTR, rint); A10_MMC_UNLOCK(sc); } @@ -388,7 +614,7 @@ int blksz; struct a10_mmc_softc *sc; struct mmc_command *cmd; - uint32_t cmdreg; + uint32_t cmdreg ; sc = device_get_softc(bus); A10_MMC_LOCK(sc); @@ -396,6 +622,7 @@ A10_MMC_UNLOCK(sc); return (EBUSY); } + sc->a10_req = req; cmd = req->cmd; cmdreg = A10_MMC_START; @@ -410,8 +637,10 @@ sc->a10_intr = 0; sc->a10_resid = 0; + sc->a10_idst = 0 ; sc->a10_intr_wait = A10_MMC_CMD_DONE; cmd->error = MMC_ERR_NONE; + if (cmd->data != NULL) { sc->a10_intr_wait |= A10_MMC_DATA_OVER; cmdreg |= A10_MMC_DATA_EXP | A10_MMC_WAIT_PREOVER; @@ -419,11 +648,38 @@ cmdreg |= A10_MMC_SEND_AUTOSTOP; sc->a10_intr_wait |= A10_MMC_AUTOCMD_DONE; } - if (cmd->data->flags & MMC_DATA_WRITE) + if (cmd->data->flags & MMC_DATA_WRITE) { cmdreg |= A10_MMC_WRITE; + } + blksz = min(cmd->data->len, MMC_SECTOR_SIZE); A10_MMC_WRITE_4(sc, A10_MMC_BLKSZ, blksz); A10_MMC_WRITE_4(sc, A10_MMC_BCNTR, cmd->data->len); + + if ((sc->a10_use_dma == 1)&&(a10_mmc_can_do_dma(req))) { + uint32_t error = a10_mmc_prepare_dma(sc) ; + if (error == 0) { + A10_MMC_WRITE_4(sc, A10_MMC_IMASK, A10_MMC_READ_4(sc, A10_MMC_IMASK) | (A10_MMC_TX_DATA_REQ | A10_MMC_RX_DATA_REQ)) ; + } + else { + uint32_t temp_val = A10_MMC_READ_4(sc, A10_MMC_GCTRL) | A10_MMC_INT_ENABLE | A10_MMC_ACCESS_BY_AHB ; + temp_val = temp_val & (~A10_MMC_DMA_ENABLE) ; + A10_MMC_WRITE_4(sc, A10_MMC_GCTRL, temp_val) ; + } + } + else + { + uint32_t temp_val = A10_MMC_READ_4(sc, A10_MMC_GCTRL) | A10_MMC_INT_ENABLE | A10_MMC_ACCESS_BY_AHB ; + temp_val = temp_val & (~A10_MMC_DMA_ENABLE) ; + A10_MMC_WRITE_4(sc, A10_MMC_GCTRL, temp_val) ; + } + + } + else + { + uint32_t temp_val = A10_MMC_READ_4(sc, A10_MMC_GCTRL) | A10_MMC_INT_ENABLE | A10_MMC_ACCESS_BY_AHB ; + temp_val = temp_val & (~A10_MMC_DMA_ENABLE) ; + A10_MMC_WRITE_4(sc, A10_MMC_GCTRL, temp_val) ; } A10_MMC_WRITE_4(sc, A10_MMC_CARG, cmd->arg); @@ -436,7 +692,7 @@ } static int -a10_mmc_read_ivar(device_t bus, device_t child, int which, +a10_mmc_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) { struct a10_mmc_softc *sc; From owner-svn-soc-all@FreeBSD.ORG Sun Jun 21 08:49:40 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16FEB82F for ; Sun, 21 Jun 2015 08:49:40 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03554354 for ; Sun, 21 Jun 2015 08:49:40 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5L8ndLE039959 for ; Sun, 21 Jun 2015 08:49:39 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5L8ncZA039941 for svn-soc-all@FreeBSD.org; Sun, 21 Jun 2015 08:49:38 GMT (envelope-from mihai@FreeBSD.org) Date: Sun, 21 Jun 2015 08:49:38 GMT Message-Id: <201506210849.t5L8ncZA039941@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287420 - in soc2015/mihai/bhyve-on-arm-head/sys: arm/include arm/vmm modules modules/vmm-arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 08:49:40 -0000 Author: mihai Date: Sun Jun 21 08:49:37 2015 New Revision: 287420 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287420 Log: soc2015: mihai: bhyve-on-arm-head: sys: arm: vmm: add stub VMM framework from amd64 Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/include/vmm.h soc2015/mihai/bhyve-on-arm-head/sys/arm/include/vmm_dev.h soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_dev.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_stat.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm_stat.h soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/ soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Modified: soc2015/mihai/bhyve-on-arm-head/sys/modules/Makefile Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/include/vmm.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/include/vmm.h Sun Jun 21 08:49:37 2015 (r287420) @@ -0,0 +1,616 @@ +/*- + * Copyright (c) 2011 NetApp, 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 NETAPP, INC ``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 NETAPP, INC 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: soc2015/mihai/bhyve-on-arm-head/sys/amd64/include/vmm.h 285151 2015-05-06 23:40:24Z neel $ + */ + +#ifndef _VMM_H_ +#define _VMM_H_ + + +enum vm_suspend_how { + VM_SUSPEND_NONE, + VM_SUSPEND_RESET, + VM_SUSPEND_POWEROFF, + VM_SUSPEND_HALT, + VM_SUSPEND_TRIPLEFAULT, + VM_SUSPEND_LAST +}; + +/* + * Identifiers for architecturally defined registers. + */ +enum vm_reg_name { + VM_REG_GUEST_RAX, + VM_REG_GUEST_RBX, + VM_REG_GUEST_RCX, + VM_REG_GUEST_RDX, + VM_REG_GUEST_RSI, + VM_REG_GUEST_RDI, + VM_REG_GUEST_RBP, + VM_REG_GUEST_R8, + VM_REG_GUEST_R9, + VM_REG_GUEST_R10, + VM_REG_GUEST_R11, + VM_REG_GUEST_R12, + VM_REG_GUEST_R13, + VM_REG_GUEST_R14, + VM_REG_GUEST_R15, + VM_REG_GUEST_CR0, + VM_REG_GUEST_CR3, + VM_REG_GUEST_CR4, + VM_REG_GUEST_DR7, + VM_REG_GUEST_RSP, + VM_REG_GUEST_RIP, + VM_REG_GUEST_RFLAGS, + VM_REG_GUEST_ES, + VM_REG_GUEST_CS, + VM_REG_GUEST_SS, + VM_REG_GUEST_DS, + VM_REG_GUEST_FS, + VM_REG_GUEST_GS, + VM_REG_GUEST_LDTR, + VM_REG_GUEST_TR, + VM_REG_GUEST_IDTR, + VM_REG_GUEST_GDTR, + VM_REG_GUEST_EFER, + VM_REG_GUEST_CR2, + VM_REG_GUEST_PDPTE0, + VM_REG_GUEST_PDPTE1, + VM_REG_GUEST_PDPTE2, + VM_REG_GUEST_PDPTE3, + VM_REG_GUEST_INTR_SHADOW, + VM_REG_LAST +}; + +enum x2apic_state { + X2APIC_DISABLED, + X2APIC_ENABLED, + X2APIC_STATE_LAST +}; + +#define VM_INTINFO_VECTOR(info) ((info) & 0xff) +#define VM_INTINFO_DEL_ERRCODE 0x800 +#define VM_INTINFO_RSVD 0x7ffff000 +#define VM_INTINFO_VALID 0x80000000 +#define VM_INTINFO_TYPE 0x700 +#define VM_INTINFO_HWINTR (0 << 8) +#define VM_INTINFO_NMI (2 << 8) +#define VM_INTINFO_HWEXCEPTION (3 << 8) +#define VM_INTINFO_SWINTR (4 << 8) + +#ifdef _KERNEL + +#define VM_MAX_NAMELEN 32 + +struct vm; +struct vm_exception; +struct vm_memory_segment; +struct seg_desc; +struct vm_exit; +struct vm_run; +struct vhpet; +struct vioapic; +struct vlapic; +struct vmspace; +struct vm_object; +struct vm_guest_paging; +struct pmap; + +typedef int (*vmm_init_func_t)(int ipinum); +typedef int (*vmm_cleanup_func_t)(void); +typedef void (*vmm_resume_func_t)(void); +typedef void * (*vmi_init_func_t)(struct vm *vm, struct pmap *pmap); +typedef int (*vmi_run_func_t)(void *vmi, int vcpu, register_t rip, + struct pmap *pmap, void *rendezvous_cookie, + void *suspend_cookie); +typedef void (*vmi_cleanup_func_t)(void *vmi); +typedef int (*vmi_get_register_t)(void *vmi, int vcpu, int num, + uint64_t *retval); +typedef int (*vmi_set_register_t)(void *vmi, int vcpu, int num, + uint64_t val); +typedef int (*vmi_get_desc_t)(void *vmi, int vcpu, int num, + struct seg_desc *desc); +typedef int (*vmi_set_desc_t)(void *vmi, int vcpu, int num, + struct seg_desc *desc); +typedef int (*vmi_get_cap_t)(void *vmi, int vcpu, int num, int *retval); +typedef int (*vmi_set_cap_t)(void *vmi, int vcpu, int num, int val); +typedef struct vmspace * (*vmi_vmspace_alloc)(vm_offset_t min, vm_offset_t max); +typedef void (*vmi_vmspace_free)(struct vmspace *vmspace); +typedef struct vlapic * (*vmi_vlapic_init)(void *vmi, int vcpu); +typedef void (*vmi_vlapic_cleanup)(void *vmi, struct vlapic *vlapic); + +struct vmm_ops { + vmm_init_func_t init; /* module wide initialization */ + vmm_cleanup_func_t cleanup; + vmm_resume_func_t resume; + + vmi_init_func_t vminit; /* vm-specific initialization */ + vmi_run_func_t vmrun; + vmi_cleanup_func_t vmcleanup; + vmi_get_register_t vmgetreg; + vmi_set_register_t vmsetreg; + vmi_get_desc_t vmgetdesc; + vmi_set_desc_t vmsetdesc; + vmi_get_cap_t vmgetcap; + vmi_set_cap_t vmsetcap; + vmi_vmspace_alloc vmspace_alloc; + vmi_vmspace_free vmspace_free; + vmi_vlapic_init vlapic_init; + vmi_vlapic_cleanup vlapic_cleanup; +}; + +extern struct vmm_ops vmm_ops_intel; +extern struct vmm_ops vmm_ops_amd; +extern struct vmm_ops vmm_ops_arm; + +int vm_create(const char *name, struct vm **retvm); +void vm_destroy(struct vm *vm); +int vm_reinit(struct vm *vm); +const char *vm_name(struct vm *vm); +int vm_malloc(struct vm *vm, vm_paddr_t gpa, size_t len); +int vm_map_mmio(struct vm *vm, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); +int vm_unmap_mmio(struct vm *vm, vm_paddr_t gpa, size_t len); +void *vm_gpa_hold(struct vm *, vm_paddr_t gpa, size_t len, int prot, + void **cookie); +void vm_gpa_release(void *cookie); +int vm_gpabase2memseg(struct vm *vm, vm_paddr_t gpabase, + struct vm_memory_segment *seg); +int vm_get_memobj(struct vm *vm, vm_paddr_t gpa, size_t len, + vm_offset_t *offset, struct vm_object **object); +boolean_t vm_mem_allocated(struct vm *vm, vm_paddr_t gpa); +int vm_get_register(struct vm *vm, int vcpu, int reg, uint64_t *retval); +int vm_set_register(struct vm *vm, int vcpu, int reg, uint64_t val); +int vm_get_seg_desc(struct vm *vm, int vcpu, int reg, + struct seg_desc *ret_desc); +int vm_set_seg_desc(struct vm *vm, int vcpu, int reg, + struct seg_desc *desc); +int vm_run(struct vm *vm, struct vm_run *vmrun); +int vm_suspend(struct vm *vm, enum vm_suspend_how how); +int vm_inject_nmi(struct vm *vm, int vcpu); +int vm_nmi_pending(struct vm *vm, int vcpuid); +void vm_nmi_clear(struct vm *vm, int vcpuid); +int vm_inject_extint(struct vm *vm, int vcpu); +int vm_extint_pending(struct vm *vm, int vcpuid); +void vm_extint_clear(struct vm *vm, int vcpuid); +struct vlapic *vm_lapic(struct vm *vm, int cpu); +struct vioapic *vm_ioapic(struct vm *vm); +struct vhpet *vm_hpet(struct vm *vm); +int vm_get_capability(struct vm *vm, int vcpu, int type, int *val); +int vm_set_capability(struct vm *vm, int vcpu, int type, int val); +int vm_get_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state *state); +int vm_set_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state state); +int vm_apicid2vcpuid(struct vm *vm, int apicid); +int vm_activate_cpu(struct vm *vm, int vcpu); +struct vm_exit *vm_exitinfo(struct vm *vm, int vcpuid); +void vm_exit_suspended(struct vm *vm, int vcpuid, uint64_t rip); +void vm_exit_rendezvous(struct vm *vm, int vcpuid, uint64_t rip); +void vm_exit_astpending(struct vm *vm, int vcpuid, uint64_t rip); + +#ifdef _SYS__CPUSET_H_ +/* + * Rendezvous all vcpus specified in 'dest' and execute 'func(arg)'. + * The rendezvous 'func(arg)' is not allowed to do anything that will + * cause the thread to be put to sleep. + * + * If the rendezvous is being initiated from a vcpu context then the + * 'vcpuid' must refer to that vcpu, otherwise it should be set to -1. + * + * The caller cannot hold any locks when initiating the rendezvous. + * + * The implementation of this API may cause vcpus other than those specified + * by 'dest' to be stalled. The caller should not rely on any vcpus making + * forward progress when the rendezvous is in progress. + */ +typedef void (*vm_rendezvous_func_t)(struct vm *vm, int vcpuid, void *arg); +void vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest, + vm_rendezvous_func_t func, void *arg); +cpuset_t vm_active_cpus(struct vm *vm); +cpuset_t vm_suspended_cpus(struct vm *vm); +#endif /* _SYS__CPUSET_H_ */ + +static __inline int +vcpu_rendezvous_pending(void *rendezvous_cookie) +{ + + return (*(uintptr_t *)rendezvous_cookie != 0); +} + +static __inline int +vcpu_suspended(void *suspend_cookie) +{ + + return (*(int *)suspend_cookie); +} + +/* + * Return 1 if device indicated by bus/slot/func is supposed to be a + * pci passthrough device. + * + * Return 0 otherwise. + */ +int vmm_is_pptdev(int bus, int slot, int func); + +void *vm_iommu_domain(struct vm *vm); + +enum vcpu_state { + VCPU_IDLE, + VCPU_FROZEN, + VCPU_RUNNING, + VCPU_SLEEPING, +}; + +int vcpu_set_state(struct vm *vm, int vcpu, enum vcpu_state state, + bool from_idle); +enum vcpu_state vcpu_get_state(struct vm *vm, int vcpu, int *hostcpu); + +static int __inline +vcpu_is_running(struct vm *vm, int vcpu, int *hostcpu) +{ + return (vcpu_get_state(vm, vcpu, hostcpu) == VCPU_RUNNING); +} + +#ifdef _SYS_PROC_H_ +static int __inline +vcpu_should_yield(struct vm *vm, int vcpu) +{ + + if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) + return (1); + else if (curthread->td_owepreempt) + return (1); + else + return (0); +} +#endif + +void *vcpu_stats(struct vm *vm, int vcpu); +void vcpu_notify_event(struct vm *vm, int vcpuid, bool lapic_intr); +struct vmspace *vm_get_vmspace(struct vm *vm); +int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func); +int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func); +struct vatpic *vm_atpic(struct vm *vm); +struct vatpit *vm_atpit(struct vm *vm); +struct vpmtmr *vm_pmtmr(struct vm *vm); +struct vrtc *vm_rtc(struct vm *vm); + +/* + * Inject exception 'vector' into the guest vcpu. This function returns 0 on + * success and non-zero on failure. + * + * Wrapper functions like 'vm_inject_gp()' should be preferred to calling + * this function directly because they enforce the trap-like or fault-like + * behavior of an exception. + * + * This function should only be called in the context of the thread that is + * executing this vcpu. + */ +int vm_inject_exception(struct vm *vm, int vcpuid, int vector, int err_valid, + uint32_t errcode, int restart_instruction); + +/* + * This function is called after a VM-exit that occurred during exception or + * interrupt delivery through the IDT. The format of 'intinfo' is described + * in Figure 15-1, "EXITINTINFO for All Intercepts", APM, Vol 2. + * + * If a VM-exit handler completes the event delivery successfully then it + * should call vm_exit_intinfo() to extinguish the pending event. For e.g., + * if the task switch emulation is triggered via a task gate then it should + * call this function with 'intinfo=0' to indicate that the external event + * is not pending anymore. + * + * Return value is 0 on success and non-zero on failure. + */ +int vm_exit_intinfo(struct vm *vm, int vcpuid, uint64_t intinfo); + +/* + * This function is called before every VM-entry to retrieve a pending + * event that should be injected into the guest. This function combines + * nested events into a double or triple fault. + * + * Returns 0 if there are no events that need to be injected into the guest + * and non-zero otherwise. + */ +int vm_entry_intinfo(struct vm *vm, int vcpuid, uint64_t *info); + +int vm_get_intinfo(struct vm *vm, int vcpuid, uint64_t *info1, uint64_t *info2); + +enum vm_reg_name vm_segment_name(int seg_encoding); + +struct vm_copyinfo { + uint64_t gpa; + size_t len; + void *hva; + void *cookie; +}; + +/* + * Set up 'copyinfo[]' to copy to/from guest linear address space starting + * at 'gla' and 'len' bytes long. The 'prot' should be set to PROT_READ for + * a copyin or PROT_WRITE for a copyout. + * + * retval is_fault Intepretation + * 0 0 Success + * 0 1 An exception was injected into the guest + * EFAULT N/A Unrecoverable error + * + * The 'copyinfo[]' can be passed to 'vm_copyin()' or 'vm_copyout()' only if + * the return value is 0. The 'copyinfo[]' resources should be freed by calling + * 'vm_copy_teardown()' after the copy is done. + */ +int vm_copy_setup(struct vm *vm, int vcpuid, struct vm_guest_paging *paging, + uint64_t gla, size_t len, int prot, struct vm_copyinfo *copyinfo, + int num_copyinfo, int *is_fault); +void vm_copy_teardown(struct vm *vm, int vcpuid, struct vm_copyinfo *copyinfo, + int num_copyinfo); +void vm_copyin(struct vm *vm, int vcpuid, struct vm_copyinfo *copyinfo, + void *kaddr, size_t len); +void vm_copyout(struct vm *vm, int vcpuid, const void *kaddr, + struct vm_copyinfo *copyinfo, size_t len); + +int vcpu_trace_exceptions(struct vm *vm, int vcpuid); +#endif /* KERNEL */ + +#define VM_MAXCPU 16 /* maximum virtual cpus */ + +/* + * Identifiers for optional vmm capabilities + */ +enum vm_cap_type { + VM_CAP_HALT_EXIT, + VM_CAP_MTRAP_EXIT, + VM_CAP_PAUSE_EXIT, + VM_CAP_UNRESTRICTED_GUEST, + VM_CAP_ENABLE_INVPCID, + VM_CAP_MAX +}; + +enum vm_intr_trigger { + EDGE_TRIGGER, + LEVEL_TRIGGER +}; + +/* + * The 'access' field has the format specified in Table 21-2 of the Intel + * Architecture Manual vol 3b. + * + * XXX The contents of the 'access' field are architecturally defined except + * bit 16 - Segment Unusable. + */ +struct seg_desc { + uint64_t base; + uint32_t limit; + uint32_t access; +}; +#define SEG_DESC_TYPE(access) ((access) & 0x001f) +#define SEG_DESC_DPL(access) (((access) >> 5) & 0x3) +#define SEG_DESC_PRESENT(access) (((access) & 0x0080) ? 1 : 0) +#define SEG_DESC_DEF32(access) (((access) & 0x4000) ? 1 : 0) +#define SEG_DESC_GRANULARITY(access) (((access) & 0x8000) ? 1 : 0) +#define SEG_DESC_UNUSABLE(access) (((access) & 0x10000) ? 1 : 0) + +enum vm_cpu_mode { + CPU_MODE_REAL, + CPU_MODE_PROTECTED, + CPU_MODE_COMPATIBILITY, /* IA-32E mode (CS.L = 0) */ + CPU_MODE_64BIT, /* IA-32E mode (CS.L = 1) */ +}; + +enum vm_paging_mode { + PAGING_MODE_FLAT, + PAGING_MODE_32, + PAGING_MODE_PAE, + PAGING_MODE_64, +}; + +struct vm_guest_paging { + uint64_t cr3; + int cpl; + enum vm_cpu_mode cpu_mode; + enum vm_paging_mode paging_mode; +}; + +/* + * The data structures 'vie' and 'vie_op' are meant to be opaque to the + * consumers of instruction decoding. The only reason why their contents + * need to be exposed is because they are part of the 'vm_exit' structure. + */ +struct vie_op { + uint8_t op_byte; /* actual opcode byte */ + uint8_t op_type; /* type of operation (e.g. MOV) */ + uint16_t op_flags; +}; + +#define VIE_INST_SIZE 15 +struct vie { + uint8_t inst[VIE_INST_SIZE]; /* instruction bytes */ + uint8_t num_valid; /* size of the instruction */ + uint8_t num_processed; + + uint8_t addrsize:4, opsize:4; /* address and operand sizes */ + uint8_t rex_w:1, /* REX prefix */ + rex_r:1, + rex_x:1, + rex_b:1, + rex_present:1, + repz_present:1, /* REP/REPE/REPZ prefix */ + repnz_present:1, /* REPNE/REPNZ prefix */ + opsize_override:1, /* Operand size override */ + addrsize_override:1, /* Address size override */ + segment_override:1; /* Segment override */ + + uint8_t mod:2, /* ModRM byte */ + reg:4, + rm:4; + + uint8_t ss:2, /* SIB byte */ + index:4, + base:4; + + uint8_t disp_bytes; + uint8_t imm_bytes; + + uint8_t scale; + int base_register; /* VM_REG_GUEST_xyz */ + int index_register; /* VM_REG_GUEST_xyz */ + int segment_register; /* VM_REG_GUEST_xyz */ + + int64_t displacement; /* optional addr displacement */ + int64_t immediate; /* optional immediate operand */ + + uint8_t decoded; /* set to 1 if successfully decoded */ + + struct vie_op op; /* opcode description */ +}; + +enum vm_exitcode { + VM_EXITCODE_INOUT, + VM_EXITCODE_VMX, + VM_EXITCODE_BOGUS, + VM_EXITCODE_RDMSR, + VM_EXITCODE_WRMSR, + VM_EXITCODE_HLT, + VM_EXITCODE_MTRAP, + VM_EXITCODE_PAUSE, + VM_EXITCODE_PAGING, + VM_EXITCODE_INST_EMUL, + VM_EXITCODE_SPINUP_AP, + VM_EXITCODE_DEPRECATED1, /* used to be SPINDOWN_CPU */ + VM_EXITCODE_RENDEZVOUS, + VM_EXITCODE_IOAPIC_EOI, + VM_EXITCODE_SUSPENDED, + VM_EXITCODE_INOUT_STR, + VM_EXITCODE_TASK_SWITCH, + VM_EXITCODE_MONITOR, + VM_EXITCODE_MWAIT, + VM_EXITCODE_SVM, + VM_EXITCODE_MAX +}; + +struct vm_inout { + uint16_t bytes:3; /* 1 or 2 or 4 */ + uint16_t in:1; + uint16_t string:1; + uint16_t rep:1; + uint16_t port; + uint32_t eax; /* valid for out */ +}; + +struct vm_inout_str { + struct vm_inout inout; /* must be the first element */ + struct vm_guest_paging paging; + uint64_t rflags; + uint64_t cr0; + uint64_t index; + uint64_t count; /* rep=1 (%rcx), rep=0 (1) */ + int addrsize; + enum vm_reg_name seg_name; + struct seg_desc seg_desc; +}; + +enum task_switch_reason { + TSR_CALL, + TSR_IRET, + TSR_JMP, + TSR_IDT_GATE, /* task gate in IDT */ +}; + +struct vm_task_switch { + uint16_t tsssel; /* new TSS selector */ + int ext; /* task switch due to external event */ + uint32_t errcode; + int errcode_valid; /* push 'errcode' on the new stack */ + enum task_switch_reason reason; + struct vm_guest_paging paging; +}; + +struct vm_exit { + enum vm_exitcode exitcode; + int inst_length; /* 0 means unknown */ + uint64_t rip; + union { + struct vm_inout inout; + struct vm_inout_str inout_str; + struct { + uint64_t gpa; + int fault_type; + } paging; + struct { + uint64_t gpa; + uint64_t gla; + uint64_t cs_base; + int cs_d; /* CS.D */ + struct vm_guest_paging paging; + struct vie vie; + } inst_emul; + /* + * VMX specific payload. Used when there is no "better" + * exitcode to represent the VM-exit. + */ + struct { + int status; /* vmx inst status */ + /* + * 'exit_reason' and 'exit_qualification' are valid + * only if 'status' is zero. + */ + uint32_t exit_reason; + uint64_t exit_qualification; + /* + * 'inst_error' and 'inst_type' are valid + * only if 'status' is non-zero. + */ + int inst_type; + int inst_error; + } vmx; + /* + * SVM specific payload. + */ + struct { + uint64_t exitcode; + uint64_t exitinfo1; + uint64_t exitinfo2; + } svm; + struct { + uint32_t code; /* ecx value */ + uint64_t wval; + } msr; + struct { + int vcpu; + uint64_t rip; + } spinup_ap; + struct { + uint64_t rflags; + } hlt; + struct { + int vector; + } ioapic_eoi; + struct { + enum vm_suspend_how how; + } suspended; + struct vm_task_switch task_switch; + } u; +}; + +#endif /* _VMM_H_ */ Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/include/vmm_dev.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/include/vmm_dev.h Sun Jun 21 08:49:37 2015 (r287420) @@ -0,0 +1,365 @@ +/*- + * Copyright (c) 2011 NetApp, 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 NETAPP, INC ``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 NETAPP, INC 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: soc2015/mihai/bhyve-on-arm-head/sys/amd64/include/vmm_dev.h 279875 2015-01-18 03:08:30Z neel $ + */ + +#ifndef _VMM_DEV_H_ +#define _VMM_DEV_H_ + +#ifdef _KERNEL +void vmmdev_init(void); +int vmmdev_cleanup(void); +#endif + +struct vm_memory_segment { + vm_paddr_t gpa; /* in */ + size_t len; + int wired; +}; + +struct vm_register { + int cpuid; + int regnum; /* enum vm_reg_name */ + uint64_t regval; +}; + +struct vm_seg_desc { /* data or code segment */ + int cpuid; + int regnum; /* enum vm_reg_name */ + struct seg_desc desc; +}; + +struct vm_run { + int cpuid; + struct vm_exit vm_exit; +}; + +struct vm_exception { + int cpuid; + int vector; + uint32_t error_code; + int error_code_valid; + int restart_instruction; +}; + +struct vm_lapic_msi { + uint64_t msg; + uint64_t addr; +}; + +struct vm_lapic_irq { + int cpuid; + int vector; +}; + +struct vm_ioapic_irq { + int irq; +}; + +struct vm_isa_irq { + int atpic_irq; + int ioapic_irq; +}; + +struct vm_isa_irq_trigger { + int atpic_irq; + enum vm_intr_trigger trigger; +}; + +struct vm_capability { + int cpuid; + enum vm_cap_type captype; + int capval; + int allcpus; +}; + +struct vm_pptdev { + int bus; + int slot; + int func; +}; + +struct vm_pptdev_mmio { + int bus; + int slot; + int func; + vm_paddr_t gpa; + vm_paddr_t hpa; + size_t len; +}; + +struct vm_pptdev_msi { + int vcpu; + int bus; + int slot; + int func; + int numvec; /* 0 means disabled */ + uint64_t msg; + uint64_t addr; +}; + +struct vm_pptdev_msix { + int vcpu; + int bus; + int slot; + int func; + int idx; + uint64_t msg; + uint32_t vector_control; + uint64_t addr; +}; + +struct vm_nmi { + int cpuid; +}; + +#define MAX_VM_STATS 64 +struct vm_stats { + int cpuid; /* in */ + int num_entries; /* out */ + struct timeval tv; + uint64_t statbuf[MAX_VM_STATS]; +}; + +struct vm_stat_desc { + int index; /* in */ + char desc[128]; /* out */ +}; + +struct vm_x2apic { + int cpuid; + enum x2apic_state state; +}; + +struct vm_gpa_pte { + uint64_t gpa; /* in */ + uint64_t pte[4]; /* out */ + int ptenum; +}; + +struct vm_hpet_cap { + uint32_t capabilities; /* lower 32 bits of HPET capabilities */ +}; + +struct vm_suspend { + enum vm_suspend_how how; +}; + +struct vm_gla2gpa { + int vcpuid; /* inputs */ + int prot; /* PROT_READ or PROT_WRITE */ + uint64_t gla; + struct vm_guest_paging paging; + int fault; /* outputs */ + uint64_t gpa; +}; + +struct vm_activate_cpu { + int vcpuid; +}; + +struct vm_cpuset { + int which; + int cpusetsize; + cpuset_t *cpus; +}; +#define VM_ACTIVE_CPUS 0 +#define VM_SUSPENDED_CPUS 1 + +struct vm_intinfo { + int vcpuid; + uint64_t info1; + uint64_t info2; +}; + +struct vm_rtc_time { + time_t secs; +}; + +struct vm_rtc_data { + int offset; + uint8_t value; +}; + +enum { + /* general routines */ + IOCNUM_ABIVERS = 0, + IOCNUM_RUN = 1, + IOCNUM_SET_CAPABILITY = 2, + IOCNUM_GET_CAPABILITY = 3, + IOCNUM_SUSPEND = 4, + IOCNUM_REINIT = 5, + + /* memory apis */ + IOCNUM_MAP_MEMORY = 10, + IOCNUM_GET_MEMORY_SEG = 11, + IOCNUM_GET_GPA_PMAP = 12, + IOCNUM_GLA2GPA = 13, + + /* register/state accessors */ + IOCNUM_SET_REGISTER = 20, + IOCNUM_GET_REGISTER = 21, + IOCNUM_SET_SEGMENT_DESCRIPTOR = 22, + IOCNUM_GET_SEGMENT_DESCRIPTOR = 23, + + /* interrupt injection */ + IOCNUM_GET_INTINFO = 28, + IOCNUM_SET_INTINFO = 29, + IOCNUM_INJECT_EXCEPTION = 30, + IOCNUM_LAPIC_IRQ = 31, + IOCNUM_INJECT_NMI = 32, + IOCNUM_IOAPIC_ASSERT_IRQ = 33, + IOCNUM_IOAPIC_DEASSERT_IRQ = 34, + IOCNUM_IOAPIC_PULSE_IRQ = 35, + IOCNUM_LAPIC_MSI = 36, + IOCNUM_LAPIC_LOCAL_IRQ = 37, + IOCNUM_IOAPIC_PINCOUNT = 38, + IOCNUM_RESTART_INSTRUCTION = 39, + + /* PCI pass-thru */ + IOCNUM_BIND_PPTDEV = 40, + IOCNUM_UNBIND_PPTDEV = 41, + IOCNUM_MAP_PPTDEV_MMIO = 42, + IOCNUM_PPTDEV_MSI = 43, + IOCNUM_PPTDEV_MSIX = 44, + + /* statistics */ + IOCNUM_VM_STATS = 50, + IOCNUM_VM_STAT_DESC = 51, + + /* kernel device state */ + IOCNUM_SET_X2APIC_STATE = 60, + IOCNUM_GET_X2APIC_STATE = 61, + IOCNUM_GET_HPET_CAPABILITIES = 62, + + /* legacy interrupt injection */ + IOCNUM_ISA_ASSERT_IRQ = 80, + IOCNUM_ISA_DEASSERT_IRQ = 81, + IOCNUM_ISA_PULSE_IRQ = 82, + IOCNUM_ISA_SET_IRQ_TRIGGER = 83, + + /* vm_cpuset */ + IOCNUM_ACTIVATE_CPU = 90, + IOCNUM_GET_CPUSET = 91, + + /* RTC */ + IOCNUM_RTC_READ = 100, + IOCNUM_RTC_WRITE = 101, + IOCNUM_RTC_SETTIME = 102, + IOCNUM_RTC_GETTIME = 103, +}; + +#define VM_RUN \ + _IOWR('v', IOCNUM_RUN, struct vm_run) +#define VM_SUSPEND \ + _IOW('v', IOCNUM_SUSPEND, struct vm_suspend) +#define VM_REINIT \ + _IO('v', IOCNUM_REINIT) +#define VM_MAP_MEMORY \ + _IOWR('v', IOCNUM_MAP_MEMORY, struct vm_memory_segment) +#define VM_GET_MEMORY_SEG \ + _IOWR('v', IOCNUM_GET_MEMORY_SEG, struct vm_memory_segment) +#define VM_SET_REGISTER \ + _IOW('v', IOCNUM_SET_REGISTER, struct vm_register) +#define VM_GET_REGISTER \ + _IOWR('v', IOCNUM_GET_REGISTER, struct vm_register) +#define VM_SET_SEGMENT_DESCRIPTOR \ + _IOW('v', IOCNUM_SET_SEGMENT_DESCRIPTOR, struct vm_seg_desc) +#define VM_GET_SEGMENT_DESCRIPTOR \ + _IOWR('v', IOCNUM_GET_SEGMENT_DESCRIPTOR, struct vm_seg_desc) +#define VM_INJECT_EXCEPTION \ + _IOW('v', IOCNUM_INJECT_EXCEPTION, struct vm_exception) +#define VM_LAPIC_IRQ \ + _IOW('v', IOCNUM_LAPIC_IRQ, struct vm_lapic_irq) +#define VM_LAPIC_LOCAL_IRQ \ + _IOW('v', IOCNUM_LAPIC_LOCAL_IRQ, struct vm_lapic_irq) +#define VM_LAPIC_MSI \ + _IOW('v', IOCNUM_LAPIC_MSI, struct vm_lapic_msi) +#define VM_IOAPIC_ASSERT_IRQ \ + _IOW('v', IOCNUM_IOAPIC_ASSERT_IRQ, struct vm_ioapic_irq) +#define VM_IOAPIC_DEASSERT_IRQ \ + _IOW('v', IOCNUM_IOAPIC_DEASSERT_IRQ, struct vm_ioapic_irq) +#define VM_IOAPIC_PULSE_IRQ \ + _IOW('v', IOCNUM_IOAPIC_PULSE_IRQ, struct vm_ioapic_irq) +#define VM_IOAPIC_PINCOUNT \ + _IOR('v', IOCNUM_IOAPIC_PINCOUNT, int) +#define VM_ISA_ASSERT_IRQ \ + _IOW('v', IOCNUM_ISA_ASSERT_IRQ, struct vm_isa_irq) +#define VM_ISA_DEASSERT_IRQ \ + _IOW('v', IOCNUM_ISA_DEASSERT_IRQ, struct vm_isa_irq) +#define VM_ISA_PULSE_IRQ \ + _IOW('v', IOCNUM_ISA_PULSE_IRQ, struct vm_isa_irq) +#define VM_ISA_SET_IRQ_TRIGGER \ + _IOW('v', IOCNUM_ISA_SET_IRQ_TRIGGER, struct vm_isa_irq_trigger) +#define VM_SET_CAPABILITY \ + _IOW('v', IOCNUM_SET_CAPABILITY, struct vm_capability) +#define VM_GET_CAPABILITY \ + _IOWR('v', IOCNUM_GET_CAPABILITY, struct vm_capability) +#define VM_BIND_PPTDEV \ + _IOW('v', IOCNUM_BIND_PPTDEV, struct vm_pptdev) +#define VM_UNBIND_PPTDEV \ + _IOW('v', IOCNUM_UNBIND_PPTDEV, struct vm_pptdev) +#define VM_MAP_PPTDEV_MMIO \ + _IOW('v', IOCNUM_MAP_PPTDEV_MMIO, struct vm_pptdev_mmio) +#define VM_PPTDEV_MSI \ + _IOW('v', IOCNUM_PPTDEV_MSI, struct vm_pptdev_msi) +#define VM_PPTDEV_MSIX \ + _IOW('v', IOCNUM_PPTDEV_MSIX, struct vm_pptdev_msix) +#define VM_INJECT_NMI \ + _IOW('v', IOCNUM_INJECT_NMI, struct vm_nmi) +#define VM_STATS \ + _IOWR('v', IOCNUM_VM_STATS, struct vm_stats) +#define VM_STAT_DESC \ + _IOWR('v', IOCNUM_VM_STAT_DESC, struct vm_stat_desc) +#define VM_SET_X2APIC_STATE \ + _IOW('v', IOCNUM_SET_X2APIC_STATE, struct vm_x2apic) +#define VM_GET_X2APIC_STATE \ + _IOWR('v', IOCNUM_GET_X2APIC_STATE, struct vm_x2apic) +#define VM_GET_HPET_CAPABILITIES \ + _IOR('v', IOCNUM_GET_HPET_CAPABILITIES, struct vm_hpet_cap) +#define VM_GET_GPA_PMAP \ + _IOWR('v', IOCNUM_GET_GPA_PMAP, struct vm_gpa_pte) +#define VM_GLA2GPA \ + _IOWR('v', IOCNUM_GLA2GPA, struct vm_gla2gpa) +#define VM_ACTIVATE_CPU \ + _IOW('v', IOCNUM_ACTIVATE_CPU, struct vm_activate_cpu) +#define VM_GET_CPUS \ + _IOW('v', IOCNUM_GET_CPUSET, struct vm_cpuset) +#define VM_SET_INTINFO \ + _IOW('v', IOCNUM_SET_INTINFO, struct vm_intinfo) +#define VM_GET_INTINFO \ + _IOWR('v', IOCNUM_GET_INTINFO, struct vm_intinfo) +#define VM_RTC_WRITE \ + _IOW('v', IOCNUM_RTC_WRITE, struct vm_rtc_data) +#define VM_RTC_READ \ + _IOWR('v', IOCNUM_RTC_READ, struct vm_rtc_data) +#define VM_RTC_SETTIME \ + _IOW('v', IOCNUM_RTC_SETTIME, struct vm_rtc_time) +#define VM_RTC_GETTIME \ + _IOR('v', IOCNUM_RTC_GETTIME, struct vm_rtc_time) +#define VM_RESTART_INSTRUCTION \ + _IOW('v', IOCNUM_RESTART_INSTRUCTION, int) +#endif Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Sun Jun 21 08:49:37 2015 (r287420) @@ -0,0 +1,66 @@ +static int +arm_init(int ipinum) +{ + return 0; +} + +static void +arm_vmcleanup(void *arg) +{ +} *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Sun Jun 21 10:44:57 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04975FF0 for ; Sun, 21 Jun 2015 10:44:57 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E6DF22A9 for ; Sun, 21 Jun 2015 10:44:56 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LAiuqe071831 for ; Sun, 21 Jun 2015 10:44:56 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5LAiuTa071816 for svn-soc-all@FreeBSD.org; Sun, 21 Jun 2015 10:44:56 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 21 Jun 2015 10:44:56 GMT Message-Id: <201506211044.t5LAiuTa071816@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287422 - soc2015/kczekirda/ipxe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 10:44:57 -0000 Author: kczekirda Date: Sun Jun 21 10:44:55 2015 New Revision: 287422 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287422 Log: iPXE script image support is default Modified: soc2015/kczekirda/ipxe/Makefile Modified: soc2015/kczekirda/ipxe/Makefile ============================================================================== --- soc2015/kczekirda/ipxe/Makefile Sun Jun 21 08:00:05 2015 (r287421) +++ soc2015/kczekirda/ipxe/Makefile Sun Jun 21 10:44:55 2015 (r287422) @@ -26,7 +26,7 @@ OPTIONS_DEFINE= NET_PROTO_IPV6 NET_PROTO_FCOE DOWNLOAD_PROTO_HTTPS \ DOWNLOAD_PROTO_FTP DOWNLOAD_PROTO_NFS \ - IMAGE_ELF IMAGE_MULTIBOOT IMAGE_PXE IMAGE_SCRIPT \ + IMAGE_ELF IMAGE_MULTIBOOT IMAGE_PXE \ IMAGE_BZIMAGE IMAGE_COMBOOT IMAGE_EFI \ CMD_NSLOOKUP CMD_DIGEST CMD_VLAN CMD_PXE CMD_REBOOT \ CMD_POWEROFF CMD_IMAGE_TRUST CMD_PCI CMD_PING CMD_IPSTAT \ @@ -54,7 +54,6 @@ IMAGE_ELF_DESC= ELF image support IMAGE_MULTIBOOT_DESC= MultiBoot image support IMAGE_PXE_DESC= PXE image support -IMAGE_SCRIPT_DESC= iPXE script image support IMAGE_BZIMAGE_DESC= Linux bzImage image support IMAGE_COMBOOT_DESC= SYSLINUX COMBOOT image support IMAGE_EFI_DESC= EFI image support @@ -105,10 +104,6 @@ DEFINESGENERAL+= IMAGE_PXE .endif -.if ${PORT_OPTIONS:MIMAGE_SCRIPT} -DEFINESGENERAL+= IMAGE_SCRIPT -.endif - .if ${PORT_OPTIONS:MIMAGE_BZIMAGE} DEFINESGENERAL+= IMAGE_BZIMAGE .endif From owner-svn-soc-all@FreeBSD.ORG Mon Jun 22 17:20:03 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52FBA88E for ; Mon, 22 Jun 2015 17:20:03 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B100AF2 for ; Mon, 22 Jun 2015 17:20:03 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MHK3c5057548 for ; Mon, 22 Jun 2015 17:20:03 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5MHJunN057364 for svn-soc-all@FreeBSD.org; Mon, 22 Jun 2015 17:19:56 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 22 Jun 2015 17:19:56 GMT Message-Id: <201506221719.t5MHJunN057364@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287448 - in soc2015/clord/head: . bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/freebsd-version bin/getfac... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 17:20:03 -0000 Author: clord Date: Mon Jun 22 17:19:51 2015 New Revision: 287448 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287448 Log: merge with head Added: soc2015/clord/head/bin/cat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/cat/Makefile.depend soc2015/clord/head/bin/chflags/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/chflags/Makefile.depend soc2015/clord/head/bin/chio/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/chio/Makefile.depend soc2015/clord/head/bin/chmod/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/chmod/Makefile.depend soc2015/clord/head/bin/cp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/cp/Makefile.depend soc2015/clord/head/bin/csh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/csh/Makefile.depend soc2015/clord/head/bin/date/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/date/Makefile.depend soc2015/clord/head/bin/dd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/dd/Makefile.depend soc2015/clord/head/bin/df/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/df/Makefile.depend soc2015/clord/head/bin/domainname/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/domainname/Makefile.depend soc2015/clord/head/bin/echo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/echo/Makefile.depend soc2015/clord/head/bin/ed/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/ed/Makefile.depend soc2015/clord/head/bin/expr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/expr/Makefile.depend soc2015/clord/head/bin/freebsd-version/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/freebsd-version/Makefile.depend soc2015/clord/head/bin/getfacl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/getfacl/Makefile.depend soc2015/clord/head/bin/hostname/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/hostname/Makefile.depend soc2015/clord/head/bin/kenv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/kenv/Makefile.depend soc2015/clord/head/bin/kill/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/kill/Makefile.depend soc2015/clord/head/bin/ln/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/ln/Makefile.depend soc2015/clord/head/bin/ls/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/ls/Makefile.depend soc2015/clord/head/bin/mkdir/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/mkdir/Makefile.depend soc2015/clord/head/bin/mv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/mv/Makefile.depend soc2015/clord/head/bin/pax/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/pax/Makefile.depend soc2015/clord/head/bin/pkill/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/pkill/Makefile.depend soc2015/clord/head/bin/ps/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/ps/Makefile.depend soc2015/clord/head/bin/pwait/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/pwait/Makefile.depend soc2015/clord/head/bin/pwd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/pwd/Makefile.depend soc2015/clord/head/bin/rcp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/rcp/Makefile.depend soc2015/clord/head/bin/realpath/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/realpath/Makefile.depend soc2015/clord/head/bin/rm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/rm/Makefile.depend soc2015/clord/head/bin/rmail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/rmail/Makefile.depend soc2015/clord/head/bin/rmdir/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/rmdir/Makefile.depend soc2015/clord/head/bin/setfacl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/setfacl/Makefile.depend soc2015/clord/head/bin/sh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/sh/Makefile.depend soc2015/clord/head/bin/sleep/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/sleep/Makefile.depend soc2015/clord/head/bin/stty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/stty/Makefile.depend soc2015/clord/head/bin/sync/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/sync/Makefile.depend soc2015/clord/head/bin/test/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/test/Makefile.depend soc2015/clord/head/bin/uuidgen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/bin/uuidgen/Makefile.depend soc2015/clord/head/cddl/lib/drti/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/drti/Makefile.depend soc2015/clord/head/cddl/lib/libavl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libavl/Makefile.depend soc2015/clord/head/cddl/lib/libctf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libctf/Makefile.depend soc2015/clord/head/cddl/lib/libdtrace/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libdtrace/Makefile.depend soc2015/clord/head/cddl/lib/libnvpair/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libnvpair/Makefile.depend soc2015/clord/head/cddl/lib/libumem/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libumem/Makefile.depend soc2015/clord/head/cddl/lib/libuutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libuutil/Makefile.depend soc2015/clord/head/cddl/lib/libzfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libzfs/Makefile.depend soc2015/clord/head/cddl/lib/libzfs_core/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libzfs_core/Makefile.depend soc2015/clord/head/cddl/lib/libzpool/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/lib/libzpool/Makefile.depend soc2015/clord/head/cddl/sbin/zfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/sbin/zfs/Makefile.depend soc2015/clord/head/cddl/sbin/zpool/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/sbin/zpool/Makefile.depend soc2015/clord/head/cddl/usr.bin/ctfconvert/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/ctfconvert/Makefile.depend soc2015/clord/head/cddl/usr.bin/ctfdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/ctfdump/Makefile.depend soc2015/clord/head/cddl/usr.bin/ctfmerge/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/ctfmerge/Makefile.depend soc2015/clord/head/cddl/usr.bin/sgsmsg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/sgsmsg/Makefile.depend soc2015/clord/head/cddl/usr.bin/zinject/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/zinject/Makefile.depend soc2015/clord/head/cddl/usr.bin/zstreamdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/zstreamdump/Makefile.depend soc2015/clord/head/cddl/usr.bin/ztest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.bin/ztest/Makefile.depend soc2015/clord/head/cddl/usr.sbin/dtrace/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.sbin/dtrace/Makefile.depend soc2015/clord/head/cddl/usr.sbin/dtruss/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.sbin/dtruss/Makefile.depend soc2015/clord/head/cddl/usr.sbin/lockstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.sbin/lockstat/Makefile.depend soc2015/clord/head/cddl/usr.sbin/zdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.sbin/zdb/Makefile.depend soc2015/clord/head/cddl/usr.sbin/zhack/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/cddl/usr.sbin/zhack/Makefile.depend soc2015/clord/head/contrib/file/magic/Magdir/cbor - copied unchanged from r287445, mirror/FreeBSD/head/contrib/file/magic/Magdir/cbor soc2015/clord/head/contrib/file/magic/Magdir/nasa - copied unchanged from r287445, mirror/FreeBSD/head/contrib/file/magic/Magdir/nasa soc2015/clord/head/contrib/file/src/gmtime_r.c - copied unchanged from r287445, mirror/FreeBSD/head/contrib/file/src/gmtime_r.c soc2015/clord/head/contrib/file/src/localtime_r.c - copied unchanged from r287445, mirror/FreeBSD/head/contrib/file/src/localtime_r.c soc2015/clord/head/etc/sendmail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/etc/sendmail/Makefile.depend soc2015/clord/head/games/caesar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/caesar/Makefile.depend soc2015/clord/head/games/factor/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/factor/Makefile.depend soc2015/clord/head/games/fortune/datfiles/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/fortune/datfiles/Makefile.depend soc2015/clord/head/games/fortune/fortune/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/fortune/fortune/Makefile.depend soc2015/clord/head/games/fortune/strfile/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/fortune/strfile/Makefile.depend soc2015/clord/head/games/fortune/unstr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/fortune/unstr/Makefile.depend soc2015/clord/head/games/grdc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/grdc/Makefile.depend soc2015/clord/head/games/morse/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/morse/Makefile.depend soc2015/clord/head/games/number/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/number/Makefile.depend soc2015/clord/head/games/pom/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/pom/Makefile.depend soc2015/clord/head/games/primes/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/primes/Makefile.depend soc2015/clord/head/games/random/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/games/random/Makefile.depend soc2015/clord/head/gnu/lib/csu/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/csu/Makefile.depend soc2015/clord/head/gnu/lib/libdialog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libdialog/Makefile.depend soc2015/clord/head/gnu/lib/libgcc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libgcc/Makefile.depend soc2015/clord/head/gnu/lib/libgcov/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libgcov/Makefile.depend soc2015/clord/head/gnu/lib/libgomp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libgomp/Makefile.depend soc2015/clord/head/gnu/lib/libreadline/readline/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libreadline/readline/Makefile.depend soc2015/clord/head/gnu/lib/libregex/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libregex/Makefile.depend soc2015/clord/head/gnu/lib/libssp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libssp/Makefile.depend soc2015/clord/head/gnu/lib/libssp/libssp_nonshared/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libssp/libssp_nonshared/Makefile.depend soc2015/clord/head/gnu/lib/libstdc++/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libstdc++/Makefile.depend soc2015/clord/head/gnu/lib/libsupc++/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/lib/libsupc++/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/addr2line/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/addr2line/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/ar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/ar/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/as/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/as/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/doc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/doc/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 soc2015/clord/head/gnu/usr.bin/binutils/ld/Makefile.depend.host - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/ld/Makefile.depend.host soc2015/clord/head/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 soc2015/clord/head/gnu/usr.bin/binutils/libbfd/Makefile.depend.host - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/libbfd/Makefile.depend.host soc2015/clord/head/gnu/usr.bin/binutils/libbinutils/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/libbinutils/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/libiberty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/libiberty/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/libopcodes/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/libopcodes/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/nm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/nm/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/objcopy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/objcopy/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/objdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/objdump/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/ranlib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/ranlib/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/readelf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/readelf/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/size/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/size/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/strings/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/strings/Makefile.depend soc2015/clord/head/gnu/usr.bin/binutils/strip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/binutils/strip/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/c++/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/c++/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/c++filt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/c++filt/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/cc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/cc/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/cc1/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/cc1/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/cc1plus/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/cc1plus/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/cc_int/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/cc_int/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/cc_tools/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/cc_tools/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/cpp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/cpp/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/gcov/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/gcov/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/include/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/include/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/libcpp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/libcpp/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/libdecnumber/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/libdecnumber/Makefile.depend soc2015/clord/head/gnu/usr.bin/cc/libiberty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/cc/libiberty/Makefile.depend soc2015/clord/head/gnu/usr.bin/dialog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/dialog/Makefile.depend soc2015/clord/head/gnu/usr.bin/diff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/diff/Makefile.depend soc2015/clord/head/gnu/usr.bin/diff3/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/diff3/Makefile.depend soc2015/clord/head/gnu/usr.bin/dtc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/dtc/Makefile.depend soc2015/clord/head/gnu/usr.bin/gdb/gdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/gdb/gdb/Makefile.depend soc2015/clord/head/gnu/usr.bin/gdb/gdbserver/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/gdb/gdbserver/Makefile.depend soc2015/clord/head/gnu/usr.bin/gdb/gdbtui/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/gdb/gdbtui/Makefile.depend soc2015/clord/head/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 soc2015/clord/head/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 soc2015/clord/head/gnu/usr.bin/gperf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/gperf/Makefile.depend soc2015/clord/head/gnu/usr.bin/grep/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/grep/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/contrib/mm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/contrib/mm/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devX100-12/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devX100-12/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devX100/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devX100/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devX75-12/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devX75-12/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devX75/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devX75/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devascii/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devascii/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devcp1047/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devcp1047/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devdvi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devdvi/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devhtml/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devhtml/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devkoi8-r/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devkoi8-r/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devlatin1/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devlatin1/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devlbp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devlbp/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devlj4/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devlj4/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devps/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devps/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/font/devutf8/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/font/devutf8/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/man/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/man/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/devices/grops/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/devices/grops/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/libs/libdriver/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/libs/libdriver/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/preproc/html/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/preproc/html/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/roff/groff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/roff/groff/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/roff/grog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/roff/grog/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/roff/psroff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/roff/psroff/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/roff/troff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/roff/troff/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend soc2015/clord/head/gnu/usr.bin/groff/tmac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/groff/tmac/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/ci/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/ci/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/co/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/co/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/ident/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/ident/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/lib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/lib/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/merge/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/merge/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/rcs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/rcs/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/rcsclean/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/rcsclean/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/rcsdiff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/rcsdiff/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/rcsfreeze/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/rcsfreeze/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/rcsmerge/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/rcsmerge/Makefile.depend soc2015/clord/head/gnu/usr.bin/rcs/rlog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/rcs/rlog/Makefile.depend soc2015/clord/head/gnu/usr.bin/sdiff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/gnu/usr.bin/sdiff/Makefile.depend soc2015/clord/head/include/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/Makefile.depend soc2015/clord/head/include/arpa/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/arpa/Makefile.depend soc2015/clord/head/include/gssapi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/gssapi/Makefile.depend soc2015/clord/head/include/protocols/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/protocols/Makefile.depend soc2015/clord/head/include/rpc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/rpc/Makefile.depend soc2015/clord/head/include/rpcsvc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/rpcsvc/Makefile.depend soc2015/clord/head/include/xlocale/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/include/xlocale/Makefile.depend soc2015/clord/head/kerberos5/lib/libasn1/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libasn1/Makefile.depend soc2015/clord/head/kerberos5/lib/libgssapi_krb5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libgssapi_krb5/Makefile.depend soc2015/clord/head/kerberos5/lib/libgssapi_ntlm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libgssapi_ntlm/Makefile.depend soc2015/clord/head/kerberos5/lib/libgssapi_spnego/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libgssapi_spnego/Makefile.depend soc2015/clord/head/kerberos5/lib/libhdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libhdb/Makefile.depend soc2015/clord/head/kerberos5/lib/libheimbase/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libheimbase/Makefile.depend soc2015/clord/head/kerberos5/lib/libheimipcc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libheimipcc/Makefile.depend soc2015/clord/head/kerberos5/lib/libheimipcs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libheimipcs/Makefile.depend soc2015/clord/head/kerberos5/lib/libheimntlm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libheimntlm/Makefile.depend soc2015/clord/head/kerberos5/lib/libhx509/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libhx509/Makefile.depend soc2015/clord/head/kerberos5/lib/libkadm5clnt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libkadm5clnt/Makefile.depend soc2015/clord/head/kerberos5/lib/libkadm5srv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libkadm5srv/Makefile.depend soc2015/clord/head/kerberos5/lib/libkafs5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libkafs5/Makefile.depend soc2015/clord/head/kerberos5/lib/libkdc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libkdc/Makefile.depend soc2015/clord/head/kerberos5/lib/libkrb5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libkrb5/Makefile.depend soc2015/clord/head/kerberos5/lib/libroken/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libroken/Makefile.depend soc2015/clord/head/kerberos5/lib/libsl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libsl/Makefile.depend soc2015/clord/head/kerberos5/lib/libvers/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libvers/Makefile.depend soc2015/clord/head/kerberos5/lib/libwind/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/lib/libwind/Makefile.depend soc2015/clord/head/kerberos5/libexec/digest-service/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/digest-service/Makefile.depend soc2015/clord/head/kerberos5/libexec/hprop/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/hprop/Makefile.depend soc2015/clord/head/kerberos5/libexec/hpropd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/hpropd/Makefile.depend soc2015/clord/head/kerberos5/libexec/ipropd-master/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/ipropd-master/Makefile.depend soc2015/clord/head/kerberos5/libexec/ipropd-slave/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/ipropd-slave/Makefile.depend soc2015/clord/head/kerberos5/libexec/kadmind/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kadmind/Makefile.depend soc2015/clord/head/kerberos5/libexec/kcm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kcm/Makefile.depend soc2015/clord/head/kerberos5/libexec/kdc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kdc/Makefile.depend soc2015/clord/head/kerberos5/libexec/kdigest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kdigest/Makefile.depend soc2015/clord/head/kerberos5/libexec/kfd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kfd/Makefile.depend soc2015/clord/head/kerberos5/libexec/kimpersonate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kimpersonate/Makefile.depend soc2015/clord/head/kerberos5/libexec/kpasswdd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/libexec/kpasswdd/Makefile.depend soc2015/clord/head/kerberos5/tools/asn1_compile/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/tools/asn1_compile/Makefile.depend soc2015/clord/head/kerberos5/tools/make-roken/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/tools/make-roken/Makefile.depend soc2015/clord/head/kerberos5/tools/slc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/tools/slc/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/hxtool/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/hxtool/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kadmin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kadmin/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kcc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kcc/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kdestroy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kdestroy/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kf/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kgetcred/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kgetcred/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kinit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kinit/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/kpasswd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/kpasswd/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/krb5-config/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/krb5-config/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/ksu/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/ksu/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/string2key/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/string2key/Makefile.depend soc2015/clord/head/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend soc2015/clord/head/kerberos5/usr.sbin/iprop-log/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.sbin/iprop-log/Makefile.depend soc2015/clord/head/kerberos5/usr.sbin/kstash/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.sbin/kstash/Makefile.depend soc2015/clord/head/kerberos5/usr.sbin/ktutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/kerberos5/usr.sbin/ktutil/Makefile.depend soc2015/clord/head/lib/atf/libatf-c++/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/atf/libatf-c++/Makefile.depend soc2015/clord/head/lib/atf/libatf-c/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/atf/libatf-c/Makefile.depend soc2015/clord/head/lib/clang/include/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/include/Makefile.depend soc2015/clord/head/lib/clang/libclanganalysis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclanganalysis/Makefile.depend soc2015/clord/head/lib/clang/libclangarcmigrate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangarcmigrate/Makefile.depend soc2015/clord/head/lib/clang/libclangast/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangast/Makefile.depend soc2015/clord/head/lib/clang/libclangbasic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangbasic/Makefile.depend soc2015/clord/head/lib/clang/libclangcodegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangcodegen/Makefile.depend soc2015/clord/head/lib/clang/libclangdriver/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangdriver/Makefile.depend soc2015/clord/head/lib/clang/libclangedit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangedit/Makefile.depend soc2015/clord/head/lib/clang/libclangfrontend/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangfrontend/Makefile.depend soc2015/clord/head/lib/clang/libclangfrontendtool/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangfrontendtool/Makefile.depend soc2015/clord/head/lib/clang/libclanglex/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclanglex/Makefile.depend soc2015/clord/head/lib/clang/libclangparse/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangparse/Makefile.depend soc2015/clord/head/lib/clang/libclangrewrite/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangrewrite/Makefile.depend soc2015/clord/head/lib/clang/libclangrewritefrontend/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangrewritefrontend/Makefile.depend soc2015/clord/head/lib/clang/libclangsema/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangsema/Makefile.depend soc2015/clord/head/lib/clang/libclangserialization/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangserialization/Makefile.depend soc2015/clord/head/lib/clang/libclangstaticanalyzercheckers/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangstaticanalyzercheckers/Makefile.depend soc2015/clord/head/lib/clang/libclangstaticanalyzercore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangstaticanalyzercore/Makefile.depend soc2015/clord/head/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend soc2015/clord/head/lib/clang/liblldb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldb/Makefile.depend soc2015/clord/head/lib/clang/liblldbAPI/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbAPI/Makefile.depend soc2015/clord/head/lib/clang/liblldbBreakpoint/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbBreakpoint/Makefile.depend soc2015/clord/head/lib/clang/liblldbCommands/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbCommands/Makefile.depend soc2015/clord/head/lib/clang/liblldbCore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbCore/Makefile.depend soc2015/clord/head/lib/clang/liblldbDataFormatters/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbDataFormatters/Makefile.depend soc2015/clord/head/lib/clang/liblldbExpression/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbExpression/Makefile.depend soc2015/clord/head/lib/clang/liblldbHostCommon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbHostCommon/Makefile.depend soc2015/clord/head/lib/clang/liblldbHostFreeBSD/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbHostFreeBSD/Makefile.depend soc2015/clord/head/lib/clang/liblldbHostPOSIX/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbHostPOSIX/Makefile.depend soc2015/clord/head/lib/clang/liblldbInterpreter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbInterpreter/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginInstructionARM/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginInstructionARM/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginInstructionARM64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginInstructionARM64/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginObjectFileELF/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginObjectFileELF/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginPlatformGDB/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginPlatformGDB/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginProcessElfCore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginProcessElfCore/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginProcessUtility/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginProcessUtility/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend soc2015/clord/head/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend soc2015/clord/head/lib/clang/liblldbSymbol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbSymbol/Makefile.depend soc2015/clord/head/lib/clang/liblldbTarget/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbTarget/Makefile.depend soc2015/clord/head/lib/clang/liblldbUtility/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/liblldbUtility/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64asmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64asmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64codegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64codegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64desc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64desc/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64disassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64disassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64info/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64info/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64instprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64instprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmaarch64utils/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmaarch64utils/Makefile.depend soc2015/clord/head/lib/clang/libllvmanalysis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmanalysis/Makefile.depend soc2015/clord/head/lib/clang/libllvmarmasmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmarmasmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmarmcodegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmarmcodegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmarmdesc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmarmdesc/Makefile.depend soc2015/clord/head/lib/clang/libllvmarmdisassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmarmdisassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmarminfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmarminfo/Makefile.depend soc2015/clord/head/lib/clang/libllvmarminstprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmarminstprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmasmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmasmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmasmprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmasmprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmbitreader/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmbitreader/Makefile.depend soc2015/clord/head/lib/clang/libllvmbitwriter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmbitwriter/Makefile.depend soc2015/clord/head/lib/clang/libllvmcodegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmcodegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmcore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmcore/Makefile.depend soc2015/clord/head/lib/clang/libllvmdebuginfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmdebuginfo/Makefile.depend soc2015/clord/head/lib/clang/libllvmexecutionengine/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmexecutionengine/Makefile.depend soc2015/clord/head/lib/clang/libllvminstcombine/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvminstcombine/Makefile.depend soc2015/clord/head/lib/clang/libllvminstrumentation/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvminstrumentation/Makefile.depend soc2015/clord/head/lib/clang/libllvminterpreter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvminterpreter/Makefile.depend soc2015/clord/head/lib/clang/libllvmipa/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmipa/Makefile.depend soc2015/clord/head/lib/clang/libllvmipo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmipo/Makefile.depend soc2015/clord/head/lib/clang/libllvmirreader/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmirreader/Makefile.depend soc2015/clord/head/lib/clang/libllvmlinker/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmlinker/Makefile.depend soc2015/clord/head/lib/clang/libllvmmc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmc/Makefile.depend soc2015/clord/head/lib/clang/libllvmmcdisassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmcdisassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmmcjit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmcjit/Makefile.depend soc2015/clord/head/lib/clang/libllvmmcparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmcparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmmipsasmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmipsasmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmmipscodegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmipscodegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmmipsdesc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmipsdesc/Makefile.depend soc2015/clord/head/lib/clang/libllvmmipsdisassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmipsdisassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmmipsinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmipsinfo/Makefile.depend soc2015/clord/head/lib/clang/libllvmmipsinstprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmmipsinstprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmobjcarcopts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmobjcarcopts/Makefile.depend soc2015/clord/head/lib/clang/libllvmobject/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmobject/Makefile.depend soc2015/clord/head/lib/clang/libllvmoption/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmoption/Makefile.depend soc2015/clord/head/lib/clang/libllvmpowerpcasmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmpowerpcasmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmpowerpccodegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmpowerpccodegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmpowerpcdesc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmpowerpcdesc/Makefile.depend soc2015/clord/head/lib/clang/libllvmpowerpcdisassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmpowerpcdisassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmpowerpcinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmpowerpcinfo/Makefile.depend soc2015/clord/head/lib/clang/libllvmpowerpcinstprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmpowerpcinstprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmprofiledata/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmprofiledata/Makefile.depend soc2015/clord/head/lib/clang/libllvmruntimedyld/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmruntimedyld/Makefile.depend soc2015/clord/head/lib/clang/libllvmscalaropts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmscalaropts/Makefile.depend soc2015/clord/head/lib/clang/libllvmselectiondag/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmselectiondag/Makefile.depend soc2015/clord/head/lib/clang/libllvmsparcasmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsparcasmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmsparccodegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsparccodegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmsparcdesc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsparcdesc/Makefile.depend soc2015/clord/head/lib/clang/libllvmsparcdisassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsparcdisassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmsparcinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsparcinfo/Makefile.depend soc2015/clord/head/lib/clang/libllvmsparcinstprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsparcinstprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmsupport/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmsupport/Makefile.depend soc2015/clord/head/lib/clang/libllvmtablegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmtablegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmtarget/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmtarget/Makefile.depend soc2015/clord/head/lib/clang/libllvmtransformutils/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmtransformutils/Makefile.depend soc2015/clord/head/lib/clang/libllvmvectorize/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmvectorize/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86asmparser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86asmparser/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86codegen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86codegen/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86desc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86desc/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86disassembler/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86disassembler/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86info/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86info/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86instprinter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86instprinter/Makefile.depend soc2015/clord/head/lib/clang/libllvmx86utils/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/clang/libllvmx86utils/Makefile.depend soc2015/clord/head/lib/csu/amd64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/amd64/Makefile.depend soc2015/clord/head/lib/csu/arm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/arm/Makefile.depend soc2015/clord/head/lib/csu/i386/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/i386/Makefile.depend soc2015/clord/head/lib/csu/mips/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/mips/Makefile.depend soc2015/clord/head/lib/csu/powerpc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/powerpc/Makefile.depend soc2015/clord/head/lib/csu/powerpc64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/powerpc64/Makefile.depend soc2015/clord/head/lib/csu/sparc64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/csu/sparc64/Makefile.depend soc2015/clord/head/lib/libalias/libalias/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/libalias/Makefile.depend soc2015/clord/head/lib/libalias/modules/cuseeme/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/cuseeme/Makefile.depend soc2015/clord/head/lib/libalias/modules/dummy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/dummy/Makefile.depend soc2015/clord/head/lib/libalias/modules/ftp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/ftp/Makefile.depend soc2015/clord/head/lib/libalias/modules/irc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/irc/Makefile.depend soc2015/clord/head/lib/libalias/modules/nbt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/nbt/Makefile.depend soc2015/clord/head/lib/libalias/modules/pptp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/pptp/Makefile.depend soc2015/clord/head/lib/libalias/modules/skinny/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/skinny/Makefile.depend soc2015/clord/head/lib/libalias/modules/smedia/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libalias/modules/smedia/Makefile.depend soc2015/clord/head/lib/libarchive/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libarchive/Makefile.depend soc2015/clord/head/lib/libauditd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libauditd/Makefile.depend soc2015/clord/head/lib/libbegemot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libbegemot/Makefile.depend soc2015/clord/head/lib/libblocksruntime/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libblocksruntime/Makefile.depend soc2015/clord/head/lib/libbluetooth/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libbluetooth/Makefile.depend soc2015/clord/head/lib/libbsm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libbsm/Makefile.depend soc2015/clord/head/lib/libbsnmp/libbsnmp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libbsnmp/libbsnmp/Makefile.depend soc2015/clord/head/lib/libbz2/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libbz2/Makefile.depend soc2015/clord/head/lib/libc++/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libc++/Makefile.depend soc2015/clord/head/lib/libc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libc/Makefile.depend soc2015/clord/head/lib/libc_nonshared/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libc_nonshared/Makefile.depend soc2015/clord/head/lib/libcalendar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcalendar/Makefile.depend soc2015/clord/head/lib/libcam/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcam/Makefile.depend soc2015/clord/head/lib/libcapsicum/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcapsicum/Makefile.depend soc2015/clord/head/lib/libcom_err/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcom_err/Makefile.depend soc2015/clord/head/lib/libcompat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcompat/Makefile.depend soc2015/clord/head/lib/libcompiler_rt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcompiler_rt/Makefile.depend soc2015/clord/head/lib/libcrypt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcrypt/Makefile.depend soc2015/clord/head/lib/libcrypt/tests/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcrypt/tests/Makefile.depend soc2015/clord/head/lib/libcuse/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcuse/Makefile.depend soc2015/clord/head/lib/libcxxrt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcxxrt/Makefile.depend soc2015/clord/head/lib/libcxxrt/Makefile.depend.host - copied unchanged from r287445, mirror/FreeBSD/head/lib/libcxxrt/Makefile.depend.host soc2015/clord/head/lib/libdevinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libdevinfo/Makefile.depend soc2015/clord/head/lib/libdevstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libdevstat/Makefile.depend soc2015/clord/head/lib/libdpv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libdpv/Makefile.depend soc2015/clord/head/lib/libdwarf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libdwarf/Makefile.depend soc2015/clord/head/lib/libedit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libedit/Makefile.depend soc2015/clord/head/lib/libedit/edit/readline/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libedit/edit/readline/Makefile.depend soc2015/clord/head/lib/libelf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libelf/Makefile.depend soc2015/clord/head/lib/libelftc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libelftc/Makefile.depend soc2015/clord/head/lib/libevent/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libevent/Makefile.depend soc2015/clord/head/lib/libexecinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libexecinfo/Makefile.depend soc2015/clord/head/lib/libexpat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libexpat/Makefile.depend soc2015/clord/head/lib/libfetch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libfetch/Makefile.depend soc2015/clord/head/lib/libfigpar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libfigpar/Makefile.depend soc2015/clord/head/lib/libgeom/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libgeom/Makefile.depend soc2015/clord/head/lib/libgpib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libgpib/Makefile.depend soc2015/clord/head/lib/libgpio/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libgpio/Makefile.depend soc2015/clord/head/lib/libgssapi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libgssapi/Makefile.depend soc2015/clord/head/lib/libiconv_modules/BIG5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/BIG5/Makefile.depend soc2015/clord/head/lib/libiconv_modules/DECHanyu/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/DECHanyu/Makefile.depend soc2015/clord/head/lib/libiconv_modules/EUC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/EUC/Makefile.depend soc2015/clord/head/lib/libiconv_modules/EUCTW/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/EUCTW/Makefile.depend soc2015/clord/head/lib/libiconv_modules/GBK2K/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/GBK2K/Makefile.depend soc2015/clord/head/lib/libiconv_modules/HZ/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/HZ/Makefile.depend soc2015/clord/head/lib/libiconv_modules/ISO2022/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/ISO2022/Makefile.depend soc2015/clord/head/lib/libiconv_modules/JOHAB/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/JOHAB/Makefile.depend soc2015/clord/head/lib/libiconv_modules/MSKanji/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/MSKanji/Makefile.depend soc2015/clord/head/lib/libiconv_modules/UES/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/UES/Makefile.depend soc2015/clord/head/lib/libiconv_modules/UTF1632/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/UTF1632/Makefile.depend soc2015/clord/head/lib/libiconv_modules/UTF7/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/UTF7/Makefile.depend soc2015/clord/head/lib/libiconv_modules/UTF8/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/UTF8/Makefile.depend soc2015/clord/head/lib/libiconv_modules/VIQR/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/VIQR/Makefile.depend soc2015/clord/head/lib/libiconv_modules/ZW/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/ZW/Makefile.depend soc2015/clord/head/lib/libiconv_modules/iconv_none/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/iconv_none/Makefile.depend soc2015/clord/head/lib/libiconv_modules/iconv_std/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/iconv_std/Makefile.depend soc2015/clord/head/lib/libiconv_modules/mapper_646/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/mapper_646/Makefile.depend soc2015/clord/head/lib/libiconv_modules/mapper_none/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/mapper_none/Makefile.depend soc2015/clord/head/lib/libiconv_modules/mapper_parallel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/mapper_parallel/Makefile.depend soc2015/clord/head/lib/libiconv_modules/mapper_serial/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/mapper_serial/Makefile.depend soc2015/clord/head/lib/libiconv_modules/mapper_std/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/mapper_std/Makefile.depend soc2015/clord/head/lib/libiconv_modules/mapper_zone/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libiconv_modules/mapper_zone/Makefile.depend soc2015/clord/head/lib/libipsec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libipsec/Makefile.depend soc2015/clord/head/lib/libjail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libjail/Makefile.depend soc2015/clord/head/lib/libkiconv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libkiconv/Makefile.depend soc2015/clord/head/lib/libkvm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libkvm/Makefile.depend soc2015/clord/head/lib/libldns/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libldns/Makefile.depend soc2015/clord/head/lib/liblzma/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/liblzma/Makefile.depend soc2015/clord/head/lib/libmagic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmagic/Makefile.depend soc2015/clord/head/lib/libmd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmd/Makefile.depend soc2015/clord/head/lib/libmd/Makefile.depend.host - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmd/Makefile.depend.host soc2015/clord/head/lib/libmemstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmemstat/Makefile.depend soc2015/clord/head/lib/libmilter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmilter/Makefile.depend soc2015/clord/head/lib/libmp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmp/Makefile.depend soc2015/clord/head/lib/libmt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libmt/Makefile.depend soc2015/clord/head/lib/libnetbsd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libnetbsd/Makefile.depend soc2015/clord/head/lib/libnetgraph/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libnetgraph/Makefile.depend soc2015/clord/head/lib/libngatm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libngatm/Makefile.depend soc2015/clord/head/lib/libnv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libnv/Makefile.depend soc2015/clord/head/lib/libohash/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libohash/Makefile.depend soc2015/clord/head/lib/libopie/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libopie/Makefile.depend soc2015/clord/head/lib/libpam/libpam/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/libpam/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_chroot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_chroot/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_deny/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_deny/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_echo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_echo/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_exec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_exec/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_ftpusers/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_ftpusers/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_group/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_group/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_guest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_guest/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_krb5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_krb5/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_ksu/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_ksu/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_lastlog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_lastlog/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_login_access/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_login_access/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_nologin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_nologin/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_opie/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_opie/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_opieaccess/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_opieaccess/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_passwdqc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_passwdqc/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_permit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_permit/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_radius/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_radius/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_rhosts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_rhosts/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_rootok/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_rootok/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_securetty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_securetty/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_self/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_self/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_ssh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_ssh/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_tacplus/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_tacplus/Makefile.depend soc2015/clord/head/lib/libpam/modules/pam_unix/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpam/modules/pam_unix/Makefile.depend soc2015/clord/head/lib/libpam/static_modules/ - copied from r287445, mirror/FreeBSD/head/lib/libpam/static_modules/ soc2015/clord/head/lib/libpcap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpcap/Makefile.depend soc2015/clord/head/lib/libpmc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libpmc/Makefile.depend soc2015/clord/head/lib/libproc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libproc/Makefile.depend soc2015/clord/head/lib/libprocstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libprocstat/Makefile.depend soc2015/clord/head/lib/libprocstat/zfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libprocstat/zfs/Makefile.depend soc2015/clord/head/lib/libradius/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libradius/Makefile.depend soc2015/clord/head/lib/librpcsec_gss/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/librpcsec_gss/Makefile.depend soc2015/clord/head/lib/librpcsvc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/librpcsvc/Makefile.depend soc2015/clord/head/lib/librt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/librt/Makefile.depend soc2015/clord/head/lib/librtld_db/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/librtld_db/Makefile.depend soc2015/clord/head/lib/libsbuf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsbuf/Makefile.depend soc2015/clord/head/lib/libsdp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsdp/Makefile.depend soc2015/clord/head/lib/libsm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsm/Makefile.depend soc2015/clord/head/lib/libsmb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsmb/Makefile.depend soc2015/clord/head/lib/libsmdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsmdb/Makefile.depend soc2015/clord/head/lib/libsmutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsmutil/Makefile.depend soc2015/clord/head/lib/libsqlite3/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libsqlite3/Makefile.depend soc2015/clord/head/lib/libstand/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libstand/Makefile.depend soc2015/clord/head/lib/libstdbuf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libstdbuf/Makefile.depend soc2015/clord/head/lib/libstdthreads/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libstdthreads/Makefile.depend soc2015/clord/head/lib/libtacplus/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libtacplus/Makefile.depend soc2015/clord/head/lib/libtelnet/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libtelnet/Makefile.depend soc2015/clord/head/lib/libthr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libthr/Makefile.depend soc2015/clord/head/lib/libthread_db/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libthread_db/Makefile.depend soc2015/clord/head/lib/libucl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libucl/Makefile.depend soc2015/clord/head/lib/libufs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libufs/Makefile.depend soc2015/clord/head/lib/libugidfw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libugidfw/Makefile.depend soc2015/clord/head/lib/libulog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libulog/Makefile.depend soc2015/clord/head/lib/libunbound/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libunbound/Makefile.depend soc2015/clord/head/lib/libusb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libusb/Makefile.depend soc2015/clord/head/lib/libusbhid/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libusbhid/Makefile.depend soc2015/clord/head/lib/libutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libutil/Makefile.depend soc2015/clord/head/lib/libvgl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libvgl/Makefile.depend soc2015/clord/head/lib/libvmmapi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libvmmapi/Makefile.depend soc2015/clord/head/lib/libwrap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libwrap/Makefile.depend soc2015/clord/head/lib/libxo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libxo/Makefile.depend soc2015/clord/head/lib/liby/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/liby/Makefile.depend soc2015/clord/head/lib/libypclnt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libypclnt/Makefile.depend soc2015/clord/head/lib/libz/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/libz/Makefile.depend soc2015/clord/head/lib/msun/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/msun/Makefile.depend soc2015/clord/head/lib/ncurses/form/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/form/Makefile.depend soc2015/clord/head/lib/ncurses/formw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/formw/Makefile.depend soc2015/clord/head/lib/ncurses/menu/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/menu/Makefile.depend soc2015/clord/head/lib/ncurses/menuw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/menuw/Makefile.depend soc2015/clord/head/lib/ncurses/ncurses/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/ncurses/Makefile.depend soc2015/clord/head/lib/ncurses/ncursesw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/ncursesw/Makefile.depend soc2015/clord/head/lib/ncurses/panel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/panel/Makefile.depend soc2015/clord/head/lib/ncurses/panelw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/lib/ncurses/panelw/Makefile.depend soc2015/clord/head/libexec/atf/atf-check/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/atf/atf-check/Makefile.depend soc2015/clord/head/libexec/atf/atf-sh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/atf/atf-sh/Makefile.depend soc2015/clord/head/libexec/atrun/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/atrun/Makefile.depend soc2015/clord/head/libexec/bootpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/bootpd/Makefile.depend soc2015/clord/head/libexec/bootpd/bootpgw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/bootpd/bootpgw/Makefile.depend soc2015/clord/head/libexec/bootpd/tools/bootpef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/bootpd/tools/bootpef/Makefile.depend soc2015/clord/head/libexec/bootpd/tools/bootptest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/bootpd/tools/bootptest/Makefile.depend soc2015/clord/head/libexec/comsat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/comsat/Makefile.depend soc2015/clord/head/libexec/fingerd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/fingerd/Makefile.depend soc2015/clord/head/libexec/ftpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/ftpd/Makefile.depend soc2015/clord/head/libexec/getty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/getty/Makefile.depend soc2015/clord/head/libexec/mail.local/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/mail.local/Makefile.depend soc2015/clord/head/libexec/mknetid/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/mknetid/Makefile.depend soc2015/clord/head/libexec/pppoed/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/pppoed/Makefile.depend soc2015/clord/head/libexec/rbootd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rbootd/Makefile.depend soc2015/clord/head/libexec/revnetgroup/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/revnetgroup/Makefile.depend soc2015/clord/head/libexec/rlogind/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rlogind/Makefile.depend soc2015/clord/head/libexec/rpc.rquotad/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rpc.rquotad/Makefile.depend soc2015/clord/head/libexec/rpc.rstatd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rpc.rstatd/Makefile.depend soc2015/clord/head/libexec/rpc.rusersd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rpc.rusersd/Makefile.depend soc2015/clord/head/libexec/rpc.rwalld/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rpc.rwalld/Makefile.depend soc2015/clord/head/libexec/rpc.sprayd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rpc.sprayd/Makefile.depend soc2015/clord/head/libexec/rshd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rshd/Makefile.depend soc2015/clord/head/libexec/rtld-elf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/rtld-elf/Makefile.depend soc2015/clord/head/libexec/save-entropy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/save-entropy/Makefile.depend soc2015/clord/head/libexec/smrsh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/smrsh/Makefile.depend soc2015/clord/head/libexec/talkd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/talkd/Makefile.depend soc2015/clord/head/libexec/tcpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/tcpd/Makefile.depend soc2015/clord/head/libexec/telnetd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/telnetd/Makefile.depend soc2015/clord/head/libexec/tftp-proxy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/tftp-proxy/Makefile.depend soc2015/clord/head/libexec/tftpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/tftpd/Makefile.depend soc2015/clord/head/libexec/ulog-helper/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/ulog-helper/Makefile.depend soc2015/clord/head/libexec/ypxfr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/libexec/ypxfr/Makefile.depend soc2015/clord/head/release/Makefile.azure - copied unchanged from r287445, mirror/FreeBSD/head/release/Makefile.azure soc2015/clord/head/rescue/librescue/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/rescue/librescue/Makefile.depend soc2015/clord/head/sbin/adjkerntz/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/adjkerntz/Makefile.depend soc2015/clord/head/sbin/atm/atmconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/atm/atmconfig/Makefile.depend soc2015/clord/head/sbin/badsect/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/badsect/Makefile.depend soc2015/clord/head/sbin/bsdlabel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/bsdlabel/Makefile.depend soc2015/clord/head/sbin/camcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/camcontrol/Makefile.depend soc2015/clord/head/sbin/camcontrol/attrib.c - copied unchanged from r287445, mirror/FreeBSD/head/sbin/camcontrol/attrib.c soc2015/clord/head/sbin/ccdconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ccdconfig/Makefile.depend soc2015/clord/head/sbin/clri/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/clri/Makefile.depend soc2015/clord/head/sbin/comcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/comcontrol/Makefile.depend soc2015/clord/head/sbin/conscontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/conscontrol/Makefile.depend soc2015/clord/head/sbin/ddb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ddb/Makefile.depend soc2015/clord/head/sbin/devd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/devd/Makefile.depend soc2015/clord/head/sbin/devfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/devfs/Makefile.depend soc2015/clord/head/sbin/dhclient/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/dhclient/Makefile.depend soc2015/clord/head/sbin/dmesg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/dmesg/Makefile.depend soc2015/clord/head/sbin/dump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/dump/Makefile.depend soc2015/clord/head/sbin/dumpfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/dumpfs/Makefile.depend soc2015/clord/head/sbin/dumpon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/dumpon/Makefile.depend soc2015/clord/head/sbin/etherswitchcfg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/etherswitchcfg/Makefile.depend soc2015/clord/head/sbin/fdisk/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fdisk/Makefile.depend soc2015/clord/head/sbin/fdisk_pc98/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fdisk_pc98/Makefile.depend soc2015/clord/head/sbin/ffsinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ffsinfo/Makefile.depend soc2015/clord/head/sbin/fsck/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fsck/Makefile.depend soc2015/clord/head/sbin/fsck_ffs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fsck_ffs/Makefile.depend soc2015/clord/head/sbin/fsck_msdosfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fsck_msdosfs/Makefile.depend soc2015/clord/head/sbin/fsdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fsdb/Makefile.depend soc2015/clord/head/sbin/fsirand/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/fsirand/Makefile.depend soc2015/clord/head/sbin/gbde/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/gbde/Makefile.depend soc2015/clord/head/sbin/geom/class/cache/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/cache/Makefile.depend soc2015/clord/head/sbin/geom/class/concat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/concat/Makefile.depend soc2015/clord/head/sbin/geom/class/eli/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/eli/Makefile.depend soc2015/clord/head/sbin/geom/class/journal/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/journal/Makefile.depend soc2015/clord/head/sbin/geom/class/label/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/label/Makefile.depend soc2015/clord/head/sbin/geom/class/mirror/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/mirror/Makefile.depend soc2015/clord/head/sbin/geom/class/mountver/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/mountver/Makefile.depend soc2015/clord/head/sbin/geom/class/multipath/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/multipath/Makefile.depend soc2015/clord/head/sbin/geom/class/nop/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/nop/Makefile.depend soc2015/clord/head/sbin/geom/class/part/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/part/Makefile.depend soc2015/clord/head/sbin/geom/class/raid/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/raid/Makefile.depend soc2015/clord/head/sbin/geom/class/raid3/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/raid3/Makefile.depend soc2015/clord/head/sbin/geom/class/sched/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/sched/Makefile.depend soc2015/clord/head/sbin/geom/class/shsec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/shsec/Makefile.depend soc2015/clord/head/sbin/geom/class/stripe/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/stripe/Makefile.depend soc2015/clord/head/sbin/geom/class/virstor/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/class/virstor/Makefile.depend soc2015/clord/head/sbin/geom/core/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/geom/core/Makefile.depend soc2015/clord/head/sbin/ggate/ggatec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ggate/ggatec/Makefile.depend soc2015/clord/head/sbin/ggate/ggated/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ggate/ggated/Makefile.depend soc2015/clord/head/sbin/ggate/ggatel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ggate/ggatel/Makefile.depend soc2015/clord/head/sbin/growfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/growfs/Makefile.depend soc2015/clord/head/sbin/gvinum/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/gvinum/Makefile.depend soc2015/clord/head/sbin/hastctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/hastctl/Makefile.depend soc2015/clord/head/sbin/hastd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/hastd/Makefile.depend soc2015/clord/head/sbin/ifconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ifconfig/Makefile.depend soc2015/clord/head/sbin/init/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/init/Makefile.depend soc2015/clord/head/sbin/ipf/ipf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipf/Makefile.depend soc2015/clord/head/sbin/ipf/ipfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipfs/Makefile.depend soc2015/clord/head/sbin/ipf/ipfstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipfstat/Makefile.depend soc2015/clord/head/sbin/ipf/ipftest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipftest/Makefile.depend soc2015/clord/head/sbin/ipf/ipmon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipmon/Makefile.depend soc2015/clord/head/sbin/ipf/ipnat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipnat/Makefile.depend soc2015/clord/head/sbin/ipf/ippool/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ippool/Makefile.depend soc2015/clord/head/sbin/ipf/ipresend/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/ipresend/Makefile.depend soc2015/clord/head/sbin/ipf/libipf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipf/libipf/Makefile.depend soc2015/clord/head/sbin/ipfw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ipfw/Makefile.depend soc2015/clord/head/sbin/iscontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/iscontrol/Makefile.depend soc2015/clord/head/sbin/kldconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/kldconfig/Makefile.depend soc2015/clord/head/sbin/kldload/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/kldload/Makefile.depend soc2015/clord/head/sbin/kldstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/kldstat/Makefile.depend soc2015/clord/head/sbin/kldunload/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/kldunload/Makefile.depend soc2015/clord/head/sbin/ldconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ldconfig/Makefile.depend soc2015/clord/head/sbin/md5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/md5/Makefile.depend soc2015/clord/head/sbin/mdconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mdconfig/Makefile.depend soc2015/clord/head/sbin/mdmfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mdmfs/Makefile.depend soc2015/clord/head/sbin/mknod/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mknod/Makefile.depend soc2015/clord/head/sbin/mksnap_ffs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mksnap_ffs/Makefile.depend soc2015/clord/head/sbin/mount/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount/Makefile.depend soc2015/clord/head/sbin/mount_cd9660/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_cd9660/Makefile.depend soc2015/clord/head/sbin/mount_fusefs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_fusefs/Makefile.depend soc2015/clord/head/sbin/mount_msdosfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_msdosfs/Makefile.depend soc2015/clord/head/sbin/mount_nfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_nfs/Makefile.depend soc2015/clord/head/sbin/mount_nullfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_nullfs/Makefile.depend soc2015/clord/head/sbin/mount_udf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_udf/Makefile.depend soc2015/clord/head/sbin/mount_unionfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/mount_unionfs/Makefile.depend soc2015/clord/head/sbin/natd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/natd/Makefile.depend soc2015/clord/head/sbin/newfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/newfs/Makefile.depend soc2015/clord/head/sbin/newfs_msdos/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/newfs_msdos/Makefile.depend soc2015/clord/head/sbin/nfsiod/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/nfsiod/Makefile.depend soc2015/clord/head/sbin/nos-tun/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/nos-tun/Makefile.depend soc2015/clord/head/sbin/nvmecontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/nvmecontrol/Makefile.depend soc2015/clord/head/sbin/pfctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/pfctl/Makefile.depend soc2015/clord/head/sbin/pflogd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/pflogd/Makefile.depend soc2015/clord/head/sbin/ping/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ping/Makefile.depend soc2015/clord/head/sbin/ping6/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/ping6/Makefile.depend soc2015/clord/head/sbin/quotacheck/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/quotacheck/Makefile.depend soc2015/clord/head/sbin/rcorder/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/rcorder/Makefile.depend soc2015/clord/head/sbin/reboot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/reboot/Makefile.depend soc2015/clord/head/sbin/recoverdisk/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/recoverdisk/Makefile.depend soc2015/clord/head/sbin/resolvconf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/resolvconf/Makefile.depend soc2015/clord/head/sbin/restore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/restore/Makefile.depend soc2015/clord/head/sbin/route/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/route/Makefile.depend soc2015/clord/head/sbin/routed/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/routed/Makefile.depend soc2015/clord/head/sbin/routed/rtquery/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/routed/rtquery/Makefile.depend soc2015/clord/head/sbin/rtsol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/rtsol/Makefile.depend soc2015/clord/head/sbin/savecore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/savecore/Makefile.depend soc2015/clord/head/sbin/sconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/sconfig/Makefile.depend soc2015/clord/head/sbin/setkey/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/setkey/Makefile.depend soc2015/clord/head/sbin/shutdown/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/shutdown/Makefile.depend soc2015/clord/head/sbin/spppcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/spppcontrol/Makefile.depend soc2015/clord/head/sbin/sunlabel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/sunlabel/Makefile.depend soc2015/clord/head/sbin/swapon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/swapon/Makefile.depend soc2015/clord/head/sbin/sysctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/sysctl/Makefile.depend soc2015/clord/head/sbin/tunefs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/tunefs/Makefile.depend soc2015/clord/head/sbin/umount/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sbin/umount/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libaep/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libaep/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libatalla/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libatalla/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libchil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libchil/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libcswift/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libcswift/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libgost/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libgost/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libnuron/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libnuron/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libsureware/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libsureware/Makefile.depend soc2015/clord/head/secure/lib/libcrypto/engines/libubsec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libcrypto/engines/libubsec/Makefile.depend soc2015/clord/head/secure/lib/libssh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libssh/Makefile.depend soc2015/clord/head/secure/lib/libssl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/lib/libssl/Makefile.depend soc2015/clord/head/secure/libexec/sftp-server/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/libexec/sftp-server/Makefile.depend soc2015/clord/head/secure/libexec/ssh-keysign/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/libexec/ssh-keysign/Makefile.depend soc2015/clord/head/secure/libexec/ssh-pkcs11-helper/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/libexec/ssh-pkcs11-helper/Makefile.depend soc2015/clord/head/secure/usr.bin/bdes/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/bdes/Makefile.depend soc2015/clord/head/secure/usr.bin/openssl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/openssl/Makefile.depend soc2015/clord/head/secure/usr.bin/scp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/scp/Makefile.depend soc2015/clord/head/secure/usr.bin/sftp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/sftp/Makefile.depend soc2015/clord/head/secure/usr.bin/ssh-add/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/ssh-add/Makefile.depend soc2015/clord/head/secure/usr.bin/ssh-agent/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/ssh-agent/Makefile.depend soc2015/clord/head/secure/usr.bin/ssh-keygen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/ssh-keygen/Makefile.depend soc2015/clord/head/secure/usr.bin/ssh-keyscan/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/ssh-keyscan/Makefile.depend soc2015/clord/head/secure/usr.bin/ssh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.bin/ssh/Makefile.depend soc2015/clord/head/secure/usr.sbin/sshd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/secure/usr.sbin/sshd/Makefile.depend soc2015/clord/head/share/colldef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/colldef/Makefile.depend soc2015/clord/head/share/dict/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/dict/Makefile.depend soc2015/clord/head/share/doc/IPv6/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/IPv6/Makefile.depend soc2015/clord/head/share/doc/atf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/atf/Makefile.depend soc2015/clord/head/share/doc/legal/intel_ipw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/legal/intel_ipw/Makefile.depend soc2015/clord/head/share/doc/legal/intel_iwi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/legal/intel_iwi/Makefile.depend soc2015/clord/head/share/doc/legal/intel_iwn/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/legal/intel_iwn/Makefile.depend soc2015/clord/head/share/doc/legal/intel_wpi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/legal/intel_wpi/Makefile.depend soc2015/clord/head/share/doc/legal/realtek/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/legal/realtek/Makefile.depend soc2015/clord/head/share/doc/llvm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/llvm/Makefile.depend soc2015/clord/head/share/doc/llvm/clang/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/llvm/clang/Makefile.depend soc2015/clord/head/share/doc/usd/13.viref/merge.awk - copied unchanged from r287445, mirror/FreeBSD/head/share/doc/usd/13.viref/merge.awk soc2015/clord/head/share/dtrace/toolkit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/dtrace/toolkit/Makefile.depend soc2015/clord/head/share/examples/ipfilter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/examples/ipfilter/Makefile.depend soc2015/clord/head/share/examples/libvgl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/examples/libvgl/Makefile.depend soc2015/clord/head/share/examples/pf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/examples/pf/Makefile.depend soc2015/clord/head/share/i18n/csmapper/APPLE/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/APPLE/Makefile.depend soc2015/clord/head/share/i18n/csmapper/AST/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/AST/Makefile.depend soc2015/clord/head/share/i18n/csmapper/BIG5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/BIG5/Makefile.depend soc2015/clord/head/share/i18n/csmapper/CNS/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/CNS/Makefile.depend soc2015/clord/head/share/i18n/csmapper/CP/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/CP/Makefile.depend soc2015/clord/head/share/i18n/csmapper/EBCDIC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/EBCDIC/Makefile.depend soc2015/clord/head/share/i18n/csmapper/GB/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/GB/Makefile.depend soc2015/clord/head/share/i18n/csmapper/GEORGIAN/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/GEORGIAN/Makefile.depend soc2015/clord/head/share/i18n/csmapper/ISO-8859/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/ISO-8859/Makefile.depend soc2015/clord/head/share/i18n/csmapper/ISO646/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/ISO646/Makefile.depend soc2015/clord/head/share/i18n/csmapper/JIS/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/JIS/Makefile.depend soc2015/clord/head/share/i18n/csmapper/KAZAKH/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/KAZAKH/Makefile.depend soc2015/clord/head/share/i18n/csmapper/KOI/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/KOI/Makefile.depend soc2015/clord/head/share/i18n/csmapper/KS/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/KS/Makefile.depend soc2015/clord/head/share/i18n/csmapper/MISC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/MISC/Makefile.depend soc2015/clord/head/share/i18n/csmapper/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/Makefile.depend soc2015/clord/head/share/i18n/csmapper/TCVN/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/csmapper/TCVN/Makefile.depend soc2015/clord/head/share/i18n/esdb/APPLE/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/APPLE/Makefile.depend soc2015/clord/head/share/i18n/esdb/AST/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/AST/Makefile.depend soc2015/clord/head/share/i18n/esdb/BIG5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/BIG5/Makefile.depend soc2015/clord/head/share/i18n/esdb/CP/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/CP/Makefile.depend soc2015/clord/head/share/i18n/esdb/DEC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/DEC/Makefile.depend soc2015/clord/head/share/i18n/esdb/EBCDIC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/EBCDIC/Makefile.depend soc2015/clord/head/share/i18n/esdb/EUC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/EUC/Makefile.depend soc2015/clord/head/share/i18n/esdb/GB/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/GB/Makefile.depend soc2015/clord/head/share/i18n/esdb/GEORGIAN/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/GEORGIAN/Makefile.depend soc2015/clord/head/share/i18n/esdb/ISO-2022/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/ISO-2022/Makefile.depend soc2015/clord/head/share/i18n/esdb/ISO-8859/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/ISO-8859/Makefile.depend soc2015/clord/head/share/i18n/esdb/ISO646/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/ISO646/Makefile.depend soc2015/clord/head/share/i18n/esdb/KAZAKH/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/KAZAKH/Makefile.depend soc2015/clord/head/share/i18n/esdb/KOI/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/KOI/Makefile.depend soc2015/clord/head/share/i18n/esdb/MISC/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/MISC/Makefile.depend soc2015/clord/head/share/i18n/esdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/Makefile.depend soc2015/clord/head/share/i18n/esdb/TCVN/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/TCVN/Makefile.depend soc2015/clord/head/share/i18n/esdb/UTF/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/i18n/esdb/UTF/Makefile.depend soc2015/clord/head/share/man/man1/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man1/Makefile.depend soc2015/clord/head/share/man/man3/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man3/Makefile.depend soc2015/clord/head/share/man/man4/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man4/Makefile.depend soc2015/clord/head/share/man/man4/man4.arm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man4/man4.arm/Makefile.depend soc2015/clord/head/share/man/man4/man4.i386/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man4/man4.i386/Makefile.depend soc2015/clord/head/share/man/man4/man4.powerpc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man4/man4.powerpc/Makefile.depend soc2015/clord/head/share/man/man4/man4.sparc64/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man4/man4.sparc64/Makefile.depend soc2015/clord/head/share/man/man4/ugold.4 - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man4/ugold.4 soc2015/clord/head/share/man/man5/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man5/Makefile.depend soc2015/clord/head/share/man/man6/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man6/Makefile.depend soc2015/clord/head/share/man/man7/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man7/Makefile.depend soc2015/clord/head/share/man/man8/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man8/Makefile.depend soc2015/clord/head/share/man/man9/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/man/man9/Makefile.depend soc2015/clord/head/share/me/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/me/Makefile.depend soc2015/clord/head/share/misc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/misc/Makefile.depend soc2015/clord/head/share/mk/auto.obj.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/auto.obj.mk soc2015/clord/head/share/mk/dirdeps.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/dirdeps.mk soc2015/clord/head/share/mk/gendirdeps.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/gendirdeps.mk soc2015/clord/head/share/mk/host-target.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/host-target.mk soc2015/clord/head/share/mk/install-new.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/install-new.mk soc2015/clord/head/share/mk/local.autodep.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.autodep.mk soc2015/clord/head/share/mk/local.dirdeps.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.dirdeps.mk soc2015/clord/head/share/mk/local.gendirdeps.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.gendirdeps.mk soc2015/clord/head/share/mk/local.init.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.init.mk soc2015/clord/head/share/mk/local.meta.sys.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.meta.sys.mk soc2015/clord/head/share/mk/local.sys.env.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.sys.env.mk soc2015/clord/head/share/mk/local.sys.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/local.sys.mk soc2015/clord/head/share/mk/meta.autodep.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/meta.autodep.mk soc2015/clord/head/share/mk/meta.stage.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/meta.stage.mk soc2015/clord/head/share/mk/meta.subdir.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/meta.subdir.mk soc2015/clord/head/share/mk/meta.sys.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/meta.sys.mk soc2015/clord/head/share/mk/meta2deps.py - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/meta2deps.py soc2015/clord/head/share/mk/meta2deps.sh - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/meta2deps.sh soc2015/clord/head/share/mk/src.sys.env.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/src.sys.env.mk soc2015/clord/head/share/mk/stage-install.sh - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/stage-install.sh soc2015/clord/head/share/mk/sys.dependfile.mk - copied unchanged from r287445, mirror/FreeBSD/head/share/mk/sys.dependfile.mk soc2015/clord/head/share/mklocale/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/mklocale/Makefile.depend soc2015/clord/head/share/monetdef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/monetdef/Makefile.depend soc2015/clord/head/share/msgdef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/msgdef/Makefile.depend soc2015/clord/head/share/numericdef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/numericdef/Makefile.depend soc2015/clord/head/share/security/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/security/Makefile.depend soc2015/clord/head/share/sendmail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/sendmail/Makefile.depend soc2015/clord/head/share/skel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/skel/Makefile.depend soc2015/clord/head/share/snmp/mibs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/snmp/mibs/Makefile.depend soc2015/clord/head/share/syscons/fonts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/syscons/fonts/Makefile.depend soc2015/clord/head/share/syscons/keymaps/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/syscons/keymaps/Makefile.depend soc2015/clord/head/share/syscons/scrnmaps/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/syscons/scrnmaps/Makefile.depend soc2015/clord/head/share/tabset/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/tabset/Makefile.depend soc2015/clord/head/share/termcap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/termcap/Makefile.depend soc2015/clord/head/share/timedef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/timedef/Makefile.depend soc2015/clord/head/share/zoneinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/share/zoneinfo/Makefile.depend soc2015/clord/head/sys/arm/ti/am335x/hdmi.h - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm/ti/am335x/hdmi.h soc2015/clord/head/sys/arm/ti/am335x/hdmi_if.m - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm/ti/am335x/hdmi_if.m soc2015/clord/head/sys/arm/ti/am335x/tda19988.c - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm/ti/am335x/tda19988.c soc2015/clord/head/sys/arm64/acpica/ - copied from r287445, mirror/FreeBSD/head/sys/arm64/acpica/ soc2015/clord/head/sys/arm64/arm64/gic.h - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/arm64/gic.h soc2015/clord/head/sys/arm64/arm64/gic_acpi.c - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/arm64/gic_acpi.c soc2015/clord/head/sys/arm64/arm64/gic_fdt.c - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/arm64/gic_fdt.c soc2015/clord/head/sys/arm64/arm64/unwind.c - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/arm64/unwind.c soc2015/clord/head/sys/arm64/include/acpica_machdep.h - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/include/acpica_machdep.h soc2015/clord/head/sys/arm64/include/iodev.h - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/include/iodev.h soc2015/clord/head/sys/arm64/include/pci_cfgreg.h - copied unchanged from r287445, mirror/FreeBSD/head/sys/arm64/include/pci_cfgreg.h soc2015/clord/head/sys/boot/common/Makefile - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/common/Makefile soc2015/clord/head/sys/boot/efi/libefi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/efi/libefi/Makefile.depend soc2015/clord/head/sys/boot/ficl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/ficl/Makefile.depend soc2015/clord/head/sys/boot/i386/boot0/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/i386/boot0/Makefile.depend soc2015/clord/head/sys/boot/i386/boot0sio/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/i386/boot0sio/Makefile.depend soc2015/clord/head/sys/boot/i386/boot2/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/i386/boot2/Makefile.depend soc2015/clord/head/sys/boot/i386/loader/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/i386/loader/Makefile.depend soc2015/clord/head/sys/boot/i386/zfsloader/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/sys/boot/i386/zfsloader/Makefile.depend soc2015/clord/head/sys/contrib/dev/acpica/include/acclib.h - copied unchanged from r287445, mirror/FreeBSD/head/sys/contrib/dev/acpica/include/acclib.h soc2015/clord/head/sys/dev/pci/pci_host_generic.c - copied unchanged from r287445, mirror/FreeBSD/head/sys/dev/pci/pci_host_generic.c soc2015/clord/head/sys/dev/usb/misc/ugold.c - copied unchanged from r287445, mirror/FreeBSD/head/sys/dev/usb/misc/ugold.c soc2015/clord/head/sys/modules/usb/ugold/ - copied from r287445, mirror/FreeBSD/head/sys/modules/usb/ugold/ soc2015/clord/head/targets/ (props changed) - copied from r287445, mirror/FreeBSD/head/targets/ soc2015/clord/head/tools/build/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/tools/build/Makefile.depend soc2015/clord/head/tools/bus_space/C/libbus.h - copied unchanged from r287445, mirror/FreeBSD/head/tools/bus_space/C/libbus.h soc2015/clord/head/tools/bus_space/bus.c - copied unchanged from r287445, mirror/FreeBSD/head/tools/bus_space/bus.c soc2015/clord/head/tools/bus_space/bus.h - copied unchanged from r287445, mirror/FreeBSD/head/tools/bus_space/bus.h soc2015/clord/head/tools/regression/include/stdatomic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/tools/regression/include/stdatomic/Makefile.depend soc2015/clord/head/tools/tools/ath/ath_ee_9300_print/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/tools/tools/ath/ath_ee_9300_print/Makefile.depend soc2015/clord/head/tools/tools/drm/radeon/mkregtable/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/tools/tools/drm/radeon/mkregtable/Makefile.depend soc2015/clord/head/tools/tools/makeroot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/tools/tools/makeroot/Makefile.depend soc2015/clord/head/tools/tools/usbtest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/tools/tools/usbtest/Makefile.depend soc2015/clord/head/usr.bin/addr2line/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/addr2line/Makefile.depend soc2015/clord/head/usr.bin/alias/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/alias/Makefile.depend soc2015/clord/head/usr.bin/apply/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/apply/Makefile.depend soc2015/clord/head/usr.bin/ar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ar/Makefile.depend soc2015/clord/head/usr.bin/asa/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/asa/Makefile.depend soc2015/clord/head/usr.bin/at/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/at/Makefile.depend soc2015/clord/head/usr.bin/atm/sscop/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/atm/sscop/Makefile.depend soc2015/clord/head/usr.bin/awk/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/awk/Makefile.depend soc2015/clord/head/usr.bin/banner/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/banner/Makefile.depend soc2015/clord/head/usr.bin/basename/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/basename/Makefile.depend soc2015/clord/head/usr.bin/bc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bc/Makefile.depend soc2015/clord/head/usr.bin/biff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/biff/Makefile.depend soc2015/clord/head/usr.bin/bluetooth/bthost/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bluetooth/bthost/Makefile.depend soc2015/clord/head/usr.bin/bluetooth/btsockstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bluetooth/btsockstat/Makefile.depend soc2015/clord/head/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend soc2015/clord/head/usr.bin/bmake/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bmake/Makefile.depend soc2015/clord/head/usr.bin/brandelf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/brandelf/Makefile.depend soc2015/clord/head/usr.bin/bsdiff/bsdiff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bsdiff/bsdiff/Makefile.depend soc2015/clord/head/usr.bin/bsdiff/bspatch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bsdiff/bspatch/Makefile.depend soc2015/clord/head/usr.bin/bzip2/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bzip2/Makefile.depend soc2015/clord/head/usr.bin/bzip2recover/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/bzip2recover/Makefile.depend soc2015/clord/head/usr.bin/c89/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/c89/Makefile.depend soc2015/clord/head/usr.bin/c99/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/c99/Makefile.depend soc2015/clord/head/usr.bin/calendar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/calendar/Makefile.depend soc2015/clord/head/usr.bin/cap_mkdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/cap_mkdb/Makefile.depend soc2015/clord/head/usr.bin/catman/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/catman/Makefile.depend soc2015/clord/head/usr.bin/chat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/chat/Makefile.depend soc2015/clord/head/usr.bin/checknr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/checknr/Makefile.depend soc2015/clord/head/usr.bin/chkey/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/chkey/Makefile.depend soc2015/clord/head/usr.bin/chpass/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/chpass/Makefile.depend soc2015/clord/head/usr.bin/cksum/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/cksum/Makefile.depend soc2015/clord/head/usr.bin/clang/clang-tblgen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/clang/clang-tblgen/Makefile.depend soc2015/clord/head/usr.bin/clang/clang/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/clang/clang/Makefile.depend soc2015/clord/head/usr.bin/clang/lldb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/clang/lldb/Makefile.depend soc2015/clord/head/usr.bin/clang/tblgen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/clang/tblgen/Makefile.depend soc2015/clord/head/usr.bin/cmp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/cmp/Makefile.depend soc2015/clord/head/usr.bin/col/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/col/Makefile.depend soc2015/clord/head/usr.bin/colcrt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/colcrt/Makefile.depend soc2015/clord/head/usr.bin/colldef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/colldef/Makefile.depend soc2015/clord/head/usr.bin/colrm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/colrm/Makefile.depend soc2015/clord/head/usr.bin/column/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/column/Makefile.depend soc2015/clord/head/usr.bin/comm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/comm/Makefile.depend soc2015/clord/head/usr.bin/compile_et/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/compile_et/Makefile.depend soc2015/clord/head/usr.bin/compress/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/compress/Makefile.depend soc2015/clord/head/usr.bin/cpio/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/cpio/Makefile.depend soc2015/clord/head/usr.bin/cpuset/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/cpuset/Makefile.depend soc2015/clord/head/usr.bin/csplit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/csplit/Makefile.depend soc2015/clord/head/usr.bin/ctags/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ctags/Makefile.depend soc2015/clord/head/usr.bin/ctlstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ctlstat/Makefile.depend soc2015/clord/head/usr.bin/cut/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/cut/Makefile.depend soc2015/clord/head/usr.bin/dc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/dc/Makefile.depend soc2015/clord/head/usr.bin/dirname/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/dirname/Makefile.depend soc2015/clord/head/usr.bin/du/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/du/Makefile.depend soc2015/clord/head/usr.bin/ee/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ee/Makefile.depend soc2015/clord/head/usr.bin/elf2aout/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/elf2aout/Makefile.depend soc2015/clord/head/usr.bin/elfcopy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/elfcopy/Makefile.depend soc2015/clord/head/usr.bin/elfdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/elfdump/Makefile.depend soc2015/clord/head/usr.bin/enigma/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/enigma/Makefile.depend soc2015/clord/head/usr.bin/env/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/env/Makefile.depend soc2015/clord/head/usr.bin/expand/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/expand/Makefile.depend soc2015/clord/head/usr.bin/false/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/false/Makefile.depend soc2015/clord/head/usr.bin/fetch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/fetch/Makefile.depend soc2015/clord/head/usr.bin/file/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/file/Makefile.depend soc2015/clord/head/usr.bin/file2c/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/file2c/Makefile.depend soc2015/clord/head/usr.bin/find/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/find/Makefile.depend soc2015/clord/head/usr.bin/finger/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/finger/Makefile.depend soc2015/clord/head/usr.bin/fmt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/fmt/Makefile.depend soc2015/clord/head/usr.bin/fold/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/fold/Makefile.depend soc2015/clord/head/usr.bin/from/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/from/Makefile.depend soc2015/clord/head/usr.bin/fstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/fstat/Makefile.depend soc2015/clord/head/usr.bin/fsync/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/fsync/Makefile.depend soc2015/clord/head/usr.bin/ftp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ftp/Makefile.depend soc2015/clord/head/usr.bin/gcore/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/gcore/Makefile.depend soc2015/clord/head/usr.bin/gencat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/gencat/Makefile.depend soc2015/clord/head/usr.bin/getconf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/getconf/Makefile.depend soc2015/clord/head/usr.bin/getent/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/getent/Makefile.depend soc2015/clord/head/usr.bin/getopt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/getopt/Makefile.depend soc2015/clord/head/usr.bin/gprof/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/gprof/Makefile.depend soc2015/clord/head/usr.bin/grep/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/grep/Makefile.depend soc2015/clord/head/usr.bin/gzip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/gzip/Makefile.depend soc2015/clord/head/usr.bin/head/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/head/Makefile.depend soc2015/clord/head/usr.bin/hexdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/hexdump/Makefile.depend soc2015/clord/head/usr.bin/host/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/host/Makefile.depend soc2015/clord/head/usr.bin/id/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/id/Makefile.depend soc2015/clord/head/usr.bin/indent/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/indent/Makefile.depend soc2015/clord/head/usr.bin/ipcrm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ipcrm/Makefile.depend soc2015/clord/head/usr.bin/ipcs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ipcs/Makefile.depend soc2015/clord/head/usr.bin/join/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/join/Makefile.depend soc2015/clord/head/usr.bin/jot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/jot/Makefile.depend soc2015/clord/head/usr.bin/kdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/kdump/Makefile.depend soc2015/clord/head/usr.bin/keylogin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/keylogin/Makefile.depend soc2015/clord/head/usr.bin/keylogout/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/keylogout/Makefile.depend soc2015/clord/head/usr.bin/killall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/killall/Makefile.depend soc2015/clord/head/usr.bin/ktrace/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ktrace/Makefile.depend soc2015/clord/head/usr.bin/ktrdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ktrdump/Makefile.depend soc2015/clord/head/usr.bin/lam/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lam/Makefile.depend soc2015/clord/head/usr.bin/last/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/last/Makefile.depend soc2015/clord/head/usr.bin/lastcomm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lastcomm/Makefile.depend soc2015/clord/head/usr.bin/ldd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ldd/Makefile.depend soc2015/clord/head/usr.bin/leave/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/leave/Makefile.depend soc2015/clord/head/usr.bin/less/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/less/Makefile.depend soc2015/clord/head/usr.bin/lessecho/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lessecho/Makefile.depend soc2015/clord/head/usr.bin/lesskey/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lesskey/Makefile.depend soc2015/clord/head/usr.bin/lex/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lex/Makefile.depend soc2015/clord/head/usr.bin/lex/lib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lex/lib/Makefile.depend soc2015/clord/head/usr.bin/limits/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/limits/Makefile.depend soc2015/clord/head/usr.bin/locale/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/locale/Makefile.depend soc2015/clord/head/usr.bin/locate/bigram/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/locate/bigram/Makefile.depend soc2015/clord/head/usr.bin/locate/code/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/locate/code/Makefile.depend soc2015/clord/head/usr.bin/locate/locate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/locate/locate/Makefile.depend soc2015/clord/head/usr.bin/lock/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lock/Makefile.depend soc2015/clord/head/usr.bin/lockf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lockf/Makefile.depend soc2015/clord/head/usr.bin/logger/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/logger/Makefile.depend soc2015/clord/head/usr.bin/login/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/login/Makefile.depend soc2015/clord/head/usr.bin/logins/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/logins/Makefile.depend soc2015/clord/head/usr.bin/logname/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/logname/Makefile.depend soc2015/clord/head/usr.bin/look/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/look/Makefile.depend soc2015/clord/head/usr.bin/lorder/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lorder/Makefile.depend soc2015/clord/head/usr.bin/lsvfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lsvfs/Makefile.depend soc2015/clord/head/usr.bin/lzmainfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/lzmainfo/Makefile.depend soc2015/clord/head/usr.bin/m4/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/m4/Makefile.depend soc2015/clord/head/usr.bin/mail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mail/Makefile.depend soc2015/clord/head/usr.bin/makewhatis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/makewhatis/Makefile.depend soc2015/clord/head/usr.bin/man/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/man/Makefile.depend soc2015/clord/head/usr.bin/mandoc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mandoc/Makefile.depend soc2015/clord/head/usr.bin/mesg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mesg/Makefile.depend soc2015/clord/head/usr.bin/minigzip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/minigzip/Makefile.depend soc2015/clord/head/usr.bin/ministat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ministat/Makefile.depend soc2015/clord/head/usr.bin/mkcsmapper_static/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mkcsmapper_static/Makefile.depend soc2015/clord/head/usr.bin/mkdep/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mkdep/Makefile.depend soc2015/clord/head/usr.bin/mkfifo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mkfifo/Makefile.depend soc2015/clord/head/usr.bin/mklocale/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mklocale/Makefile.depend soc2015/clord/head/usr.bin/mkstr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mkstr/Makefile.depend soc2015/clord/head/usr.bin/mktemp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mktemp/Makefile.depend soc2015/clord/head/usr.bin/mkulzma/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mkulzma/Makefile.depend soc2015/clord/head/usr.bin/mkuzip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mkuzip/Makefile.depend soc2015/clord/head/usr.bin/msgs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/msgs/Makefile.depend soc2015/clord/head/usr.bin/mt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/mt/Makefile.depend soc2015/clord/head/usr.bin/nc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/nc/Makefile.depend soc2015/clord/head/usr.bin/ncal/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ncal/Makefile.depend soc2015/clord/head/usr.bin/netstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/netstat/Makefile.depend soc2015/clord/head/usr.bin/newgrp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/newgrp/Makefile.depend soc2015/clord/head/usr.bin/newkey/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/newkey/Makefile.depend soc2015/clord/head/usr.bin/nfsstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/nfsstat/Makefile.depend soc2015/clord/head/usr.bin/nice/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/nice/Makefile.depend soc2015/clord/head/usr.bin/nl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/nl/Makefile.depend soc2015/clord/head/usr.bin/nm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/nm/Makefile.depend soc2015/clord/head/usr.bin/nohup/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/nohup/Makefile.depend soc2015/clord/head/usr.bin/opieinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/opieinfo/Makefile.depend soc2015/clord/head/usr.bin/opiekey/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/opiekey/Makefile.depend soc2015/clord/head/usr.bin/opiepasswd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/opiepasswd/Makefile.depend soc2015/clord/head/usr.bin/pagesize/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/pagesize/Makefile.depend soc2015/clord/head/usr.bin/pamtest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/pamtest/Makefile.depend soc2015/clord/head/usr.bin/passwd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/passwd/Makefile.depend soc2015/clord/head/usr.bin/paste/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/paste/Makefile.depend soc2015/clord/head/usr.bin/pathchk/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/pathchk/Makefile.depend soc2015/clord/head/usr.bin/perror/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/perror/Makefile.depend soc2015/clord/head/usr.bin/pr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/pr/Makefile.depend soc2015/clord/head/usr.bin/printenv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/printenv/Makefile.depend soc2015/clord/head/usr.bin/printf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/printf/Makefile.depend soc2015/clord/head/usr.bin/procstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/procstat/Makefile.depend soc2015/clord/head/usr.bin/quota/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/quota/Makefile.depend soc2015/clord/head/usr.bin/rctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rctl/Makefile.depend soc2015/clord/head/usr.bin/readelf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/readelf/Makefile.depend soc2015/clord/head/usr.bin/renice/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/renice/Makefile.depend soc2015/clord/head/usr.bin/rev/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rev/Makefile.depend soc2015/clord/head/usr.bin/revoke/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/revoke/Makefile.depend soc2015/clord/head/usr.bin/rlogin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rlogin/Makefile.depend soc2015/clord/head/usr.bin/rpcgen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rpcgen/Makefile.depend soc2015/clord/head/usr.bin/rpcinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rpcinfo/Makefile.depend soc2015/clord/head/usr.bin/rs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rs/Makefile.depend soc2015/clord/head/usr.bin/rsh/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rsh/Makefile.depend soc2015/clord/head/usr.bin/rup/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rup/Makefile.depend soc2015/clord/head/usr.bin/ruptime/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ruptime/Makefile.depend soc2015/clord/head/usr.bin/rusers/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rusers/Makefile.depend soc2015/clord/head/usr.bin/rwall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rwall/Makefile.depend soc2015/clord/head/usr.bin/rwho/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/rwho/Makefile.depend soc2015/clord/head/usr.bin/script/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/script/Makefile.depend soc2015/clord/head/usr.bin/sed/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/sed/Makefile.depend soc2015/clord/head/usr.bin/seq/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/seq/Makefile.depend soc2015/clord/head/usr.bin/setchannel/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/setchannel/Makefile.depend soc2015/clord/head/usr.bin/shar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/shar/Makefile.depend soc2015/clord/head/usr.bin/showmount/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/showmount/Makefile.depend soc2015/clord/head/usr.bin/size/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/size/Makefile.depend soc2015/clord/head/usr.bin/smbutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/smbutil/Makefile.depend soc2015/clord/head/usr.bin/sockstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/sockstat/Makefile.depend soc2015/clord/head/usr.bin/sort/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/sort/Makefile.depend soc2015/clord/head/usr.bin/split/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/split/Makefile.depend soc2015/clord/head/usr.bin/ssh-copy-id/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ssh-copy-id/Makefile.depend soc2015/clord/head/usr.bin/stat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/stat/Makefile.depend soc2015/clord/head/usr.bin/stdbuf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/stdbuf/Makefile.depend soc2015/clord/head/usr.bin/strings/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/strings/Makefile.depend soc2015/clord/head/usr.bin/su/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/su/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libapr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libapr/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libapr_util/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libapr_util/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libserf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libserf/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_client/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_client/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_delta/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_delta/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_diff/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_diff/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_fs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_fs/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_fs_fs/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_fs_util/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_ra/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_ra/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_ra_local/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_ra_serf/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_ra_svn/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_repos/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_repos/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_subr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_subr/Makefile.depend soc2015/clord/head/usr.bin/svn/lib/libsvn_wc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/lib/libsvn_wc/Makefile.depend soc2015/clord/head/usr.bin/svn/svn/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svn/Makefile.depend soc2015/clord/head/usr.bin/svn/svnadmin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnadmin/Makefile.depend soc2015/clord/head/usr.bin/svn/svndumpfilter/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svndumpfilter/Makefile.depend soc2015/clord/head/usr.bin/svn/svnlook/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnlook/Makefile.depend soc2015/clord/head/usr.bin/svn/svnmucc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnmucc/Makefile.depend soc2015/clord/head/usr.bin/svn/svnrdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnrdump/Makefile.depend soc2015/clord/head/usr.bin/svn/svnserve/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnserve/Makefile.depend soc2015/clord/head/usr.bin/svn/svnsync/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnsync/Makefile.depend soc2015/clord/head/usr.bin/svn/svnversion/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/svn/svnversion/Makefile.depend soc2015/clord/head/usr.bin/systat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/systat/Makefile.depend soc2015/clord/head/usr.bin/tabs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tabs/Makefile.depend soc2015/clord/head/usr.bin/tail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tail/Makefile.depend soc2015/clord/head/usr.bin/talk/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/talk/Makefile.depend soc2015/clord/head/usr.bin/tar/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tar/Makefile.depend soc2015/clord/head/usr.bin/tcopy/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tcopy/Makefile.depend soc2015/clord/head/usr.bin/tee/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tee/Makefile.depend soc2015/clord/head/usr.bin/telnet/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/telnet/Makefile.depend soc2015/clord/head/usr.bin/tftp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tftp/Makefile.depend soc2015/clord/head/usr.bin/time/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/time/Makefile.depend soc2015/clord/head/usr.bin/timeout/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/timeout/Makefile.depend soc2015/clord/head/usr.bin/tip/tip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tip/tip/Makefile.depend soc2015/clord/head/usr.bin/top/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/top/Makefile.depend soc2015/clord/head/usr.bin/touch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/touch/Makefile.depend soc2015/clord/head/usr.bin/tput/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tput/Makefile.depend soc2015/clord/head/usr.bin/tr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tr/Makefile.depend soc2015/clord/head/usr.bin/true/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/true/Makefile.depend soc2015/clord/head/usr.bin/truncate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/truncate/Makefile.depend soc2015/clord/head/usr.bin/truss/Makefile.depend.amd64 - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/truss/Makefile.depend.amd64 soc2015/clord/head/usr.bin/tset/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tset/Makefile.depend soc2015/clord/head/usr.bin/tsort/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tsort/Makefile.depend soc2015/clord/head/usr.bin/tty/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/tty/Makefile.depend soc2015/clord/head/usr.bin/ul/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ul/Makefile.depend soc2015/clord/head/usr.bin/uname/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/uname/Makefile.depend soc2015/clord/head/usr.bin/unexpand/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/unexpand/Makefile.depend soc2015/clord/head/usr.bin/unifdef/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/unifdef/Makefile.depend soc2015/clord/head/usr.bin/uniq/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/uniq/Makefile.depend soc2015/clord/head/usr.bin/units/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/units/Makefile.depend soc2015/clord/head/usr.bin/unvis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/unvis/Makefile.depend soc2015/clord/head/usr.bin/unzip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/unzip/Makefile.depend soc2015/clord/head/usr.bin/usbhidaction/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/usbhidaction/Makefile.depend soc2015/clord/head/usr.bin/usbhidctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/usbhidctl/Makefile.depend soc2015/clord/head/usr.bin/users/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/users/Makefile.depend soc2015/clord/head/usr.bin/uudecode/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/uudecode/Makefile.depend soc2015/clord/head/usr.bin/uuencode/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/uuencode/Makefile.depend soc2015/clord/head/usr.bin/vacation/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vacation/Makefile.depend soc2015/clord/head/usr.bin/vgrind/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vgrind/Makefile.depend soc2015/clord/head/usr.bin/vgrind/RETEST/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vgrind/RETEST/Makefile.depend soc2015/clord/head/usr.bin/vi/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vi/Makefile.depend soc2015/clord/head/usr.bin/vis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vis/Makefile.depend soc2015/clord/head/usr.bin/vmstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vmstat/Makefile.depend soc2015/clord/head/usr.bin/vtfontcvt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/vtfontcvt/Makefile.depend soc2015/clord/head/usr.bin/w/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/w/Makefile.depend soc2015/clord/head/usr.bin/wall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/wall/Makefile.depend soc2015/clord/head/usr.bin/wc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/wc/Makefile.depend soc2015/clord/head/usr.bin/what/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/what/Makefile.depend soc2015/clord/head/usr.bin/whereis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/whereis/Makefile.depend soc2015/clord/head/usr.bin/which/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/which/Makefile.depend soc2015/clord/head/usr.bin/who/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/who/Makefile.depend soc2015/clord/head/usr.bin/whois/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/whois/Makefile.depend soc2015/clord/head/usr.bin/write/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/write/Makefile.depend soc2015/clord/head/usr.bin/xargs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xargs/Makefile.depend soc2015/clord/head/usr.bin/xinstall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xinstall/Makefile.depend soc2015/clord/head/usr.bin/xinstall/Makefile.depend.host - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xinstall/Makefile.depend.host soc2015/clord/head/usr.bin/xlint/lint1/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xlint/lint1/Makefile.depend soc2015/clord/head/usr.bin/xlint/lint2/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xlint/lint2/Makefile.depend soc2015/clord/head/usr.bin/xlint/llib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xlint/llib/Makefile.depend soc2015/clord/head/usr.bin/xlint/xlint/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xlint/xlint/Makefile.depend soc2015/clord/head/usr.bin/xstr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xstr/Makefile.depend soc2015/clord/head/usr.bin/xz/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xz/Makefile.depend soc2015/clord/head/usr.bin/xzdec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/xzdec/Makefile.depend soc2015/clord/head/usr.bin/yacc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/yacc/Makefile.depend soc2015/clord/head/usr.bin/yes/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/yes/Makefile.depend soc2015/clord/head/usr.bin/ypcat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ypcat/Makefile.depend soc2015/clord/head/usr.bin/ypmatch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ypmatch/Makefile.depend soc2015/clord/head/usr.bin/ypwhich/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.bin/ypwhich/Makefile.depend soc2015/clord/head/usr.sbin/ac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ac/Makefile.depend soc2015/clord/head/usr.sbin/accton/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/accton/Makefile.depend soc2015/clord/head/usr.sbin/acpi/acpiconf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/acpi/acpiconf/Makefile.depend soc2015/clord/head/usr.sbin/acpi/acpidb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/acpi/acpidb/Makefile.depend soc2015/clord/head/usr.sbin/acpi/acpidump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/acpi/acpidump/Makefile.depend soc2015/clord/head/usr.sbin/acpi/iasl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/acpi/iasl/Makefile.depend soc2015/clord/head/usr.sbin/adduser/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/adduser/Makefile.depend soc2015/clord/head/usr.sbin/amd/amd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/amd/Makefile.depend soc2015/clord/head/usr.sbin/amd/amq/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/amq/Makefile.depend soc2015/clord/head/usr.sbin/amd/fixmount/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/fixmount/Makefile.depend soc2015/clord/head/usr.sbin/amd/fsinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/fsinfo/Makefile.depend soc2015/clord/head/usr.sbin/amd/hlfsd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/hlfsd/Makefile.depend soc2015/clord/head/usr.sbin/amd/include/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/include/Makefile.depend soc2015/clord/head/usr.sbin/amd/libamu/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/libamu/Makefile.depend soc2015/clord/head/usr.sbin/amd/mk-amd-map/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/mk-amd-map/Makefile.depend soc2015/clord/head/usr.sbin/amd/pawd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/pawd/Makefile.depend soc2015/clord/head/usr.sbin/amd/scripts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/scripts/Makefile.depend soc2015/clord/head/usr.sbin/amd/wire-test/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/amd/wire-test/Makefile.depend soc2015/clord/head/usr.sbin/ancontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ancontrol/Makefile.depend soc2015/clord/head/usr.sbin/apm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/apm/Makefile.depend soc2015/clord/head/usr.sbin/apmd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/apmd/Makefile.depend soc2015/clord/head/usr.sbin/arp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/arp/Makefile.depend soc2015/clord/head/usr.sbin/asf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/asf/Makefile.depend soc2015/clord/head/usr.sbin/audit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/audit/Makefile.depend soc2015/clord/head/usr.sbin/auditd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/auditd/Makefile.depend soc2015/clord/head/usr.sbin/auditreduce/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/auditreduce/Makefile.depend soc2015/clord/head/usr.sbin/authpf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/authpf/Makefile.depend soc2015/clord/head/usr.sbin/bhyve/bootrom.c - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bhyve/bootrom.c soc2015/clord/head/usr.sbin/bhyve/bootrom.h - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bhyve/bootrom.h soc2015/clord/head/usr.sbin/bluetooth/ath3kfw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/ath3kfw/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/bcmfw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/bcmfw/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/bt3cfw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/bt3cfw/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/bthidcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/bthidcontrol/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/bthidd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/bthidd/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/btpand/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/btpand/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/hccontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/hccontrol/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/hcsecd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/hcsecd/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/hcseriald/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/hcseriald/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/l2control/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/l2control/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/l2ping/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/l2ping/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/sdpcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/sdpcontrol/Makefile.depend soc2015/clord/head/usr.sbin/bluetooth/sdpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bluetooth/sdpd/Makefile.depend soc2015/clord/head/usr.sbin/boot0cfg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/boot0cfg/Makefile.depend soc2015/clord/head/usr.sbin/boot98cfg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/boot98cfg/Makefile.depend soc2015/clord/head/usr.sbin/bootparamd/bootparamd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bootparamd/bootparamd/Makefile.depend soc2015/clord/head/usr.sbin/bootparamd/callbootd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bootparamd/callbootd/Makefile.depend soc2015/clord/head/usr.sbin/bsdconfig/packages/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdconfig/packages/Makefile.depend soc2015/clord/head/usr.sbin/bsdconfig/packages/include/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdconfig/packages/include/Makefile.depend soc2015/clord/head/usr.sbin/bsdconfig/share/packages/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdconfig/share/packages/Makefile.depend soc2015/clord/head/usr.sbin/bsdinstall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdinstall/Makefile.depend soc2015/clord/head/usr.sbin/bsdinstall/distextract/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdinstall/distextract/Makefile.depend soc2015/clord/head/usr.sbin/bsdinstall/distfetch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdinstall/distfetch/Makefile.depend soc2015/clord/head/usr.sbin/bsdinstall/partedit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdinstall/partedit/Makefile.depend soc2015/clord/head/usr.sbin/bsdinstall/scripts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsdinstall/scripts/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/bsnmpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/bsnmpd/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/gensnmptree/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/gensnmptree/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend soc2015/clord/head/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend soc2015/clord/head/usr.sbin/btxld/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/btxld/Makefile.depend soc2015/clord/head/usr.sbin/cdcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/cdcontrol/Makefile.depend soc2015/clord/head/usr.sbin/chkgrp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/chkgrp/Makefile.depend soc2015/clord/head/usr.sbin/chown/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/chown/Makefile.depend soc2015/clord/head/usr.sbin/chroot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/chroot/Makefile.depend soc2015/clord/head/usr.sbin/ckdist/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ckdist/Makefile.depend soc2015/clord/head/usr.sbin/clear_locks/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/clear_locks/Makefile.depend soc2015/clord/head/usr.sbin/config/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/config/Makefile.depend soc2015/clord/head/usr.sbin/cpucontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/cpucontrol/Makefile.depend soc2015/clord/head/usr.sbin/crashinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/crashinfo/Makefile.depend soc2015/clord/head/usr.sbin/cron/cron/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/cron/cron/Makefile.depend soc2015/clord/head/usr.sbin/cron/crontab/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/cron/crontab/Makefile.depend soc2015/clord/head/usr.sbin/cron/lib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/cron/lib/Makefile.depend soc2015/clord/head/usr.sbin/crunch/crunchgen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/crunch/crunchgen/Makefile.depend soc2015/clord/head/usr.sbin/crunch/crunchide/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/crunch/crunchide/Makefile.depend soc2015/clord/head/usr.sbin/ctladm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ctladm/Makefile.depend soc2015/clord/head/usr.sbin/ctm/ctm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ctm/ctm/Makefile.depend soc2015/clord/head/usr.sbin/ctm/ctm_dequeue/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ctm/ctm_dequeue/Makefile.depend soc2015/clord/head/usr.sbin/ctm/ctm_rmail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ctm/ctm_rmail/Makefile.depend soc2015/clord/head/usr.sbin/ctm/ctm_smail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ctm/ctm_smail/Makefile.depend soc2015/clord/head/usr.sbin/daemon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/daemon/Makefile.depend soc2015/clord/head/usr.sbin/dconschat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/dconschat/Makefile.depend soc2015/clord/head/usr.sbin/devinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/devinfo/Makefile.depend soc2015/clord/head/usr.sbin/digictl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/digictl/Makefile.depend soc2015/clord/head/usr.sbin/diskinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/diskinfo/Makefile.depend soc2015/clord/head/usr.sbin/dumpcis/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/dumpcis/Makefile.depend soc2015/clord/head/usr.sbin/editmap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/editmap/Makefile.depend soc2015/clord/head/usr.sbin/edquota/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/edquota/Makefile.depend soc2015/clord/head/usr.sbin/eeprom/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/eeprom/Makefile.depend soc2015/clord/head/usr.sbin/etcupdate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/etcupdate/Makefile.depend soc2015/clord/head/usr.sbin/extattr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/extattr/Makefile.depend soc2015/clord/head/usr.sbin/extattrctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/extattrctl/Makefile.depend soc2015/clord/head/usr.sbin/fdcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fdcontrol/Makefile.depend soc2015/clord/head/usr.sbin/fdformat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fdformat/Makefile.depend soc2015/clord/head/usr.sbin/fdread/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fdread/Makefile.depend soc2015/clord/head/usr.sbin/fdwrite/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fdwrite/Makefile.depend soc2015/clord/head/usr.sbin/fifolog/fifolog_create/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fifolog/fifolog_create/Makefile.depend soc2015/clord/head/usr.sbin/fifolog/fifolog_reader/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fifolog/fifolog_reader/Makefile.depend soc2015/clord/head/usr.sbin/fifolog/fifolog_writer/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fifolog/fifolog_writer/Makefile.depend soc2015/clord/head/usr.sbin/fifolog/lib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fifolog/lib/Makefile.depend soc2015/clord/head/usr.sbin/flowctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/flowctl/Makefile.depend soc2015/clord/head/usr.sbin/freebsd-update/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/freebsd-update/Makefile.depend soc2015/clord/head/usr.sbin/fstyp/geli.c - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fstyp/geli.c soc2015/clord/head/usr.sbin/fstyp/zfs.c - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fstyp/zfs.c soc2015/clord/head/usr.sbin/fwcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/fwcontrol/Makefile.depend soc2015/clord/head/usr.sbin/getfmac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/getfmac/Makefile.depend soc2015/clord/head/usr.sbin/getpmac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/getpmac/Makefile.depend soc2015/clord/head/usr.sbin/gpioctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/gpioctl/Makefile.depend soc2015/clord/head/usr.sbin/gssd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/gssd/Makefile.depend soc2015/clord/head/usr.sbin/gstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/gstat/Makefile.depend soc2015/clord/head/usr.sbin/i2c/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/i2c/Makefile.depend soc2015/clord/head/usr.sbin/ifmcstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ifmcstat/Makefile.depend soc2015/clord/head/usr.sbin/inetd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/inetd/Makefile.depend soc2015/clord/head/usr.sbin/iostat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/iostat/Makefile.depend soc2015/clord/head/usr.sbin/ip6addrctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ip6addrctl/Makefile.depend soc2015/clord/head/usr.sbin/ipfwpcap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ipfwpcap/Makefile.depend soc2015/clord/head/usr.sbin/jail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/jail/Makefile.depend soc2015/clord/head/usr.sbin/jexec/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/jexec/Makefile.depend soc2015/clord/head/usr.sbin/jls/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/jls/Makefile.depend soc2015/clord/head/usr.sbin/kbdcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/kbdcontrol/Makefile.depend soc2015/clord/head/usr.sbin/kbdmap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/kbdmap/Makefile.depend soc2015/clord/head/usr.sbin/keyserv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/keyserv/Makefile.depend soc2015/clord/head/usr.sbin/kgmon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/kgmon/Makefile.depend soc2015/clord/head/usr.sbin/kgzip/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/kgzip/Makefile.depend soc2015/clord/head/usr.sbin/kldxref/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/kldxref/Makefile.depend soc2015/clord/head/usr.sbin/lastlogin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lastlogin/Makefile.depend soc2015/clord/head/usr.sbin/lmcconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lmcconfig/Makefile.depend soc2015/clord/head/usr.sbin/lpr/chkprintcap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/chkprintcap/Makefile.depend soc2015/clord/head/usr.sbin/lpr/common_source/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/common_source/Makefile.depend soc2015/clord/head/usr.sbin/lpr/filters.ru/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/filters.ru/Makefile.depend soc2015/clord/head/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend soc2015/clord/head/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend soc2015/clord/head/usr.sbin/lpr/filters/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/filters/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lp/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lpc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lpc/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lpd/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lpq/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lpq/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lpr/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lpr/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lprm/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lprm/Makefile.depend soc2015/clord/head/usr.sbin/lpr/lptest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/lptest/Makefile.depend soc2015/clord/head/usr.sbin/lpr/pac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lpr/pac/Makefile.depend soc2015/clord/head/usr.sbin/lptcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/lptcontrol/Makefile.depend soc2015/clord/head/usr.sbin/mailstats/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mailstats/Makefile.depend soc2015/clord/head/usr.sbin/mailwrapper/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mailwrapper/Makefile.depend soc2015/clord/head/usr.sbin/makefs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/makefs/Makefile.depend soc2015/clord/head/usr.sbin/makemap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/makemap/Makefile.depend soc2015/clord/head/usr.sbin/manctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/manctl/Makefile.depend soc2015/clord/head/usr.sbin/memcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/memcontrol/Makefile.depend soc2015/clord/head/usr.sbin/mergemaster/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mergemaster/Makefile.depend soc2015/clord/head/usr.sbin/mfiutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mfiutil/Makefile.depend soc2015/clord/head/usr.sbin/mixer/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mixer/Makefile.depend soc2015/clord/head/usr.sbin/mld6query/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mld6query/Makefile.depend soc2015/clord/head/usr.sbin/mlxcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mlxcontrol/Makefile.depend soc2015/clord/head/usr.sbin/mount_smbfs/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mount_smbfs/Makefile.depend soc2015/clord/head/usr.sbin/mountd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mountd/Makefile.depend soc2015/clord/head/usr.sbin/moused/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/moused/Makefile.depend soc2015/clord/head/usr.sbin/mptable/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mptable/Makefile.depend soc2015/clord/head/usr.sbin/mptutil/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mptutil/Makefile.depend soc2015/clord/head/usr.sbin/mtest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mtest/Makefile.depend soc2015/clord/head/usr.sbin/mtree/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/mtree/Makefile.depend soc2015/clord/head/usr.sbin/ndiscvt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ndiscvt/Makefile.depend soc2015/clord/head/usr.sbin/ndp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ndp/Makefile.depend soc2015/clord/head/usr.sbin/newsyslog/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/newsyslog/Makefile.depend soc2015/clord/head/usr.sbin/nfscbd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nfscbd/Makefile.depend soc2015/clord/head/usr.sbin/nfsd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nfsd/Makefile.depend soc2015/clord/head/usr.sbin/nfsdumpstate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nfsdumpstate/Makefile.depend soc2015/clord/head/usr.sbin/nfsrevoke/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nfsrevoke/Makefile.depend soc2015/clord/head/usr.sbin/nfsuserd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nfsuserd/Makefile.depend soc2015/clord/head/usr.sbin/ngctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ngctl/Makefile.depend soc2015/clord/head/usr.sbin/nghook/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nghook/Makefile.depend soc2015/clord/head/usr.sbin/nmtree/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nmtree/Makefile.depend soc2015/clord/head/usr.sbin/nologin/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nologin/Makefile.depend soc2015/clord/head/usr.sbin/nscd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/nscd/Makefile.depend soc2015/clord/head/usr.sbin/ntp/doc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/doc/Makefile.depend soc2015/clord/head/usr.sbin/ntp/libntp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/libntp/Makefile.depend soc2015/clord/head/usr.sbin/ntp/libntpevent/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/libntpevent/Makefile.depend soc2015/clord/head/usr.sbin/ntp/libopts/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/libopts/Makefile.depend soc2015/clord/head/usr.sbin/ntp/libparse/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/libparse/Makefile.depend soc2015/clord/head/usr.sbin/ntp/ntp-keygen/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/ntp-keygen/Makefile.depend soc2015/clord/head/usr.sbin/ntp/ntpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/ntpd/Makefile.depend soc2015/clord/head/usr.sbin/ntp/ntpdate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/ntpdate/Makefile.depend soc2015/clord/head/usr.sbin/ntp/ntpdc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/ntpdc/Makefile.depend soc2015/clord/head/usr.sbin/ntp/ntpq/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/ntpq/Makefile.depend soc2015/clord/head/usr.sbin/ntp/ntptime/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/ntptime/Makefile.depend soc2015/clord/head/usr.sbin/ntp/sntp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ntp/sntp/Makefile.depend soc2015/clord/head/usr.sbin/ofwdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ofwdump/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/backend-query/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/backend-query/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/backend/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/backend/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/conf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/conf/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/doc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/doc/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/examples/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/examples/Makefile.depend soc2015/clord/head/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile.depend soc2015/clord/head/usr.sbin/pciconf/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pciconf/Makefile.depend soc2015/clord/head/usr.sbin/periodic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/periodic/Makefile.depend soc2015/clord/head/usr.sbin/pkg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pkg/Makefile.depend soc2015/clord/head/usr.sbin/pmcannotate/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pmcannotate/Makefile.depend soc2015/clord/head/usr.sbin/pmccontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pmccontrol/Makefile.depend soc2015/clord/head/usr.sbin/pmcstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pmcstat/Makefile.depend soc2015/clord/head/usr.sbin/pnpinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pnpinfo/Makefile.depend soc2015/clord/head/usr.sbin/portsnap/make_index/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/portsnap/make_index/Makefile.depend soc2015/clord/head/usr.sbin/portsnap/phttpget/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/portsnap/phttpget/Makefile.depend soc2015/clord/head/usr.sbin/portsnap/portsnap/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/portsnap/portsnap/Makefile.depend soc2015/clord/head/usr.sbin/powerd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/powerd/Makefile.depend soc2015/clord/head/usr.sbin/ppp/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ppp/Makefile.depend soc2015/clord/head/usr.sbin/pppctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pppctl/Makefile.depend soc2015/clord/head/usr.sbin/praliases/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/praliases/Makefile.depend soc2015/clord/head/usr.sbin/praudit/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/praudit/Makefile.depend soc2015/clord/head/usr.sbin/procctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/procctl/Makefile.depend soc2015/clord/head/usr.sbin/pstat/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pstat/Makefile.depend soc2015/clord/head/usr.sbin/pw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pw/Makefile.depend soc2015/clord/head/usr.sbin/pwd_mkdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/pwd_mkdb/Makefile.depend soc2015/clord/head/usr.sbin/quot/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/quot/Makefile.depend soc2015/clord/head/usr.sbin/quotaon/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/quotaon/Makefile.depend soc2015/clord/head/usr.sbin/rarpd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rarpd/Makefile.depend soc2015/clord/head/usr.sbin/repquota/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/repquota/Makefile.depend soc2015/clord/head/usr.sbin/rip6query/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rip6query/Makefile.depend soc2015/clord/head/usr.sbin/rmt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rmt/Makefile.depend soc2015/clord/head/usr.sbin/route6d/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/route6d/Makefile.depend soc2015/clord/head/usr.sbin/rpc.lockd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpc.lockd/Makefile.depend soc2015/clord/head/usr.sbin/rpc.statd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpc.statd/Makefile.depend soc2015/clord/head/usr.sbin/rpc.umntall/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpc.umntall/Makefile.depend soc2015/clord/head/usr.sbin/rpc.yppasswdd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpc.yppasswdd/Makefile.depend soc2015/clord/head/usr.sbin/rpc.ypupdated/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpc.ypupdated/Makefile.depend soc2015/clord/head/usr.sbin/rpc.ypxfrd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpc.ypxfrd/Makefile.depend soc2015/clord/head/usr.sbin/rpcbind/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rpcbind/Makefile.depend soc2015/clord/head/usr.sbin/rrenumd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rrenumd/Makefile.depend soc2015/clord/head/usr.sbin/rtadvctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rtadvctl/Makefile.depend soc2015/clord/head/usr.sbin/rtadvd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rtadvd/Makefile.depend soc2015/clord/head/usr.sbin/rtprio/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rtprio/Makefile.depend soc2015/clord/head/usr.sbin/rtsold/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rtsold/Makefile.depend soc2015/clord/head/usr.sbin/rwhod/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/rwhod/Makefile.depend soc2015/clord/head/usr.sbin/sa/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/sa/Makefile.depend soc2015/clord/head/usr.sbin/sendmail/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/sendmail/Makefile.depend soc2015/clord/head/usr.sbin/service/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/service/Makefile.depend soc2015/clord/head/usr.sbin/services_mkdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/services_mkdb/Makefile.depend soc2015/clord/head/usr.sbin/setfib/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/setfib/Makefile.depend soc2015/clord/head/usr.sbin/setfmac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/setfmac/Makefile.depend soc2015/clord/head/usr.sbin/setpmac/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/setpmac/Makefile.depend soc2015/clord/head/usr.sbin/sicontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/sicontrol/Makefile.depend soc2015/clord/head/usr.sbin/smbmsg/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/smbmsg/Makefile.depend soc2015/clord/head/usr.sbin/snapinfo/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/snapinfo/Makefile.depend soc2015/clord/head/usr.sbin/spkrtest/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/spkrtest/Makefile.depend soc2015/clord/head/usr.sbin/spray/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/spray/Makefile.depend soc2015/clord/head/usr.sbin/syslogd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/syslogd/Makefile.depend soc2015/clord/head/usr.sbin/tcpdchk/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/tcpdchk/Makefile.depend soc2015/clord/head/usr.sbin/tcpdmatch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/tcpdmatch/Makefile.depend soc2015/clord/head/usr.sbin/tcpdrop/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/tcpdrop/Makefile.depend soc2015/clord/head/usr.sbin/tcpdump/tcpdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/tcpdump/tcpdump/Makefile.depend soc2015/clord/head/usr.sbin/timed/timed/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/timed/timed/Makefile.depend soc2015/clord/head/usr.sbin/timed/timedc/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/timed/timedc/Makefile.depend soc2015/clord/head/usr.sbin/traceroute/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/traceroute/Makefile.depend soc2015/clord/head/usr.sbin/traceroute6/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/traceroute6/Makefile.depend soc2015/clord/head/usr.sbin/trpt/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/trpt/Makefile.depend soc2015/clord/head/usr.sbin/tzsetup/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/tzsetup/Makefile.depend soc2015/clord/head/usr.sbin/uathload/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/uathload/Makefile.depend soc2015/clord/head/usr.sbin/ugidfw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ugidfw/Makefile.depend soc2015/clord/head/usr.sbin/uhsoctl/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/uhsoctl/Makefile.depend soc2015/clord/head/usr.sbin/usbconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/usbconfig/Makefile.depend soc2015/clord/head/usr.sbin/usbdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/usbdump/Makefile.depend soc2015/clord/head/usr.sbin/utx/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/utx/Makefile.depend soc2015/clord/head/usr.sbin/vidcontrol/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/vidcontrol/Makefile.depend soc2015/clord/head/usr.sbin/vipw/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/vipw/Makefile.depend soc2015/clord/head/usr.sbin/wake/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wake/Makefile.depend soc2015/clord/head/usr.sbin/watch/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/watch/Makefile.depend soc2015/clord/head/usr.sbin/watchdogd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/watchdogd/Makefile.depend soc2015/clord/head/usr.sbin/wlandebug/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wlandebug/Makefile.depend soc2015/clord/head/usr.sbin/wlconfig/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wlconfig/Makefile.depend soc2015/clord/head/usr.sbin/wpa/hostapd/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wpa/hostapd/Makefile.depend soc2015/clord/head/usr.sbin/wpa/hostapd_cli/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wpa/hostapd_cli/Makefile.depend soc2015/clord/head/usr.sbin/wpa/ndis_events/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wpa/ndis_events/Makefile.depend soc2015/clord/head/usr.sbin/wpa/wpa_cli/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wpa/wpa_cli/Makefile.depend soc2015/clord/head/usr.sbin/wpa/wpa_passphrase/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wpa/wpa_passphrase/Makefile.depend soc2015/clord/head/usr.sbin/wpa/wpa_supplicant/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/wpa/wpa_supplicant/Makefile.depend soc2015/clord/head/usr.sbin/yp_mkdb/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/yp_mkdb/Makefile.depend soc2015/clord/head/usr.sbin/ypbind/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ypbind/Makefile.depend soc2015/clord/head/usr.sbin/yppoll/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/yppoll/Makefile.depend soc2015/clord/head/usr.sbin/yppush/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/yppush/Makefile.depend soc2015/clord/head/usr.sbin/ypserv/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ypserv/Makefile.depend soc2015/clord/head/usr.sbin/ypset/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/ypset/Makefile.depend soc2015/clord/head/usr.sbin/zic/zdump/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/zic/zdump/Makefile.depend soc2015/clord/head/usr.sbin/zic/zic/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/zic/zic/Makefile.depend soc2015/clord/head/usr.sbin/zzz/Makefile.depend - copied unchanged from r287445, mirror/FreeBSD/head/usr.sbin/zzz/Makefile.depend Deleted: soc2015/clord/head/tools/bus_space/C/libbus_space.h soc2015/clord/head/tools/bus_space/bus_space.c soc2015/clord/head/tools/bus_space/bus_space.h soc2015/clord/head/usr.bin/make/ Modified: soc2015/clord/head/ (props changed) soc2015/clord/head/Makefile soc2015/clord/head/Makefile.inc1 soc2015/clord/head/ObsoleteFiles.inc soc2015/clord/head/UPDATING soc2015/clord/head/bin/ls/Makefile soc2015/clord/head/bin/ls/extern.h soc2015/clord/head/bin/ls/ls.1 soc2015/clord/head/bin/ls/ls.c soc2015/clord/head/bin/ls/print.c soc2015/clord/head/bin/ls/util.c soc2015/clord/head/cddl/ (props changed) soc2015/clord/head/cddl/contrib/opensolaris/ (props changed) soc2015/clord/head/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c soc2015/clord/head/cddl/contrib/opensolaris/cmd/zdb/zdb.c soc2015/clord/head/cddl/contrib/opensolaris/cmd/zfs/ (props changed) soc2015/clord/head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c soc2015/clord/head/cddl/contrib/opensolaris/cmd/ztest/ztest.c soc2015/clord/head/cddl/contrib/opensolaris/lib/libzfs/ (props changed) soc2015/clord/head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c soc2015/clord/head/cddl/lib/libzfs/Makefile soc2015/clord/head/cddl/lib/libzfs_core/Makefile soc2015/clord/head/contrib/bmake/ (props changed) soc2015/clord/head/contrib/bmake/ChangeLog soc2015/clord/head/contrib/bmake/Makefile soc2015/clord/head/contrib/bmake/bmake.1 soc2015/clord/head/contrib/bmake/bmake.cat1 soc2015/clord/head/contrib/bmake/make.1 soc2015/clord/head/contrib/bmake/mk/ChangeLog soc2015/clord/head/contrib/bmake/mk/dirdeps.mk soc2015/clord/head/contrib/bmake/mk/gendirdeps.mk soc2015/clord/head/contrib/bmake/mk/install-mk soc2015/clord/head/contrib/bmake/mk/meta.stage.mk soc2015/clord/head/contrib/bmake/mk/meta.sys.mk soc2015/clord/head/contrib/bmake/mk/mkopt.sh soc2015/clord/head/contrib/bmake/targ.c soc2015/clord/head/contrib/elftoolchain/ (props changed) soc2015/clord/head/contrib/elftoolchain/elfcopy/sections.c soc2015/clord/head/contrib/file/ (props changed) soc2015/clord/head/contrib/file/ChangeLog soc2015/clord/head/contrib/file/Makefile.in soc2015/clord/head/contrib/file/TODO soc2015/clord/head/contrib/file/aclocal.m4 soc2015/clord/head/contrib/file/compile soc2015/clord/head/contrib/file/config.h.in soc2015/clord/head/contrib/file/configure soc2015/clord/head/contrib/file/configure.ac soc2015/clord/head/contrib/file/depcomp soc2015/clord/head/contrib/file/doc/Makefile.in soc2015/clord/head/contrib/file/doc/file.man soc2015/clord/head/contrib/file/doc/libmagic.man soc2015/clord/head/contrib/file/ltmain.sh soc2015/clord/head/contrib/file/magic/Magdir/android soc2015/clord/head/contrib/file/magic/Magdir/apple soc2015/clord/head/contrib/file/magic/Magdir/archive soc2015/clord/head/contrib/file/magic/Magdir/audio soc2015/clord/head/contrib/file/magic/Magdir/cafebabe soc2015/clord/head/contrib/file/magic/Magdir/commands soc2015/clord/head/contrib/file/magic/Magdir/compress soc2015/clord/head/contrib/file/magic/Magdir/console soc2015/clord/head/contrib/file/magic/Magdir/dyadic soc2015/clord/head/contrib/file/magic/Magdir/filesystems soc2015/clord/head/contrib/file/magic/Magdir/gnu soc2015/clord/head/contrib/file/magic/Magdir/images soc2015/clord/head/contrib/file/magic/Magdir/jpeg soc2015/clord/head/contrib/file/magic/Magdir/linux soc2015/clord/head/contrib/file/magic/Magdir/mach soc2015/clord/head/contrib/file/magic/Magdir/mathematica soc2015/clord/head/contrib/file/magic/Magdir/misctools soc2015/clord/head/contrib/file/magic/Magdir/modem soc2015/clord/head/contrib/file/magic/Magdir/mozilla soc2015/clord/head/contrib/file/magic/Magdir/os2 soc2015/clord/head/contrib/file/magic/Magdir/pdf soc2015/clord/head/contrib/file/magic/Magdir/perl soc2015/clord/head/contrib/file/magic/Magdir/riff soc2015/clord/head/contrib/file/magic/Magdir/sereal soc2015/clord/head/contrib/file/magic/Magdir/sgml soc2015/clord/head/contrib/file/magic/Magdir/varied.script soc2015/clord/head/contrib/file/magic/Magdir/vorbis soc2015/clord/head/contrib/file/magic/Makefile.am soc2015/clord/head/contrib/file/magic/Makefile.in soc2015/clord/head/contrib/file/missing soc2015/clord/head/contrib/file/python/Makefile.in soc2015/clord/head/contrib/file/src/Makefile.in soc2015/clord/head/contrib/file/src/apprentice.c soc2015/clord/head/contrib/file/src/ascmagic.c soc2015/clord/head/contrib/file/src/cdf.c soc2015/clord/head/contrib/file/src/cdf.h soc2015/clord/head/contrib/file/src/compress.c soc2015/clord/head/contrib/file/src/encoding.c soc2015/clord/head/contrib/file/src/file.c soc2015/clord/head/contrib/file/src/file.h soc2015/clord/head/contrib/file/src/file_opts.h soc2015/clord/head/contrib/file/src/fsmagic.c soc2015/clord/head/contrib/file/src/funcs.c soc2015/clord/head/contrib/file/src/is_tar.c soc2015/clord/head/contrib/file/src/magic.c soc2015/clord/head/contrib/file/src/magic.h soc2015/clord/head/contrib/file/src/magic.h.in soc2015/clord/head/contrib/file/src/print.c soc2015/clord/head/contrib/file/src/readcdf.c soc2015/clord/head/contrib/file/src/readelf.c soc2015/clord/head/contrib/file/src/softmagic.c soc2015/clord/head/contrib/file/tests/Makefile.in soc2015/clord/head/contrib/gcc/ (props changed) soc2015/clord/head/contrib/gcc/longlong.h soc2015/clord/head/contrib/libcxxrt/ (props changed) soc2015/clord/head/contrib/libcxxrt/FREEBSD-upgrade soc2015/clord/head/contrib/libcxxrt/libelftc_dem_gnu3.c soc2015/clord/head/contrib/libxo/libxo/libxo.c soc2015/clord/head/contrib/sendmail/ (props changed) soc2015/clord/head/contrib/sendmail/src/tls.c soc2015/clord/head/contrib/tzdata/ (props changed) soc2015/clord/head/contrib/tzdata/africa soc2015/clord/head/contrib/tzdata/northamerica soc2015/clord/head/contrib/tzdata/southamerica soc2015/clord/head/contrib/tzdata/zone1970.tab soc2015/clord/head/crypto/openssl/ (props changed) soc2015/clord/head/crypto/openssl/CHANGES soc2015/clord/head/crypto/openssl/Configure soc2015/clord/head/crypto/openssl/Makefile soc2015/clord/head/crypto/openssl/Makefile.org soc2015/clord/head/crypto/openssl/NEWS soc2015/clord/head/crypto/openssl/README soc2015/clord/head/crypto/openssl/apps/Makefile soc2015/clord/head/crypto/openssl/apps/apps.c soc2015/clord/head/crypto/openssl/apps/asn1pars.c soc2015/clord/head/crypto/openssl/apps/ca.c soc2015/clord/head/crypto/openssl/apps/cms.c soc2015/clord/head/crypto/openssl/apps/dhparam.c soc2015/clord/head/crypto/openssl/apps/enc.c soc2015/clord/head/crypto/openssl/apps/gendh.c soc2015/clord/head/crypto/openssl/apps/ocsp.c soc2015/clord/head/crypto/openssl/apps/s_cb.c soc2015/clord/head/crypto/openssl/apps/s_client.c soc2015/clord/head/crypto/openssl/apps/s_server.c soc2015/clord/head/crypto/openssl/apps/s_time.c soc2015/clord/head/crypto/openssl/apps/smime.c soc2015/clord/head/crypto/openssl/apps/srp.c soc2015/clord/head/crypto/openssl/apps/verify.c soc2015/clord/head/crypto/openssl/crypto/Makefile soc2015/clord/head/crypto/openssl/crypto/aes/Makefile soc2015/clord/head/crypto/openssl/crypto/asn1/Makefile soc2015/clord/head/crypto/openssl/crypto/asn1/a_int.c soc2015/clord/head/crypto/openssl/crypto/asn1/asn1_gen.c soc2015/clord/head/crypto/openssl/crypto/asn1/asn_mime.c soc2015/clord/head/crypto/openssl/crypto/asn1/bio_ndef.c soc2015/clord/head/crypto/openssl/crypto/asn1/tasn_new.c soc2015/clord/head/crypto/openssl/crypto/asn1/tasn_prn.c soc2015/clord/head/crypto/openssl/crypto/asn1/x_x509.c soc2015/clord/head/crypto/openssl/crypto/bf/Makefile soc2015/clord/head/crypto/openssl/crypto/bio/Makefile soc2015/clord/head/crypto/openssl/crypto/bio/b_print.c soc2015/clord/head/crypto/openssl/crypto/bio/bf_nbio.c soc2015/clord/head/crypto/openssl/crypto/bio/bio_lib.c soc2015/clord/head/crypto/openssl/crypto/bio/bss_dgram.c soc2015/clord/head/crypto/openssl/crypto/bn/Makefile soc2015/clord/head/crypto/openssl/crypto/bn/bn.h soc2015/clord/head/crypto/openssl/crypto/bn/bn_err.c soc2015/clord/head/crypto/openssl/crypto/bn/bn_gf2m.c soc2015/clord/head/crypto/openssl/crypto/bn/bn_lcl.h soc2015/clord/head/crypto/openssl/crypto/bn/bn_print.c soc2015/clord/head/crypto/openssl/crypto/bn/bn_rand.c soc2015/clord/head/crypto/openssl/crypto/bn/bn_shift.c soc2015/clord/head/crypto/openssl/crypto/buffer/Makefile soc2015/clord/head/crypto/openssl/crypto/buffer/buffer.c soc2015/clord/head/crypto/openssl/crypto/camellia/Makefile soc2015/clord/head/crypto/openssl/crypto/cast/Makefile soc2015/clord/head/crypto/openssl/crypto/cmac/Makefile soc2015/clord/head/crypto/openssl/crypto/cmac/cmac.c soc2015/clord/head/crypto/openssl/crypto/cms/Makefile soc2015/clord/head/crypto/openssl/crypto/cms/cms_pwri.c soc2015/clord/head/crypto/openssl/crypto/cms/cms_smime.c soc2015/clord/head/crypto/openssl/crypto/comp/Makefile soc2015/clord/head/crypto/openssl/crypto/conf/Makefile soc2015/clord/head/crypto/openssl/crypto/cryptlib.c soc2015/clord/head/crypto/openssl/crypto/des/Makefile soc2015/clord/head/crypto/openssl/crypto/des/des.c soc2015/clord/head/crypto/openssl/crypto/des/enc_writ.c soc2015/clord/head/crypto/openssl/crypto/dh/Makefile soc2015/clord/head/crypto/openssl/crypto/dh/dh_ameth.c soc2015/clord/head/crypto/openssl/crypto/dsa/Makefile soc2015/clord/head/crypto/openssl/crypto/dsa/dsa_gen.c soc2015/clord/head/crypto/openssl/crypto/dsa/dsa_ossl.c soc2015/clord/head/crypto/openssl/crypto/dso/Makefile soc2015/clord/head/crypto/openssl/crypto/dso/dso_lib.c soc2015/clord/head/crypto/openssl/crypto/ec/Makefile soc2015/clord/head/crypto/openssl/crypto/ec/ec2_oct.c soc2015/clord/head/crypto/openssl/crypto/ec/ec_asn1.c soc2015/clord/head/crypto/openssl/crypto/ec/ec_check.c soc2015/clord/head/crypto/openssl/crypto/ec/ec_key.c soc2015/clord/head/crypto/openssl/crypto/ec/ec_lcl.h soc2015/clord/head/crypto/openssl/crypto/ec/ec_lib.c soc2015/clord/head/crypto/openssl/crypto/ec/eck_prn.c soc2015/clord/head/crypto/openssl/crypto/ec/ecp_oct.c soc2015/clord/head/crypto/openssl/crypto/ec/ectest.c soc2015/clord/head/crypto/openssl/crypto/ecdh/Makefile soc2015/clord/head/crypto/openssl/crypto/ecdsa/Makefile soc2015/clord/head/crypto/openssl/crypto/ecdsa/ecdsatest.c soc2015/clord/head/crypto/openssl/crypto/engine/Makefile soc2015/clord/head/crypto/openssl/crypto/engine/eng_table.c soc2015/clord/head/crypto/openssl/crypto/err/Makefile soc2015/clord/head/crypto/openssl/crypto/evp/Makefile soc2015/clord/head/crypto/openssl/crypto/evp/bio_ok.c soc2015/clord/head/crypto/openssl/crypto/evp/e_aes.c soc2015/clord/head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c soc2015/clord/head/crypto/openssl/crypto/evp/e_rc4_hmac_md5.c soc2015/clord/head/crypto/openssl/crypto/evp/encode.c soc2015/clord/head/crypto/openssl/crypto/evp/evp.h soc2015/clord/head/crypto/openssl/crypto/evp/p_seal.c soc2015/clord/head/crypto/openssl/crypto/hmac/Makefile soc2015/clord/head/crypto/openssl/crypto/hmac/hmac.c soc2015/clord/head/crypto/openssl/crypto/hmac/hmactest.c soc2015/clord/head/crypto/openssl/crypto/idea/Makefile soc2015/clord/head/crypto/openssl/crypto/jpake/Makefile soc2015/clord/head/crypto/openssl/crypto/krb5/Makefile soc2015/clord/head/crypto/openssl/crypto/lhash/Makefile soc2015/clord/head/crypto/openssl/crypto/md2/Makefile soc2015/clord/head/crypto/openssl/crypto/md32_common.h soc2015/clord/head/crypto/openssl/crypto/md4/Makefile soc2015/clord/head/crypto/openssl/crypto/md5/Makefile soc2015/clord/head/crypto/openssl/crypto/mdc2/Makefile soc2015/clord/head/crypto/openssl/crypto/mem.c soc2015/clord/head/crypto/openssl/crypto/modes/Makefile soc2015/clord/head/crypto/openssl/crypto/modes/gcm128.c soc2015/clord/head/crypto/openssl/crypto/objects/Makefile soc2015/clord/head/crypto/openssl/crypto/objects/o_names.c soc2015/clord/head/crypto/openssl/crypto/objects/obj_dat.c soc2015/clord/head/crypto/openssl/crypto/objects/objects.README soc2015/clord/head/crypto/openssl/crypto/objects/objects.pl soc2015/clord/head/crypto/openssl/crypto/ocsp/Makefile soc2015/clord/head/crypto/openssl/crypto/ocsp/ocsp_ext.c soc2015/clord/head/crypto/openssl/crypto/ocsp/ocsp_vfy.c soc2015/clord/head/crypto/openssl/crypto/opensslv.h soc2015/clord/head/crypto/openssl/crypto/pem/Makefile soc2015/clord/head/crypto/openssl/crypto/pem/pem_lib.c soc2015/clord/head/crypto/openssl/crypto/pem/pem_pk8.c soc2015/clord/head/crypto/openssl/crypto/pkcs12/Makefile soc2015/clord/head/crypto/openssl/crypto/pkcs12/p12_mutl.c soc2015/clord/head/crypto/openssl/crypto/pkcs7/Makefile soc2015/clord/head/crypto/openssl/crypto/pkcs7/pk7_doit.c soc2015/clord/head/crypto/openssl/crypto/pqueue/Makefile soc2015/clord/head/crypto/openssl/crypto/rand/Makefile soc2015/clord/head/crypto/openssl/crypto/rc2/Makefile soc2015/clord/head/crypto/openssl/crypto/rc4/Makefile soc2015/clord/head/crypto/openssl/crypto/rc5/Makefile soc2015/clord/head/crypto/openssl/crypto/ripemd/Makefile soc2015/clord/head/crypto/openssl/crypto/rsa/Makefile soc2015/clord/head/crypto/openssl/crypto/rsa/rsa_pmeth.c soc2015/clord/head/crypto/openssl/crypto/seed/Makefile soc2015/clord/head/crypto/openssl/crypto/sha/Makefile soc2015/clord/head/crypto/openssl/crypto/srp/Makefile soc2015/clord/head/crypto/openssl/crypto/srp/srp_vfy.c soc2015/clord/head/crypto/openssl/crypto/stack/Makefile soc2015/clord/head/crypto/openssl/crypto/store/Makefile soc2015/clord/head/crypto/openssl/crypto/threads/th-lock.c soc2015/clord/head/crypto/openssl/crypto/ts/Makefile soc2015/clord/head/crypto/openssl/crypto/txt_db/Makefile soc2015/clord/head/crypto/openssl/crypto/ui/Makefile soc2015/clord/head/crypto/openssl/crypto/whrlpool/Makefile soc2015/clord/head/crypto/openssl/crypto/x509/Makefile soc2015/clord/head/crypto/openssl/crypto/x509/x509_lu.c soc2015/clord/head/crypto/openssl/crypto/x509/x509_vfy.c soc2015/clord/head/crypto/openssl/crypto/x509/x509_vfy.h soc2015/clord/head/crypto/openssl/crypto/x509/x509_vpm.c soc2015/clord/head/crypto/openssl/crypto/x509/x509type.c soc2015/clord/head/crypto/openssl/crypto/x509v3/Makefile soc2015/clord/head/crypto/openssl/crypto/x509v3/v3_alt.c soc2015/clord/head/crypto/openssl/crypto/x509v3/v3_cpols.c soc2015/clord/head/crypto/openssl/crypto/x509v3/v3_utl.c soc2015/clord/head/crypto/openssl/doc/apps/cms.pod soc2015/clord/head/crypto/openssl/doc/apps/config.pod soc2015/clord/head/crypto/openssl/doc/apps/dhparam.pod soc2015/clord/head/crypto/openssl/doc/apps/ocsp.pod soc2015/clord/head/crypto/openssl/doc/apps/s_client.pod soc2015/clord/head/crypto/openssl/doc/apps/s_server.pod soc2015/clord/head/crypto/openssl/doc/apps/smime.pod soc2015/clord/head/crypto/openssl/doc/apps/verify.pod soc2015/clord/head/crypto/openssl/doc/crypto/BN_rand.pod soc2015/clord/head/crypto/openssl/doc/crypto/BN_set_bit.pod soc2015/clord/head/crypto/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod soc2015/clord/head/crypto/openssl/doc/crypto/pem.pod soc2015/clord/head/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod soc2015/clord/head/crypto/openssl/e_os2.h soc2015/clord/head/crypto/openssl/engines/Makefile soc2015/clord/head/crypto/openssl/engines/ccgost/Makefile soc2015/clord/head/crypto/openssl/engines/ccgost/e_gost_err.c soc2015/clord/head/crypto/openssl/engines/ccgost/e_gost_err.h soc2015/clord/head/crypto/openssl/engines/ccgost/gost2001.c soc2015/clord/head/crypto/openssl/engines/ccgost/gost94_keyx.c soc2015/clord/head/crypto/openssl/engines/ccgost/gost_ameth.c soc2015/clord/head/crypto/openssl/engines/ccgost/gost_pmeth.c soc2015/clord/head/crypto/openssl/engines/ccgost/gost_sign.c soc2015/clord/head/crypto/openssl/engines/e_sureware.c soc2015/clord/head/crypto/openssl/ssl/Makefile soc2015/clord/head/crypto/openssl/ssl/d1_both.c soc2015/clord/head/crypto/openssl/ssl/d1_clnt.c soc2015/clord/head/crypto/openssl/ssl/d1_lib.c soc2015/clord/head/crypto/openssl/ssl/d1_pkt.c soc2015/clord/head/crypto/openssl/ssl/d1_srvr.c soc2015/clord/head/crypto/openssl/ssl/s2_pkt.c soc2015/clord/head/crypto/openssl/ssl/s2_srvr.c soc2015/clord/head/crypto/openssl/ssl/s3_both.c soc2015/clord/head/crypto/openssl/ssl/s3_cbc.c soc2015/clord/head/crypto/openssl/ssl/s3_clnt.c soc2015/clord/head/crypto/openssl/ssl/s3_pkt.c soc2015/clord/head/crypto/openssl/ssl/s3_srvr.c soc2015/clord/head/crypto/openssl/ssl/ssl.h soc2015/clord/head/crypto/openssl/ssl/ssl_err.c soc2015/clord/head/crypto/openssl/ssl/ssl_lib.c soc2015/clord/head/crypto/openssl/ssl/ssl_locl.h soc2015/clord/head/crypto/openssl/ssl/ssl_sess.c soc2015/clord/head/crypto/openssl/ssl/ssl_stat.c soc2015/clord/head/crypto/openssl/ssl/ssltest.c soc2015/clord/head/crypto/openssl/ssl/t1_enc.c soc2015/clord/head/crypto/openssl/ssl/t1_lib.c soc2015/clord/head/crypto/openssl/ssl/tls_srp.c soc2015/clord/head/crypto/openssl/util/mk1mf.pl soc2015/clord/head/crypto/openssl/util/mkerr.pl soc2015/clord/head/crypto/openssl/util/pl/BC-32.pl soc2015/clord/head/crypto/openssl/util/pl/VC-32.pl soc2015/clord/head/etc/ (props changed) soc2015/clord/head/etc/Makefile soc2015/clord/head/etc/devd/usb.conf soc2015/clord/head/etc/etc.arm/ttys soc2015/clord/head/etc/rc.firewall soc2015/clord/head/gnu/lib/ (props changed) soc2015/clord/head/gnu/lib/csu/Makefile soc2015/clord/head/gnu/lib/libgcc/Makefile soc2015/clord/head/gnu/lib/libreadline/readline/Makefile soc2015/clord/head/gnu/usr.bin/binutils/ (props changed) soc2015/clord/head/gnu/usr.bin/binutils/ld/Makefile soc2015/clord/head/gnu/usr.bin/binutils/libbfd/Makefile soc2015/clord/head/gnu/usr.bin/cc/cc_tools/ (props changed) soc2015/clord/head/gnu/usr.bin/cc/cc_tools/Makefile soc2015/clord/head/gnu/usr.bin/gdb/ (props changed) soc2015/clord/head/gnu/usr.bin/groff/Makefile.inc soc2015/clord/head/gnu/usr.bin/groff/font/devX100-12/Makefile soc2015/clord/head/gnu/usr.bin/groff/font/devX100/Makefile soc2015/clord/head/gnu/usr.bin/groff/font/devX75-12/Makefile soc2015/clord/head/gnu/usr.bin/groff/font/devX75/Makefile soc2015/clord/head/include/ (props changed) soc2015/clord/head/include/Makefile soc2015/clord/head/include/arpa/Makefile soc2015/clord/head/include/gssapi/Makefile soc2015/clord/head/include/mk-osreldate.sh soc2015/clord/head/include/protocols/Makefile soc2015/clord/head/include/xlocale/Makefile soc2015/clord/head/kerberos5/Makefile.inc soc2015/clord/head/kerberos5/lib/libasn1/Makefile soc2015/clord/head/kerberos5/lib/libhdb/Makefile soc2015/clord/head/kerberos5/lib/libheimipcc/Makefile soc2015/clord/head/kerberos5/lib/libhx509/Makefile soc2015/clord/head/lib/clang/clang.build.mk soc2015/clord/head/lib/clang/include/Makefile soc2015/clord/head/lib/csu/Makefile.inc soc2015/clord/head/lib/libc/ (props changed) soc2015/clord/head/lib/libc++/Makefile soc2015/clord/head/lib/libc/Makefile soc2015/clord/head/lib/libc/arm/aeabi/Makefile.inc soc2015/clord/head/lib/libc/arm/aeabi/Symbol.map soc2015/clord/head/lib/libc/gen/fts.c soc2015/clord/head/lib/libc/net/sctp_bindx.3 soc2015/clord/head/lib/libc/resolv/res_comp.c soc2015/clord/head/lib/libc/sys/stack_protector.c soc2015/clord/head/lib/libfetch/http.c soc2015/clord/head/lib/libmagic/config.h soc2015/clord/head/lib/libpam/Makefile soc2015/clord/head/lib/libpam/libpam/Makefile soc2015/clord/head/lib/libpmc/libpmc.c soc2015/clord/head/lib/libproc/Makefile soc2015/clord/head/lib/libsbuf/Makefile soc2015/clord/head/lib/libsbuf/Symbol.map soc2015/clord/head/lib/libsbuf/Version.def soc2015/clord/head/lib/libtelnet/Makefile soc2015/clord/head/lib/libthr/thread/thr_sig.c soc2015/clord/head/lib/libugidfw/ugidfw.c soc2015/clord/head/lib/libutil/ (props changed) soc2015/clord/head/lib/libutil/Makefile soc2015/clord/head/lib/libutil/hexdump.3 soc2015/clord/head/lib/libvmmapi/ (props changed) soc2015/clord/head/lib/libvmmapi/vmmapi.c soc2015/clord/head/lib/libvmmapi/vmmapi.h soc2015/clord/head/lib/libz/ (props changed) soc2015/clord/head/lib/msun/Makefile soc2015/clord/head/lib/msun/src/s_ccosh.c soc2015/clord/head/lib/msun/src/s_ccoshf.c soc2015/clord/head/lib/msun/src/s_csinh.c soc2015/clord/head/lib/msun/src/s_csinhf.c soc2015/clord/head/lib/msun/src/s_ctanh.c soc2015/clord/head/lib/msun/src/s_ctanhf.c soc2015/clord/head/lib/ncurses/ncurses/Makefile soc2015/clord/head/libexec/ftpd/Makefile soc2015/clord/head/libexec/save-entropy/Makefile soc2015/clord/head/release/Makefile.ec2 soc2015/clord/head/release/Makefile.vm soc2015/clord/head/release/arm/WANDBOARD.conf soc2015/clord/head/release/tools/azure.conf soc2015/clord/head/sbin/ (props changed) soc2015/clord/head/sbin/camcontrol/Makefile soc2015/clord/head/sbin/camcontrol/camcontrol.8 soc2015/clord/head/sbin/camcontrol/camcontrol.c soc2015/clord/head/sbin/camcontrol/camcontrol.h soc2015/clord/head/sbin/dumpon/ (props changed) soc2015/clord/head/sbin/geom/class/eli/geom_eli.c soc2015/clord/head/sbin/geom/class/multipath/gmultipath.8 soc2015/clord/head/sbin/ipfw/ (props changed) soc2015/clord/head/sbin/umount/umount.8 soc2015/clord/head/secure/lib/libcrypt/crypt-blowfish.c soc2015/clord/head/secure/lib/libcrypto/Makefile.inc soc2015/clord/head/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 soc2015/clord/head/secure/lib/libcrypto/man/ASN1_STRING_length.3 soc2015/clord/head/secure/lib/libcrypto/man/ASN1_STRING_new.3 soc2015/clord/head/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 soc2015/clord/head/secure/lib/libcrypto/man/ASN1_generate_nconf.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_ctrl.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_f_base64.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_f_buffer.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_f_cipher.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_f_md.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_f_null.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_f_ssl.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_find_type.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_new.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_new_CMS.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_push.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_read.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_accept.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_bio.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_connect.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_fd.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_file.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_mem.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_null.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_s_socket.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_set_callback.3 soc2015/clord/head/secure/lib/libcrypto/man/BIO_should_retry.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_BLINDING_new.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_CTX_new.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_CTX_start.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_add.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_add_word.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_bn2bin.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_cmp.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_copy.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_generate_prime.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_mod_inverse.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_new.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_num_bytes.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_rand.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_set_bit.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_swap.3 soc2015/clord/head/secure/lib/libcrypto/man/BN_zero.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_add0_cert.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_add1_signer.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_compress.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_decrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_encrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_final.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_get0_type.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_sign.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_sign_receipt.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_uncompress.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_verify.3 soc2015/clord/head/secure/lib/libcrypto/man/CMS_verify_receipt.3 soc2015/clord/head/secure/lib/libcrypto/man/CONF_modules_free.3 soc2015/clord/head/secure/lib/libcrypto/man/CONF_modules_load_file.3 soc2015/clord/head/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 soc2015/clord/head/secure/lib/libcrypto/man/DH_generate_key.3 soc2015/clord/head/secure/lib/libcrypto/man/DH_generate_parameters.3 soc2015/clord/head/secure/lib/libcrypto/man/DH_get_ex_new_index.3 soc2015/clord/head/secure/lib/libcrypto/man/DH_new.3 soc2015/clord/head/secure/lib/libcrypto/man/DH_set_method.3 soc2015/clord/head/secure/lib/libcrypto/man/DH_size.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_SIG_new.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_do_sign.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_dup_DH.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_generate_key.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_generate_parameters.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_new.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_set_method.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_sign.3 soc2015/clord/head/secure/lib/libcrypto/man/DSA_size.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_GET_LIB.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_clear_error.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_error_string.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_get_error.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_load_strings.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_print_errors.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_put_error.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_remove_state.3 soc2015/clord/head/secure/lib/libcrypto/man/ERR_set_mark.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_BytesToKey.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_DigestInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_DigestSignInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_EncryptInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_OpenInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_derive.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_new.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_sign.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_verify.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_SealInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_SignInit.3 soc2015/clord/head/secure/lib/libcrypto/man/EVP_VerifyInit.3 soc2015/clord/head/secure/lib/libcrypto/man/OBJ_nid2obj.3 soc2015/clord/head/secure/lib/libcrypto/man/OPENSSL_Applink.3 soc2015/clord/head/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 soc2015/clord/head/secure/lib/libcrypto/man/OPENSSL_config.3 soc2015/clord/head/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 soc2015/clord/head/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 soc2015/clord/head/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 soc2015/clord/head/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 soc2015/clord/head/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS12_create.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS12_parse.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS7_decrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS7_encrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS7_sign.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 soc2015/clord/head/secure/lib/libcrypto/man/PKCS7_verify.3 soc2015/clord/head/secure/lib/libcrypto/man/RAND_add.3 soc2015/clord/head/secure/lib/libcrypto/man/RAND_bytes.3 soc2015/clord/head/secure/lib/libcrypto/man/RAND_cleanup.3 soc2015/clord/head/secure/lib/libcrypto/man/RAND_egd.3 soc2015/clord/head/secure/lib/libcrypto/man/RAND_load_file.3 soc2015/clord/head/secure/lib/libcrypto/man/RAND_set_rand_method.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_blinding_on.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_check_key.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_generate_key.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_new.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_print.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_private_encrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_public_encrypt.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_set_method.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_sign.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 soc2015/clord/head/secure/lib/libcrypto/man/RSA_size.3 soc2015/clord/head/secure/lib/libcrypto/man/SMIME_read_CMS.3 soc2015/clord/head/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 soc2015/clord/head/secure/lib/libcrypto/man/SMIME_write_CMS.3 soc2015/clord/head/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_NAME_print_ex.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_new.3 soc2015/clord/head/secure/lib/libcrypto/man/X509_verify_cert.3 soc2015/clord/head/secure/lib/libcrypto/man/bio.3 soc2015/clord/head/secure/lib/libcrypto/man/blowfish.3 soc2015/clord/head/secure/lib/libcrypto/man/bn.3 soc2015/clord/head/secure/lib/libcrypto/man/bn_internal.3 soc2015/clord/head/secure/lib/libcrypto/man/buffer.3 soc2015/clord/head/secure/lib/libcrypto/man/crypto.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_DHparams.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_X509.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_X509_CRL.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_X509_NAME.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_X509_REQ.3 soc2015/clord/head/secure/lib/libcrypto/man/d2i_X509_SIG.3 soc2015/clord/head/secure/lib/libcrypto/man/des.3 soc2015/clord/head/secure/lib/libcrypto/man/dh.3 soc2015/clord/head/secure/lib/libcrypto/man/dsa.3 soc2015/clord/head/secure/lib/libcrypto/man/ecdsa.3 soc2015/clord/head/secure/lib/libcrypto/man/engine.3 soc2015/clord/head/secure/lib/libcrypto/man/err.3 soc2015/clord/head/secure/lib/libcrypto/man/evp.3 soc2015/clord/head/secure/lib/libcrypto/man/hmac.3 soc2015/clord/head/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 soc2015/clord/head/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 soc2015/clord/head/secure/lib/libcrypto/man/lh_stats.3 soc2015/clord/head/secure/lib/libcrypto/man/lhash.3 soc2015/clord/head/secure/lib/libcrypto/man/md5.3 soc2015/clord/head/secure/lib/libcrypto/man/mdc2.3 soc2015/clord/head/secure/lib/libcrypto/man/pem.3 soc2015/clord/head/secure/lib/libcrypto/man/rand.3 soc2015/clord/head/secure/lib/libcrypto/man/rc4.3 soc2015/clord/head/secure/lib/libcrypto/man/ripemd.3 soc2015/clord/head/secure/lib/libcrypto/man/rsa.3 soc2015/clord/head/secure/lib/libcrypto/man/sha.3 soc2015/clord/head/secure/lib/libcrypto/man/threads.3 soc2015/clord/head/secure/lib/libcrypto/man/ui.3 soc2015/clord/head/secure/lib/libcrypto/man/ui_compat.3 soc2015/clord/head/secure/lib/libcrypto/man/x509.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CIPHER_get_name.3 soc2015/clord/head/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_add_session.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_ctrl.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_free.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_new.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_sess_number.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_sessions.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_mode.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_options.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_timeout.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_set_verify.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_use_certificate.3 soc2015/clord/head/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 soc2015/clord/head/secure/lib/libssl/man/SSL_SESSION_free.3 soc2015/clord/head/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 soc2015/clord/head/secure/lib/libssl/man/SSL_SESSION_get_time.3 soc2015/clord/head/secure/lib/libssl/man/SSL_accept.3 soc2015/clord/head/secure/lib/libssl/man/SSL_alert_type_string.3 soc2015/clord/head/secure/lib/libssl/man/SSL_clear.3 soc2015/clord/head/secure/lib/libssl/man/SSL_connect.3 soc2015/clord/head/secure/lib/libssl/man/SSL_do_handshake.3 soc2015/clord/head/secure/lib/libssl/man/SSL_free.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_SSL_CTX.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_ciphers.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_client_CA_list.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_current_cipher.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_default_timeout.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_error.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_ex_new_index.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_fd.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_peer_certificate.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_psk_identity.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_rbio.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_session.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_verify_result.3 soc2015/clord/head/secure/lib/libssl/man/SSL_get_version.3 soc2015/clord/head/secure/lib/libssl/man/SSL_library_init.3 soc2015/clord/head/secure/lib/libssl/man/SSL_load_client_CA_file.3 soc2015/clord/head/secure/lib/libssl/man/SSL_new.3 soc2015/clord/head/secure/lib/libssl/man/SSL_pending.3 soc2015/clord/head/secure/lib/libssl/man/SSL_read.3 soc2015/clord/head/secure/lib/libssl/man/SSL_rstate_string.3 soc2015/clord/head/secure/lib/libssl/man/SSL_session_reused.3 soc2015/clord/head/secure/lib/libssl/man/SSL_set_bio.3 soc2015/clord/head/secure/lib/libssl/man/SSL_set_connect_state.3 soc2015/clord/head/secure/lib/libssl/man/SSL_set_fd.3 soc2015/clord/head/secure/lib/libssl/man/SSL_set_session.3 soc2015/clord/head/secure/lib/libssl/man/SSL_set_shutdown.3 soc2015/clord/head/secure/lib/libssl/man/SSL_set_verify_result.3 soc2015/clord/head/secure/lib/libssl/man/SSL_shutdown.3 soc2015/clord/head/secure/lib/libssl/man/SSL_state_string.3 soc2015/clord/head/secure/lib/libssl/man/SSL_want.3 soc2015/clord/head/secure/lib/libssl/man/SSL_write.3 soc2015/clord/head/secure/lib/libssl/man/d2i_SSL_SESSION.3 soc2015/clord/head/secure/lib/libssl/man/ssl.3 soc2015/clord/head/secure/usr.bin/openssl/man/CA.pl.1 soc2015/clord/head/secure/usr.bin/openssl/man/asn1parse.1 soc2015/clord/head/secure/usr.bin/openssl/man/c_rehash.1 soc2015/clord/head/secure/usr.bin/openssl/man/ca.1 soc2015/clord/head/secure/usr.bin/openssl/man/ciphers.1 soc2015/clord/head/secure/usr.bin/openssl/man/cms.1 soc2015/clord/head/secure/usr.bin/openssl/man/crl.1 soc2015/clord/head/secure/usr.bin/openssl/man/crl2pkcs7.1 soc2015/clord/head/secure/usr.bin/openssl/man/dgst.1 soc2015/clord/head/secure/usr.bin/openssl/man/dhparam.1 soc2015/clord/head/secure/usr.bin/openssl/man/dsa.1 soc2015/clord/head/secure/usr.bin/openssl/man/dsaparam.1 soc2015/clord/head/secure/usr.bin/openssl/man/ec.1 soc2015/clord/head/secure/usr.bin/openssl/man/ecparam.1 soc2015/clord/head/secure/usr.bin/openssl/man/enc.1 soc2015/clord/head/secure/usr.bin/openssl/man/errstr.1 soc2015/clord/head/secure/usr.bin/openssl/man/gendsa.1 soc2015/clord/head/secure/usr.bin/openssl/man/genpkey.1 soc2015/clord/head/secure/usr.bin/openssl/man/genrsa.1 soc2015/clord/head/secure/usr.bin/openssl/man/nseq.1 soc2015/clord/head/secure/usr.bin/openssl/man/ocsp.1 soc2015/clord/head/secure/usr.bin/openssl/man/openssl.1 soc2015/clord/head/secure/usr.bin/openssl/man/passwd.1 soc2015/clord/head/secure/usr.bin/openssl/man/pkcs12.1 soc2015/clord/head/secure/usr.bin/openssl/man/pkcs7.1 soc2015/clord/head/secure/usr.bin/openssl/man/pkcs8.1 soc2015/clord/head/secure/usr.bin/openssl/man/pkey.1 soc2015/clord/head/secure/usr.bin/openssl/man/pkeyparam.1 soc2015/clord/head/secure/usr.bin/openssl/man/pkeyutl.1 soc2015/clord/head/secure/usr.bin/openssl/man/rand.1 soc2015/clord/head/secure/usr.bin/openssl/man/req.1 soc2015/clord/head/secure/usr.bin/openssl/man/rsa.1 soc2015/clord/head/secure/usr.bin/openssl/man/rsautl.1 soc2015/clord/head/secure/usr.bin/openssl/man/s_client.1 soc2015/clord/head/secure/usr.bin/openssl/man/s_server.1 soc2015/clord/head/secure/usr.bin/openssl/man/s_time.1 soc2015/clord/head/secure/usr.bin/openssl/man/sess_id.1 soc2015/clord/head/secure/usr.bin/openssl/man/smime.1 soc2015/clord/head/secure/usr.bin/openssl/man/speed.1 soc2015/clord/head/secure/usr.bin/openssl/man/spkac.1 soc2015/clord/head/secure/usr.bin/openssl/man/ts.1 soc2015/clord/head/secure/usr.bin/openssl/man/tsget.1 soc2015/clord/head/secure/usr.bin/openssl/man/verify.1 soc2015/clord/head/secure/usr.bin/openssl/man/version.1 soc2015/clord/head/secure/usr.bin/openssl/man/x509.1 soc2015/clord/head/secure/usr.bin/openssl/man/x509v3_config.1 soc2015/clord/head/share/ (props changed) soc2015/clord/head/share/colldef/Makefile soc2015/clord/head/share/dict/Makefile soc2015/clord/head/share/doc/IPv6/Makefile soc2015/clord/head/share/doc/atf/Makefile soc2015/clord/head/share/doc/legal/intel_ipw/Makefile soc2015/clord/head/share/doc/legal/intel_iwi/Makefile soc2015/clord/head/share/doc/legal/intel_iwn/Makefile soc2015/clord/head/share/doc/legal/intel_wpi/Makefile soc2015/clord/head/share/doc/legal/realtek/Makefile soc2015/clord/head/share/doc/llvm/Makefile soc2015/clord/head/share/doc/llvm/clang/Makefile soc2015/clord/head/share/doc/pjdfstest/Makefile soc2015/clord/head/share/doc/usd/13.viref/Makefile soc2015/clord/head/share/dtrace/toolkit/Makefile soc2015/clord/head/share/examples/bhyve/vmrun.sh soc2015/clord/head/share/examples/pf/Makefile soc2015/clord/head/share/i18n/csmapper/Makefile.inc soc2015/clord/head/share/i18n/esdb/Makefile.inc soc2015/clord/head/share/man/man4/ (props changed) soc2015/clord/head/share/man/man4/Makefile soc2015/clord/head/share/man/man4/aacraid.4 soc2015/clord/head/share/man/man4/acpi_hp.4 soc2015/clord/head/share/man/man4/acpi_ibm.4 soc2015/clord/head/share/man/man4/acpi_panasonic.4 soc2015/clord/head/share/man/man4/ada.4 soc2015/clord/head/share/man/man4/bwn.4 soc2015/clord/head/share/man/man4/ctl.4 soc2015/clord/head/share/man/man4/iscsi.4 soc2015/clord/head/share/man/man5/src.conf.5 soc2015/clord/head/share/man/man9/atomic.9 soc2015/clord/head/share/man/man9/ifnet.9 soc2015/clord/head/share/man/man9/pci_iov_schema.9 soc2015/clord/head/share/man/man9/sbuf.9 soc2015/clord/head/share/man/man9/taskqueue.9 soc2015/clord/head/share/misc/Makefile soc2015/clord/head/share/mk/Makefile soc2015/clord/head/share/mk/atf.test.mk soc2015/clord/head/share/mk/bsd.compiler.mk soc2015/clord/head/share/mk/bsd.crunchgen.mk soc2015/clord/head/share/mk/bsd.dep.mk soc2015/clord/head/share/mk/bsd.doc.mk soc2015/clord/head/share/mk/bsd.files.mk soc2015/clord/head/share/mk/bsd.incs.mk soc2015/clord/head/share/mk/bsd.init.mk soc2015/clord/head/share/mk/bsd.lib.mk soc2015/clord/head/share/mk/bsd.man.mk soc2015/clord/head/share/mk/bsd.nls.mk soc2015/clord/head/share/mk/bsd.obj.mk soc2015/clord/head/share/mk/bsd.opts.mk soc2015/clord/head/share/mk/bsd.own.mk soc2015/clord/head/share/mk/bsd.prog.mk soc2015/clord/head/share/mk/bsd.progs.mk soc2015/clord/head/share/mk/bsd.subdir.mk soc2015/clord/head/share/mk/bsd.sys.mk soc2015/clord/head/share/mk/bsd.test.mk soc2015/clord/head/share/mk/src.libnames.mk soc2015/clord/head/share/mk/src.opts.mk soc2015/clord/head/share/mk/src.sys.mk soc2015/clord/head/share/mk/sys.mk soc2015/clord/head/share/mklocale/Makefile soc2015/clord/head/share/monetdef/Makefile soc2015/clord/head/share/msgdef/Makefile soc2015/clord/head/share/numericdef/Makefile soc2015/clord/head/share/sendmail/Makefile soc2015/clord/head/share/skel/Makefile soc2015/clord/head/share/snmp/mibs/Makefile soc2015/clord/head/share/syscons/fonts/Makefile soc2015/clord/head/share/syscons/keymaps/Makefile soc2015/clord/head/share/timedef/Makefile soc2015/clord/head/share/zoneinfo/ (props changed) soc2015/clord/head/sys/ (props changed) soc2015/clord/head/sys/amd64/amd64/gdb_machdep.c soc2015/clord/head/sys/amd64/amd64/trap.c soc2015/clord/head/sys/amd64/conf/NOTES soc2015/clord/head/sys/amd64/include/vmm.h (contents, props changed) soc2015/clord/head/sys/amd64/include/vmm_dev.h (contents, props changed) soc2015/clord/head/sys/amd64/linux/linux_machdep.c soc2015/clord/head/sys/amd64/linux32/linux32_machdep.c soc2015/clord/head/sys/amd64/vmm/ (props changed) soc2015/clord/head/sys/amd64/vmm/amd/svm.c soc2015/clord/head/sys/amd64/vmm/intel/vmx.c soc2015/clord/head/sys/amd64/vmm/io/ppt.c soc2015/clord/head/sys/amd64/vmm/vmm.c soc2015/clord/head/sys/amd64/vmm/vmm_dev.c soc2015/clord/head/sys/amd64/vmm/vmm_instruction_emul.c soc2015/clord/head/sys/amd64/vmm/vmm_mem.c soc2015/clord/head/sys/amd64/vmm/vmm_mem.h soc2015/clord/head/sys/arm/arm/bcopyinout.S soc2015/clord/head/sys/arm/arm/bcopyinout_xscale.S soc2015/clord/head/sys/arm/arm/copystr.S soc2015/clord/head/sys/arm/arm/generic_timer.c soc2015/clord/head/sys/arm/arm/locore-v4.S soc2015/clord/head/sys/arm/arm/locore-v6.S soc2015/clord/head/sys/arm/arm/machdep.c soc2015/clord/head/sys/arm/arm/trap-v6.c soc2015/clord/head/sys/arm/arm/trap.c soc2015/clord/head/sys/arm/conf/BEAGLEBONE soc2015/clord/head/sys/arm/conf/NOTES soc2015/clord/head/sys/arm/include/pcpu.h soc2015/clord/head/sys/arm/ti/am335x/am335x_lcd.c soc2015/clord/head/sys/arm/ti/am335x/am335x_lcd.h soc2015/clord/head/sys/arm/ti/am335x/am335x_prcm.c soc2015/clord/head/sys/arm/ti/am335x/files.am335x soc2015/clord/head/sys/arm/ti/omap4/omap4_prcm_clks.c soc2015/clord/head/sys/arm/ti/ti_prcm.c soc2015/clord/head/sys/arm/ti/ti_prcm.h soc2015/clord/head/sys/arm64/arm64/db_interface.c soc2015/clord/head/sys/arm64/arm64/db_trace.c soc2015/clord/head/sys/arm64/arm64/gic.c soc2015/clord/head/sys/arm64/arm64/machdep.c soc2015/clord/head/sys/arm64/arm64/nexus.c soc2015/clord/head/sys/arm64/arm64/vfp.c soc2015/clord/head/sys/arm64/conf/GENERIC soc2015/clord/head/sys/arm64/include/atomic.h soc2015/clord/head/sys/arm64/include/pcpu.h soc2015/clord/head/sys/arm64/include/stack.h soc2015/clord/head/sys/boot/ (props changed) soc2015/clord/head/sys/boot/Makefile soc2015/clord/head/sys/boot/common/Makefile.inc soc2015/clord/head/sys/boot/efi/loader/arch/arm64/exec.c soc2015/clord/head/sys/boot/fdt/dts/arm/beaglebone-black.dts soc2015/clord/head/sys/boot/forth/Makefile soc2015/clord/head/sys/boot/i386/loader/Makefile soc2015/clord/head/sys/boot/mips/beri/loader/Makefile soc2015/clord/head/sys/boot/pc98/loader/Makefile soc2015/clord/head/sys/boot/powerpc/kboot/ (props changed) soc2015/clord/head/sys/boot/powerpc/kboot/Makefile soc2015/clord/head/sys/boot/powerpc/ofw/ (props changed) soc2015/clord/head/sys/boot/powerpc/ofw/Makefile soc2015/clord/head/sys/boot/powerpc/ps3/Makefile soc2015/clord/head/sys/boot/sparc64/loader/Makefile soc2015/clord/head/sys/boot/uboot/lib/copy.c soc2015/clord/head/sys/boot/uboot/lib/glue.c soc2015/clord/head/sys/cam/cam.c soc2015/clord/head/sys/cam/cam.h soc2015/clord/head/sys/cam/ctl/ctl.c soc2015/clord/head/sys/cam/ctl/ctl_frontend.c soc2015/clord/head/sys/cam/ctl/ctl_frontend.h soc2015/clord/head/sys/cam/ctl/ctl_frontend_cam_sim.c soc2015/clord/head/sys/cam/ctl/ctl_frontend_internal.c soc2015/clord/head/sys/cam/ctl/ctl_frontend_iscsi.c soc2015/clord/head/sys/cam/ctl/ctl_private.h soc2015/clord/head/sys/cam/ctl/ctl_tpc.c soc2015/clord/head/sys/cam/ctl/ctl_tpc_local.c soc2015/clord/head/sys/cam/ctl/scsi_ctl.c soc2015/clord/head/sys/cam/scsi/scsi_all.c soc2015/clord/head/sys/cam/scsi/scsi_all.h soc2015/clord/head/sys/cddl/contrib/opensolaris/ (props changed) soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c soc2015/clord/head/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h soc2015/clord/head/sys/cddl/dev/dtrace/arm/dtrace_asm.S soc2015/clord/head/sys/compat/linux/linux_event.c soc2015/clord/head/sys/compat/linux/linux_event.h soc2015/clord/head/sys/compat/linux/linux_file.c soc2015/clord/head/sys/compat/linux/linux_fork.c soc2015/clord/head/sys/compat/linux/linux_misc.c soc2015/clord/head/sys/compat/svr4/imgact_svr4.c soc2015/clord/head/sys/compat/svr4/svr4_misc.c soc2015/clord/head/sys/compat/svr4/svr4_resource.c soc2015/clord/head/sys/conf/ (props changed) soc2015/clord/head/sys/conf/NOTES soc2015/clord/head/sys/conf/files soc2015/clord/head/sys/conf/files.amd64 soc2015/clord/head/sys/conf/files.arm soc2015/clord/head/sys/conf/files.arm64 soc2015/clord/head/sys/conf/files.i386 soc2015/clord/head/sys/conf/files.mips soc2015/clord/head/sys/conf/files.powerpc soc2015/clord/head/sys/conf/kern.post.mk soc2015/clord/head/sys/conf/kern.pre.mk soc2015/clord/head/sys/conf/kmod.mk soc2015/clord/head/sys/contrib/dev/acpica/ (props changed) soc2015/clord/head/sys/contrib/dev/acpica/acpica_prep.sh soc2015/clord/head/sys/contrib/dev/acpica/changes.txt soc2015/clord/head/sys/contrib/dev/acpica/common/adisasm.c soc2015/clord/head/sys/contrib/dev/acpica/common/ahids.c soc2015/clord/head/sys/contrib/dev/acpica/common/ahpredef.c soc2015/clord/head/sys/contrib/dev/acpica/common/ahuuids.c soc2015/clord/head/sys/contrib/dev/acpica/common/dmextern.c soc2015/clord/head/sys/contrib/dev/acpica/common/dmrestag.c soc2015/clord/head/sys/contrib/dev/acpica/common/dmtable.c soc2015/clord/head/sys/contrib/dev/acpica/common/dmtbdump.c soc2015/clord/head/sys/contrib/dev/acpica/common/dmtbinfo.c soc2015/clord/head/sys/contrib/dev/acpica/common/getopt.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslanalyze.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslascii.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslcodegen.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslcompile.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslcompiler.h soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslcompiler.l soc2015/clord/head/sys/contrib/dev/acpica/compiler/asldefine.h soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslerror.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslfileio.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslfiles.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslfold.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslglobal.h soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslmain.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslmapenter.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslmapoutput.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslmethod.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslopcodes.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/asloperands.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslopt.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/asloptions.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslprintf.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslstartup.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslsupport.l soc2015/clord/head/sys/contrib/dev/acpica/compiler/asltypes.h soc2015/clord/head/sys/contrib/dev/acpica/compiler/aslutils.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/asluuid.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtcompile.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtcompiler.h soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtexpress.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtfield.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtio.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtparser.y soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtsubtable.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dttable.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dttemplate.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/dttemplate.h soc2015/clord/head/sys/contrib/dev/acpica/compiler/dtutils.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/prparser.y soc2015/clord/head/sys/contrib/dev/acpica/compiler/prscan.c soc2015/clord/head/sys/contrib/dev/acpica/compiler/prutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbcmds.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbconvert.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbdisply.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbexec.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbfileio.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbhistry.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbinput.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbmethod.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbnames.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbtest.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/debugger/dbxface.c soc2015/clord/head/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c soc2015/clord/head/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c soc2015/clord/head/sys/contrib/dev/acpica/components/disassembler/dmopcode.c soc2015/clord/head/sys/contrib/dev/acpica/components/dispatcher/dsfield.c soc2015/clord/head/sys/contrib/dev/acpica/components/dispatcher/dsinit.c soc2015/clord/head/sys/contrib/dev/acpica/components/dispatcher/dsobject.c soc2015/clord/head/sys/contrib/dev/acpica/components/dispatcher/dsutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/dispatcher/dswload.c soc2015/clord/head/sys/contrib/dev/acpica/components/events/evgpe.c soc2015/clord/head/sys/contrib/dev/acpica/components/events/evgpeinit.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exconfig.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exconvrt.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exdebug.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exdump.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exfield.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exfldio.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exmisc.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exnames.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exoparg2.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exoparg3.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exregion.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exstorob.c soc2015/clord/head/sys/contrib/dev/acpica/components/executer/exutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/hardware/hwgpe.c soc2015/clord/head/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsaccess.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsconvert.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsdump.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nseval.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsinit.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsparse.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsrepair2.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nssearch.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsxfeval.c soc2015/clord/head/sys/contrib/dev/acpica/components/namespace/nsxfname.c soc2015/clord/head/sys/contrib/dev/acpica/components/parser/psutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/resources/rscreate.c soc2015/clord/head/sys/contrib/dev/acpica/components/resources/rsmisc.c soc2015/clord/head/sys/contrib/dev/acpica/components/resources/rsutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/resources/rsxface.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbdata.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbfadt.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbfind.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbinstal.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbprint.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbutils.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbxface.c soc2015/clord/head/sys/contrib/dev/acpica/components/tables/tbxfload.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utalloc.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utbuffer.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utcache.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utcopy.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utids.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utmisc.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utosi.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utpredef.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utprint.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utstring.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/uttrack.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utxface.c soc2015/clord/head/sys/contrib/dev/acpica/components/utilities/utxfinit.c soc2015/clord/head/sys/contrib/dev/acpica/include/accommon.h soc2015/clord/head/sys/contrib/dev/acpica/include/acglobal.h soc2015/clord/head/sys/contrib/dev/acpica/include/acinterp.h soc2015/clord/head/sys/contrib/dev/acpica/include/aclocal.h soc2015/clord/head/sys/contrib/dev/acpica/include/acnames.h soc2015/clord/head/sys/contrib/dev/acpica/include/acnamesp.h soc2015/clord/head/sys/contrib/dev/acpica/include/acobject.h soc2015/clord/head/sys/contrib/dev/acpica/include/acoutput.h soc2015/clord/head/sys/contrib/dev/acpica/include/acpixf.h soc2015/clord/head/sys/contrib/dev/acpica/include/acstruct.h soc2015/clord/head/sys/contrib/dev/acpica/include/actbl.h soc2015/clord/head/sys/contrib/dev/acpica/include/actbl1.h soc2015/clord/head/sys/contrib/dev/acpica/include/actbl2.h soc2015/clord/head/sys/contrib/dev/acpica/include/actbl3.h soc2015/clord/head/sys/contrib/dev/acpica/include/actypes.h soc2015/clord/head/sys/contrib/dev/acpica/include/acutils.h soc2015/clord/head/sys/contrib/dev/acpica/include/platform/acenv.h soc2015/clord/head/sys/contrib/dev/acpica/include/platform/acenvex.h soc2015/clord/head/sys/contrib/dev/acpica/include/platform/acgcc.h soc2015/clord/head/sys/ddb/db_sym.c soc2015/clord/head/sys/dev/acpi_support/acpi_ibm.c soc2015/clord/head/sys/dev/acpica/Osd/OsdHardware.c soc2015/clord/head/sys/dev/acpica/acpi_cpu.c soc2015/clord/head/sys/dev/atkbdc/psm.c soc2015/clord/head/sys/dev/bxe/bxe.c soc2015/clord/head/sys/dev/bxe/bxe.h soc2015/clord/head/sys/dev/bxe/ecore_reg.h soc2015/clord/head/sys/dev/bxe/ecore_sp.c soc2015/clord/head/sys/dev/cxgbe/adapter.h soc2015/clord/head/sys/dev/cxgbe/common/t4_hw.c soc2015/clord/head/sys/dev/cxgbe/t4_main.c soc2015/clord/head/sys/dev/drm2/i915/i915_gem.c soc2015/clord/head/sys/dev/drm2/ttm/ttm_page_alloc.c soc2015/clord/head/sys/dev/filemon/filemon.h soc2015/clord/head/sys/dev/filemon/filemon_wrapper.c soc2015/clord/head/sys/dev/gpio/ofw_gpiobus.c soc2015/clord/head/sys/dev/hwpmc/hwpmc_armv7.c soc2015/clord/head/sys/dev/hwpmc/hwpmc_armv7.h soc2015/clord/head/sys/dev/hwpmc/pmc_events.h soc2015/clord/head/sys/dev/ichsmb/ichsmb_pci.c soc2015/clord/head/sys/dev/isp/isp.c soc2015/clord/head/sys/dev/isp/isp_freebsd.c soc2015/clord/head/sys/dev/isp/isp_library.c soc2015/clord/head/sys/dev/iwn/if_iwn.c soc2015/clord/head/sys/dev/iwn/if_iwnvar.h soc2015/clord/head/sys/dev/ixl/if_ixl.c soc2015/clord/head/sys/dev/mii/mii.h soc2015/clord/head/sys/dev/ofw/ofw_bus_subr.c soc2015/clord/head/sys/dev/ofw/ofw_bus_subr.h soc2015/clord/head/sys/dev/proto/proto_bus_pci.c soc2015/clord/head/sys/dev/proto/proto_busdma.c soc2015/clord/head/sys/dev/proto/proto_dev.h soc2015/clord/head/sys/dev/uart/uart_bus_pci.c soc2015/clord/head/sys/dev/usb/usbdevs soc2015/clord/head/sys/dev/videomode/videomode.h soc2015/clord/head/sys/dev/virtio/mmio/virtio_mmio.h soc2015/clord/head/sys/dev/virtio/network/if_vtnet.c soc2015/clord/head/sys/dev/xen/blkback/blkback.c soc2015/clord/head/sys/dev/xen/blkfront/blkfront.c soc2015/clord/head/sys/dev/xen/blkfront/block.h soc2015/clord/head/sys/fs/fdescfs/fdesc_vfsops.c soc2015/clord/head/sys/fs/fdescfs/fdesc_vnops.c soc2015/clord/head/sys/fs/nfsclient/nfs_clbio.c soc2015/clord/head/sys/fs/tmpfs/tmpfs_subr.c soc2015/clord/head/sys/geom/label/g_label.c soc2015/clord/head/sys/geom/label/g_label.h soc2015/clord/head/sys/geom/label/g_label_iso9660.c soc2015/clord/head/sys/geom/label/g_label_msdosfs.c soc2015/clord/head/sys/i386/conf/NOTES soc2015/clord/head/sys/i386/i386/exception.s soc2015/clord/head/sys/i386/i386/gdb_machdep.c soc2015/clord/head/sys/i386/i386/machdep.c soc2015/clord/head/sys/i386/i386/trap.c soc2015/clord/head/sys/i386/ibcs2/ibcs2_misc.c soc2015/clord/head/sys/i386/include/asmacros.h soc2015/clord/head/sys/i386/include/gdb_machdep.h soc2015/clord/head/sys/i386/linux/imgact_linux.c soc2015/clord/head/sys/i386/linux/linux_machdep.c soc2015/clord/head/sys/kern/imgact_aout.c soc2015/clord/head/sys/kern/imgact_binmisc.c soc2015/clord/head/sys/kern/imgact_elf.c soc2015/clord/head/sys/kern/imgact_gzip.c soc2015/clord/head/sys/kern/init_main.c soc2015/clord/head/sys/kern/kern_descrip.c soc2015/clord/head/sys/kern/kern_event.c soc2015/clord/head/sys/kern/kern_exec.c soc2015/clord/head/sys/kern/kern_fork.c soc2015/clord/head/sys/kern/kern_jail.c soc2015/clord/head/sys/kern/kern_kthread.c soc2015/clord/head/sys/kern/kern_mutex.c soc2015/clord/head/sys/kern/kern_proc.c soc2015/clord/head/sys/kern/kern_prot.c soc2015/clord/head/sys/kern/kern_racct.c soc2015/clord/head/sys/kern/kern_resource.c soc2015/clord/head/sys/kern/kern_rwlock.c soc2015/clord/head/sys/kern/kern_sig.c soc2015/clord/head/sys/kern/kern_sx.c soc2015/clord/head/sys/kern/kern_syscalls.c soc2015/clord/head/sys/kern/kern_tc.c soc2015/clord/head/sys/kern/kern_thr.c soc2015/clord/head/sys/kern/kern_thread.c soc2015/clord/head/sys/kern/stack_protector.c soc2015/clord/head/sys/kern/subr_prf.c soc2015/clord/head/sys/kern/subr_syscall.c soc2015/clord/head/sys/kern/subr_trap.c soc2015/clord/head/sys/kern/subr_uio.c soc2015/clord/head/sys/kern/sysv_shm.c soc2015/clord/head/sys/kern/tty_pts.c soc2015/clord/head/sys/kern/uipc_shm.c soc2015/clord/head/sys/kern/uipc_sockbuf.c soc2015/clord/head/sys/kern/uipc_syscalls.c soc2015/clord/head/sys/kern/uipc_usrreq.c soc2015/clord/head/sys/kern/vfs_acl.c soc2015/clord/head/sys/kern/vfs_extattr.c soc2015/clord/head/sys/kern/vfs_subr.c soc2015/clord/head/sys/kern/vfs_syscalls.c soc2015/clord/head/sys/kern/vfs_vnops.c soc2015/clord/head/sys/mips/conf/AR934X_BASE soc2015/clord/head/sys/modules/usb/Makefile soc2015/clord/head/sys/net/if_bridge.c soc2015/clord/head/sys/netinet/if_ether.c soc2015/clord/head/sys/netinet/ip_encap.c soc2015/clord/head/sys/netinet/sctp_asconf.c soc2015/clord/head/sys/netinet/sctp_input.c soc2015/clord/head/sys/netinet/sctp_input.h soc2015/clord/head/sys/netinet/sctp_os_bsd.h soc2015/clord/head/sys/netinet/sctp_output.c soc2015/clord/head/sys/netinet/sctp_output.h soc2015/clord/head/sys/netinet/sctp_pcb.c soc2015/clord/head/sys/netinet/sctp_pcb.h soc2015/clord/head/sys/netinet/sctp_syscalls.c soc2015/clord/head/sys/netinet/sctp_usrreq.c soc2015/clord/head/sys/netinet/sctp_var.h soc2015/clord/head/sys/netinet/sctputil.c soc2015/clord/head/sys/netinet/sctputil.h soc2015/clord/head/sys/netinet/tcp_timer.c soc2015/clord/head/sys/netinet/tcp_timer.h soc2015/clord/head/sys/netinet6/sctp6_usrreq.c soc2015/clord/head/sys/netipsec/key.c soc2015/clord/head/sys/netipsec/key.h soc2015/clord/head/sys/netpfil/pf/pf_norm.c soc2015/clord/head/sys/ofed/drivers/infiniband/core/umem.c soc2015/clord/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c soc2015/clord/head/sys/ofed/include/linux/file.h soc2015/clord/head/sys/opencrypto/crypto.c soc2015/clord/head/sys/powerpc/conf/NOTES soc2015/clord/head/sys/powerpc/powerpc/trap.c soc2015/clord/head/sys/security/audit/audit_arg.c soc2015/clord/head/sys/sparc64/sparc64/trap.c soc2015/clord/head/sys/sys/filedesc.h soc2015/clord/head/sys/sys/lockstat.h soc2015/clord/head/sys/sys/param.h soc2015/clord/head/sys/sys/pmc.h soc2015/clord/head/sys/sys/proc.h soc2015/clord/head/sys/sys/resourcevar.h soc2015/clord/head/sys/sys/sbuf.h soc2015/clord/head/sys/sys/vnode.h soc2015/clord/head/sys/ufs/ffs/ffs_alloc.c soc2015/clord/head/sys/ufs/ffs/ffs_vfsops.c soc2015/clord/head/sys/vm/swap_pager.c soc2015/clord/head/sys/vm/vm_fault.c soc2015/clord/head/sys/vm/vm_glue.c soc2015/clord/head/sys/vm/vm_kern.c soc2015/clord/head/sys/vm/vm_map.c soc2015/clord/head/sys/vm/vm_mmap.c soc2015/clord/head/sys/vm/vm_object.c soc2015/clord/head/sys/vm/vm_pageout.c soc2015/clord/head/sys/vm/vm_pager.c soc2015/clord/head/sys/vm/vm_pager.h soc2015/clord/head/sys/vm/vm_unix.c soc2015/clord/head/sys/x86/acpica/acpi_wakeup.c soc2015/clord/head/sys/xen/blkif.h soc2015/clord/head/sys/xen/interface/io/blkif.h soc2015/clord/head/tests/sys/pjdfstest/pjdfstest/Makefile soc2015/clord/head/tools/build/mk/Makefile.boot soc2015/clord/head/tools/build/mk/OptionalObsoleteFiles.inc soc2015/clord/head/tools/bus_space/C/Makefile soc2015/clord/head/tools/bus_space/C/lang.c soc2015/clord/head/tools/bus_space/Makefile.inc soc2015/clord/head/tools/bus_space/Python/Makefile soc2015/clord/head/tools/bus_space/Python/lang.c soc2015/clord/head/tools/bus_space/busdma.c soc2015/clord/head/tools/bus_space/busdma.h soc2015/clord/head/usr.bin/Makefile soc2015/clord/head/usr.bin/alias/Makefile soc2015/clord/head/usr.bin/bmake/Makefile soc2015/clord/head/usr.bin/calendar/ (props changed) soc2015/clord/head/usr.bin/calendar/calendars/calendar.freebsd soc2015/clord/head/usr.bin/calendar/calendars/calendar.holiday soc2015/clord/head/usr.bin/clang/clang.prog.mk soc2015/clord/head/usr.bin/clang/lldb/Makefile soc2015/clord/head/usr.bin/grep/Makefile soc2015/clord/head/usr.bin/kdump/Makefile soc2015/clord/head/usr.bin/kdump/mkioctls soc2015/clord/head/usr.bin/mkcsmapper_static/Makefile soc2015/clord/head/usr.bin/mkesdb_static/Makefile soc2015/clord/head/usr.bin/mkimg/ (props changed) soc2015/clord/head/usr.bin/mkimg/Makefile soc2015/clord/head/usr.bin/mkimg/format.c soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-apm.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-bsd.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-ebr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-mbr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-apm.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-apm.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-bsd.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-ebr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-mbr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-apm.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-bsd.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-ebr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-mbr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-apm.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-apm.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-bsd.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-ebr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-mbr.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.gz.uu soc2015/clord/head/usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.gz.uu soc2015/clord/head/usr.bin/mkimg/vhd.c soc2015/clord/head/usr.bin/procstat/ (props changed) soc2015/clord/head/usr.bin/sockstat/sockstat.1 soc2015/clord/head/usr.bin/sockstat/sockstat.c soc2015/clord/head/usr.bin/top/Makefile soc2015/clord/head/usr.bin/truss/Makefile soc2015/clord/head/usr.bin/xlint/llib/Makefile soc2015/clord/head/usr.sbin/bhyve/ (props changed) soc2015/clord/head/usr.sbin/bhyve/Makefile soc2015/clord/head/usr.sbin/bhyve/bhyve.8 soc2015/clord/head/usr.sbin/bhyve/bhyverun.c soc2015/clord/head/usr.sbin/bhyve/dbgport.c soc2015/clord/head/usr.sbin/bhyve/pci_lpc.c soc2015/clord/head/usr.sbin/bhyve/pci_lpc.h soc2015/clord/head/usr.sbin/bhyve/pci_passthru.c soc2015/clord/head/usr.sbin/bhyvectl/ (props changed) soc2015/clord/head/usr.sbin/bhyvectl/Makefile soc2015/clord/head/usr.sbin/bhyvectl/bhyvectl.c soc2015/clord/head/usr.sbin/bhyveload/ (props changed) soc2015/clord/head/usr.sbin/bhyveload/bhyveload.8 soc2015/clord/head/usr.sbin/bhyveload/bhyveload.c soc2015/clord/head/usr.sbin/bsdconfig/usermgmt/share/group.subr soc2015/clord/head/usr.sbin/bsdconfig/usermgmt/share/user.subr soc2015/clord/head/usr.sbin/crunch/crunchgen/crunchgen.c soc2015/clord/head/usr.sbin/ctld/token.l soc2015/clord/head/usr.sbin/freebsd-update/freebsd-update.sh soc2015/clord/head/usr.sbin/fstyp/Makefile soc2015/clord/head/usr.sbin/fstyp/cd9660.c soc2015/clord/head/usr.sbin/fstyp/fstyp.8 soc2015/clord/head/usr.sbin/fstyp/fstyp.c soc2015/clord/head/usr.sbin/fstyp/fstyp.h soc2015/clord/head/usr.sbin/fstyp/msdosfs.c soc2015/clord/head/usr.sbin/jail/ (props changed) soc2015/clord/head/usr.sbin/ndiscvt/ (props changed) soc2015/clord/head/usr.sbin/pc-sysinstall/backend-partmanager/Makefile soc2015/clord/head/usr.sbin/pc-sysinstall/backend-query/Makefile soc2015/clord/head/usr.sbin/pc-sysinstall/backend/Makefile soc2015/clord/head/usr.sbin/pc-sysinstall/conf/Makefile soc2015/clord/head/usr.sbin/pc-sysinstall/doc/Makefile soc2015/clord/head/usr.sbin/pc-sysinstall/examples/Makefile soc2015/clord/head/usr.sbin/pw/pw.8 soc2015/clord/head/usr.sbin/rtadvctl/ (props changed) soc2015/clord/head/usr.sbin/rtadvd/ (props changed) soc2015/clord/head/usr.sbin/rtsold/ (props changed) soc2015/clord/head/usr.sbin/syslogd/syslogd.8 soc2015/clord/head/usr.sbin/syslogd/syslogd.c soc2015/clord/head/usr.sbin/zic/ (props changed) Modified: soc2015/clord/head/Makefile ============================================================================== --- soc2015/clord/head/Makefile Mon Jun 22 16:24:27 2015 (r287447) +++ soc2015/clord/head/Makefile Mon Jun 22 17:19:51 2015 (r287448) @@ -99,6 +99,14 @@ # # For more information, see the build(7) manual page. # + +# Note: we use this awkward construct to be compatible with FreeBSD's +# old make used in 10.0 and 9.2 and earlier. +.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" +# targets/Makefile plays the role of top-level +.include "targets/Makefile" +.else + TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ @@ -430,9 +438,12 @@ universe_${target}: universe_${target}_prologue universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=C date`" +universe_${target}_worlds: + .if !defined(MAKE_JUST_KERNELS) +universe_${target}_done: universe_${target}_worlds .for target_arch in ${TARGET_ARCHES_${target}} -universe_${target}: universe_${target}_${target_arch} +universe_${target}_worlds: universe_${target}_${target_arch} universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @@ -445,15 +456,11 @@ ${MAKEFAIL})) @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`" .endfor -.endif +.endif # !MAKE_JUST_KERNELS + .if !defined(MAKE_JUST_WORLDS) -# If we are building world and kernels wait for the required worlds to finish -.if !defined(MAKE_JUST_KERNELS) -.for target_arch in ${TARGET_ARCHES_${target}} -universe_${target}_kernels: universe_${target}_${target_arch} -.endfor -.endif -universe_${target}: universe_${target}_kernels +universe_${target}_done: universe_${target}_kernels +universe_${target}_kernels: universe_${target}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ @@ -463,7 +470,11 @@ .endif @cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels -.endif +.endif # !MAKE_JUST_WORLDS + +# Tell the user the worlds and kernels have completed +universe_${target}: universe_${target}_done +universe_${target}_done: @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs @@ -517,9 +528,23 @@ ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT .if defined(.PARSEDIR) +# This makefile does not run in meta mode +.MAKE.MODE= normal +# Normally the things we run from here don't either. +# Using -DWITH_META_FILES +# we can buildworld with meta files created which are useful +# for debugging, but without any of the rest of a meta mode build. +MK_META_MODE= no +MK_STAGING= no +# tell meta.autodep.mk to not even think about updating anything. +UPDATE_DEPENDFILE= NO +.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE + .if make(universe) # we do not want a failure of one branch abort all. MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif -.endif +.endif # bmake + +.endif # META_MODE Modified: soc2015/clord/head/Makefile.inc1 ============================================================================== --- soc2015/clord/head/Makefile.inc1 Mon Jun 22 16:24:27 2015 (r287447) +++ soc2015/clord/head/Makefile.inc1 Mon Jun 22 17:19:51 2015 (r287448) @@ -1258,7 +1258,7 @@ _strfile= games/fortune/strfile .endif -.if ${MK_CXX} != "no" +.if ${MK_GCC} != "no" && ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf .endif Modified: soc2015/clord/head/ObsoleteFiles.inc ============================================================================== --- soc2015/clord/head/ObsoleteFiles.inc Mon Jun 22 16:24:27 2015 (r287447) +++ soc2015/clord/head/ObsoleteFiles.inc Mon Jun 22 17:19:51 2015 (r287448) @@ -39,9 +39,9 @@ # done # 20150528: PCI IOV device driver methods moved to a separate kobj interface. -OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9 -OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9 -OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9 +OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz +OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz +OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1. OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h @@ -117,9 +117,13 @@ OLD_FILES+=usr/lib32/libheimsqlite.so OLD_LIBS+=usr/lib32/libheimsqlite.so.11 OLD_FILES+=usr/lib32/libheimsqlite_p.a +# 20150518: tzdata2015c update +OLD_FILES+=usr/share/zoneinfo/America/Montreal # 20150506 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20150504 +OLD_FILES+=usr/share/examples/etc/libmap32.conf +OLD_FILES+=usr/include/bsdstat.h OLD_LIBS+=usr/lib32/private/libatf-c++.so.2 OLD_LIBS+=usr/lib32/private/libbsdstat.so.1 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11 @@ -160,6 +164,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz @@ -168,6 +173,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz @@ -176,6 +182,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz @@ -184,6 +191,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz @@ -204,10 +212,33 @@ OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz -# 20150429: -OLD_FILES+=usr/share/docs/papers/hwpmc.ascii.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz +OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz +# 20150429: remove never written documentation +OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test OLD_FILES+=usr/tests/sys/kern/mmap_test +# 20150422: zlib.c moved from net to libkern +OLD_FILES+=usr/include/net/zlib.h +OLD_FILES+=usr/include/net/zutil.h # 20150418 OLD_FILES+=sbin/mount_oldnfs OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz @@ -226,6 +257,42 @@ OLD_FILES+=usr/include/altq/altq_cbq.h OLD_FILES+=usr/include/altq/altq_rio.h OLD_DIRS+=usr/include/altq +# 20150330: ntp 4.2.8p1 +OLD_FILES+=usr/share/doc/ntp/driver1.html +OLD_FILES+=usr/share/doc/ntp/driver10.html +OLD_FILES+=usr/share/doc/ntp/driver11.html +OLD_FILES+=usr/share/doc/ntp/driver12.html +OLD_FILES+=usr/share/doc/ntp/driver16.html +OLD_FILES+=usr/share/doc/ntp/driver18.html +OLD_FILES+=usr/share/doc/ntp/driver19.html +OLD_FILES+=usr/share/doc/ntp/driver2.html +OLD_FILES+=usr/share/doc/ntp/driver20.html +OLD_FILES+=usr/share/doc/ntp/driver22.html +OLD_FILES+=usr/share/doc/ntp/driver26.html +OLD_FILES+=usr/share/doc/ntp/driver27.html +OLD_FILES+=usr/share/doc/ntp/driver28.html +OLD_FILES+=usr/share/doc/ntp/driver29.html +OLD_FILES+=usr/share/doc/ntp/driver3.html +OLD_FILES+=usr/share/doc/ntp/driver30.html +OLD_FILES+=usr/share/doc/ntp/driver32.html +OLD_FILES+=usr/share/doc/ntp/driver33.html +OLD_FILES+=usr/share/doc/ntp/driver34.html +OLD_FILES+=usr/share/doc/ntp/driver35.html +OLD_FILES+=usr/share/doc/ntp/driver36.html +OLD_FILES+=usr/share/doc/ntp/driver37.html +OLD_FILES+=usr/share/doc/ntp/driver4.html +OLD_FILES+=usr/share/doc/ntp/driver5.html +OLD_FILES+=usr/share/doc/ntp/driver6.html +OLD_FILES+=usr/share/doc/ntp/driver7.html +OLD_FILES+=usr/share/doc/ntp/driver8.html +OLD_FILES+=usr/share/doc/ntp/driver9.html +OLD_FILES+=usr/share/doc/ntp/ldisc.html +OLD_FILES+=usr/share/doc/ntp/measure.html +OLD_FILES+=usr/share/doc/ntp/mx4200data.html +OLD_FILES+=usr/share/doc/ntp/notes.html +OLD_FILES+=usr/share/doc/ntp/patches.html +OLD_FILES+=usr/share/doc/ntp/porting.html +OLD_FILES+=usr/share/man/man1/sntp.1.gz # 20150329 .if ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/bootconfig.h @@ -297,7 +364,7 @@ OLD_FILES+=usr/share/man/man6/bcd.6.gz OLD_FILES+=usr/share/man/man6/ppt.6.gz # 20150217: Removed remnants of ar(4) driver -OLD_FILES+=usr/include/sys/dev/ic/hd64570.h +OLD_FILES+=usr/include/dev/ic/hd64570.h # 20150212: /usr/games moving into /usr/bin OLD_FILES+=usr/games/bcd OLD_FILES+=usr/games/caesar @@ -317,19 +384,23 @@ # 20150209: liblzma header OLD_FILES+=usr/include/lzma/lzma.h # 20150124: spl.9 and friends -OLD_FILES+=usr/share/man/man9/spl.9 -OLD_FILES+=usr/share/man/man9/spl0.9 -OLD_FILES+=usr/share/man/man9/splbio.9 -OLD_FILES+=usr/share/man/man9/splclock.9 -OLD_FILES+=usr/share/man/man9/splhigh.9 -OLD_FILES+=usr/share/man/man9/splimp.9 -OLD_FILES+=usr/share/man/man9/splnet.9 -OLD_FILES+=usr/share/man/man9/splsoftclock.9 -OLD_FILES+=usr/share/man/man9/splsofttty.9 -OLD_FILES+=usr/share/man/man9/splstatclock.9 -OLD_FILES+=usr/share/man/man9/spltty.9 -OLD_FILES+=usr/share/man/man9/splvm.9 -OLD_FILES+=usr/share/man/man9/splx.9 +OLD_FILES+=usr/share/man/man9/spl.9.gz +OLD_FILES+=usr/share/man/man9/spl0.9.gz +OLD_FILES+=usr/share/man/man9/splbio.9.gz +OLD_FILES+=usr/share/man/man9/splclock.9.gz +OLD_FILES+=usr/share/man/man9/splhigh.9.gz +OLD_FILES+=usr/share/man/man9/splimp.9.gz +OLD_FILES+=usr/share/man/man9/splnet.9.gz +OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz +OLD_FILES+=usr/share/man/man9/splsofttty.9.gz +OLD_FILES+=usr/share/man/man9/splstatclock.9.gz +OLD_FILES+=usr/share/man/man9/spltty.9.gz +OLD_FILES+=usr/share/man/man9/splvm.9.gz +OLD_FILES+=usr/share/man/man9/splx.9.gz +# 20150122: callout changes reverted +OLD_FILES+=usr/share/man/man9/callout_drain_async.9.gz +# 20150118: toeplitz.c moved from netinet to net +OLD_FILES+=usr/include/netinet/toeplitz.h # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1. OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h @@ -384,6 +455,8 @@ OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd OLD_DIRS+=usr/lib/clang/3.5.0/lib OLD_DIRS+=usr/lib/clang/3.5.0 +# 20150102: removal of asr(4) +OLD_FILES+=usr/share/man/man4/asr.4.gz # 20150102: removal of texinfo OLD_FILES+=usr/bin/info OLD_FILES+=usr/bin/infokey @@ -452,7 +525,7 @@ OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h OLD_DIRS+=usr/include/clang/3.4.1 -# 20141226: Remove gpib/ieee488 +# 20141225: Remove gpib/ieee488 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h OLD_FILES+=usr/include/dev/ieee488/tnt4882.h OLD_FILES+=usr/include/dev/ieee488/ugpib.h @@ -465,22 +538,37 @@ OLD_FILES+=usr/lib/libgpib.so OLD_LIBS+=usr/lib/libgpib.so.3 OLD_FILES+=usr/lib/libgpib_p.a -OLD_FILES+=share/man/man4/pcii.4.gz -OLD_FILES+=share/man/man4/gpib.4.gz -OLD_FILES+=share/man/man4/tnt4882.4.gz -.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" OLD_FILES+=usr/lib32/libgpib.a OLD_FILES+=usr/lib32/libgpib_p.a OLD_FILES+=usr/lib32/libgpib.so OLD_LIBS+=usr/lib32/libgpib.so.3 -.endif - +OLD_FILES+=usr/share/man/man3/gpib.3.gz +OLD_FILES+=usr/share/man/man3/ibclr.3.gz +OLD_FILES+=usr/share/man/man3/ibdev.3.gz +OLD_FILES+=usr/share/man/man3/ibdma.3.gz +OLD_FILES+=usr/share/man/man3/ibeos.3.gz +OLD_FILES+=usr/share/man/man3/ibeot.3.gz +OLD_FILES+=usr/share/man/man3/ibloc.3.gz +OLD_FILES+=usr/share/man/man3/ibonl.3.gz +OLD_FILES+=usr/share/man/man3/ibpad.3.gz +OLD_FILES+=usr/share/man/man3/ibrd.3.gz +OLD_FILES+=usr/share/man/man3/ibsad.3.gz +OLD_FILES+=usr/share/man/man3/ibsic.3.gz +OLD_FILES+=usr/share/man/man3/ibtmo.3.gz +OLD_FILES+=usr/share/man/man3/ibtrg.3.gz +OLD_FILES+=usr/share/man/man3/ibwrt.3.gz +OLD_FILES+=usr/share/man/man4/gpib.4.gz +OLD_FILES+=usr/share/man/man4/pcii.4.gz +OLD_FILES+=usr/share/man/man4/tnt4882.4.gz # 20141224: libxo moved to /lib OLD_LIBS+=usr/lib/libxo.so.0 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h OLD_FILES+=usr/include/net/if_stf.h OLD_FILES+=usr/include/netinet/in_gif.h OLD_FILES+=usr/include/netinet6/in6_gif.h +# 20141209: pw tests broken into a file per command +OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete +OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify # 20141202: update to mandoc CVS 20141201 OLD_FILES+=usr.bin/preconv OLD_FILES+=share/man/man1/preconv.1.gz @@ -492,6 +580,11 @@ OLD_FILES+=usr/tests/sbin/mdconfig/run.pl # 20141126: remove xform_ipip decapsulation fallback OLD_FILES+=usr/include/netipsec/ipip_var.h +# 20141122: mandoc updated to 1.13.1 +OLD_FILES+=usr/share/mdocml/external.png +# 20141111: SF_KQUEUE code removed +OLD_FILES+=usr/include/sys/sf_base.h +OLD_FILES+=usr/include/sys/sf_sync.h # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz @@ -504,6 +597,8 @@ OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/initrandom +# 20141030: atf 0.21 import +OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz # 20141028: debug files accidentally installed as directory name OLD_FILES+=usr/lib/debug/usr/lib/i18n OLD_FILES+=usr/lib/debug/usr/lib/private @@ -511,6 +606,9 @@ OLD_FILES+=usr/lib/debug/usr/lib32/private # 20141015: OpenSSL 1.0.1j import OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz +# 20141003: libproc version bump +OLD_LIBS+=usr/lib/libproc.so.2 +OLD_LIBS+=usr/lib32/libproc.so.2 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz @@ -520,6 +618,10 @@ OLD_LIBS+=usr/lib/libnv.so.0 # 20140829: rc.d/kerberos removed OLD_FILES+=etc/rc.d/kerberos +# 20140827: tzdata2014f import +OLD_FILES+=usr/share/zoneinfo/Asia/Chongqing +OLD_FILES+=usr/share/zoneinfo/Asia/Harbin +OLD_FILES+=usr/share/zoneinfo/Asia/Kashgar # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 @@ -583,14 +685,19 @@ OLD_FILES+=usr/lib/private/libucl_p.a # 20140803: Remove an obsolete man page OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz +# 20140731 +OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz # 20140728: libsbuf restored to old version. OLD_LIBS+=lib/libsbuf.so.7 +OLD_LIBS+=usr/lib32/libsbuf.so.7 # 20140728: Remove an obsolete man page OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz # 20140723: renamed to PCBGROUP.9 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz +# 20140722: browse_packages_ftp.sh removed +OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh # 20140718: Remove obsolete man pages OLD_FILES+=usr/share/man/man9/zero_copy.9.gz OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz @@ -611,6 +718,14 @@ OLD_FILES+=usr/lib/libhistory_p.a OLD_FILES+=usr/lib/libhistory.so OLD_LIBS+=usr/lib/libhistory.so.8 +OLD_FILES+=usr/lib32/libhistory.a +OLD_FILES+=usr/lib32/libhistory.so +OLD_LIBS+=usr/lib32/libhistory.so.8 +OLD_FILES+=usr/lib32/libhistory_p.a +OLD_FILES+=usr/lib32/libreadline.a +OLD_FILES+=usr/lib32/libreadline.so +OLD_LIBS+=usr/lib32/libreadline.so.8 +OLD_FILES+=usr/lib32/libreadline_p.a OLD_FILES+=usr/include/readline/chardefs.h OLD_FILES+=usr/include/readline/history.h OLD_FILES+=usr/include/readline/keymaps.h @@ -623,6 +738,7 @@ OLD_DIRS+=usr/include/readline OLD_FILES+=usr/share/info/readline.info.gz OLD_FILES+=usr/share/man/man3/readline.3.gz +OLD_FILES+=usr/share/man/man3/rlhistory.3.gz # 20140625: csup removal OLD_FILES+=usr/bin/csup OLD_FILES+=usr/bin/cpasswd @@ -683,6 +799,12 @@ OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test # 20140502: Removal of lindev(4) OLD_FILES+=usr/share/man/man4/lindev.4.gz +# 20140425 +OLD_FILES+=usr/lib/libssp_p.a +OLD_FILES+=usr/lib/libstand_p.a +OLD_FILES+=usr/lib32/libc_pic.a +OLD_FILES+=usr/lib32/libssp_p.a +OLD_FILES+=usr/lib32/libstand_p.a # 20140314: AppleTalk OLD_DIRS+=usr/include/netatalk OLD_FILES+=usr/include/netatalk/aarp.h @@ -2001,7 +2123,6 @@ OLD_LIBS+=usr/lib/libpanelw.so.4 OLD_LIBS+=usr/lib/libpmc.so.4 OLD_LIBS+=usr/lib/libproc.so.1 -OLD_LIBS+=usr/lib/libproc.so.2 OLD_LIBS+=usr/lib/libradius.so.3 OLD_LIBS+=usr/lib/librpcsvc.so.4 OLD_LIBS+=usr/lib/libsdp.so.3 Modified: soc2015/clord/head/UPDATING ============================================================================== --- soc2015/clord/head/UPDATING Mon Jun 22 16:24:27 2015 (r287447) +++ soc2015/clord/head/UPDATING Mon Jun 22 17:19:51 2015 (r287448) @@ -31,6 +31,64 @@ disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150616: + /etc/make.conf now included earlier. + sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier + than previously. + This makes it simple to interpose external toolchains etc. + However it may cause problems for users who have things like:: + + INSTALL+= something + + in /etc/make.conf, since INSTALL is not yet defined. + A safe fix for that is to have:: + + INSTALL?= install + INSTALL+= something + + which is equivalent to previous behavior. + +20150616: + FreeBSD's old make (fmake) has been removed from the system. It is + available as the devel/fmake port or via pkg install fmake. + +20150615: + The fix for the issue described in the 20150614 sendmail entry + below has been been committed in revision 284436. The work + around described in that entry is no longer needed unless the + default setting is overridden by a confDH_PARAMETERS configuration + setting of '5' or pointing to a 512 bit DH parameter file. + +20150614: + ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support has been removed from + atf.test.mk (included from bsd.test.mk). Please upgrade devel/atf + and devel/kyua to version 0.20+ and adjust any calling code to work + with Kyuafile and kyua. + +20150614: + The import of openssl to address the FreeBSD-SA-15:10.openssl + security advisory includes a change which rejects handshakes + with DH parameters below 768 bits. sendmail releases prior + to 8.15.2 (not yet released), defaulted to a 512 bit + DH parameter setting for client connections. To work around + this interoperability, sendmail can be configured to use a + 2048 bit DH parameter by: + + 1. Edit /etc/mail/`hostname`.mc + 2. If a setting for confDH_PARAMETERS does not exist or + exists and is set to a string beginning with '5', + replace it with '2'. + 3. If a setting for confDH_PARAMETERS exists and is set to + a file path, create a new file with: + openssl dhparam -out /path/to/file 2048 + 4. Rebuild the .cf file: + cd /etc/mail/; make; make install + 5. Restart sendmail: + cd /etc/mail/; make restart + + A sendmail patch is coming, at which time this file will be + updated. + 20150604: Generation of legacy formatted entries have been disabled by default in pwd_mkdb(8), as all base system consumers of the legacy formatted Copied: soc2015/clord/head/bin/cat/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/cat/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/cat/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/cat/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/chflags/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/chflags/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/chflags/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/chflags/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/chio/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/chio/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/chio/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/chio/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/chmod/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/chmod/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/chmod/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/chmod/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/cp/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/cp/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/cp/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/cp/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/csh/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/csh/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/csh/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/csh/Makefile.depend) @@ -0,0 +1,243 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/ncurses/ncursesw \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +ed.chared.o: ed.defns.h +ed.chared.o: sh.err.h +ed.chared.o: tc.const.h +ed.chared.po: ed.defns.h +ed.chared.po: sh.err.h +ed.chared.po: tc.const.h +ed.defns.o: sh.err.h +ed.defns.o: tc.const.h +ed.defns.po: sh.err.h +ed.defns.po: tc.const.h +ed.init.o: ed.defns.h +ed.init.o: sh.err.h +ed.init.o: tc.const.h +ed.init.po: ed.defns.h +ed.init.po: sh.err.h +ed.init.po: tc.const.h +ed.inputl.o: ed.defns.h +ed.inputl.o: sh.err.h +ed.inputl.o: tc.const.h +ed.inputl.po: ed.defns.h +ed.inputl.po: sh.err.h +ed.inputl.po: tc.const.h +ed.refresh.o: sh.err.h +ed.refresh.o: tc.const.h +ed.refresh.po: sh.err.h +ed.refresh.po: tc.const.h +ed.screen.o: ed.defns.h +ed.screen.o: sh.err.h +ed.screen.o: tc.const.h +ed.screen.po: ed.defns.h +ed.screen.po: sh.err.h +ed.screen.po: tc.const.h +ed.term.o: sh.err.h +ed.term.o: tc.const.h +ed.term.po: sh.err.h +ed.term.po: tc.const.h +ed.xmap.o: ed.defns.h +ed.xmap.o: sh.err.h +ed.xmap.o: tc.const.h +ed.xmap.po: ed.defns.h +ed.xmap.po: sh.err.h +ed.xmap.po: tc.const.h +glob.o: sh.err.h +glob.o: tc.const.h +glob.po: sh.err.h +glob.po: tc.const.h +mi.termios.o: sh.err.h +mi.termios.o: tc.const.h +mi.termios.po: sh.err.h +mi.termios.po: tc.const.h +sh.char.o: sh.err.h +sh.char.o: tc.const.h +sh.char.po: sh.err.h +sh.char.po: tc.const.h +sh.dir.o: sh.err.h +sh.dir.o: tc.const.h +sh.dir.po: sh.err.h +sh.dir.po: tc.const.h +sh.dol.o: sh.err.h +sh.dol.o: tc.const.h +sh.dol.po: sh.err.h +sh.dol.po: tc.const.h +sh.err.o: sh.err.h +sh.err.o: tc.const.h +sh.err.po: sh.err.h +sh.err.po: tc.const.h +sh.exec.o: sh.err.h +sh.exec.o: tc.const.h +sh.exec.po: sh.err.h +sh.exec.po: tc.const.h +sh.exp.o: sh.err.h +sh.exp.o: tc.const.h +sh.exp.po: sh.err.h +sh.exp.po: tc.const.h +sh.file.o: sh.err.h +sh.file.o: tc.const.h +sh.file.po: sh.err.h +sh.file.po: tc.const.h +sh.func.o: sh.err.h +sh.func.o: tc.const.h +sh.func.po: sh.err.h +sh.func.po: tc.const.h +sh.glob.o: sh.err.h +sh.glob.o: tc.const.h +sh.glob.po: sh.err.h +sh.glob.po: tc.const.h +sh.hist.o: sh.err.h +sh.hist.o: tc.const.h +sh.hist.po: sh.err.h +sh.hist.po: tc.const.h +sh.init.o: sh.err.h +sh.init.o: tc.const.h +sh.init.po: sh.err.h +sh.init.po: tc.const.h +sh.lex.o: sh.err.h +sh.lex.o: tc.const.h +sh.lex.po: sh.err.h +sh.lex.po: tc.const.h +sh.misc.o: sh.err.h +sh.misc.o: tc.const.h +sh.misc.po: sh.err.h +sh.misc.po: tc.const.h +sh.o: sh.err.h +sh.o: tc.const.h +sh.parse.o: sh.err.h +sh.parse.o: tc.const.h +sh.parse.po: sh.err.h +sh.parse.po: tc.const.h +sh.po: sh.err.h +sh.po: tc.const.h +sh.print.o: sh.err.h +sh.print.o: tc.const.h +sh.print.po: sh.err.h +sh.print.po: tc.const.h +sh.proc.o: sh.err.h +sh.proc.o: tc.const.h +sh.proc.po: sh.err.h +sh.proc.po: tc.const.h +sh.sem.o: sh.err.h +sh.sem.o: tc.const.h +sh.sem.po: sh.err.h +sh.sem.po: tc.const.h +sh.set.o: sh.err.h +sh.set.o: tc.const.h +sh.set.po: sh.err.h +sh.set.po: tc.const.h +sh.time.o: sh.err.h +sh.time.o: tc.const.h +sh.time.po: sh.err.h +sh.time.po: tc.const.h +tc.alloc.o: sh.err.h +tc.alloc.o: tc.const.h +tc.alloc.po: sh.err.h +tc.alloc.po: tc.const.h +tc.bind.o: ed.defns.h +tc.bind.o: sh.err.h +tc.bind.o: tc.const.h +tc.bind.po: ed.defns.h +tc.bind.po: sh.err.h +tc.bind.po: tc.const.h +tc.const.o: sh.err.h +tc.const.o: tc.const.h +tc.const.po: sh.err.h +tc.const.po: tc.const.h +tc.defs.o: sh.err.h +tc.defs.o: tc.const.h +tc.defs.o: tc.defs.c +tc.defs.po: sh.err.h +tc.defs.po: tc.const.h +tc.defs.po: tc.defs.c +tc.disc.o: sh.err.h +tc.disc.o: tc.const.h +tc.disc.po: sh.err.h +tc.disc.po: tc.const.h +tc.func.o: ed.defns.h +tc.func.o: sh.err.h +tc.func.o: tc.const.h +tc.func.po: ed.defns.h +tc.func.po: sh.err.h +tc.func.po: tc.const.h +tc.nls.o: sh.err.h +tc.nls.o: tc.const.h +tc.nls.po: sh.err.h +tc.nls.po: tc.const.h +tc.os.o: ed.defns.h +tc.os.o: sh.err.h +tc.os.o: tc.const.h +tc.os.po: ed.defns.h +tc.os.po: sh.err.h +tc.os.po: tc.const.h +tc.printf.o: sh.err.h +tc.printf.o: tc.const.h +tc.printf.po: sh.err.h +tc.printf.po: tc.const.h +tc.prompt.o: sh.err.h +tc.prompt.o: tc.const.h +tc.prompt.po: sh.err.h +tc.prompt.po: tc.const.h +tc.sched.o: sh.err.h +tc.sched.o: tc.const.h +tc.sched.po: sh.err.h +tc.sched.po: tc.const.h +tc.sig.o: sh.err.h +tc.sig.o: tc.const.h +tc.sig.po: sh.err.h +tc.sig.po: tc.const.h +tc.str.o: sh.err.h +tc.str.o: tc.const.h +tc.str.po: sh.err.h +tc.str.po: tc.const.h +tc.vers.o: sh.err.h +tc.vers.o: tc.const.h +tc.vers.po: sh.err.h +tc.vers.po: tc.const.h +tc.who.o: sh.err.h +tc.who.o: tc.const.h +tc.who.po: sh.err.h +tc.who.po: tc.const.h +tw.color.o: sh.err.h +tw.color.o: tc.const.h +tw.color.po: sh.err.h +tw.color.po: tc.const.h +tw.comp.o: sh.err.h +tw.comp.o: tc.const.h +tw.comp.po: sh.err.h +tw.comp.po: tc.const.h +tw.help.o: sh.err.h +tw.help.o: tc.const.h +tw.help.po: sh.err.h +tw.help.po: tc.const.h +tw.init.o: sh.err.h +tw.init.o: tc.const.h +tw.init.po: sh.err.h +tw.init.po: tc.const.h +tw.parse.o: sh.err.h +tw.parse.o: tc.const.h +tw.parse.po: sh.err.h +tw.parse.po: tc.const.h +tw.spell.o: sh.err.h +tw.spell.o: tc.const.h +tw.spell.po: sh.err.h +tw.spell.po: tc.const.h +.endif Copied: soc2015/clord/head/bin/date/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/date/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/date/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/date/Makefile.depend) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/protocols \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/dd/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/dd/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/dd/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/dd/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/df/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/df/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/df/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/df/Makefile.depend) @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libutil \ + lib/libxo \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/domainname/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/domainname/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/domainname/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/domainname/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/echo/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/echo/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/echo/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/echo/Makefile.depend) @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Copied: soc2015/clord/head/bin/ed/Makefile.depend (from r287445, mirror/FreeBSD/head/bin/ed/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/bin/ed/Makefile.depend Mon Jun 22 17:19:51 2015 (r287448, copy of r287445, mirror/FreeBSD/head/bin/ed/Makefile.depend) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + secure/lib/libcrypto \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Mon Jun 22 19:09:03 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B269158 for ; Mon, 22 Jun 2015 19:09:03 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1975AF0E for ; Mon, 22 Jun 2015 19:09:03 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MJ92d9013600 for ; Mon, 22 Jun 2015 19:09:02 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5MJ92RZ013576 for svn-soc-all@FreeBSD.org; Mon, 22 Jun 2015 19:09:02 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 22 Jun 2015 19:09:02 GMT Message-Id: <201506221909.t5MJ92RZ013576@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287453 - in soc2015/clord/head/sys/boot: ficl ficl32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 19:09:03 -0000 Author: clord Date: Mon Jun 22 19:09:01 2015 New Revision: 287453 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287453 Log: modify ficl Makefiles to use sources in sys/contrib/ficl rather than boot/ficl Modified: soc2015/clord/head/sys/boot/ficl/Makefile soc2015/clord/head/sys/boot/ficl32/Makefile Modified: soc2015/clord/head/sys/boot/ficl/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/ficl/Makefile Mon Jun 22 18:18:15 2015 (r287452) +++ soc2015/clord/head/sys/boot/ficl/Makefile Mon Jun 22 19:09:01 2015 (r287453) @@ -1,7 +1,7 @@ # $FreeBSD$ # -FICLDIR?= ${.CURDIR} +FICLDIR?= ${.CURDIR}/../../contrib/ficl .if defined(FICL32) .PATH: ${FICLDIR}/${MACHINE_CPUARCH:S/amd64/i386/} Modified: soc2015/clord/head/sys/boot/ficl32/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/ficl32/Makefile Mon Jun 22 18:18:15 2015 (r287452) +++ soc2015/clord/head/sys/boot/ficl32/Makefile Mon Jun 22 19:09:01 2015 (r287453) @@ -1,8 +1,8 @@ # $FreeBSD$ FICL32= -FICLDIR= ${.CURDIR}/../ficl +FICLDIR= ${.CURDIR}/../../contrib/ficl .PATH: ${FICLDIR} -.include "${FICLDIR}/Makefile" +.include "${.CURDIR}/../Makefile" From owner-svn-soc-all@FreeBSD.ORG Mon Jun 22 20:05:27 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86A6E45F for ; Mon, 22 Jun 2015 20:05:27 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 74E57AE9 for ; Mon, 22 Jun 2015 20:05:27 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MK5RLP004170 for ; Mon, 22 Jun 2015 20:05:27 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5MK5QqR004168 for svn-soc-all@FreeBSD.org; Mon, 22 Jun 2015 20:05:26 GMT (envelope-from stefano@FreeBSD.org) Date: Mon, 22 Jun 2015 20:05:26 GMT Message-Id: <201506222005.t5MK5QqR004168@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287457 - soc2015/stefano MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 20:05:27 -0000 Author: stefano Date: Mon Jun 22 20:05:26 2015 New Revision: 287457 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287457 Log: update README Modified: soc2015/stefano/README Modified: soc2015/stefano/README ============================================================================== --- soc2015/stefano/README Mon Jun 22 19:43:08 2015 (r287456) +++ soc2015/stefano/README Mon Jun 22 20:05:26 2015 (r287457) @@ -66,11 +66,11 @@ Estimated end dates: 2015/08/17-21 Timetable: -Week 1-2: --- STARTED --- +Week 1-2: --- DONE --- add ptnetmap support to virtio device driver and QEMU frontend [D1]. -Week 3: +Week 3: --- DONE --- test, bugfix, and performance evaluation [D1]. -Week 4-5: +Week 4-5: --- STARTED --- write code to map netmap host memory into the guest [D2]. Week 6: test and bugfix [D2]. prepare documents to mid-term evaluation. @@ -83,4 +83,4 @@ Week 11: test and performance evaluation [D4]. Week 12: -clean code and prepare documents to final evaluation. \ No newline at end of file +clean code and prepare documents to final evaluation. From owner-svn-soc-all@FreeBSD.ORG Mon Jun 22 20:21:10 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABA49624 for ; Mon, 22 Jun 2015 20:21:10 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98E4831E for ; Mon, 22 Jun 2015 20:21:10 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MKLAeX019055 for ; Mon, 22 Jun 2015 20:21:10 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5MKL9Kd019038 for svn-soc-all@FreeBSD.org; Mon, 22 Jun 2015 20:21:09 GMT (envelope-from stefano@FreeBSD.org) Date: Mon, 22 Jun 2015 20:21:09 GMT Message-Id: <201506222021.t5MKL9Kd019038@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287458 - soc2015/stefano/ptnetmap/head/sys/net MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 20:21:10 -0000 Author: stefano Date: Mon Jun 22 20:21:09 2015 New Revision: 287458 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287458 Log: [ptnetmap] add new netmap headers Modified: soc2015/stefano/ptnetmap/head/sys/net/netmap.h soc2015/stefano/ptnetmap/head/sys/net/netmap_user.h Modified: soc2015/stefano/ptnetmap/head/sys/net/netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/net/netmap.h Mon Jun 22 20:05:26 2015 (r287457) +++ soc2015/stefano/ptnetmap/head/sys/net/netmap.h Mon Jun 22 20:21:09 2015 (r287458) @@ -25,7 +25,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/net/netmap.h 251139 2013-05-30 14:07:14Z luigi $ * * Definitions of constants and the structures used by the netmap * framework, for the part visible to both kernel and userspace. @@ -157,6 +157,11 @@ /* * must be set whenever buf_idx is changed (as it might be * necessary to recompute the physical address and mapping) + * + * It is also set by the kernel whenever the buf_idx is + * changed internally (e.g., by pipes). Applications may + * use this information to know when they can reuse the + * contents of previously prepared buffers. */ #define NS_REPORT 0x0002 /* ask the hardware to report results */ @@ -491,6 +496,8 @@ #define NETMAP_BDG_OFFSET NETMAP_BDG_VNET_HDR /* deprecated alias */ #define NETMAP_BDG_NEWIF 6 /* create a virtual port */ #define NETMAP_BDG_DELIF 7 /* destroy a virtual port */ +#define NETMAP_PT_HOST_CREATE 8 /* create ptnetmap kthreads */ +#define NETMAP_PT_HOST_DELETE 9 /* delete ptnetmap kthreads */ uint16_t nr_arg1; /* reserve extra rings in NIOCREGIF */ #define NETMAP_BDG_HOST 1 /* attach the host stack on ATTACH */ @@ -513,7 +520,11 @@ /* monitor uses the NR_REG to select the rings to monitor */ #define NR_MONITOR_TX 0x100 #define NR_MONITOR_RX 0x200 - +#define NR_ZCOPY_MON 0x400 +/* request exclusive access to the selected rings */ +#define NR_EXCLUSIVE 0x800 +/* request netmap passthrough full support */ +#define NR_PASSTHROUGH_HOST 0x1000 /* * FreeBSD uses the size value embedded in the _IOWR to determine @@ -552,5 +563,4 @@ char nifr_name[IFNAMSIZ]; char data[NM_IFRDATA_LEN]; }; - #endif /* _NET_NETMAP_H_ */ Modified: soc2015/stefano/ptnetmap/head/sys/net/netmap_user.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/net/netmap_user.h Mon Jun 22 20:05:26 2015 (r287457) +++ soc2015/stefano/ptnetmap/head/sys/net/netmap_user.h Mon Jun 22 20:21:09 2015 (r287458) @@ -284,6 +284,12 @@ * -NN bind individual NIC ring pair * {NN bind master side of pipe NN * }NN bind slave side of pipe NN + * a suffix starting with + and the following flags, + * in any order: + * x exclusive access + * z zero copy monitor + * t monitor tx side + * r monitor rx side * * req provides the initial values of nmreq before parsing ifname. * Remember that the ifname parsing will override the ring @@ -323,6 +329,13 @@ static int nm_close(struct nm_desc *); /* + * nm_mmap() do mmap or inherit from parent if the nr_arg2 + * (memory block) matches. + */ + +static int nm_mmap(struct nm_desc *, const struct nm_desc *); + +/* * nm_inject() is the same as pcap_inject() * nm_dispatch() is the same as pcap_dispatch() * nm_nextpkt() is the same as pcap_next() @@ -338,7 +351,8 @@ * An invalid netmap name will return errno = 0; * You can pass a pointer to a pre-filled nm_desc to add special * parameters. Flags is used as follows - * NM_OPEN_NO_MMAP use the memory from arg, only + * NM_OPEN_NO_MMAP XXX: avoid mmap + * use the memory from arg, only * if the nr_arg2 (memory block) matches. * NM_OPEN_ARG1 use req.nr_arg1 from arg * NM_OPEN_ARG2 use req.nr_arg2 from arg @@ -351,9 +365,12 @@ struct nm_desc *d = NULL; const struct nm_desc *parent = arg; u_int namelen; - uint32_t nr_ringid = 0, nr_flags; + uint32_t nr_ringid = 0, nr_flags, nr_reg; const char *port = NULL; - const char *errmsg = NULL; +#define MAXERRMSG 80 + char errmsg[MAXERRMSG] = ""; + enum { P_START, P_RNGSFXOK, P_GETNUM, P_FLAGS, P_FLAGSOK } p_state; + long num; if (strncmp(ifname, "netmap:", 7) && strncmp(ifname, "vale", 4)) { errno = 0; /* name not recognised, not an error */ @@ -362,60 +379,112 @@ if (ifname[0] == 'n') ifname += 7; /* scan for a separator */ - for (port = ifname; *port && !index("-*^{}", *port); port++) + for (port = ifname; *port && !index("-*^{}/", *port); port++) ; namelen = port - ifname; if (namelen >= sizeof(d->req.nr_name)) { - errmsg = "name too long"; + snprintf(errmsg, MAXERRMSG, "name too long"); goto fail; } - switch (*port) { - default: /* '\0', no suffix */ - nr_flags = NR_REG_ALL_NIC; - break; - case '-': /* one NIC */ - nr_flags = NR_REG_ONE_NIC; - nr_ringid = atoi(port + 1); - break; - case '*': /* NIC and SW, ignore port */ - nr_flags = NR_REG_NIC_SW; - if (port[1]) { - errmsg = "invalid port for nic+sw"; - goto fail; + p_state = P_START; + nr_flags = NR_REG_ALL_NIC; /* default for no suffix */ + while (*port) { + switch (p_state) { + case P_START: + switch (*port) { + case '^': /* only SW ring */ + nr_flags = NR_REG_SW; + p_state = P_RNGSFXOK; + break; + case '*': /* NIC and SW */ + nr_flags = NR_REG_NIC_SW; + p_state = P_RNGSFXOK; + break; + case '-': /* one NIC ring pair */ + nr_flags = NR_REG_ONE_NIC; + p_state = P_GETNUM; + break; + case '{': /* pipe (master endpoint) */ + nr_flags = NR_REG_PIPE_MASTER; + p_state = P_GETNUM; + break; + case '}': /* pipe (slave endoint) */ + nr_flags = NR_REG_PIPE_SLAVE; + p_state = P_GETNUM; + break; + case '/': /* start of flags */ + p_state = P_FLAGS; + break; + default: + snprintf(errmsg, MAXERRMSG, "unknown modifier: '%c'", *port); + goto fail; + } + port++; + break; + case P_RNGSFXOK: + switch (*port) { + case '/': + p_state = P_FLAGS; + break; + default: + snprintf(errmsg, MAXERRMSG, "unexpected character: '%c'", *port); + goto fail; + } + port++; + break; + case P_GETNUM: + num = strtol(port, (char **)&port, 10); + if (num < 0 || num >= NETMAP_RING_MASK) { + snprintf(errmsg, MAXERRMSG, "'%ld' out of range [0, %d)", + num, NETMAP_RING_MASK); + goto fail; + } + nr_ringid = num & NETMAP_RING_MASK; + p_state = P_RNGSFXOK; + break; + case P_FLAGS: + case P_FLAGSOK: + switch (*port) { + case 'x': + nr_flags |= NR_EXCLUSIVE; + break; + case 'z': + nr_flags |= NR_ZCOPY_MON; + break; + case 't': + nr_flags |= NR_MONITOR_TX; + break; + case 'r': + nr_flags |= NR_MONITOR_RX; + break; + default: + snprintf(errmsg, MAXERRMSG, "unrecognized flag: '%c'", *port); + goto fail; + } + port++; + p_state = P_FLAGSOK; + break; } - break; - case '^': /* only sw ring */ - nr_flags = NR_REG_SW; - if (port[1]) { - errmsg = "invalid port for sw ring"; - goto fail; - } - break; - case '{': - nr_flags = NR_REG_PIPE_MASTER; - nr_ringid = atoi(port + 1); - break; - case '}': - nr_flags = NR_REG_PIPE_SLAVE; - nr_ringid = atoi(port + 1); - break; } - - if (nr_ringid >= NETMAP_RING_MASK) { - errmsg = "invalid ringid"; + if (p_state != P_START && p_state != P_RNGSFXOK && p_state != P_FLAGSOK) { + snprintf(errmsg, MAXERRMSG, "unexpected end of port name"); goto fail; } - + ND("flags: %s %s %s %s", + (nr_flags & NR_EXCLUSIVE) ? "EXCLUSIVE" : "", + (nr_flags & NR_ZCOPY_MON) ? "ZCOPY_MON" : "", + (nr_flags & NR_MONITOR_TX) ? "MONITOR_TX" : "", + (nr_flags & NR_MONITOR_RX) ? "MONITOR_RX" : ""); d = (struct nm_desc *)calloc(1, sizeof(*d)); if (d == NULL) { - errmsg = "nm_desc alloc failure"; + snprintf(errmsg, MAXERRMSG, "nm_desc alloc failure"); errno = ENOMEM; return NULL; } d->self = d; /* set this early so nm_close() works */ d->fd = open("/dev/netmap", O_RDWR); if (d->fd < 0) { - errmsg = "cannot open /dev/netmap"; + snprintf(errmsg, MAXERRMSG, "cannot open /dev/netmap: %s", strerror(errno)); goto fail; } @@ -426,7 +495,7 @@ /* these fields are overridden by ifname and flags processing */ d->req.nr_ringid |= nr_ringid; - d->req.nr_flags = nr_flags; + d->req.nr_flags |= nr_flags; memcpy(d->req.nr_name, ifname, namelen); d->req.nr_name[namelen] = '\0'; /* optionally import info from parent */ @@ -464,51 +533,31 @@ d->req.nr_ringid |= new_flags & (NETMAP_NO_TX_POLL | NETMAP_DO_RX_POLL); if (ioctl(d->fd, NIOCREGIF, &d->req)) { - errmsg = "NIOCREGIF failed"; + snprintf(errmsg, MAXERRMSG, "NIOCREGIF failed: %s", strerror(errno)); goto fail; } - if (IS_NETMAP_DESC(parent) && parent->mem && - parent->req.nr_arg2 == d->req.nr_arg2) { - /* do not mmap, inherit from parent */ - d->memsize = parent->memsize; - d->mem = parent->mem; - } else { - /* XXX TODO: check if memsize is too large (or there is overflow) */ - d->memsize = d->req.nr_memsize; - d->mem = mmap(0, d->memsize, PROT_WRITE | PROT_READ, MAP_SHARED, - d->fd, 0); - if (d->mem == MAP_FAILED) { - errmsg = "mmap failed"; - goto fail; - } - d->done_mmap = 1; + if (!(new_flags & NM_OPEN_NO_MMAP) && nm_mmap(d, parent)) { + snprintf(errmsg, MAXERRMSG, "mmap failed: %s", strerror(errno)); + goto fail; } - { - struct netmap_if *nifp = NETMAP_IF(d->mem, d->req.nr_offset); - struct netmap_ring *r = NETMAP_RXRING(nifp, ); - *(struct netmap_if **)(uintptr_t)&(d->nifp) = nifp; - *(struct netmap_ring **)(uintptr_t)&d->some_ring = r; - *(void **)(uintptr_t)&d->buf_start = NETMAP_BUF(r, 0); - *(void **)(uintptr_t)&d->buf_end = - (char *)d->mem + d->memsize; - } + nr_reg = d->req.nr_flags & NR_REG_MASK; - if (d->req.nr_flags == NR_REG_SW) { /* host stack */ + if (nr_reg == NR_REG_SW) { /* host stack */ d->first_tx_ring = d->last_tx_ring = d->req.nr_tx_rings; d->first_rx_ring = d->last_rx_ring = d->req.nr_rx_rings; - } else if (d->req.nr_flags == NR_REG_ALL_NIC) { /* only nic */ + } else if (nr_reg == NR_REG_ALL_NIC) { /* only nic */ d->first_tx_ring = 0; d->first_rx_ring = 0; d->last_tx_ring = d->req.nr_tx_rings - 1; d->last_rx_ring = d->req.nr_rx_rings - 1; - } else if (d->req.nr_flags == NR_REG_NIC_SW) { + } else if (nr_reg == NR_REG_NIC_SW) { d->first_tx_ring = 0; d->first_rx_ring = 0; d->last_tx_ring = d->req.nr_tx_rings; d->last_rx_ring = d->req.nr_rx_rings; - } else if (d->req.nr_flags == NR_REG_ONE_NIC) { + } else if (nr_reg == NR_REG_ONE_NIC) { /* XXX check validity */ d->first_tx_ring = d->last_tx_ring = d->first_rx_ring = d->last_rx_ring = d->req.nr_ringid & NETMAP_RING_MASK; @@ -541,7 +590,7 @@ fail: nm_close(d); - if (errmsg) + if (errmsg[0]) D("%s %s", errmsg, ifname); if (errno == 0) errno = EINVAL; @@ -571,6 +620,44 @@ } +static int +nm_mmap(struct nm_desc *d, const struct nm_desc *parent) +{ + //XXX TODO: check if mmap is already done + + if (IS_NETMAP_DESC(parent) && parent->mem && + parent->req.nr_arg2 == d->req.nr_arg2) { + /* do not mmap, inherit from parent */ + D("do not mmap, inherit from parent"); + d->memsize = parent->memsize; + d->mem = parent->mem; + } else { + /* XXX TODO: check if memsize is too large (or there is overflow) */ + d->memsize = d->req.nr_memsize; + d->mem = mmap(0, d->memsize, PROT_WRITE | PROT_READ, MAP_SHARED, + d->fd, 0); + if (d->mem == MAP_FAILED) { + goto fail; + } + d->done_mmap = 1; + } + { + struct netmap_if *nifp = NETMAP_IF(d->mem, d->req.nr_offset); + struct netmap_ring *r = NETMAP_RXRING(nifp, ); + + *(struct netmap_if **)(uintptr_t)&(d->nifp) = nifp; + *(struct netmap_ring **)(uintptr_t)&d->some_ring = r; + *(void **)(uintptr_t)&d->buf_start = NETMAP_BUF(r, 0); + *(void **)(uintptr_t)&d->buf_end = + (char *)d->mem + d->memsize; + } + + return 0; + +fail: + return EINVAL; +} + /* * Same prototype as pcap_inject(), only need to cast. */ From owner-svn-soc-all@FreeBSD.ORG Mon Jun 22 20:26:40 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C87E6B3 for ; Mon, 22 Jun 2015 20:26:40 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 19440959 for ; Mon, 22 Jun 2015 20:26:40 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MKQefb023837 for ; Mon, 22 Jun 2015 20:26:40 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5MKQa1Z023778 for svn-soc-all@FreeBSD.org; Mon, 22 Jun 2015 20:26:36 GMT (envelope-from stefano@FreeBSD.org) Date: Mon, 22 Jun 2015 20:26:36 GMT Message-Id: <201506222026.t5MKQa1Z023778@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287459 - soc2015/stefano/ptnetmap/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 20:26:40 -0000 Author: stefano Date: Mon Jun 22 20:26:35 2015 New Revision: 287459 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287459 Log: [ptnetmap] add new netmap files Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_em_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_igb_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_ixl_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_re_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/ixgbe_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_freebsd.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_generic.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_mem2.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_mem2.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_monitor.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_offloadings.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_pipe.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_vale.c Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_em_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_em_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_em_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -24,7 +24,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/if_em_netmap.h 238985 2012-08-02 11:59:43Z luigi $ * * netmap support for: em. * @@ -198,7 +198,6 @@ } } - nm_txsync_finalize(kring); return 0; } @@ -217,7 +216,7 @@ u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -303,8 +302,6 @@ E1000_WRITE_REG(&adapter->hw, E1000_RDT(rxr->me), nic_i); } - /* tell userspace that there might be new packets */ - nm_rxsync_finalize(kring); return 0; Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_igb_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_igb_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_igb_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -24,7 +24,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/if_igb_netmap.h 256200 2013-10-09 17:32:52Z jfv $ * * Netmap support for igb, partly contributed by Ahmed Kooli * For details on netmap support please see ixgbe_netmap.h @@ -180,7 +180,6 @@ kring->nr_hwtail = nm_prev(netmap_idx_n2k(kring, nic_i), lim); } - nm_txsync_finalize(kring); return 0; } @@ -199,7 +198,7 @@ u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -283,8 +282,6 @@ E1000_WRITE_REG(&adapter->hw, E1000_RDT(rxr->me), nic_i); } - /* tell userspace that there might be new packets */ - nm_rxsync_finalize(kring); return 0; Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_ixl_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_ixl_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_ixl_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -24,7 +24,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/if_ixl_netmap.h 279232 2015-02-24 06:20:50Z luigi $ * * netmap support for: ixl * Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -25,7 +25,7 @@ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/if_lem_netmap.h 271849 2014-09-19 03:51:26Z glebius $ * * netmap support for: lem * @@ -302,7 +302,6 @@ kring->nr_hwtail = nm_prev(netmap_idx_n2k(kring, nic_i), lim); } - nm_txsync_finalize(kring); return 0; } @@ -321,7 +320,7 @@ u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -466,8 +465,6 @@ E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), nic_i); } - /* tell userspace that there might be new packets */ - nm_rxsync_finalize(kring); return 0; Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_re_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_re_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_re_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -24,7 +24,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/if_re_netmap.h 234225 2012-04-13 15:33:12Z luigi $ * * netmap support for: re * @@ -159,7 +159,6 @@ } } - nm_txsync_finalize(kring); return 0; } @@ -178,7 +177,7 @@ u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -273,8 +272,6 @@ BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } - /* tell userspace that there might be new packets */ - nm_rxsync_finalize(kring); return 0; Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -24,7 +24,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/if_vtnet_netmap.h 270097 2014-08-17 10:25:27Z luigi $ */ #include @@ -215,7 +215,6 @@ } //out: - nm_txsync_finalize(kring); return 0; } @@ -278,7 +277,7 @@ // u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -340,8 +339,6 @@ vtnet_rxq_enable_intr(rxq); } - /* tell userspace that there might be new packets. */ - nm_rxsync_finalize(kring); ND("[C] h %d c %d t %d hwcur %d hwtail %d", ring->head, ring->cur, ring->tail, Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/ixgbe_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/ixgbe_netmap.h Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/ixgbe_netmap.h Mon Jun 22 20:26:35 2015 (r287459) @@ -24,7 +24,7 @@ */ /* - * $FreeBSD$ + * $FreeBSD: head/sys/dev/netmap/ixgbe_netmap.h 244514 2012-12-20 22:26:03Z luigi $ * * netmap support for: ixgbe * @@ -322,7 +322,6 @@ } } - nm_txsync_finalize(kring); return 0; } @@ -351,7 +350,7 @@ u_int nic_i; /* index into the NIC ring */ u_int n; u_int const lim = kring->nkr_num_slots - 1; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; /* device-specific */ @@ -458,8 +457,6 @@ IXGBE_WRITE_REG(&adapter->hw, IXGBE_RDT(rxr->me), nic_i); } - /* tell userspace that there might be new packets */ - nm_rxsync_finalize(kring); return 0; Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c Mon Jun 22 20:21:09 2015 (r287458) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c Mon Jun 22 20:26:35 2015 (r287459) @@ -293,7 +293,7 @@ * kring->nm_sync() == DEVICE_netmap_rxsync() * 2) device interrupt handler * na->nm_notify() == netmap_notify() - * - tx from host stack + * - rx from host stack * concurrently: * 1) host stack * netmap_transmit() @@ -313,31 +313,113 @@ * * -= SYSTEM DEVICE WITH GENERIC SUPPORT =- * + * na == NA(ifp) == generic_netmap_adapter created in generic_netmap_attach() * - * - * -= VALE PORT =- - * - * - * - * -= NETMAP PIPE =- - * - * - * - * -= SYSTEM DEVICE WITH NATIVE SUPPORT, CONNECTED TO VALE, NO HOST RINGS =- - * - * - * - * -= SYSTEM DEVICE WITH NATIVE SUPPORT, CONNECTED TO VALE, WITH HOST RINGS =- - * - * - * - * -= SYSTEM DEVICE WITH GENERIC SUPPORT, CONNECTED TO VALE, NO HOST RINGS =- - * + * - tx from netmap userspace: + * concurrently: + * 1) ioctl(NIOCTXSYNC)/netmap_poll() in process context + * kring->nm_sync() == generic_netmap_txsync() + * linux: dev_queue_xmit() with NM_MAGIC_PRIORITY_TX + * generic_ndo_start_xmit() + * orig. dev. start_xmit + * FreeBSD: na->if_transmit() == orig. dev if_transmit + * 2) generic_mbuf_destructor() + * na->nm_notify() == netmap_notify() + * - rx from netmap userspace: + * 1) ioctl(NIOCRXSYNC)/netmap_poll() in process context + * kring->nm_sync() == generic_netmap_rxsync() + * mbq_safe_dequeue() + * 2) device driver + * generic_rx_handler() + * mbq_safe_enqueue() + * na->nm_notify() == netmap_notify() + * - rx from host stack: + * concurrently: + * 1) host stack + * linux: generic_ndo_start_xmit() + * netmap_transmit() + * FreeBSD: ifp->if_input() == netmap_transmit + * both: + * na->nm_notify() == netmap_notify() + * 2) ioctl(NIOCRXSYNC)/netmap_poll() in process context + * kring->nm_sync() == netmap_rxsync_from_host_compat + * netmap_rxsync_from_host(na, NULL, NULL) + * - tx to host stack: + * ioctl(NIOCTXSYNC)/netmap_poll() in process context + * kring->nm_sync() == netmap_txsync_to_host_compat + * netmap_txsync_to_host(na) + * NM_SEND_UP() + * FreeBSD: na->if_input() == ??? XXX + * linux: netif_rx() with NM_MAGIC_PRIORITY_RX * * - * -= SYSTEM DEVICE WITH GENERIC SUPPORT, CONNECTED TO VALE, WITH HOST RINGS =- + * -= VALE =- * + * INCOMING: * + * - VALE ports: + * ioctl(NIOCTXSYNC)/netmap_poll() in process context + * kring->nm_sync() == netmap_vp_txsync() + * + * - system device with native support: + * from cable: + * interrupt + * na->nm_notify() == netmap_bwrap_intr_notify(ring_nr != host ring) + * kring->nm_sync() == DEVICE_netmap_rxsync() + * netmap_vp_txsync() + * kring->nm_sync() == DEVICE_netmap_rxsync() + * from host stack: + * netmap_transmit() + * na->nm_notify() == netmap_bwrap_intr_notify(ring_nr == host ring) + * kring->nm_sync() == netmap_rxsync_from_host_compat() + * netmap_vp_txsync() + * + * - system device with generic support: + * from device driver: + * generic_rx_handler() + * na->nm_notify() == netmap_bwrap_intr_notify(ring_nr != host ring) + * kring->nm_sync() == generic_netmap_rxsync() + * netmap_vp_txsync() + * kring->nm_sync() == generic_netmap_rxsync() + * from host stack: + * netmap_transmit() + * na->nm_notify() == netmap_bwrap_intr_notify(ring_nr == host ring) + * kring->nm_sync() == netmap_rxsync_from_host_compat() + * netmap_vp_txsync() + * + * (all cases) --> nm_bdg_flush() + * dest_na->nm_notify() == (see below) + * + * OUTGOING: + * + * - VALE ports: + * concurrently: + * 1) ioctlNIOCRXSYNC)/netmap_poll() in process context + * kring->nm_sync() == netmap_vp_rxsync() + * 2) from nm_bdg_flush() + * na->nm_notify() == netmap_notify() + * + * - system device with native support: + * to cable: + * na->nm_notify() == netmap_bwrap_notify() + * netmap_vp_rxsync() + * kring->nm_sync() == DEVICE_netmap_txsync() + * netmap_vp_rxsync() + * to host stack: + * netmap_vp_rxsync() + * kring->nm_sync() == netmap_txsync_to_host_compat + * netmap_vp_rxsync_locked() + * + * - system device with generic adapter: + * to device driver: + * na->nm_notify() == netmap_bwrap_notify() + * netmap_vp_rxsync() + * kring->nm_sync() == generic_netmap_txsync() + * netmap_vp_rxsync() + * to host stack: + * netmap_vp_rxsync() + * kring->nm_sync() == netmap_txsync_to_host_compat + * netmap_vp_rxsync() * */ @@ -412,15 +494,6 @@ MALLOC_DEFINE(M_NETMAP, "netmap", "Network memory map"); -/* - * The following variables are used by the drivers and replicate - * fields in the global memory pool. They only refer to buffers - * used by physical interfaces. - */ -u_int netmap_total_buffers; -u_int netmap_buf_size; -char *netmap_buffer_base; /* also address of an invalid buffer */ - /* user-controlled variables */ int netmap_verbose; @@ -446,7 +519,6 @@ int netmap_flags = 0; /* debug flags */ int netmap_fwd = 0; /* force transparent mode */ -int netmap_mmap_unreg = 0; /* allow mmap of unregistered fds */ /* * netmap_admode selects the netmap mode to use. @@ -464,7 +536,6 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, flags, CTLFLAG_RW, &netmap_flags, 0 , ""); SYSCTL_INT(_dev_netmap, OID_AUTO, fwd, CTLFLAG_RW, &netmap_fwd, 0 , ""); -SYSCTL_INT(_dev_netmap, OID_AUTO, mmap_unreg, CTLFLAG_RW, &netmap_mmap_unreg, 0, ""); SYSCTL_INT(_dev_netmap, OID_AUTO, admode, CTLFLAG_RW, &netmap_admode, 0 , ""); SYSCTL_INT(_dev_netmap, OID_AUTO, generic_mit, CTLFLAG_RW, &netmap_generic_mit, 0 , ""); SYSCTL_INT(_dev_netmap, OID_AUTO, generic_ringsize, CTLFLAG_RW, &netmap_generic_ringsize, 0 , ""); @@ -472,15 +543,6 @@ NMG_LOCK_T netmap_global_lock; - -static void -nm_kr_get(struct netmap_kring *kr) -{ - while (NM_ATOMIC_TEST_AND_SET(&kr->nr_busy)) - tsleep(kr, 0, "NM_KR_GET", 4); -} - - /* * mark the ring as stopped, and run through the locks * to make sure other users get to see it. @@ -495,34 +557,14 @@ nm_kr_put(kr); } -/* stop or enable a single tx ring */ +/* stop or enable a single ring */ void -netmap_set_txring(struct netmap_adapter *na, u_int ring_id, int stopped) +netmap_set_ring(struct netmap_adapter *na, u_int ring_id, enum txrx t, int stopped) { if (stopped) - netmap_disable_ring(na->tx_rings + ring_id); + netmap_disable_ring(NMR(na, t) + ring_id); else - na->tx_rings[ring_id].nkr_stopped = 0; - /* nofify that the stopped state has changed. This is currently - *only used by bwrap to propagate the state to its own krings. - * (see netmap_bwrap_intr_notify). - */ - na->nm_notify(na, ring_id, NR_TX, NAF_DISABLE_NOTIFY); -} - -/* stop or enable a single rx ring */ -void -netmap_set_rxring(struct netmap_adapter *na, u_int ring_id, int stopped) -{ - if (stopped) - netmap_disable_ring(na->rx_rings + ring_id); - else - na->rx_rings[ring_id].nkr_stopped = 0; - /* nofify that the stopped state has changed. This is currently - *only used by bwrap to propagate the state to its own krings. - * (see netmap_bwrap_intr_notify). - */ - na->nm_notify(na, ring_id, NR_RX, NAF_DISABLE_NOTIFY); + NMR(na, t)[ring_id].nkr_stopped = 0; } @@ -531,20 +573,15 @@ netmap_set_all_rings(struct netmap_adapter *na, int stopped) { int i; - u_int ntx, nrx; + enum txrx t; if (!nm_netmap_on(na)) return; - ntx = netmap_real_tx_rings(na); - nrx = netmap_real_rx_rings(na); - - for (i = 0; i < ntx; i++) { - netmap_set_txring(na, i, stopped); - } - - for (i = 0; i < nrx; i++) { - netmap_set_rxring(na, i, stopped); + for_rx_tx(t) { + for (i = 0; i < netmap_real_rings(na, t); i++) { + netmap_set_ring(na, i, t, stopped); + } } } @@ -657,7 +694,8 @@ txr = txd = rxr = rxd = 0; if (na->nm_config == NULL || - na->nm_config(na, &txr, &txd, &rxr, &rxd)) { + na->nm_config(na, &txr, &txd, &rxr, &rxd)) + { /* take whatever we had at init time */ txr = na->num_tx_rings; txd = na->num_tx_desc; @@ -738,73 +776,59 @@ { u_int i, len, ndesc; struct netmap_kring *kring; - u_int ntx, nrx; + u_int n[NR_TXRX]; + enum txrx t; /* account for the (possibly fake) host rings */ - ntx = na->num_tx_rings + 1; - nrx = na->num_rx_rings + 1; + n[NR_TX] = na->num_tx_rings + 1; + n[NR_RX] = na->num_rx_rings + 1; - len = (ntx + nrx) * sizeof(struct netmap_kring) + tailroom; + len = (n[NR_TX] + n[NR_RX]) * sizeof(struct netmap_kring) + tailroom; na->tx_rings = malloc((size_t)len, M_DEVBUF, M_NOWAIT | M_ZERO); if (na->tx_rings == NULL) { D("Cannot allocate krings"); return ENOMEM; } - na->rx_rings = na->tx_rings + ntx; + na->rx_rings = na->tx_rings + n[NR_TX]; /* * All fields in krings are 0 except the one initialized below. * but better be explicit on important kring fields. */ - ndesc = na->num_tx_desc; - for (i = 0; i < ntx; i++) { /* Transmit rings */ - kring = &na->tx_rings[i]; - bzero(kring, sizeof(*kring)); - kring->na = na; - kring->ring_id = i; - kring->nkr_num_slots = ndesc; - if (i < na->num_tx_rings) { - kring->nm_sync = na->nm_txsync; - } else if (i == na->num_tx_rings) { - kring->nm_sync = netmap_txsync_to_host_compat; + for_rx_tx(t) { + ndesc = nma_get_ndesc(na, t); + for (i = 0; i < n[t]; i++) { + kring = &NMR(na, t)[i]; + bzero(kring, sizeof(*kring)); + kring->na = na; + kring->ring_id = i; + kring->tx = t; + kring->nkr_num_slots = ndesc; + if (i < nma_get_nrings(na, t)) { + kring->nm_sync = (t == NR_TX ? na->nm_txsync : na->nm_rxsync); + } else if (i == na->num_tx_rings) { + kring->nm_sync = (t == NR_TX ? + netmap_txsync_to_host_compat : + netmap_rxsync_from_host_compat); + } + kring->nm_notify = na->nm_notify; + kring->rhead = kring->rcur = kring->nr_hwcur = 0; + /* + * IMPORTANT: Always keep one slot empty. + */ + kring->rtail = kring->nr_hwtail = (t == NR_TX ? ndesc - 1 : 0); + snprintf(kring->name, sizeof(kring->name) - 1, "%s %s%d", na->name, + nm_txrx2str(t), i); + ND("ktx %s h %d c %d t %d", + kring->name, kring->rhead, kring->rcur, kring->rtail); + mtx_init(&kring->q_lock, (t == NR_TX ? "nm_txq_lock" : "nm_rxq_lock"), NULL, MTX_DEF); + init_waitqueue_head(&kring->si); } - /* - * IMPORTANT: Always keep one slot empty. - */ - kring->rhead = kring->rcur = kring->nr_hwcur = 0; - kring->rtail = kring->nr_hwtail = ndesc - 1; - snprintf(kring->name, sizeof(kring->name) - 1, "%s TX%d", na->name, i); - ND("ktx %s h %d c %d t %d", - kring->name, kring->rhead, kring->rcur, kring->rtail); - mtx_init(&kring->q_lock, "nm_txq_lock", NULL, MTX_DEF); - init_waitqueue_head(&kring->si); - } - - ndesc = na->num_rx_desc; - for (i = 0; i < nrx; i++) { /* Receive rings */ - kring = &na->rx_rings[i]; - bzero(kring, sizeof(*kring)); - kring->na = na; - kring->ring_id = i; - kring->nkr_num_slots = ndesc; - if (i < na->num_rx_rings) { - kring->nm_sync = na->nm_rxsync; - } else if (i == na->num_rx_rings) { - kring->nm_sync = netmap_rxsync_from_host_compat; - } - kring->rhead = kring->rcur = kring->nr_hwcur = 0; - kring->rtail = kring->nr_hwtail = 0; - snprintf(kring->name, sizeof(kring->name) - 1, "%s RX%d", na->name, i); - ND("krx %s h %d c %d t %d", - kring->name, kring->rhead, kring->rcur, kring->rtail); - mtx_init(&kring->q_lock, "nm_rxq_lock", NULL, MTX_DEF); - init_waitqueue_head(&kring->si); + init_waitqueue_head(&na->si[t]); } - init_waitqueue_head(&na->tx_si); - init_waitqueue_head(&na->rx_si); - na->tailroom = na->rx_rings + nrx; + na->tailroom = na->rx_rings + n[NR_RX]; return 0; } @@ -858,142 +882,35 @@ } -/* create a new netmap_if for a newly registered fd. - * If this is the first registration of the adapter, - * also create the netmap rings and their in-kernel view, - * the netmap krings. - */ -/* call with NMG_LOCK held */ -static struct netmap_if* -netmap_if_new(struct netmap_adapter *na) -{ - struct netmap_if *nifp; - - if (netmap_update_config(na)) { - /* configuration mismatch, report and fail */ - return NULL; - } - - if (na->active_fds) /* already registered */ - goto final; - - /* create and init the krings arrays. - * Depending on the adapter, this may also create - * the netmap rings themselves - */ - if (na->nm_krings_create(na)) - return NULL; - - /* create all missing netmap rings */ - if (netmap_mem_rings_create(na)) - goto cleanup; - -final: - - /* in all cases, create a new netmap if */ - nifp = netmap_mem_if_new(na); - if (nifp == NULL) - goto cleanup; - - return (nifp); - -cleanup: - - if (na->active_fds == 0) { - netmap_mem_rings_delete(na); - na->nm_krings_delete(na); - } - - return NULL; -} - - -/* grab a reference to the memory allocator, if we don't have one already. The - * reference is taken from the netmap_adapter registered with the priv. - */ -/* call with NMG_LOCK held */ -static int -netmap_get_memory_locked(struct netmap_priv_d* p) -{ - struct netmap_mem_d *nmd; - int error = 0; - - if (p->np_na == NULL) { - if (!netmap_mmap_unreg) - return ENODEV; - /* for compatibility with older versions of the API - * we use the global allocator when no interface has been - * registered - */ - nmd = &nm_mem; - } else { - nmd = p->np_na->nm_mem; - } - if (p->np_mref == NULL) { - error = netmap_mem_finalize(nmd, p->np_na); - if (!error) - p->np_mref = nmd; - } else if (p->np_mref != nmd) { - /* a virtual port has been registered, but previous - * syscalls already used the global allocator. - * We cannot continue - */ - error = ENODEV; - } - return error; -} - - -/* call with NMG_LOCK *not* held */ -int -netmap_get_memory(struct netmap_priv_d* p) -{ - int error; - NMG_LOCK(); - error = netmap_get_memory_locked(p); - NMG_UNLOCK(); - return error; -} - - -/* call with NMG_LOCK held */ -static int -netmap_have_memory_locked(struct netmap_priv_d* p) -{ - return p->np_mref != NULL; -} - - -/* call with NMG_LOCK held */ -static void -netmap_drop_memory_locked(struct netmap_priv_d* p) -{ - if (p->np_mref) { - netmap_mem_deref(p->np_mref, p->np_na); - p->np_mref = NULL; - } -} - /* - * Call nm_register(ifp,0) to stop netmap mode on the interface and + * Undo everything that was done in netmap_do_regif(). In particular, + * call nm_register(ifp,0) to stop netmap mode on the interface and * revert to normal operation. - * The second argument is the nifp to work on. In some cases it is - * not attached yet to the netmap_priv_d so we need to pass it as - * a separate argument. */ /* call with NMG_LOCK held */ +static void netmap_unset_ringid(struct netmap_priv_d *); +static void netmap_rel_exclusive(struct netmap_priv_d *); static void -netmap_do_unregif(struct netmap_priv_d *priv, struct netmap_if *nifp) +netmap_do_unregif(struct netmap_priv_d *priv) { struct netmap_adapter *na = priv->np_na; NMG_LOCK_ASSERT(); na->active_fds--; + /* release exclusive use if it was requested on regif */ + netmap_rel_exclusive(priv); if (na->active_fds <= 0) { /* last instance */ if (netmap_verbose) D("deleting last instance for %s", na->name); + +#ifdef WITH_MONITOR + /* walk through all the rings and tell any monitor + * that the port is going to exit netmap mode + */ + netmap_monitor_stop(na); +#endif /* * (TO CHECK) This function is only called * when the last reference to this file descriptor goes @@ -1014,37 +931,36 @@ * XXX The wake up now must happen during *_down(), when * we order all activities to stop. -gl */ - netmap_knlist_destroy(&na->tx_si); - netmap_knlist_destroy(&na->rx_si); + netmap_knlist_destroy(&na->si[NR_TX]); + netmap_knlist_destroy(&na->si[NR_RX]); /* delete rings and buffers */ netmap_mem_rings_delete(na); na->nm_krings_delete(na); } + /* possibily decrement counter of tx_si/rx_si users */ + netmap_unset_ringid(priv); /* delete the nifp */ - netmap_mem_if_delete(na, nifp); -} - -/* call with NMG_LOCK held */ -static __inline int -nm_tx_si_user(struct netmap_priv_d *priv) -{ - return (priv->np_na != NULL && - (priv->np_txqlast - priv->np_txqfirst > 1)); + netmap_mem_if_delete(na, priv->np_nifp); + /* drop the allocator */ + netmap_mem_deref(na->nm_mem, na); + /* mark the priv as unregistered */ + priv->np_na = NULL; + priv->np_nifp = NULL; } /* call with NMG_LOCK held */ static __inline int -nm_rx_si_user(struct netmap_priv_d *priv) +nm_si_user(struct netmap_priv_d *priv, enum txrx t) { return (priv->np_na != NULL && - (priv->np_rxqlast - priv->np_rxqfirst > 1)); + (priv->np_qlast[t] - priv->np_qfirst[t] > 1)); } - /* * Destructor of the netmap_priv_d, called when the fd has - * no active open() and mmap(). Also called in error paths. + * no active open() and mmap(). + * Undo all the things done by NIOCREGIF. * * returns 1 if this is the last instance and we can free priv */ @@ -1066,17 +982,8 @@ if (!na) { return 1; //XXX is it correct? } - netmap_do_unregif(priv, priv->np_nifp); - priv->np_nifp = NULL; - netmap_drop_memory_locked(priv); - if (priv->np_na) { - if (nm_tx_si_user(priv)) - na->tx_si_users--; - if (nm_rx_si_user(priv)) - na->rx_si_users--; - netmap_adapter_put(na); - priv->np_na = NULL; - } + netmap_do_unregif(priv); + netmap_adapter_put(na); return 1; } @@ -1148,7 +1055,7 @@ netmap_grab_packets(struct netmap_kring *kring, struct mbq *q, int force) { u_int const lim = kring->nkr_num_slots - 1; - u_int const head = kring->ring->head; + u_int const head = kring->rhead; u_int n; struct netmap_adapter *na = kring->na; @@ -1235,7 +1142,6 @@ netmap_txsync_to_host(struct netmap_adapter *na) { struct netmap_kring *kring = &na->tx_rings[na->num_tx_rings]; - struct netmap_ring *ring = kring->ring; u_int const lim = kring->nkr_num_slots - 1; u_int const head = kring->rhead; struct mbq q; @@ -1246,14 +1152,12 @@ * the queue is drained in all cases. */ mbq_init(&q); - ring->cur = head; netmap_grab_packets(kring, &q, 1 /* force */); ND("have %d pkts in queue", mbq_len(&q)); kring->nr_hwcur = head; kring->nr_hwtail = head + lim; if (kring->nr_hwtail > lim) kring->nr_hwtail -= lim + 1; - nm_txsync_finalize(kring); netmap_send_up(na->ifp, &q); } @@ -1323,8 +1227,6 @@ kring->nr_hwcur = head; } - nm_rxsync_finalize(kring); - /* access copies of cur,tail in the kring */ if (kring->rcur == kring->rtail && td) /* no bufs available */ OS_selrecord(td, &kring->si); @@ -1363,9 +1265,11 @@ { /* generic support */ int i = netmap_admode; /* Take a snapshot. */ - int error = 0; struct netmap_adapter *prev_na; +#ifdef WITH_GENERIC struct netmap_generic_adapter *gna; + int error = 0; +#endif *na = NULL; /* default */ @@ -1401,6 +1305,7 @@ if (!NETMAP_CAPABLE(ifp) && i == NETMAP_ADMODE_NATIVE) return EOPNOTSUPP; +#ifdef WITH_GENERIC /* Otherwise, create a generic adapter and return it, * saving the previously used netmap adapter, if any. * @@ -1431,6 +1336,9 @@ ND("Created generic NA %p (prev %p)", gna, gna->prev); return 0; +#else /* !WITH_GENERIC */ + return EOPNOTSUPP; +#endif } @@ -1489,7 +1397,7 @@ return error; if (*na != NULL) /* valid match in netmap_get_bdg_na() */ - goto pipes; + goto out; /* * This must be a hardware na, lookup the name in the system. @@ -1509,14 +1417,6 @@ *na = ret; netmap_adapter_get(ret); -pipes: - /* - * If we are opening a pipe whose parent was not in netmap mode, - * we have to allocate the pipe array now. - * XXX get rid of this clumsiness (2014-03-15) - */ - error = netmap_pipe_alloc(*na, nmr); - out: if (error && ret != NULL) netmap_adapter_put(ret); @@ -1627,7 +1527,7 @@ uint32_t const n = kring->nkr_num_slots; uint32_t head, cur; - ND("%s kc %d kt %d h %d c %d t %d", + ND(5,"%s kc %d kt %d h %d c %d t %d", kring->name, kring->nr_hwcur, kring->nr_hwtail, ring->head, ring->cur, ring->tail); @@ -1719,7 +1619,7 @@ for (i = 0; i <= lim; i++) { u_int idx = ring->slot[i].buf_idx; u_int len = ring->slot[i].len; - if (idx < 2 || idx >= netmap_total_buffers) { + if (idx < 2 || idx >= kring->na->na_lut_objtotal) { RD(5, "bad index at slot %d idx %d len %d ", i, idx, len); ring->slot[i].buf_idx = 0; ring->slot[i].len = 0; @@ -1754,6 +1654,7 @@ struct netmap_adapter *na = priv->np_na; u_int j, i = ringid & NETMAP_RING_MASK; u_int reg = flags & NR_REG_MASK; + enum txrx t; if (reg == NR_REG_DEFAULT) { /* convert from old ringid to flags */ @@ -1770,12 +1671,12 @@ case NR_REG_ALL_NIC: case NR_REG_PIPE_MASTER: case NR_REG_PIPE_SLAVE: - priv->np_txqfirst = 0; - priv->np_txqlast = na->num_tx_rings; - priv->np_rxqfirst = 0; - priv->np_rxqlast = na->num_rx_rings; + for_rx_tx(t) { + priv->np_qfirst[t] = 0; + priv->np_qlast[t] = nma_get_nrings(na, t); + } ND("%s %d %d", "ALL/PIPE", - priv->np_rxqfirst, priv->np_rxqlast); + priv->np_qfirst[NR_RX], priv->np_qlast[NR_RX]); break; case NR_REG_SW: case NR_REG_NIC_SW: @@ -1783,31 +1684,27 @@ D("host rings not supported"); return EINVAL; } - priv->np_txqfirst = (reg == NR_REG_SW ? - na->num_tx_rings : 0); - priv->np_txqlast = na->num_tx_rings + 1; - priv->np_rxqfirst = (reg == NR_REG_SW ? - na->num_rx_rings : 0); - priv->np_rxqlast = na->num_rx_rings + 1; + for_rx_tx(t) { + priv->np_qfirst[t] = (reg == NR_REG_SW ? + nma_get_nrings(na, t) : 0); + priv->np_qlast[t] = nma_get_nrings(na, t) + 1; + } ND("%s %d %d", reg == NR_REG_SW ? "SW" : "NIC+SW", - priv->np_rxqfirst, priv->np_rxqlast); + priv->np_qfirst[NR_RX], priv->np_qlast[NR_RX]); break; case NR_REG_ONE_NIC: *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 15:35:57 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C327224 for ; Tue, 23 Jun 2015 15:35:57 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 293AA834 for ; Tue, 23 Jun 2015 15:35:57 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NFZvpa049967 for ; Tue, 23 Jun 2015 15:35:57 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NFZuo7049950 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 15:35:56 GMT (envelope-from clord@FreeBSD.org) Date: Tue, 23 Jun 2015 15:35:56 GMT Message-Id: <201506231535.t5NFZuo7049950@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287478 - soc2015/clord/head/sys/contrib/ficl/softwords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 15:35:57 -0000 Author: clord Date: Tue Jun 23 15:35:55 2015 New Revision: 287478 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287478 Log: Add more FreeBSD customizations back into vendor code Added: soc2015/clord/head/sys/contrib/ficl/softwords/freebsd.fr - copied unchanged from r287241, soc2015/clord/head/sys/boot/ficl/softwords/freebsd.fr soc2015/clord/head/sys/contrib/ficl/softwords/softcore.awk - copied unchanged from r287241, soc2015/clord/head/sys/boot/ficl/softwords/softcore.awk Copied: soc2015/clord/head/sys/contrib/ficl/softwords/freebsd.fr (from r287241, soc2015/clord/head/sys/boot/ficl/softwords/freebsd.fr) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/sys/contrib/ficl/softwords/freebsd.fr Tue Jun 23 15:35:55 2015 (r287478, copy of r287241, soc2015/clord/head/sys/boot/ficl/softwords/freebsd.fr) @@ -0,0 +1,36 @@ +\ ** Copyright (c) 1998 Daniel C. Sobral +\ ** 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$ + +\ Words for use in scripts: +\ % ignore errors here +\ $ echo this line + +: tib> source >in @ tuck over >in ! - >r + r> ; +: % tib> ['] evaluate catch drop ; +: $ tib> 2dup type cr evaluate ; + +\ ** E N D F R E E B S D . F R + Copied: soc2015/clord/head/sys/contrib/ficl/softwords/softcore.awk (from r287241, soc2015/clord/head/sys/boot/ficl/softwords/softcore.awk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/clord/head/sys/contrib/ficl/softwords/softcore.awk Tue Jun 23 15:35:55 2015 (r287478, copy of r287241, soc2015/clord/head/sys/boot/ficl/softwords/softcore.awk) @@ -0,0 +1,183 @@ +#!/usr/bin/awk -f +# +# Convert forth source files to a giant C string +# +# Joe Abley , 12 January 1999 +# +# 02-oct-1999: Cleaned up awk slightly; added some additional logic +# suggested by dcs to compress the stored forth program. +# +# Note! This script uses strftime() which is a gawk-ism, and the +# POSIX [[:space:]] character class. +# +# $FreeBSD$ + +BEGIN \ +{ + printf "/*******************************************************************\n"; + printf "** s o f t c o r e . c\n"; + printf "** Forth Inspired Command Language -\n"; + printf "** Words from CORE set written in FICL\n"; + printf "** Author: John Sadler (john_sadler@alum.mit.edu)\n"; + printf "** Created: 27 December 1997\n"; + printf "** Last update: %s\n", datestamp; + printf "*******************************************************************/\n"; + printf "/*\n"; + printf "** DO NOT EDIT THIS FILE -- it is generated by softwords/softcore.awk\n"; + printf "** Make changes to the .fr files in ficl/softwords instead.\n"; + printf "** This file contains definitions that are compiled into the\n"; + printf "** system dictionary by the first virtual machine to be created.\n"; + printf "** Created automagically by ficl/softwords/softcore.awk\n"; + printf "*/\n"; + printf "/*\n"; + printf "** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu)\n"; + printf "** All rights reserved.\n"; + printf "**\n"; + printf "** Get the latest Ficl release at http://ficl.sourceforge.net\n"; + printf "**\n"; + printf "** I am interested in hearing from anyone who uses ficl. If you have\n"; + printf "** a problem, a success story, a defect, an enhancement request, or\n"; + printf "** if you would like to contribute to the ficl release, please send\n"; + printf "** contact me by email at the address above.\n"; + printf "**\n"; + printf "** L I C E N S E and D I S C L A I M E R\n"; + printf "** \n"; + printf "** Redistribution and use in source and binary forms, with or without\n"; + printf "** modification, are permitted provided that the following conditions\n"; + printf "** are met:\n"; + printf "** 1. Redistributions of source code must retain the above copyright\n"; + printf "** notice, this list of conditions and the following disclaimer.\n"; + printf "** 2. Redistributions in binary form must reproduce the above copyright\n"; + printf "** notice, this list of conditions and the following disclaimer in the\n"; + printf "** documentation and/or other materials provided with the distribution.\n"; + printf "**\n"; + printf "** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\n"; + printf "** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"; + printf "** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"; + printf "** ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n"; + printf "** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n"; + printf "** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n"; + printf "** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n"; + printf "** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n"; + printf "** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n"; + printf "** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n"; + printf "** SUCH DAMAGE.\n"; + printf "*/\n"; + printf "\n"; + printf "\n#include \"ficl.h\"\n"; + printf "\nstatic char softWords[] =\n"; + printf "#if FICL_WANT_SOFTWORDS\n"; + + commenting = 0; +} + +# some general early substitutions +{ + gsub(/\t/, " "); # replace each tab with 4 spaces + gsub(/\"/, "\\\""); # escape quotes + gsub(/\\[[:space:]]+$/, ""); # toss empty comments +} + +# strip out empty lines +/^ *$/ \ +{ + next; +} + +# emit / ** lines as multi-line C comments +/^\\[[:space:]]\*\*/ \ +{ + sub(/^\\[[:space:]]/, ""); + if (commenting == 0) printf "/*\n"; + printf "%s\n", $0; + commenting = 1; + next; +} + +# strip blank lines +/^[[:space:]]*$/ \ +{ + next; +} + +# function to close a comment, used later +function end_comments() +{ + commenting = 0; + printf "*/\n"; +} + +# pass commented preprocessor directives +/^\\[[:space:]]#/ \ +{ + if (commenting) end_comments(); + sub(/^\\[[:space:]]/, ""); + printf "%s\n", $0; + next; +} + +# toss all other full-line \ comments +/^\\/ \ +{ + if (commenting) end_comments(); + next; +} + +# lop off trailing \ comments +/\\[[:space:]]+/ \ +{ + sub(/\\[[:space:]]+.*$/, ""); +} + +# expunge ( ) comments +/[[:space:]]+\([[:space:]][^)]*\)/ \ +{ + sub(/[[:space:]]+\([[:space:]][^)]*\)/, ""); +} + +# remove leading spaces +/^[[:space:]]+/ \ +{ + sub(/^[[:space:]]+/, ""); +} + +# removing trailing spaces +/[[:space:]]+$/ \ +{ + sub(/[[:space:]]+$/, ""); +} + +# strip out empty lines again (preceding rules may have generated some) +/^[[:space:]]*$/ \ +{ + if (commenting) end_comments(); + next; +} + +# emit all other lines as quoted string fragments +{ + if (commenting) end_comments(); + + printf " \"%s \"\n", $0; + next; +} + +END \ +{ + if (commenting) end_comments(); + printf "#endif /* WANT_SOFTWORDS */\n"; + printf " \"quit \";\n"; + printf "\n\nvoid ficlCompileSoftCore(FICL_SYSTEM *pSys)\n"; + printf "{\n"; + printf " FICL_VM *pVM = pSys->vmList;\n"; + printf " CELL id = pVM->sourceID;\n"; + printf " int ret = sizeof (softWords);\n"; + printf " assert(pVM);\n"; + printf " pVM->sourceID.i = -1;\n"; + printf " ret = ficlExec(pVM, softWords);\n"; + printf " pVM->sourceID = id;\n"; + printf " if (ret == VM_ERREXIT)\n"; + printf " assert(FALSE);\n"; + printf " return;\n"; + printf "}\n"; +} From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 15:38:00 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BDBD252 for ; Tue, 23 Jun 2015 15:38:00 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A1318CE for ; Tue, 23 Jun 2015 15:38:00 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NFbx8L050692 for ; Tue, 23 Jun 2015 15:37:59 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NFbxnD050676 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 15:37:59 GMT (envelope-from clord@FreeBSD.org) Date: Tue, 23 Jun 2015 15:37:59 GMT Message-Id: <201506231537.t5NFbxnD050676@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287479 - soc2015/clord/head/sys/boot/ficl32 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 15:38:00 -0000 Author: clord Date: Tue Jun 23 15:37:58 2015 New Revision: 287479 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287479 Log: Fix path to ficl Makefile Modified: soc2015/clord/head/sys/boot/ficl32/Makefile Modified: soc2015/clord/head/sys/boot/ficl32/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/ficl32/Makefile Tue Jun 23 15:35:55 2015 (r287478) +++ soc2015/clord/head/sys/boot/ficl32/Makefile Tue Jun 23 15:37:58 2015 (r287479) @@ -5,4 +5,4 @@ .PATH: ${FICLDIR} -.include "${.CURDIR}/../Makefile" +.include "${.CURDIR}/../ficl/Makefile" From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 15:39:16 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E73825F for ; Tue, 23 Jun 2015 15:39:16 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CF9C90C for ; Tue, 23 Jun 2015 15:39:16 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NFdG5N051148 for ; Tue, 23 Jun 2015 15:39:16 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NFdFhN051145 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 15:39:15 GMT (envelope-from clord@FreeBSD.org) Date: Tue, 23 Jun 2015 15:39:15 GMT Message-Id: <201506231539.t5NFdFhN051145@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287480 - soc2015/clord/head/sys/boot/ficl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 15:39:16 -0000 Author: clord Date: Tue Jun 23 15:39:15 2015 New Revision: 287480 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287480 Log: Fix path to common files in ficl Makefile Modified: soc2015/clord/head/sys/boot/ficl/Makefile Modified: soc2015/clord/head/sys/boot/ficl/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/ficl/Makefile Tue Jun 23 15:37:58 2015 (r287479) +++ soc2015/clord/head/sys/boot/ficl/Makefile Tue Jun 23 15:39:15 2015 (r287480) @@ -76,7 +76,7 @@ .endif CFLAGS+= -I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} \ - -I${FICLDIR}/../common + -I${FICLDIR}/../../boot/common softcore.c: ${SOFTWORDS} softcore.awk (cd ${FICLDIR}/softwords; cat ${SOFTWORDS} \ From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 15:40:42 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 378E0267 for ; Tue, 23 Jun 2015 15:40:42 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 258499A2 for ; Tue, 23 Jun 2015 15:40:42 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NFegUs052810 for ; Tue, 23 Jun 2015 15:40:42 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NFef4E052806 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 15:40:41 GMT (envelope-from clord@FreeBSD.org) Date: Tue, 23 Jun 2015 15:40:41 GMT Message-Id: <201506231540.t5NFef4E052806@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287481 - soc2015/clord/head/sys/boot/i386/loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 15:40:42 -0000 Author: clord Date: Tue Jun 23 15:40:41 2015 New Revision: 287481 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287481 Log: Fix path to ficl sources to match new location in sys/contrib/ficl rather than sys/boot/ficl Modified: soc2015/clord/head/sys/boot/i386/loader/Makefile Modified: soc2015/clord/head/sys/boot/i386/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/i386/loader/Makefile Tue Jun 23 15:39:15 2015 (r287480) +++ soc2015/clord/head/sys/boot/i386/loader/Makefile Tue Jun 23 15:40:41 2015 (r287481) @@ -41,7 +41,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/i386 .if ${MACHINE_CPUARCH} == "amd64" LIBFICL= ${.OBJDIR}/../../ficl32/libficl.a .else From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 15:48:37 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19ADD2B7 for ; Tue, 23 Jun 2015 15:48:37 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 073F8CDB for ; Tue, 23 Jun 2015 15:48:37 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NFmaNu060225 for ; Tue, 23 Jun 2015 15:48:36 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NFma8s060224 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 15:48:36 GMT (envelope-from clord@FreeBSD.org) Date: Tue, 23 Jun 2015 15:48:36 GMT Message-Id: <201506231548.t5NFma8s060224@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287482 - in soc2015/clord/head/sys/boot/ficl: . aarch64 amd64 arm i386 mips mips64 powerpc softwords sparc64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 15:48:37 -0000 Author: clord Date: Tue Jun 23 15:48:36 2015 New Revision: 287482 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287482 Log: Remove ficl sources from old location Deleted: soc2015/clord/head/sys/boot/ficl/aarch64/ soc2015/clord/head/sys/boot/ficl/amd64/ soc2015/clord/head/sys/boot/ficl/arm/ soc2015/clord/head/sys/boot/ficl/dict.c soc2015/clord/head/sys/boot/ficl/ficl.c soc2015/clord/head/sys/boot/ficl/ficl.h soc2015/clord/head/sys/boot/ficl/fileaccess.c soc2015/clord/head/sys/boot/ficl/float.c soc2015/clord/head/sys/boot/ficl/i386/ soc2015/clord/head/sys/boot/ficl/loader.c soc2015/clord/head/sys/boot/ficl/math64.c soc2015/clord/head/sys/boot/ficl/math64.h soc2015/clord/head/sys/boot/ficl/mips/ soc2015/clord/head/sys/boot/ficl/mips64/ soc2015/clord/head/sys/boot/ficl/powerpc/ soc2015/clord/head/sys/boot/ficl/prefix.c soc2015/clord/head/sys/boot/ficl/search.c soc2015/clord/head/sys/boot/ficl/softwords/ soc2015/clord/head/sys/boot/ficl/sparc64/ soc2015/clord/head/sys/boot/ficl/stack.c soc2015/clord/head/sys/boot/ficl/testmain.c soc2015/clord/head/sys/boot/ficl/tools.c soc2015/clord/head/sys/boot/ficl/unix.c soc2015/clord/head/sys/boot/ficl/vm.c soc2015/clord/head/sys/boot/ficl/words.c From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 17:20:01 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57ECA77D for ; Tue, 23 Jun 2015 17:20:01 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43BDACCE for ; Tue, 23 Jun 2015 17:20:01 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHK15i020351 for ; Tue, 23 Jun 2015 17:20:01 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHK0ZQ020276 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 17:20:00 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 17:20:00 GMT Message-Id: <201506231720.t5NHK0ZQ020276@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287486 - soc2015/stefano/ptnetmap/head/release/picobsd/build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:20:01 -0000 Author: stefano Date: Tue Jun 23 17:20:00 2015 New Revision: 287486 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287486 Log: picobsd: fix iso generation Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 16:34:43 2015 (r287485) +++ soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:20:00 2015 (r287486) @@ -888,7 +888,7 @@ # build_iso_image # XXX not implemented yet (cd ${BUILDDIR} cp -p /boot/cdboot ${dst}/boot || fail $? no_space "copying cdboot" - mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -L \ + mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -posix-L \ -o ${c_iso} ${dst} ) fi From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 17:20:35 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5F6B781 for ; Tue, 23 Jun 2015 17:20:35 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C41F0D67 for ; Tue, 23 Jun 2015 17:20:35 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHKZhJ022289 for ; Tue, 23 Jun 2015 17:20:35 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHKZET022285 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 17:20:35 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 17:20:35 GMT Message-Id: <201506231720.t5NHKZET022285@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287487 - soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:20:35 -0000 Author: stefano Date: Tue Jun 23 17:20:34 2015 New Revision: 287487 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287487 Log: picobsd: enable tcp extensions Modified: soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc.conf.defaults Modified: soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc.conf.defaults ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc.conf.defaults Tue Jun 23 17:20:00 2015 (r287486) +++ soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc.conf.defaults Tue Jun 23 17:20:34 2015 (r287487) @@ -35,7 +35,7 @@ firewall_enable="NO" firewall_quiet="NO" # be quiet if set. firewall_type="" # Standard types or absolute pathname. -tcp_extensions="NO" # Allow RFC1323 & RFC1644 extensions (or NO). +tcp_extensions="YES" # Allow RFC1323 & RFC1644 extensions (or NO). ### Overrides for some files in /etc. Leave empty if no override, ### set variable (remember to use multiple lines) to override content. From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 17:21:04 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4DFB789 for ; Tue, 23 Jun 2015 17:21:04 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7180DC6 for ; Tue, 23 Jun 2015 17:21:04 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHL4EE023152 for ; Tue, 23 Jun 2015 17:21:04 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHL34R023135 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 17:21:03 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 17:21:03 GMT Message-Id: <201506231721.t5NHL34R023135@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287488 - in soc2015/stefano/ptnetmap/head/release/picobsd: build floppy.tree/etc floppy.tree/etc/ssh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:21:05 -0000 Author: stefano Date: Tue Jun 23 17:21:02 2015 New Revision: 287488 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287488 Log: picobsd: fix sshd add ecdsa keys move keys in /etc/ssh/ change sshd_config file Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc1 soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/ssh/sshd_config Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:20:34 2015 (r287487) +++ soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:21:02 2015 (r287488) @@ -670,7 +670,7 @@ ) || fail $? crunch log "Setting up host key for sshd:" - for K in rsa1 rsa dsa ; do + for K in rsa1 rsa dsa ecdsa; do if [ $K = rsa1 ] ; then i=ssh_host_key else Modified: soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc1 ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc1 Tue Jun 23 17:20:34 2015 (r287487) +++ soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/rc1 Tue Jun 23 17:21:02 2015 (r287488) @@ -54,8 +54,9 @@ if [ "${sshd_enable}" = "YES" -a -f /usr/sbin/sshd ] ; then echo "Starting sshd..." - chmod 600 /etc/ssh_host*key - /usr/sbin/sshd -f /etc/sshd_config + mv /etc/ssh_host* /etc/ssh/ + chmod 600 /etc/ssh/* + /usr/sbin/sshd -f /etc/ssh/sshd_config fi echo '' Modified: soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/ssh/sshd_config ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/ssh/sshd_config Tue Jun 23 17:20:34 2015 (r287487) +++ soc2015/stefano/ptnetmap/head/release/picobsd/floppy.tree/etc/ssh/sshd_config Tue Jun 23 17:21:02 2015 (r287488) @@ -1,25 +1,27 @@ # $FreeBSD$ # minimal config for sshd on picobsd -Port 22 -ListenAddress 0.0.0.0 -HostKey /etc/ssh_host_key -#RandomSeed /etc/ssh_random_seed -ServerKeyBits 768 -LoginGraceTime 600 -KeyRegenerationInterval 3600 -PermitRootLogin yes -IgnoreRhosts no -StrictModes yes -X11Forwarding no -X11DisplayOffset 10 -PrintMotd yes -KeepAlive yes -SyslogFacility AUTH -RhostsRSAAuthentication yes -RSAAuthentication yes +UsePAM no PasswordAuthentication yes -PermitEmptyPasswords no -UseLogin no +PermitRootLogin yes +#Port 22 +#ListenAddress 0.0.0.0 +#HostKey /etc/ssh_host_key +#RandomSeed /etc/ssh_random_seed +#ServerKeyBits 768 +#LoginGraceTime 600 +#KeyRegenerationInterval 3600 +#IgnoreRhosts no +#StrictModes yes +#X11Forwarding no +#X11DisplayOffset 10 +#PrintMotd yes +#KeepAlive yes +#SyslogFacility AUTH +#RhostsRSAAuthentication yes +#RSAAuthentication yes +#PasswordAuthentication yes +#PermitEmptyPasswords no +#UseLogin no # CheckMail no # PidFile /u/zappa/.ssh/pid # AllowHosts *.our.com friend.other.com From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 17:21:31 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10A7E78D for ; Tue, 23 Jun 2015 17:21:31 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3365E34 for ; Tue, 23 Jun 2015 17:21:30 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHLUQk024900 for ; Tue, 23 Jun 2015 17:21:30 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHLUjT024898 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 17:21:30 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 17:21:30 GMT Message-Id: <201506231721.t5NHLUjT024898@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287489 - soc2015/stefano/ptnetmap/head/release/picobsd/build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:21:31 -0000 Author: stefano Date: Tue Jun 23 17:21:29 2015 New Revision: 287489 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287489 Log: picobsd: fix loader.conf copy /boot/*.4th and /boot/defaults/loader.conf in the picobsd image to allow the boot loader to read the /boot/loader.conf Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:21:02 2015 (r287488) +++ soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:21:29 2015 (r287489) @@ -864,7 +864,15 @@ # XXX loader.conf does not work unless we also load the .4th files # echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf # echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf - local blf="loader* *.4th" # loader.rc loader.4th support.4th" + + mkdir -p ${dst}/boot/defaults + cp -p /boot/*.4th ${dst}/boot/ + cp -p /boot/defaults/loader.conf ${dst}/boot/defaults/loader.conf + + echo "include /boot/loader.4th" > ${dst}/boot/loader.rc + echo "start" >> ${dst}/boot/loader.rc + echo "boot" >> ${dst}/boot/loader.rc + (cd /boot; cp -p loader ${dst}/boot) || fail $? no_space "copying bootloader" cp ${MY_TREE}/floppy.tree/boot/loader.conf ${dst}/boot || true gzip -c kernel > ${dst}/boot/kernel/kernel.gz || fail $? no_space "copying kernel" From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 17:25:30 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C5107FD for ; Tue, 23 Jun 2015 17:25:30 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 20927F8 for ; Tue, 23 Jun 2015 17:25:30 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHPTrh028184 for ; Tue, 23 Jun 2015 17:25:29 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHPTxv028179 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 17:25:29 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 17:25:29 GMT Message-Id: <201506231725.t5NHPTxv028179@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287490 - soc2015/stefano/ptnetmap/head/sys/conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:25:30 -0000 Author: stefano Date: Tue Jun 23 17:25:29 2015 New Revision: 287490 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287490 Log: fix ixgbe compilation now we can compile "device ix" without "device ixv" Modified: soc2015/stefano/ptnetmap/head/sys/conf/files Modified: soc2015/stefano/ptnetmap/head/sys/conf/files ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/conf/files Tue Jun 23 17:21:29 2015 (r287489) +++ soc2015/stefano/ptnetmap/head/sys/conf/files Tue Jun 23 17:25:29 2015 (r287490) @@ -1761,25 +1761,25 @@ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" dev/ixgbe/if_ixv.c optional ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" -dev/ixgbe/ix_txrx.c optional ix ixv inet \ +dev/ixgbe/ix_txrx.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP" -dev/ixgbe/ixgbe_phy.c optional ix ixv inet \ +dev/ixgbe/ixgbe_phy.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_api.c optional ix ixv inet \ +dev/ixgbe/ixgbe_api.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_common.c optional ix ixv inet \ +dev/ixgbe/ixgbe_common.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_mbx.c optional ix ixv inet \ +dev/ixgbe/ixgbe_mbx.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_vf.c optional ix ixv inet \ +dev/ixgbe/ixgbe_vf.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_82598.c optional ix ixv inet \ +dev/ixgbe/ixgbe_82598.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_82599.c optional ix ixv inet \ +dev/ixgbe/ixgbe_82599.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_x540.c optional ix ixv inet \ +dev/ixgbe/ixgbe_x540.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" -dev/ixgbe/ixgbe_x550.c optional ix ixv inet \ +dev/ixgbe/ixgbe_x550.c optional ix | ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/ixgbe/ixgbe_dcb.c optional ix ixv inet \ compile-with "${NORMAL_C} -I$S/dev/ixgbe" From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 17:27:43 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95E39881 for ; Tue, 23 Jun 2015 17:27:43 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 833C481C for ; Tue, 23 Jun 2015 17:27:43 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NHRhk0029398 for ; Tue, 23 Jun 2015 17:27:43 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NHRhPd029395 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 17:27:43 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 17:27:43 GMT Message-Id: <201506231727.t5NHRhPd029395@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287491 - soc2015/stefano/ptnetmap/head/lib/liblzma MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 17:27:43 -0000 Author: stefano Date: Tue Jun 23 17:27:42 2015 New Revision: 287491 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287491 Log: fix picobsd init error TODO: check the compiler in the ifdef (picobsd uses GCC) Modified: soc2015/stefano/ptnetmap/head/lib/liblzma/config.h Modified: soc2015/stefano/ptnetmap/head/lib/liblzma/config.h ============================================================================== --- soc2015/stefano/ptnetmap/head/lib/liblzma/config.h Tue Jun 23 17:25:29 2015 (r287490) +++ soc2015/stefano/ptnetmap/head/lib/liblzma/config.h Tue Jun 23 17:27:42 2015 (r287491) @@ -150,9 +150,11 @@ #define HAVE_ICONV 1 /* Define to 1 if you have the header file. */ +#if 0 /* TODO-ste: check the compiler */ #if defined(__FreeBSD__) && defined(__amd64__) #define HAVE_IMMINTRIN_H 1 #endif +#endif /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 18:45:31 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83E55C1D for ; Tue, 23 Jun 2015 18:45:31 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D34BB2A for ; Tue, 23 Jun 2015 18:45:31 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NIjVfD096596 for ; Tue, 23 Jun 2015 18:45:31 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NIjQZo096541 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 18:45:26 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 18:45:26 GMT Message-Id: <201506231845.t5NIjQZo096541@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287496 - in soc2015/stefano/ptnetmap/head/release/picobsd/netmap: . floppy.tree floppy.tree/boot floppy.tree/etc floppy.tree/root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 18:45:31 -0000 Author: stefano Date: Tue Jun 23 18:45:26 2015 New Revision: 287496 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287496 Log: [ptnetmap] add picobsd netmap configuration Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/PICOBSD soc2015/stefano/ptnetmap/head/release/picobsd/netmap/PICOBSD.hints soc2015/stefano/ptnetmap/head/release/picobsd/netmap/config soc2015/stefano/ptnetmap/head/release/picobsd/netmap/crunch.conf soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree.exclude soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/boot/ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/boot/loader.conf soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/OLD_rc.conf soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/rc.conf.defaults soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/ttys soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/change_mtu.sh (contents, props changed) soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/initialize.sh (contents, props changed) soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/initialize_real.sh (contents, props changed) soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/send_trace.sh (contents, props changed) Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/PICOBSD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/PICOBSD Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,357 @@ +# +# GENERIC -- Generic kernel configuration file for FreeBSD/amd64 +# +# +# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 249549 2013-04-16 16:09:27Z brooks $ + +# Line starting with #PicoBSD contains PicoBSD build parameters +#marker def_sz init MFS_inodes floppy_inodes +#PicoBSD 18000 init 8192 32768 +options MD_ROOT_SIZE=18000 # same as def_sz + +cpu HAMMER +ident PICOBSD + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support + +#options INVARIANT_SUPPORT +#options INVARIANTS # STE enable KASSERT + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +#options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +#options UFS_ACL # Support for access control lists +#options UFS_DIRHASH # Improve performance on big directories +#options UFS_GJOURNAL # Enable gjournal-based UFS journaling +#options QUOTA # Enable disk quotas for UFS +options MD_ROOT # MD is a potential root device +#options NFSCL # New Network Filesystem Client +#options NFSD # New Network Filesystem Server +#options NFSLOCKD # Network Lock Manager +#options NFS_ROOT # NFS usable as /, requires NFSCL +#options MSDOSFS # MSDOS Filesystem +#options CD9660 # ISO 9660 Filesystem +#options PROCFS # Process filesystem (requires PSEUDOFS) +#options PSEUDOFS # Pseudo-filesystem framework +#options GEOM_PART_GPT # GUID Partition Tables. +#options GEOM_RAID # Soft RAID functionality. +#options GEOM_LABEL # Provides labelization +options COMPAT_FREEBSD32 # Compatible with i386 binaries +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 +#options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +#options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework +options KDTRACE_FRAME # Ensure frames are compiled in +options KDTRACE_HOOKS # Kernel DTrace hooks +options INCLUDE_CONFIG_FILE # Include this file in kernel +options KDB # Kernel debugger related code +options KDB_TRACE # Print a stack trace for a panic +options DDB_CTF # kernel ELF linker loads CTF data +#ste debug +options DDB +options BREAK_TO_DEBUGGER +#options KDB_UNATTENDED +# qemu +#options HZ=1000 + +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel + +#options GSO +device netmap +# CPU frequency control +device cpufreq + +# Bus support. +device acpi +device pci + +# Floppy drives +device fdc + +# ATA controllers +#device ahci # AHCI-compatible SATA controllers +#device ata # Legacy ATA/SATA controllers +#options ATA_CAM # Handle legacy controllers with CAM +#options ATA_STATIC_ID # Static device numbering +#device mvs # Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA +#device siis # SiliconImage SiI3124/SiI3132/SiI3531 SATA + +# SCSI Controllers +#device ahc # AHA2940 and onboard AIC7xxx devices +#options AHC_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~128k to driver. +#device ahd # AHA39320/29320 and onboard AIC79xx devices +#options AHD_REG_PRETTY_PRINT # Print register bitfields in debug + # output. Adds ~215k to driver. +#device esp # AMD Am53C974 (Tekram DC-390(T)) +#device hptiop # Highpoint RocketRaid 3xxx series +#device isp # Qlogic family +#device ispfw # Firmware for QLogic HBAs- normally a module +#device mpt # LSI-Logic MPT-Fusion +#device mps # LSI-Logic MPT-Fusion 2 +#device ncr # NCR/Symbios Logic +#device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +#device trm # Tekram DC395U/UW/F DC315U adapters + +#device adv # Advansys SCSI adapters +#device adw # Advansys wide SCSI adapters +#device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. +#device bt # Buslogic/Mylex MultiMaster SCSI adapters +#device isci # Intel C600 SAS controller + +# ATA/SCSI peripherals +device scbus # SCSI bus (required for ATA/SCSI) +#device ch # SCSI media changers +device da # Direct Access (disks) +device sa # Sequential Access (tape etc) +#device cd # CD +#device pass # Passthrough device (direct ATA/SCSI access) +#device ses # Enclosure Services (SES and SAF-TE) +#device ctl # CAM Target Layer + +# RAID controllers interfaced to the SCSI subsystem +#device amr # AMI MegaRAID +#device arcmsr # Areca SATA II RAID +#XXX it is not 64-bit clean, -scottl +#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +#device ciss # Compaq Smart RAID 5* +#device dpt # DPT Smartcache III, IV - See NOTES for options +#device hptmv # Highpoint RocketRAID 182x +#device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx +#device hpt27xx # Highpoint RocketRAID 27xx +#device iir # Intel Integrated RAID +#device ips # IBM (Adaptec) ServeRAID +#device mly # Mylex AcceleRAID/eXtremeRAID +#device twa # 3ware 9000 series PATA/SATA RAID +#device tws # LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller + +# RAID controllers +#device aac # Adaptec FSA RAID +#device aacp # SCSI passthrough for aac (requires CAM) +#device ida # Compaq Smart RAID +#device mfi # LSI MegaRAID SAS +#device mlx # Mylex DAC960 family +#XXX pointer/int warnings +#device pst # Promise Supertrak SX6000 +#device twe # 3ware ATA RAID + +# atkbdc0 controls both the keyboard and the PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +#device psm # PS/2 mouse + +device kbdmux # keyboard multiplexer + +device vga # VGA video card driver +#options VESA # Add support for VESA BIOS Extensions (VBE) + +#device splash # Splash screen and screen saver support + +# syscons is the default console driver, resembling an SCO console +device sc +options SC_PIXEL_MODE # add support for the raster text mode + +device agp # support several AGP chipsets + +# PCCARD (PCMCIA) support +# PCMCIA and cardbus bridge support +#device cbb # cardbus (yenta) bridge +#device pccard # PC Card (16-bit) bus +#device cardbus # CardBus (32-bit) bus + +# Serial (COM) ports +device uart # Generic UART driver + +# Parallel port +#device ppc +#device ppbus # Parallel port bus (required) +#device lpt # Printer +#device plip # TCP/IP over parallel +#device ppi # Parallel port interface device +#device vpo # Requires scbus and da + +#device puc # Multi I/O cards and multi-channel UARTs + +# PCI Ethernet NICs. +#device bxe # Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet +#device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel PRO/1000 Gigabit Ethernet Family +device igb # Intel PRO/1000 PCIE Server Gigabit Family +#device ixgbe # Intel PRO/10GbE PCIE Ethernet Family +#device oce # Emulex 10 GbE (OneConnect Ethernet) +#device le # AMD Am7900 LANCE and Am79C9xx PCnet +#device ti # Alteon Networks Tigon I/II gigabit Ethernet +#device txp # 3Com 3cR990 (``Typhoon'') +#device vx # 3Com 3c590, 3c595 (``Vortex'') + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +#device ae # Attansic/Atheros L2 FastEthernet +#device age # Attansic/Atheros L1 Gigabit Ethernet +#device alc # Atheros AR8131/AR8132 Ethernet +#device ale # Atheros AR8121/AR8113/AR8114 Ethernet +#device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet +#device bfe # Broadcom BCM440x 10/100 Ethernet +#device bge # Broadcom BCM570xx Gigabit Ethernet +#device cas # Sun Cassini/Cassini+ and NS DP83065 Saturn +#device dc # DEC/Intel 21143 and various workalikes +#device et # Agere ET1310 10/100/Gigabit Ethernet +#device fxp # Intel EtherExpress PRO/100B (82557, 82558) +#device gem # Sun GEM/Sun ERI/Apple GMAC +#device hme # Sun HME (Happy Meal Ethernet) +#device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet +#device lge # Level 1 LXT1001 gigabit Ethernet +#device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet +#device nfe # nVidia nForce MCP on-board Ethernet +#device nge # NatSemi DP83820 gigabit Ethernet +#device nve # nVidia nForce MCP on-board Ethernet Networking +#device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') +device re # RealTek 8139C+/8169/8169S/8110S +device rl # RealTek 8129/8139 +#device sf # Adaptec AIC-6915 (``Starfire'') +#device sge # Silicon Integrated Systems SiS190/191 +#device sis # Silicon Integrated Systems SiS 900/SiS 7016 +#device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet +#device ste # Sundance ST201 (D-Link DFE-550TX) +#device stge # Sundance/Tamarack TC9021 gigabit Ethernet +#device tl # Texas Instruments ThunderLAN +#device tx # SMC EtherPower II (83c170 ``EPIC'') +#device vge # VIA VT612x gigabit Ethernet +#device vr # VIA Rhine, Rhine II +#device wb # Winbond W89C840F +#device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') + +# ISA Ethernet NICs. pccard NICs included. +#device cs # Crystal Semiconductor CS89x0 NIC +# 'device ed' requires 'device miibus' +#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +#device ex # Intel EtherExpress Pro/10 and Pro/10+ +#device ep # Etherlink III based cards +#device fe # Fujitsu MB8696x based cards +#device sn # SMC's 9000 series of Ethernet chips +#device xe # Xircom pccard Ethernet + +# Wireless NIC cards +#device wlan # 802.11 support +#options IEEE80211_DEBUG # enable debug msgs +#options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's +#options IEEE80211_SUPPORT_MESH # enable 802.11s draft support +#device wlan_wep # 802.11 WEP support +#device wlan_ccmp # 802.11 CCMP support +#device wlan_tkip # 802.11 TKIP support +#device wlan_amrr # AMRR transmit rate control algorithm +#device an # Aironet 4500/4800 802.11 wireless NICs. +#device ath # Atheros NICs +#device ath_pci # Atheros pci/cardbus glue +#device ath_hal # pci/cardbus chip support +#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +#device ath_rate_sample # SampleRate tx rate control for ath +#device bwi # Broadcom BCM430x/BCM431x wireless NICs. +#device bwn # Broadcom BCM43xx wireless NICs. +#device ipw # Intel 2100 wireless NICs. +#device iwi # Intel 2200BG/2225BG/2915ABG wireless NICs. +#device iwn # Intel 4965/1000/5000/6000 wireless NICs. +#device malo # Marvell Libertas wireless NICs. +#device mwl # Marvell 88W8363 802.11n wireless NICs. +#device ral # Ralink Technology RT2500 wireless NICs. +#device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. +#device wpi # Intel 3945ABG wireless NICs. + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +#options PADLOCK_RNG # VIA Padlock RNG +#options RDRAND_RNG # Intel Bull Mountain RNG +device ether # Ethernet support +device vlan # 802.1Q VLAN support +device tun # Packet tunnel. +device pty # BSD-style compatibility pseudo ttys +device md # Memory "disks" +#device gif # IPv6 and IPv4 tunneling +#device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module +#device tap + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + +# USB support +#options USB_DEBUG # enable debug msgs +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device xhci # XHCI PCI->USB interface (USB 3.0) +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices (needs netgraph) +device uhid # "Human Interface Devices" +device ukbd # Keyboard +#device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +#device urio # Diamond Rio 500 MP3 player +# USB Serial devices +#device u3g # USB-based 3G modems (Option, Huawei, Sierra) +#device uark # Technologies ARK3116 based serial adapters +#device ubsa # Belkin F5U103 and compatible serial adapters +#device uftdi # For FTDI usb serial adapters +#device uipaq # Some WinCE based devices +#device uplcom # Prolific PL-2303 serial adapters +#device uslcom # SI Labs CP2101/CP2102 serial adapters +#device uvisor # Visor and Palm devices +#device uvscom # USB serial support for DDI pocket's PHS +# USB Ethernet, requires miibus +#device aue # ADMtek USB Ethernet +#device axe # ASIX Electronics USB Ethernet +#device cdce # Generic USB over Ethernet +#device cue # CATC USB Ethernet +#device kue # Kawasaki LSI USB Ethernet +#device rue # RealTek RTL8150 USB Ethernet +#device udav # Davicom DM9601E USB +# USB Wireless +#device rum # Ralink Technology RT2501USB wireless NICs +#device run # Ralink Technology RT2700/RT2800/RT3000 NICs. +#device uath # Atheros AR5523 wireless NICs +#device upgt # Conexant/Intersil PrismGT wireless NICs. +#device ural # Ralink Technology RT2500USB wireless NICs +#device urtw # Realtek RTL8187B/L wireless NICs +#device zyd # ZyDAS zd1211/zd1211b wireless NICs + +# Sound support +#device sound # Generic sound driver (required) +#device snd_cmi # CMedia CMI8338/CMI8738 +#device snd_csa # Crystal Semiconductor CS461x/428x +#device snd_emu10kx # Creative SoundBlaster Live! and Audigy +#device snd_es137x # Ensoniq AudioPCI ES137x +#device snd_hda # Intel High Definition Audio +#device snd_ich # Intel, NVidia and other ICH AC'97 Audio +#device snd_uaudio # USB Audio +#device snd_via8233 # VIA VT8233x Audio + +# VirtIO support +device virtio # Generic VirtIO bus (required) +device virtio_pci # VirtIO PCI Interface +device vtnet # VirtIO Ethernet device +device virtio_blk # VirtIO Block device +device virtio_scsi # VirtIO SCSI device +device virtio_balloon # VirtIO Memory Balloon device Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/PICOBSD.hints ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/PICOBSD.hints Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,33 @@ +# $FreeBSD: stable/9/sys/amd64/conf/GENERIC.hints 235926 2012-05-24 19:24:31Z bz $ +hint.fdc.0.at="isa" +hint.fdc.0.port="0x3F0" +hint.fdc.0.irq="6" +hint.fdc.0.drq="2" +hint.fd.0.at="fdc0" +hint.fd.0.drive="0" +hint.fd.1.at="fdc0" +hint.fd.1.drive="1" +hint.atkbdc.0.at="isa" +hint.atkbdc.0.port="0x060" +hint.atkbd.0.at="atkbdc" +hint.atkbd.0.irq="1" +hint.psm.0.at="atkbdc" +hint.psm.0.irq="12" +hint.sc.0.at="isa" +hint.sc.0.flags="0x100" +hint.uart.0.at="isa" +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x30" +hint.uart.0.irq="4" +hint.uart.1.at="isa" +hint.uart.1.port="0x2F8" +hint.uart.1.irq="3" +hint.ppc.0.at="isa" +hint.ppc.0.irq="7" +hint.atrtc.0.at="isa" +hint.atrtc.0.port="0x70" +hint.atrtc.0.irq="8" +hint.attimer.0.at="isa" +hint.attimer.0.port="0x40" +hint.attimer.0.irq="0" +hint.wbwd.0.at="isa" Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/config Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,58 @@ +# configuration for picobsd build script. +# $FreeBSD: stable/9/release/picobsd/qemu/config 201076 2009-12-28 01:25:05Z luigi $ +# it should only contain variable definitions -- it is sourced +# by the shell much like rc.conf* files + +fd_size="12240" + +# To copy individual files you can use the function do_copyfiles_user +# as below (find_progs locates the programs and their libraries, +# then you manually copy them. +#copy_files=" +#" +do_copyfiles_user() { + local dst=$1 # the destination root + log "--- put the libraries in /usr/lib to avoid conflicts" + mkdir -p ${dst}/usr/lib + # log "-- import dropbear from its build directory --" + # find_progs -L / -P /usr/ports/security/dropbear/work/dropbear-2012.55 \ + # dbclient dropbear + # cp -p ${u_progs} ${dst}/bin + # cp -p ${u_libs} ${dst}/usr/lib + log "--- also import ssh, scp and sshd ---" + find_progs -L / /usr/bin/ssh /usr/bin/scp /usr/sbin/sshd + cp -p ${u_progs} ${dst}/bin + cp -p ${u_libs} ${dst}/usr/lib + + #find_progs -L / -P /usr/local/bin trafshow netperf netserver iperf3 + #cp -p ${u_progs} ${dst}/bin + #cp -p ${u_libs} ${dst}/usr/lib + + #find_progs -L / -P /usr/bin egrep + #cp -p ${u_progs} ${dst}/bin + #cp -p ${u_libs} ${dst}/usr/lib + + find_progs -L / -P /home/stefano/repos/passthrough/netmap/examples pkt-gen pkt-gen-b bridge vale-ctl + cp -p ${u_progs} ${dst}/bin + cp -p ${u_libs} ${dst}/usr/lib + + #find_progs -L / -P /usr/local/bin ttcp + #cp -p ${u_progs} ${dst}/bin + #cp -p ${u_libs} ${dst}/usr/lib + + #find_progs -L / -P /home/stefano/apps netsend + #cp -p ${u_progs} ${dst}/bin + #cp -p ${u_libs} ${dst}/usr/lib + + if [ ${TARGET_ARCH} = amd64 ]; then + cp -p /usr/lib/libssh.so.5 /lib/libmd.so.5 ${dst}/usr/lib + cp -p /usr/local/lib/libiperf.so.0 ${dst}/usr/local/lib + else + fi + + #STE - modules - before create picobsd image with --modules parameter + #mkdir -p ${dst}/root/modules + #cp ${BUILDDIR}/PICOBSD-${name}/modules/${SRC}/sys/modules/cc/*/*.ko ${dst}/root/modules/ + #cp ${BUILDDIR}/PICOBSD-${name}/modules/${SRC}/sys/modules/ixgbe/*.ko ${dst}/root/modules/ +} + Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/crunch.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/crunch.conf Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,227 @@ +# +# $FreeBSD: stable/9/release/picobsd/qemu/crunch.conf 210125 2010-07-15 16:32:59Z luigi $ +# +# Configuration file for "qemu" images.. +# +# Depending on your needs, you will almost surely need to +# add/remove/change programs according to your needs. +# Remember that some programs require matching kernel options to +# enable device drivers etc. +# +# To figure out how much space is used by each program, do +# +# size build_dir-bridge/crunch/*lo +# +# Remember that programs require libraries, which add up to the +# total size. The final binary is build_dir-bridge/mfs.tree/stand/crunch +# and you can check which libraries it uses with +# +# ldd build_dir-bridge/mfs.tree/stand/crunch + +# crunchgen configuration to build the crunched binary, see "man crunchgen" +# We need to specify generic build options, the places where to look +# for sources, and the list of program and libraries we want to put +# in the crunched binary. +# +# NOTE: the string "/usr/src" below will be automatically replaced with +# the path set in the 'build' script. + +# Default build options. Basically tell the Makefiles +# that to use the most compact possible version of the code. + +buildopts -DWITHOUT_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH +buildopts -DTRACEROUTE_NO_IPSEC #-DNO_INET6 +buildopts -DWITHOUT_IPX +buildopts -DWITHOUT_INET6 +buildopts -DWITHOUT_CASPER +#buildopts -DWITH_INET6 -DWITH_INET6_SUPPORT + +# Directories where to look for sources of various binaries. +# @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) +# which is replaced with the directory with the picobsd configuration +# corresponding to your image. This way you can have custom sources +# in that directory overriding system programs. + +srcdirs @__CWD__@/src + +# Some programs are especially written for PicoBSD and reside in +# release/picobsd/tinyware. +# Put this entry near the head of the list to override standard binaries. + +srcdirs /usr/src/release/picobsd/tinyware + +# Other standard locations for sources. +# If a program uses its own source directory, add + +srcdirs /usr/src/bin +#srcdirs /usr/src/sbin/amd64 +srcdirs /usr/src/sbin +srcdirs /usr/src/usr.bin +srcdirs /usr/src/gnu/usr.bin +srcdirs /usr/src/usr.sbin +srcdirs /usr/src/libexec +srcdirs /usr/src/contrib + +# For programs that reside in different places, the best option +# is to use the command "special XXX srcdir YYY" where XXX is the +# program name and YYY is the directory path. +# "special XXX ..." can be used to specify more options, see again +# the crunchgen manpage. + +#--- Basic configuraton +# init is always necessary (unless you have a replacement, oinit) +progs init + +# fsck is almost always necessary, unless you have everything on the +# image and use 'tar' or something similar to read/write raw blocks +# from the floppy. + +progs fsck + +# ifconfig is needed if you want to configure interfaces. +progs ifconfig + +# You will also need a shell and a bunch of utilities. +# The standard shell is not that large, but you need many +# external programs. In fact most of them do not take much space +# as they merely issue a system call, and print the result. +# For a more compact version of shell and utilities, you could +# try busybox, however most system management commands in busybox +# will not work as they use linux-specific interfaces. + +progs sh +ln sh -sh + +# the small utilities +progs echo +progs pwd mkdir rmdir +progs chmod chown +ln chown chgrp +progs mv ln cp rm ls +progs cat tail tee cut head +progs test +ln test [ + +progs less +ln less more +progs mount +progs minigzip +ln minigzip gzip +progs kill +progs killall +progs grep awk xargs +ln grep egrep +#progs xo +progs df +libs_so -lxo +progs ps +progs ns # this is the picobsd version +#ln ns netstat +#progs netstat #ste +progs vm +progs hostname +progs login +progs getty +progs stty +progs w +progs msg +ln msg dmesg +progs reboot +progs halt + +progs sysctl +progs swapon +progs pwd_mkdb +progs umount +progs du +progs passwd + +progs route + +# If you want to run natd, remember the alias library +# progs natd +# libs_so -lalias # natd +#progs tcpdump +#special tcpdump srcdir /usr/src/usr.sbin/tcpdump/tcpdump +#libs_so -lpcap # used by tcpdump +#libs_so -lcrypto # used by tcpdump with inet6 + +# ppp is rather large. Note that as of Jan.01, RELEASE_CRUNCH +# makes ppp not use libalias, so you cannot have aliasing. +#progs ppp + +# You need an editor. ee is relatively small, though there are +# smaller ones. vi is much larger. +# The editor also usually need a curses library. +progs ee + +progs arp + +# these require libgeom +# progs bsdlabel fdisk mdconfig + +progs kldload kldunload kldstat +# progs kldxref +progs bsdgrep +libs_so -lgnuregex -lbz2 +# dhclient-script requires 'sed' +progs dhclient +progs sed +progs date +progs time +progs ping +progs ping6 +progs tar + +progs top + +#progs routed +progs ipfw +progs traceroute +progs mdmfs +ln mdmfs mount_mfs +# Various filesystem support -- remember to enable the kernel parts +# progs mount_msdosfs +#progs mount_nfs +# progs mount_cd9660 +#ln mount_nfs nfs +#ln mount_cd9660 cd9660 +#progs newfs +#ln newfs mount_mfs +# ln mount_msdosfs msdos + +# For a small ssh client/server use dropbear +# progs jail jexec jls # why not... + +progs nc + +progs vmstat +progs limits +progs uname + +progs sleep + +progs ddb + +# Now the libraries +libs_so -lc # the C library +libs_so -ll # used by sh (really ?) +libs_so -lufs # used by mount +### ee uses ncurses but as a dependency +libs_so -lncurses +libs_so -lm +libs_so -ledit -lutil +libs_so -lcrypt +libs_so -lkvm +libs_so -lz +libs_so -lbsdxml +libs_so -lsbuf +libs_so -ljail # used by ifconfig +libs_so -lipsec -lmd # used with ipv6 +libs_so -larchive -lbz2 +libs_so -llzma # added after 207840 +libs_so -lulog +libs_so -ldevstat # used by vmstat +libs_so -lmemstat # used by vmstat +libs_so -lnetgraph # used by netstat +libs_so -lpam Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree.exclude ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree.exclude Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,2 @@ +etc/snmpd.conf +etc/ppp Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/boot/loader.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/boot/loader.conf Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,5 @@ +hw.ix.num_queues="1" +boot_multicons="YES" +boot_serial="YES" +comconsole_speed="115200" +console="comconsole,vidconsole" Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/OLD_rc.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/OLD_rc.conf Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,23 @@ +# Sample rc.conf file for PicoBSD +# you should mostly set variables here, see rc.conf.defaults. + +case ${hostname} in +host1) + ifconfig_em0="inet 10.0.0.1 netmask 255.255.255.0" + ifconfig_re0="inet 10.0.0.1 netmask 255.255.255.0" +;; + +host2) + ifconfig_em0="inet 10.0.0.2 netmask 255.255.255.0" + ifconfig_re0="inet 10.0.0.2 netmask 255.255.255.0" +;; + +host3) + ifconfig_em0="inet 10.0.0.3 netmask 255.255.255.0" + ifconfig_re0="inet 10.0.0.3 netmask 255.255.255.0" +;; + +*) + echo "processing rc.conf for ${hostname}" + ;; +esac Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/rc.conf.defaults ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/rc.conf.defaults Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,188 @@ +#!/bin/sh +# $FreeBSD$ +# +# rc.conf for picobsd. This is sourced from /etc/rc1, and is supposed to +# contain only shell functions that are used later in /etc/rc1. + +# set default values for variables. Boolean values should be either +# NO or YES -- other values are not guaranteed to work. + +rc_conf_set_defaults() { +hostname="" # Should not need to set it +syslogd_enable="NO" +pccard_enable="NO" +swapfile="" # name of swapfile if aux swapfile desired. + +# Network interface configurations: ifconfig_${interface}[_aliasNN] +ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. +#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. + +### Network daemons options: they are only run if present. +sshd_enable="YES" # if present... +inetd_enable="YES" # Run the network daemon dispatcher (or NO) +inetd_flags="" # Optional flags to inetd +snmpd_enable="NO" # Run the SNMP daemon (or NO) +snmpd_flags="-C -c /etc/snmpd.conf" # Optional flags to snmpd + +### Network routing options: ### +defaultrouter="NO" # Set to default gateway (or NO). +static_routes="" # Set to static route list (or leave empty). +gateway_enable="NO" # Set to YES if this host will be a gateway. +arpproxy_all="" # replaces obsolete kernel option ARP_PROXYALL. +default_mask="0xffffff00" + +### Other network features +firewall_enable="NO" +firewall_quiet="NO" # be quiet if set. +firewall_type="" # Standard types or absolute pathname. +tcp_extensions="NO" # Allow RFC1323 & RFC1644 extensions (or NO). + +### Overrides for some files in /etc. Leave empty if no override, +### set variable (remember to use multiple lines) to override content. + +host_conf="hosts +bind" +resolv_conf="" +} + +# Try to identify the system by using the MAC address and name of the +# first ethernet interface, made available as $main_eth $main_if +find_system_id() { + main_ether="" + for main_if in `ifconfig -l` ; do + set `ifconfig $main_if` + while [ "$1" != "" ] ; do + if [ $1 = "ether" ] ; then + main_ether=$2 + break 2 + else + shift + fi + done + done +} + +# the following lets the user specify a name and ip for his system +read_address() { +## XXX disabled + hostname=default + return # + + echo "Please enter a hostname and IP address for your system $main_ether" + read hostname the_ip + if [ "${hostname}" != "" ] ; then + echo "# $main_ether $hostname" >> /etc/hosts + echo "$the_ip $hostname" >> /etc/hosts + else + hostname=default + fi +} + +# set "ether" using $1 (interface name) as search key +get_ether() { + local key + key=$1 + ether="" + set `ifconfig ${key}` + while [ "$1" != "" ] ; do + if [ "$1" = "ether" ] ; then + ether=$2 + break + else + shift + fi + done +} + +# read content from /etc/hosts into a couple of arrays +# (needed later in fetch_hostname) +read_hosts() { + local i a b c key junk + i="" + while read a b c junk ; do + if [ "$a" = "#ethertable" ] ; then + i=0 + elif [ "$i" != "" -a "$a" = "#" -a "$b" != "" ] ; then + eval eth_${i}=$b + eval eth_host_${i}=$c + i=$(($i+1)) + fi + done < /etc/hosts +} + +# set ${hostname} using $1 (MAC address) as search key in /etc/hosts +# Returns empty value if $1 is empty +fetch_hostname() { + local i b key + hostname="" + [ "$1" = "" ] && return + key=$1 + i=0 + b="x" + [ "${eth_0}" = "" ] && read_hosts # fill cache. + while [ "$b" != "" -a "${hostname}" = "" ] ; do + eval b=\${eth_${i}} + case X${key} in + X${b} ) # so we can use wildcards + eval hostname=\${eth_host_${i}} + break + ;; + esac + i=$(($i+1)) + done + echo "fetch_hostname for <${key}> returns <${hostname}>" +} + +# sets "mask" using $1 (netmask name) as the search key in /etc/networks +fetch_mask() { + local a b key junk + key=$1 # search key, typically hostname-netmask + mask="" + while read a b junk; do # key mask otherstuff + case X${key} in + X${a} ) # The X is so we can use wildcards in ${a} + mask=$b + break + ;; + esac + done < /etc/networks + if [ "${mask}" = "" ] ; then + mask=${default_mask} + fi + echo "fetch_mask for <${key}> returns <${mask}>" +} + +# set hostname, and ifconfig_${main_if} (whose MAC is ${main_ether}) +# if not found, read from console +set_main_interface() { + if [ -z "${hostname}" ] ; then + if [ -z "${main_ether}" ] ; then + echo "No ethernets found, using localhost" + hostname=localhost + return + fi + fetch_hostname ${main_ether} + fi + + [ -z "${hostname}" -o "${hostname}" = "." ] && read_address + + fetch_mask ${hostname}-netmask + + eval ifconfig_${main_if}=\" \${hostname} netmask \${mask}\" + network_interfaces=`ifconfig -l` +} + +# set ifconfig_${interface} for all other interfaces +set_all_interfaces() { + local i ether hostname mask + + for i in `ifconfig -l` ; do + if [ "$i" != "${main_if}" ] ; then + get_ether $i + fetch_hostname ${ether} + fetch_mask ${hostname}-netmask + [ -n "${ether}" -a -n "${hostname}" ] && \ + eval ifconfig_${i}=\" \${hostname} netmask \${mask}\" + fi + done +} Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/ttys ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/etc/ttys Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,36 @@ +# +# @(#)ttys 5.1 (Berkeley) 4/17/89 +# +# $FreeBSD$ +# +# name getty type status comments +# +# This entry needed for asking password when init goes to single-user mode +# If you want to be asked for password, change "secure" to "insecure" here +#console none unknown off secure +vga none xterm off secure +# +ttyu0 "/usr/libexec/getty std.9600" xterm on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure +# Virtual terminals +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure +#ttyv8 "/usr/libexec/getty Pc" xterm on secure +#ttyv9 "/usr/libexec/getty Pc" xterm on secure +# Pseudo terminals +ttyp0 none network secure +ttyp1 none network secure +ttyp2 none network secure +ttyp3 none network secure +ttyp4 none network secure +ttyp5 none network secure +ttyp6 none network secure +ttyp7 none network secure +ttyp8 none network secure +ttyp9 none network secure + Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/change_mtu.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/change_mtu.sh Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,15 @@ +#!/bin/sh + +# usage change_mtu.sh new_MTU_value + +ip_old=$(ifconfig em0 | grep inet) +mtu_old=$(ifconfig em0 | grep mtu | cut -f 6 -d ' ') + +ifconfig em0 mtu $1 +ifconfig em0 delete +ifconfig em0 $ip_old + +mtu_new=$(ifconfig em0 | grep mtu | cut -f 6 -d ' ') + +echo "em0 mtu: $mtu_old -> $mtu_new" + Added: soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/initialize.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/stefano/ptnetmap/head/release/picobsd/netmap/floppy.tree/root/initialize.sh Tue Jun 23 18:45:26 2015 (r287496) @@ -0,0 +1,88 @@ +#!/bin/sh + +#set -x + +usage() +{ + echo -e "\nUSAGE: initialize [options]" + echo -e "\nOptions:" + echo -e " -h\t\t\tHelp" + echo -e " -csb\t\tEnable(def)/Disable CSB (dev.em.0.csb_on=[0,1])" + echo -e " -itr\t\tvalue\tSet the interrupt delay limit [usec]" + echo -e " -dack\t\tEnable(def)/Disable delayed ack (net.inet.tcp.delayed_ack=1)" + echo -e " -mtu\t\tvalue\tSet the mtu value" + echo -e " -msb\t\tvalue\tSet the maxsockbuf value (kern.ipc.maxsockbuf)" + echo -e " -maxfrags\t\tvalue\tSet the maxfragsperpacket value (net.inet.ip.maxfragsperpacket)" +} + + +CSB=1 +ITR=488 +DACK=1 + +MTU=1500 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 18:54:10 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3463CCC for ; Tue, 23 Jun 2015 18:54:10 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E6EA2DA for ; Tue, 23 Jun 2015 18:54:10 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NIsAfW007986 for ; Tue, 23 Jun 2015 18:54:10 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NIs8RV007935 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 18:54:08 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 18:54:08 GMT Message-Id: <201506231854.t5NIs8RV007935@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287497 - soc2015/stefano/ptnetmap/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 18:54:10 -0000 Author: stefano Date: Tue Jun 23 18:54:07 2015 New Revision: 287497 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287497 Log: [ptnetmap] preliminary version of ptnetmap - add netmap_virt.h (ex paravirt.h) contains: - CSB definition (shared memory between host/guest) - ptnetmap functions declaration (host/guest) - ptnetmap-memdev ID, register and routines - add ptnetmap.c contains ptnetmap implementation - OS independent (FreeBSD/linux) Added: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_virt.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/ptnetmap.c Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_freebsd.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_mem2.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_mem2.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_monitor.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_pipe.c soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_vale.c Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h Tue Jun 23 18:45:26 2015 (r287496) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_lem_netmap.h Tue Jun 23 18:54:07 2015 (r287497) @@ -38,6 +38,7 @@ #include #include /* vtophys ? */ #include +#include extern int netmap_adaptive_io; @@ -472,6 +473,256 @@ return netmap_ring_reinit(kring); } +#if defined (NIC_PTNETMAP) && defined (WITH_PTNETMAP_GUEST) +static uint32_t lem_netmap_ptctl(struct ifnet *, uint32_t); + +static int +lem_ptnetmap_config(struct netmap_adapter *na, + u_int *txr, u_int *txd, u_int *rxr, u_int *rxd) +{ + struct ifnet *ifp = na->ifp; + struct adapter *adapter = ifp->if_softc; + struct paravirt_csb *csb = adapter->csb; + int ret; + + if (csb == NULL) + return EINVAL; + + ret = lem_netmap_ptctl(ifp, NET_PARAVIRT_PTCTL_CONFIG); + if (ret) + return ret; + + *txr = 1; //*txr = csb->num_tx_rings; + *rxr = 1; //*rxr = csb->num_rx_rings; + *txd = csb->num_tx_slots; + *rxd = csb->num_rx_slots; + + D("txr %u rxr %u txd %u rxd %u", + *txr, *rxr, *txd, *rxd); + + return 0; +} + +static int +lem_ptnetmap_txsync(struct netmap_kring *kring, int flags) +{ + struct netmap_adapter *na = kring->na; + //u_int ring_nr = kring->ring_id; + struct ifnet *ifp = na->ifp; + struct adapter *adapter = ifp->if_softc; + struct paravirt_csb *csb = adapter->csb; + bool send_kick = false; + + /* Disable notifications */ + csb->guest_need_txkick = 0; + + /* + * First part: process new packets to send. + */ + kring->nr_hwcur = csb->tx_ring.hwcur; + ptnetmap_guest_write_kring_csb(&csb->tx_ring, kring->rcur, kring->rhead); + if (kring->rhead != kring->nr_hwcur) { + send_kick = true; + } + + /* Send kick to the host if it needs them */ + if ((send_kick && ACCESS_ONCE(csb->host_need_txkick)) || (flags & NAF_FORCE_RECLAIM)) { + csb->tx_ring.sync_flags = flags; + E1000_WRITE_REG(&adapter->hw, E1000_TDT(0), 0); + } + + /* + * Second part: reclaim buffers for completed transmissions. + */ + if (flags & NAF_FORCE_RECLAIM || nm_kr_txempty(kring)) { + ptnetmap_guest_read_kring_csb(&csb->tx_ring, &kring->nr_hwcur, &kring->nr_hwtail, kring->nkr_num_slots); + } + + /* + * Ring full. The user thread will go to sleep and + * we need a notification (interrupt) from the NIC, + * whene there is free space. + */ + if (kring->rcur == kring->nr_hwtail) { + /* Reenable notifications. */ + csb->guest_need_txkick = 1; + /* Double check */ + ptnetmap_guest_read_kring_csb(&csb->tx_ring, &kring->nr_hwcur, &kring->nr_hwtail, kring->nkr_num_slots); + /* If there is new free space, disable notifications */ + if (kring->rcur != kring->nr_hwtail) { + csb->guest_need_txkick = 0; + } + } + + ND("TX - CSB: head:%u cur:%u hwtail:%u - KRING: head:%u cur:%u", + csb->tx_ring.head, csb->tx_ring.cur, csb->tx_ring.hwtail, kring->rhead, kring->rcur); + + return 0; +} + +static int +lem_ptnetmap_rxsync(struct netmap_kring *kring, int flags) +{ + struct netmap_adapter *na = kring->na; + //u_int ring_nr = kring->ring_id; + struct ifnet *ifp = na->ifp; + struct adapter *adapter = ifp->if_softc; + struct paravirt_csb *csb = adapter->csb; + + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; + uint32_t h_hwcur = kring->nr_hwcur, h_hwtail = kring->nr_hwtail; + + /* Disable notifications */ + csb->guest_need_rxkick = 0; + + ptnetmap_guest_read_kring_csb(&csb->rx_ring, &h_hwcur, &h_hwtail, kring->nkr_num_slots); + + /* + * First part: import newly received packets. + */ + if (netmap_no_pendintr || force_update) { + kring->nr_hwtail = h_hwtail; + kring->nr_kflags &= ~NKR_PENDINTR; + } + + /* + * Second part: skip past packets that userspace has released. + */ + kring->nr_hwcur = h_hwcur; + if (kring->rhead != kring->nr_hwcur) { + ptnetmap_guest_write_kring_csb(&csb->rx_ring, kring->rcur, kring->rhead); + /* Send kick to the host if it needs them */ + if (ACCESS_ONCE(csb->host_need_rxkick)) { + csb->rx_ring.sync_flags = flags; + E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), 0); + } + } + + /* + * Ring empty. The user thread will go to sleep and + * we need a notification (interrupt) from the NIC, + * whene there are new packets. + */ + if (kring->rcur == kring->nr_hwtail) { + /* Reenable notifications. */ + csb->guest_need_rxkick = 1; + /* Double check */ + ptnetmap_guest_read_kring_csb(&csb->rx_ring, &kring->nr_hwcur, &kring->nr_hwtail, kring->nkr_num_slots); + /* If there are new packets, disable notifications */ + if (kring->rcur != kring->nr_hwtail) { + csb->guest_need_rxkick = 0; + } + } + + ND("RX - CSB: head:%u cur:%u hwtail:%u - KRING: head:%u cur:%u", + csb->rx_ring.head, csb->rx_ring.cur, csb->rx_ring.hwtail, kring->rhead, kring->rcur); + + return 0; + + +} + +static int +lem_ptnetmap_reg(struct netmap_adapter *na, int onoff) +{ + struct ifnet *ifp = na->ifp; + struct adapter *adapter = ifp->if_softc; + struct paravirt_csb *csb = adapter->csb; + struct netmap_kring *kring; + int ret; + + if (onoff) { + ret = lem_netmap_ptctl(ifp, NET_PARAVIRT_PTCTL_REGIF); + if (ret) + return ret; + + na->na_flags |= NAF_NETMAP_ON; + adapter->ptnetmap_enabled = 1; + /* + * Init ring and kring pointers + * After PARAVIRT_PTCTL_REGIF, the csb contains a snapshot of a + * host kring pointers. + * XXX This initialization is required, because we don't close the + * host port on UNREGIF. + */ + + // Init rx ring + kring = na->rx_rings; + kring->rhead = kring->ring->head = csb->rx_ring.head; + kring->rcur = kring->ring->cur = csb->rx_ring.cur; + kring->nr_hwcur = csb->rx_ring.hwcur; + kring->nr_hwtail = kring->rtail = kring->ring->tail = csb->rx_ring.hwtail; + + // Init tx ring + kring = na->tx_rings; + kring->rhead = kring->ring->head = csb->tx_ring.head; + kring->rcur = kring->ring->cur = csb->tx_ring.cur; + kring->nr_hwcur = csb->tx_ring.hwcur; + kring->nr_hwtail = kring->rtail = kring->ring->tail = csb->tx_ring.hwtail; + } else { + na->na_flags &= ~NAF_NETMAP_ON; + adapter->ptnetmap_enabled = 0; + ret = lem_netmap_ptctl(ifp, NET_PARAVIRT_PTCTL_UNREGIF); + } + + return lem_netmap_reg(na, onoff); +} + + +static int +lem_ptnetmap_bdg_attach(const char *bdg_name, struct netmap_adapter *na) +{ + return EOPNOTSUPP; +} + +static struct paravirt_csb * +lem_netmap_getcsb(struct ifnet *ifp) +{ + struct adapter *adapter = ifp->if_softc; + + return adapter->csb; +} + +static uint32_t +lem_netmap_ptctl(struct ifnet *ifp, uint32_t val) +{ + struct adapter *adapter = ifp->if_softc; + uint32_t ret; + + E1000_WRITE_REG(&adapter->hw, E1000_PTCTL, val); + ret = E1000_READ_REG(&adapter->hw, E1000_PTSTS); + D("PTSTS = %u", ret); + + return ret; +} + + + +static uint32_t +lem_ptnetmap_features(struct adapter *adapter) +{ + uint32_t features; + /* tell the device the features we support */ + E1000_WRITE_REG(&adapter->hw, E1000_PTFEAT, NET_PTN_FEATURES_BASE); + /* get back the acknowledged features */ + features = E1000_READ_REG(&adapter->hw, E1000_PTFEAT); + device_printf(adapter->dev, "netmap passthrough: %s\n", + (features & NET_PTN_FEATURES_BASE) ? "base" : + "none"); + return features; +} + +static struct netmap_pt_guest_ops lem_ptnetmap_ops = { + .nm_getcsb = lem_netmap_getcsb, + .nm_ptctl = lem_netmap_ptctl, +}; +#elif defined (NIC_PTNETMAP) +#warning "if_lem supports ptnetmap but netmap does not support it" +#warning "(configure netmap with passthrough support)" +#elif defined (WITH_PTNETMAP_GUEST) +#warning "netmap supports ptnetmap but e1000 does not support it" +#warning "(configure if_lem with passthrough support)" +#endif /* NIC_PTNETMAP && WITH_PTNETMAP_GUEST */ static void lem_netmap_attach(struct adapter *adapter) @@ -488,7 +739,19 @@ na.nm_rxsync = lem_netmap_rxsync; na.nm_register = lem_netmap_reg; na.num_tx_rings = na.num_rx_rings = 1; - netmap_attach(&na); +#if defined (NIC_PTNETMAP) && defined (WITH_PTNETMAP_GUEST) + /* XXX: check if the device support ptnetmap (now we use PARA_SUBDEV) */ + if ((adapter->hw.subsystem_device_id == E1000_PARA_SUBDEV) && + (lem_ptnetmap_features(adapter) & NET_PTN_FEATURES_BASE)) { + na.nm_config = lem_ptnetmap_config; + na.nm_register = lem_ptnetmap_reg; + na.nm_txsync = lem_ptnetmap_txsync; + na.nm_rxsync = lem_ptnetmap_rxsync; + na.nm_bdg_attach = lem_ptnetmap_bdg_attach; /* XXX */ + netmap_pt_guest_attach(&na, &lem_ptnetmap_ops); + } else +#endif /* NIC_PTNETMAP && defined WITH_PTNETMAP_GUEST */ + netmap_attach(&na); } /* end of file */ Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c Tue Jun 23 18:45:26 2015 (r287496) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap.c Tue Jun 23 18:54:07 2015 (r287497) @@ -1381,6 +1381,11 @@ * !0 !NULL impossible */ + /* try to see if this is a passthrough port */ + error = netmap_get_pt_host_na(nmr, na, create); + if (error || *na != NULL) + return error; + /* try to see if this is a monitor port */ error = netmap_get_monitor_na(nmr, na, create); if (error || *na != NULL) @@ -1442,17 +1447,14 @@ * hwcur, rhead, rtail and hwtail are reliable */ u_int -nm_txsync_prologue(struct netmap_kring *kring) +nm_txsync_prologue(struct netmap_kring *kring, uint32_t head, uint32_t cur, uint32_t *tail) { - struct netmap_ring *ring = kring->ring; - u_int head = ring->head; /* read only once */ - u_int cur = ring->cur; /* read only once */ u_int n = kring->nkr_num_slots; ND(5, "%s kcur %d ktail %d head %d cur %d tail %d", kring->name, kring->nr_hwcur, kring->nr_hwtail, - ring->head, ring->cur, ring->tail); + head, cur, tail ? *tail : 0); #if 1 /* kernel sanity checks; but we can trust the kring. */ if (kring->nr_hwcur >= n || kring->rhead >= n || kring->rtail >= n || kring->nr_hwtail >= n) @@ -1490,10 +1492,10 @@ goto error; } } - if (ring->tail != kring->rtail) { + if (tail && *tail != kring->rtail) { RD(5, "tail overwritten was %d need %d", - ring->tail, kring->rtail); - ring->tail = kring->rtail; + *tail, kring->rtail); + *tail = kring->rtail; } kring->rhead = head; kring->rcur = cur; @@ -1504,7 +1506,7 @@ kring->name, kring->nr_hwcur, kring->rcur, kring->nr_hwtail, - cur, ring->tail); + cur, tail ? *tail : 0); return n; } @@ -1521,16 +1523,14 @@ * */ u_int -nm_rxsync_prologue(struct netmap_kring *kring) +nm_rxsync_prologue(struct netmap_kring *kring, uint32_t head, uint32_t cur, uint32_t *tail) { - struct netmap_ring *ring = kring->ring; uint32_t const n = kring->nkr_num_slots; - uint32_t head, cur; ND(5,"%s kc %d kt %d h %d c %d t %d", kring->name, kring->nr_hwcur, kring->nr_hwtail, - ring->head, ring->cur, ring->tail); + head, cur, tail ? *tail : 0); /* * Before storing the new values, we should check they do not * move backwards. However: @@ -1538,8 +1538,8 @@ * - cur could in principle go back, however it does not matter * because we are processing a brand new rxsync() */ - cur = kring->rcur = ring->cur; /* read only once */ - head = kring->rhead = ring->head; /* read only once */ + kring->rcur = cur; /* read only once */ + kring->rhead = head; /* read only once */ #if 1 /* kernel sanity checks */ if (kring->nr_hwcur >= n || kring->nr_hwtail >= n) goto error; @@ -1567,11 +1567,11 @@ goto error; } } - if (ring->tail != kring->rtail) { + if (tail && *tail != kring->rtail) { RD(5, "%s tail overwritten was %d need %d", kring->name, - ring->tail, kring->rtail); - ring->tail = kring->rtail; + *tail, kring->rtail); + *tail = kring->rtail; } return head; @@ -1579,7 +1579,7 @@ RD(5, "kring error: hwcur %d rcur %d hwtail %d head %d cur %d tail %d", kring->nr_hwcur, kring->rcur, kring->nr_hwtail, - kring->rhead, kring->rcur, ring->tail); + kring->rhead, kring->rcur, tail ? *tail : 0); return n; } @@ -1619,7 +1619,7 @@ for (i = 0; i <= lim; i++) { u_int idx = ring->slot[i].buf_idx; u_int len = ring->slot[i].len; - if (idx < 2 || idx >= kring->na->na_lut_objtotal) { + if (idx < 2 || idx >= kring->na->na_lut.objtotal) { RD(5, "bad index at slot %d idx %d len %d ", i, idx, len); ring->slot[i].buf_idx = 0; ring->slot[i].len = 0; @@ -1981,10 +1981,11 @@ * and make it use the shared buffers. */ /* cache the allocator info in the na */ - na->na_lut = netmap_mem_get_lut(na->nm_mem); - ND("%p->na_lut == %p", na, na->na_lut); - na->na_lut_objtotal = netmap_mem_get_buftotal(na->nm_mem); - na->na_lut_objsize = netmap_mem_get_bufsize(na->nm_mem); + error = netmap_mem_get_lut(na->nm_mem, &na->na_lut); + if (error) + goto err_del_if; + D("lut %p bufs %u size %u", na->na_lut.lut, na->na_lut.objtotal, + na->na_lut.objsize); error = na->nm_register(na, 1); /* mode on */ if (error) goto err_del_if; @@ -2001,9 +2002,7 @@ return 0; err_del_if: - na->na_lut = NULL; - na->na_lut_objtotal = 0; - na->na_lut_objsize = 0; + memset(&na->na_lut, 0, sizeof(na->na_lut)); na->active_fds--; netmap_mem_if_delete(na, nifp); err_rel_excl: @@ -2123,6 +2122,9 @@ || i == NETMAP_BDG_DELIF) { error = netmap_bdg_ctl(nmr, NULL); break; + } else if (i == NETMAP_PT_HOST_CREATE || i == NETMAP_PT_HOST_DELETE) { + error = ptnetmap_ctl(nmr, priv->np_na); + break; } else if (i != 0) { D("nr_cmd must be 0 not %d", i); error = EINVAL; @@ -2216,6 +2218,7 @@ for (i = qfirst; i < qlast; i++) { struct netmap_kring *kring = krings + i; + struct netmap_ring *ring = kring->ring; if (nm_kr_tryget(kring)) { error = EBUSY; goto out; @@ -2223,24 +2226,26 @@ if (cmd == NIOCTXSYNC) { if (netmap_verbose & NM_VERB_TXSYNC) D("pre txsync ring %d cur %d hwcur %d", - i, kring->ring->cur, + i, ring->cur, kring->nr_hwcur); - if (nm_txsync_prologue(kring) >= kring->nkr_num_slots) { + if (nm_txsync_prologue(kring, ring->head, ring->cur, + &ring->tail) >= kring->nkr_num_slots) { netmap_ring_reinit(kring); } else if (kring->nm_sync(kring, NAF_FORCE_RECLAIM) == 0) { nm_txsync_finalize(kring); } if (netmap_verbose & NM_VERB_TXSYNC) D("post txsync ring %d cur %d hwcur %d", - i, kring->ring->cur, + i, ring->cur, kring->nr_hwcur); } else { - if (nm_rxsync_prologue(kring) >= kring->nkr_num_slots) { + if (nm_rxsync_prologue(kring, ring->head, ring->cur, + &ring->tail) >= kring->nkr_num_slots) { netmap_ring_reinit(kring); } else if (kring->nm_sync(kring, NAF_FORCE_READ) == 0) { nm_rxsync_finalize(kring); } - microtime(&na->rx_rings[i].ring->ts); + microtime(&ring->ts); } nm_kr_put(kring); } @@ -2314,6 +2319,7 @@ struct netmap_priv_d *priv = NULL; struct netmap_adapter *na; struct netmap_kring *kring; + struct netmap_ring *ring; u_int i, check_all_tx, check_all_rx, want[NR_TXRX], revents = 0; #define want_tx want[NR_TX] #define want_rx want[NR_RX] @@ -2363,7 +2369,6 @@ want_tx = events & (POLLOUT | POLLWRNORM); want_rx = events & (POLLIN | POLLRDNORM); - /* * check_all_{tx|rx} are set if the card has more than one queue AND * the file descriptor is bound to all of them. If so, we sleep on @@ -2415,7 +2420,9 @@ int found = 0; kring = &na->tx_rings[i]; - if (!want_tx && kring->ring->cur == kring->nr_hwcur) + ring = kring->ring; + + if (!want_tx && ring->cur == kring->nr_hwcur) continue; /* only one thread does txsync */ if (nm_kr_tryget(kring)) { @@ -2429,7 +2436,8 @@ priv, i); continue; } - if (nm_txsync_prologue(kring) >= kring->nkr_num_slots) { + if (nm_txsync_prologue(kring, ring->head, ring->cur, + &ring->tail) >= kring->nkr_num_slots) { netmap_ring_reinit(kring); revents |= POLLERR; } else { @@ -2473,6 +2481,7 @@ int found = 0; kring = &na->rx_rings[i]; + ring = kring->ring; if (nm_kr_tryget(kring)) { if (netmap_verbose) @@ -2481,7 +2490,8 @@ continue; } - if (nm_rxsync_prologue(kring) >= kring->nkr_num_slots) { + if (nm_rxsync_prologue(kring, ring->head, ring->cur, + &ring->tail) >= kring->nkr_num_slots) { netmap_ring_reinit(kring); revents |= POLLERR; } @@ -2493,9 +2503,9 @@ * XXX NR_FORWARD should only be read on * physical or NIC ports */ - if (netmap_fwd ||kring->ring->flags & NR_FORWARD) { + if (netmap_fwd || ring->flags & NR_FORWARD) { ND(10, "forwarding some buffers up %d to %d", - kring->nr_hwcur, kring->ring->cur); + kring->nr_hwcur, ring->cur); netmap_grab_packets(kring, &q, netmap_fwd); } @@ -2504,8 +2514,8 @@ else nm_rxsync_finalize(kring); if (netmap_no_timestamp == 0 || - kring->ring->flags & NR_TIMESTAMP) { - microtime(&kring->ring->ts); + ring->flags & NR_TIMESTAMP) { + microtime(&ring->ts); } found = kring->rcur != kring->rtail; nm_kr_put(kring); @@ -2518,13 +2528,13 @@ /* transparent mode XXX only during first pass ? */ if (na->na_flags & NAF_HOST_RINGS) { - kring = &na->rx_rings[na->num_rx_rings]; + ring = na->rx_rings[na->num_rx_rings].ring; if (check_all_rx - && (netmap_fwd || kring->ring->flags & NR_FORWARD)) { + && (netmap_fwd || ring->flags & NR_FORWARD)) { /* XXX fix to use kring fields */ - if (nm_ring_empty(kring->ring)) + if (nm_ring_empty(ring)) send_down = netmap_rxsync_from_host(na, td, dev); - if (!nm_ring_empty(kring->ring)) + if (!nm_ring_empty(ring)) revents |= want_rx; } } @@ -2633,6 +2643,7 @@ if (na->nm_mem == NULL) /* use the global allocator */ na->nm_mem = &nm_mem; + netmap_mem_get(na->nm_mem); #ifdef WITH_VALE if (na->nm_bdg_attach == NULL) /* no special nm_bdg_attach callback. On VALE @@ -2656,8 +2667,8 @@ na->nm_krings_delete(na); } netmap_pipe_dealloc(na); - if (na->na_flags & NAF_MEM_OWNER) - netmap_mem_private_delete(na->nm_mem); + if (na->nm_mem) + netmap_mem_put(na->nm_mem); bzero(na, sizeof(*na)); free(na, M_DEVBUF); } @@ -2695,8 +2706,8 @@ * kring N+1 is only used for the selinfo for all queues. // XXX still true ? * Return 0 on success, ENOMEM otherwise. */ -int -netmap_attach(struct netmap_adapter *arg) +static int +_netmap_attach(struct netmap_adapter *arg, size_t size) { struct netmap_hw_adapter *hwna = NULL; // XXX when is arg == NULL ? @@ -2704,7 +2715,7 @@ if (arg == NULL || ifp == NULL) goto fail; - hwna = malloc(sizeof(*hwna), M_DEVBUF, M_NOWAIT | M_ZERO); + hwna = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO); if (hwna == NULL) goto fail; hwna->up = *arg; @@ -2753,6 +2764,40 @@ } +int +netmap_attach(struct netmap_adapter *arg) +{ + return _netmap_attach(arg, sizeof(struct netmap_hw_adapter)); +} + + +#ifdef WITH_PTNETMAP_GUEST +int +netmap_pt_guest_attach(struct netmap_adapter *arg, + struct netmap_pt_guest_ops *pv_ops) +{ + struct netmap_pt_guest_adapter *ptna; + struct ifnet *ifp = arg ? arg->ifp : NULL; + int error; + + /* get allocator */ + arg->nm_mem = netmap_mem_pt_guest_new(ifp, pv_ops); + if (arg->nm_mem == NULL) + return ENOMEM; + arg->na_flags |= NAF_MEM_OWNER; + error = _netmap_attach(arg, sizeof(struct netmap_pt_guest_adapter)); + if (error) + return error; + + /* get the netmap_pt_guest_adapter */ + ptna = (struct netmap_pt_guest_adapter *) NA(ifp); + ptna->pv_ops = pv_ops; + + return 0; +} +#endif /* WITH_PTNETMAP_GUEST */ + + void NM_DBG(netmap_adapter_get)(struct netmap_adapter *na) { Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_freebsd.c ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_freebsd.c Tue Jun 23 18:45:26 2015 (r287496) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_freebsd.c Tue Jun 23 18:54:07 2015 (r287497) @@ -62,6 +62,7 @@ #include #include #include +#include /* ======================== FREEBSD-SPECIFIC ROUTINES ================== */ @@ -447,6 +448,248 @@ if_free(ifp); } +/* ======================== PTNETMAP SUPPORT ========================== */ + +#ifdef WITH_PTNETMAP_GUEST +#include +#include +#include /* bus_dmamap_* */ +#include +#include +#include +/* + * ptnetmap memory device (memdev) for freebsd guest + * Used to expose host memory to the guest through PCI-BAR + */ + +/* + * ptnetmap memdev private data structure + */ +struct ptnetmap_memdev +{ + device_t dev; + struct resource *pci_io; + struct resource *pci_mem; + struct netmap_mem_d *nm_mem; +}; + +static int ptn_memdev_probe(device_t); +static int ptn_memdev_attach(device_t); +static int ptn_memdev_detach(device_t); +static int ptn_memdev_shutdown(device_t); + +static device_method_t ptn_memdev_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ptn_memdev_probe), + DEVMETHOD(device_attach, ptn_memdev_attach), + DEVMETHOD(device_detach, ptn_memdev_detach), + DEVMETHOD(device_shutdown, ptn_memdev_shutdown), + DEVMETHOD_END +}; + +static driver_t ptn_memdev_driver = { + PTN_MEMDEV_NAME, ptn_memdev_methods, sizeof(struct ptnetmap_memdev), +}; + +devclass_t ptnetmap_devclass; +DRIVER_MODULE(netmap, pci, ptn_memdev_driver, ptnetmap_devclass, 0, 0); + +MODULE_DEPEND(netmap, pci, 1, 1, 1); + +/* + * I/O port read/write wrappers. + */ +#define ptn_ioread8(ptn_dev, reg) bus_read_1((ptn_dev)->pci_io, (reg)) +#define ptn_ioread16(ptn_dev, reg) bus_read_2((ptn_dev)->pci_io, (reg)) +#define ptn_ioread32(ptn_dev, reg) bus_read_4((ptn_dev)->pci_io, (reg)) +#define ptn_iowrite8(ptn_dev, reg, val) bus_write_1((ptn_dev)->pci_io, (reg), (val)) +#define ptn_iowrite16(ptn_dev, reg, val) bus_write_2((ptn_dev)->pci_io, (reg), (val)) +#define ptn_iowrite32(ptn_dev, reg, val) bus_write_4((ptn_dev)->pci_io, (reg), (val)) + +/* + * map host netmap memory through PCI-BAR in the guest OS + * + * return physical (nm_paddr) and virtual (nm_addr) addresses + * of the netmap memory mapped in the guest. + */ +int +netmap_pt_memdev_iomap(struct ptnetmap_memdev *ptn_dev, vm_paddr_t *nm_paddr, void **nm_addr) +{ + uint32_t mem_size; + int rid; + + D("ptn_memdev_driver iomap"); + + rid = PCIR_BAR(PTNETMAP_MEM_PCI_BAR); + mem_size = ptn_ioread32(ptn_dev, PTNETMAP_IO_PCI_MEMSIZE); + + /* map memory allocator */ + ptn_dev->pci_mem = bus_alloc_resource(ptn_dev->dev, SYS_RES_MEMORY, + &rid, 0, ~0, mem_size, RF_ACTIVE); + if (ptn_dev->pci_mem == NULL) { + *nm_paddr = 0; + *nm_addr = 0; + return ENOMEM; + } + + *nm_paddr = rman_get_start(ptn_dev->pci_mem); + *nm_addr = rman_get_virtual(ptn_dev->pci_mem); + + D("=== BAR %d start %llx len %llx mem_size %x ===", + PTNETMAP_MEM_PCI_BAR, + *nm_paddr, + rman_get_size(ptn_dev->pci_mem), + mem_size); + return (0); +} + +/* + * unmap PCI-BAR + */ +void +netmap_pt_memdev_iounmap(struct ptnetmap_memdev *ptn_dev) +{ + D("ptn_memdev_driver iounmap"); + + if (ptn_dev->pci_mem) { + bus_release_resource(ptn_dev->dev, SYS_RES_MEMORY, + PCIR_BAR(PTNETMAP_MEM_PCI_BAR), ptn_dev->pci_mem); + ptn_dev->pci_mem = NULL; + } +} + +/********************************************************************* + * Device identification routine + * + * ixgbe_probe determines if the driver should be loaded on + * adapter based on PCI vendor/device id of the adapter. + * + * return BUS_PROBE_DEFAULT on success, positive on failure + *********************************************************************/ +static int +ptn_memdev_probe(device_t dev) +{ + char desc[256]; + + if (pci_get_vendor(dev) != PTNETMAP_PCI_VENDOR_ID) + return (ENXIO); + if (pci_get_device(dev) != PTNETMAP_PCI_DEVICE_ID) + return (ENXIO); + + D("ptn_memdev_driver probe"); + snprintf(desc, sizeof(desc), "%s PCI adapter", + PTN_MEMDEV_NAME); + device_set_desc_copy(dev, desc); + + return (BUS_PROBE_DEFAULT); +} + +/********************************************************************* + * Device initialization routine + * + * The attach entry point is called when the driver is being loaded. + * This routine identifies the type of hardware, allocates all resources + * and initializes the hardware. + * + * return 0 on success, positive on failure + *********************************************************************/ +static int +ptn_memdev_attach(device_t dev) +{ + struct ptnetmap_memdev *ptn_dev; + int rid; + uint16_t mem_id; + + D("ptn_memdev_driver attach"); + + ptn_dev = device_get_softc(dev); + ptn_dev->dev = dev; + + pci_enable_busmaster(dev); + + rid = PCIR_BAR(PTNETMAP_IO_PCI_BAR); + ptn_dev->pci_io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, + RF_ACTIVE); + if (ptn_dev->pci_io == NULL) { + device_printf(dev, "cannot map I/O space\n"); + return (ENXIO); + } + + mem_id = ptn_ioread16(ptn_dev, PTNETMAP_IO_PCI_HOSTID); + + /* create guest allocator */ + ptn_dev->nm_mem = netmap_mem_pt_guest_attach(ptn_dev, mem_id); + if (ptn_dev->nm_mem == NULL) { + ptn_memdev_detach(dev); + return (ENOMEM); + } + netmap_mem_get(ptn_dev->nm_mem); + + D("ptn_memdev_driver probe OK - host_id: %d", mem_id); + + return (0); +} + +/********************************************************************* + * Device removal routine + * + * The detach entry point is called when the driver is being removed. + * This routine stops the adapter and deallocates all the resources + * that were allocated for driver operation. + * + * return 0 on success, positive on failure + *********************************************************************/ +static int +ptn_memdev_detach(device_t dev) +{ + struct ptnetmap_memdev *ptn_dev; + + D("ptn_memdev_driver detach"); + ptn_dev = device_get_softc(dev); + + if (ptn_dev->nm_mem) { + netmap_mem_put(ptn_dev->nm_mem); + ptn_dev->nm_mem = NULL; + } + if (ptn_dev->pci_mem) { + bus_release_resource(dev, SYS_RES_MEMORY, + PCIR_BAR(PTNETMAP_MEM_PCI_BAR), ptn_dev->pci_mem); + ptn_dev->pci_mem = NULL; + } + if (ptn_dev->pci_io) { + bus_release_resource(dev, SYS_RES_IOPORT, + PCIR_BAR(PTNETMAP_IO_PCI_BAR), ptn_dev->pci_io); + ptn_dev->pci_io = NULL; + } + + return (0); +} + +/********************************************************************* + * + * Shutdown entry point + * + **********************************************************************/ +static int +ptn_memdev_shutdown(device_t dev) +{ + D("ptn_memdev_driver shutsown"); + return bus_generic_shutdown(dev); +} + +int +netmap_pt_memdev_init(void) +{ + return 0; +} + +void +netmap_pt_memdev_uninit(void) +{ + +} +#endif /* WITH_PTNETMAP_GUEST */ + /* * In order to track whether pages are still mapped, we hook into * the standard cdev_pager and intercept the constructor and Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h Tue Jun 23 18:45:26 2015 (r287496) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h Tue Jun 23 18:54:07 2015 (r287497) @@ -51,6 +51,10 @@ #if defined(CONFIG_NETMAP_V1000) #define WITH_V1000 #endif +#if defined(CONFIG_NETMAP_PASSTHROUGH) +#define WITH_PTNETMAP_HOST +#define WITH_PTNETMAP_GUEST +#endif #else /* not linux */ @@ -58,6 +62,8 @@ #define WITH_PIPES #define WITH_MONITOR #define WITH_GENERIC +//#define WITH_PTNETMAP_HOST /* ptnetmap host not supported in FreeBSD */ +#define WITH_PTNETMAP_GUEST #endif @@ -65,6 +71,8 @@ #define likely(x) __builtin_expect((long)!!(x), 1L) #define unlikely(x) __builtin_expect((long)!!(x), 0L) +#define __user /* XXX: temp */ +#define ACCESS_ONCE(x) (x) /* XXX: temp */ #define NM_LOCK_T struct mtx /* low level spinlock, used to protect queues */ @@ -298,6 +306,7 @@ uint32_t nr_kflags; /* private driver flags */ #define NKR_PENDINTR 0x1 // Pending interrupt. #define NKR_EXCLUSIVE 0x2 /* exclusive binding */ +#define NKR_PASSTHROUGH 0x4 uint32_t nkr_num_slots; /* @@ -465,6 +474,11 @@ */ +struct netmap_lut { + struct lut_entry *lut; + uint32_t objtotal; /* max buffer index */ + uint32_t objsize; /* buffer size */ +}; struct netmap_vp_adapter; // forward @@ -494,8 +508,8 @@ * forwarding packets coming from this * interface */ -#define NAF_MEM_OWNER 8 /* the adapter is responsible for the - * deallocation of the memory allocator +#define NAF_MEM_OWNER 8 /* the adapter uses its own memory area + * that cannot be changed */ #define NAF_NATIVE_ON 16 /* the adapter is native and the attached * interface is in netmap mode. @@ -508,6 +522,7 @@ */ #define NAF_HOST_RINGS 64 /* the adapter supports the host rings */ #define NAF_FORCE_NATIVE 128 /* the adapter is always NATIVE */ +#define NAF_PASSTHROUGH_HOST 256/* the adapter supports passthrough in the host */ #define NAF_BUSY (1U<<31) /* the adapter is used internally and * cannot be registered from userspace */ @@ -637,13 +652,11 @@ * buffer addresses, and the total number of buffers. */ struct netmap_mem_d *nm_mem; - struct lut_entry *na_lut; - uint32_t na_lut_objtotal; /* max buffer index */ - uint32_t na_lut_objsize; /* buffer size */ + struct netmap_lut na_lut; /* additional information attached to this adapter *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 19:04:48 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DCD33D9E for ; Tue, 23 Jun 2015 19:04:48 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA2B4C3A for ; Tue, 23 Jun 2015 19:04:48 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NJ4mlP051617 for ; Tue, 23 Jun 2015 19:04:48 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NJ4lsF051594 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 19:04:47 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 19:04:47 GMT Message-Id: <201506231904.t5NJ4lsF051594@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287503 - soc2015/stefano/ptnetmap/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 19:04:49 -0000 Author: stefano Date: Tue Jun 23 19:04:46 2015 New Revision: 287503 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287503 Log: [ptnetmap] first implelementation of ptnetmap on virtio-net Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_virt.h soc2015/stefano/ptnetmap/head/sys/dev/netmap/ptnetmap.c Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Tue Jun 23 18:55:08 2015 (r287502) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Tue Jun 23 19:04:46 2015 (r287503) @@ -32,6 +32,13 @@ #include #include /* vtophys ? */ #include +#ifdef WITH_PTNETMAP_GUEST +#include +static int vtnet_ptnetmap_txsync(struct netmap_kring *kring, int flags); +#define VTNET_PTNETMAP_ON(_na) ((nm_netmap_on(_na)) && ((_na)->nm_txsync == vtnet_ptnetmap_txsync)) +#else /* !WITH_PTNETMAP_GUEST */ +#define VTNET_PTNETMAP_ON(_na) 0 +#endif /* WITH_PTNETMAP_GUEST */ #define SOFTC_T vtnet_softc @@ -356,6 +363,9 @@ struct netmap_adapter* na = NA(ifp); unsigned int r; + /* if ptnetmap is enabled we must not init netmap buffers */ + if (VTNET_PTNETMAP_ON(na)) + return 1; if (!nm_native_on(na)) return 0; for (r = 0; r < na->num_rx_rings; r++) { @@ -406,6 +416,357 @@ return 0; } +#ifdef WITH_PTNETMAP_GUEST +/* ptnetmap virtio register BASE */ +#define PTNETMAP_VIRTIO_IO_BASE sizeof(struct virtio_net_config) + +#ifndef VIRTIO_NET_F_PTNETMAP +#define VIRTIO_NET_F_PTNETMAP 0x1000000 /* linux/qeum 24 */ +#endif /* VIRTIO_NET_F_PTNETMAP */ + +static void inline +vtnet_ptnetmap_iowrite4(device_t dev, uint32_t addr, uint32_t val) +{ + virtio_write_dev_config_4(dev, PTNETMAP_VIRTIO_IO_BASE + addr, val); +} + +static uint32_t inline +vtnet_ptnetmap_ioread4(device_t dev, uint32_t addr) +{ + return virtio_read_dev_config_4(dev, PTNETMAP_VIRTIO_IO_BASE + addr); +} + +static int +vtnet_ptnetmap_alloc_csb(struct SOFTC_T *sc) +{ + device_t dev = sc->vtnet_dev; + struct ifnet *ifp = sc->vtnet_ifp; + struct netmap_pt_guest_adapter* ptna = (struct netmap_pt_guest_adapter *)NA(ifp); + + vm_paddr_t csb_phyaddr; + + if (ptna->csb) + return 0; + + ptna->csb = contigmalloc(NET_PARAVIRT_CSB_SIZE, M_DEVBUF, M_NOWAIT | M_ZERO, + (size_t)0, -1UL, PAGE_SIZE, 0); + if (!ptna->csb) { + D("Communication Status Block allocation failed!"); + return ENOMEM; + } + + csb_phyaddr = vtophys(ptna->csb); + + ptna->csb->guest_csb_on = 1; + + /* Tell the device the CSB physical address. */ + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAH, (csb_phyaddr >> 32)); + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAL, (csb_phyaddr & 0x00000000ffffffffULL)); + + return 0; +} + +static void +vtnet_ptnetmap_free_csb(struct SOFTC_T *sc) +{ + device_t dev = sc->vtnet_dev; + struct ifnet *ifp = sc->vtnet_ifp; + struct netmap_pt_guest_adapter* ptna = (struct netmap_pt_guest_adapter *)NA(ifp); + + if (ptna->csb) { + /* CSB deallocation protocol. */ + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAH, 0x0ULL); + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAL, 0x0ULL); + + contigfree(ptna->csb, NET_PARAVIRT_CSB_SIZE, M_DEVBUF); + ptna->csb = NULL; + } +} + +static uint32_t vtnet_ptnetmap_ptctl(struct ifnet *, uint32_t); +static int +vtnet_ptnetmap_config(struct netmap_adapter *na, + u_int *txr, u_int *txd, u_int *rxr, u_int *rxd) +{ + struct netmap_pt_guest_adapter *ptna = (struct netmap_pt_guest_adapter *)na; + struct paravirt_csb *csb = ptna->csb; + int ret; + + if (csb == NULL) + return EINVAL; + + ret = vtnet_ptnetmap_ptctl(na->ifp, NET_PARAVIRT_PTCTL_CONFIG); + if (ret) + return ret; + + *txr = 1; //*txr = csb->num_tx_rings; + *rxr = 1; //*rxr = csb->num_rx_rings; + *txd = csb->num_tx_slots; + *rxd = csb->num_rx_slots; + + D("txr %u rxr %u txd %u rxd %u", + *txr, *rxr, *txd, *rxd); + return 0; +} + +static int +vtnet_ptnetmap_txsync(struct netmap_kring *kring, int flags) +{ + struct netmap_adapter *na = kring->na; + struct netmap_pt_guest_adapter *ptna = (struct netmap_pt_guest_adapter *)na; + struct ifnet *ifp = na->ifp; + u_int ring_nr = kring->ring_id; + + /* device-specific */ + struct SOFTC_T *sc = ifp->if_softc; + struct vtnet_txq *txq = &sc->vtnet_txqs[ring_nr]; + struct virtqueue *vq = txq->vtntx_vq; + struct paravirt_csb *csb = ptna->csb; + bool send_kick = false; + + /* Disable notifications */ + csb->guest_need_txkick = 0; + + /* + * First part: process new packets to send. + */ + kring->nr_hwcur = csb->tx_ring.hwcur; + ptnetmap_guest_write_kring_csb(&csb->tx_ring, kring->rcur, kring->rhead); + if (kring->rhead != kring->nr_hwcur) { + send_kick = true; + } + + /* Send kick to the host if it needs them */ + if ((send_kick && ACCESS_ONCE(csb->host_need_txkick)) || (flags & NAF_FORCE_RECLAIM)) { + csb->tx_ring.sync_flags = flags; + virtqueue_notify(vq); + } + + /* + * Second part: reclaim buffers for completed transmissions. + */ + if (flags & NAF_FORCE_RECLAIM || nm_kr_txempty(kring)) { + ptnetmap_guest_read_kring_csb(&csb->tx_ring, &kring->nr_hwcur, &kring->nr_hwtail, kring->nkr_num_slots); + } + + /* + * Ring full. The user thread will go to sleep and + * we need a notification (interrupt) from the NIC, + * whene there is free space. + */ + if (kring->rcur == kring->nr_hwtail) { + /* Reenable notifications. */ + csb->guest_need_txkick = 1; + /* Double check */ + ptnetmap_guest_read_kring_csb(&csb->tx_ring, &kring->nr_hwcur, &kring->nr_hwtail, kring->nkr_num_slots); + /* If there is new free space, disable notifications */ + if (kring->rcur != kring->nr_hwtail) { + csb->guest_need_txkick = 0; + } + } + + + ND(1,"TX - CSB: head:%u cur:%u hwtail:%u - KRING: head:%u cur:%u tail: %u", + csb->tx_ring.head, csb->tx_ring.cur, csb->tx_ring.hwtail, kring->rhead, kring->rcur, kring->nr_hwtail); + ND("TX - vq_index: %d", vq->index); + + return 0; +} + +static int +vtnet_ptnetmap_rxsync(struct netmap_kring *kring, int flags) +{ + struct netmap_adapter *na = kring->na; + struct netmap_pt_guest_adapter *ptna = (struct netmap_pt_guest_adapter *)na; + struct ifnet *ifp = na->ifp; + u_int ring_nr = kring->ring_id; + + /* device-specific */ + struct SOFTC_T *sc = ifp->if_softc; + struct vtnet_rxq *rxq = &sc->vtnet_rxqs[ring_nr]; + struct virtqueue *vq = rxq->vtnrx_vq; + struct paravirt_csb *csb = ptna->csb; + + int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; + uint32_t h_hwcur = kring->nr_hwcur, h_hwtail = kring->nr_hwtail; + + /* Disable notifications */ + csb->guest_need_rxkick = 0; + + ptnetmap_guest_read_kring_csb(&csb->rx_ring, &h_hwcur, &h_hwtail, kring->nkr_num_slots); + + /* + * First part: import newly received packets. + */ + if (netmap_no_pendintr || force_update) { + kring->nr_hwtail = h_hwtail; + kring->nr_kflags &= ~NKR_PENDINTR; + } + + /* + * Second part: skip past packets that userspace has released. + */ + kring->nr_hwcur = h_hwcur; + if (kring->rhead != kring->nr_hwcur) { + ptnetmap_guest_write_kring_csb(&csb->rx_ring, kring->rcur, kring->rhead); + /* Send kick to the host if it needs them */ + if (ACCESS_ONCE(csb->host_need_rxkick)) { + csb->rx_ring.sync_flags = flags; + virtqueue_notify(vq); + } + } + + /* + * Ring empty. The user thread will go to sleep and + * we need a notification (interrupt) from the NIC, + * whene there are new packets. + */ + if (kring->rcur == kring->nr_hwtail) { + /* Reenable notifications. */ + csb->guest_need_rxkick = 1; + /* Double check */ + ptnetmap_guest_read_kring_csb(&csb->rx_ring, &kring->nr_hwcur, &kring->nr_hwtail, kring->nkr_num_slots); + /* If there are new packets, disable notifications */ + if (kring->rcur != kring->nr_hwtail) { + csb->guest_need_rxkick = 0; + } + } + + ND("RX - CSB: head:%u cur:%u hwtail:%u - KRING: head:%u cur:%u", + csb->rx_ring.head, csb->rx_ring.cur, csb->rx_ring.hwtail, kring->rhead, kring->rcur); + ND("RX - vq_index: %d", vq->index); + + return 0; +} + +static int +vtnet_ptnetmap_reg(struct netmap_adapter *na, int onoff) +{ + struct netmap_pt_guest_adapter *ptna = (struct netmap_pt_guest_adapter *)na; + + /* device-specific */ + struct ifnet *ifp = na->ifp; + struct SOFTC_T *sc = ifp->if_softc; + struct paravirt_csb *csb = ptna->csb; + struct netmap_kring *kring; + int ret = 0; + + if (na == NULL) + return EINVAL; + + VTNET_CORE_LOCK(sc); + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + /* enable or disable flags and callbacks in na and ifp */ + if (onoff) { + int i; + nm_set_native_flags(na); + /* push fake-elem in the tx queues to enable interrupts */ + for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { + struct vtnet_txq *txq = &sc->vtnet_txqs[i]; + struct mbuf *m0; + m0 = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, 64); + m0->m_len = 64; + + if (m0) { + vtnet_txq_encap(txq, &m0); + } + } + ret = vtnet_ptnetmap_ptctl(na->ifp, NET_PARAVIRT_PTCTL_REGIF); + if (ret) { + //na->na_flags &= ~NAF_NETMAP_ON; + nm_clear_native_flags(na); + goto out; + } + /* + * Init ring and kring pointers + * After PARAVIRT_PTCTL_REGIF, the csb contains a snapshot of a + * host kring pointers. + * XXX This initialization is required, because we don't close the + * host port on UNREGIF. + */ + // Init rx ring + kring = na->rx_rings; + kring->rhead = kring->ring->head = csb->rx_ring.head; + kring->rcur = kring->ring->cur = csb->rx_ring.cur; + kring->nr_hwcur = csb->rx_ring.hwcur; + kring->nr_hwtail = kring->rtail = kring->ring->tail = csb->rx_ring.hwtail; + + // Init tx ring + kring = na->tx_rings; + kring->rhead = kring->ring->head = csb->tx_ring.head; + kring->rcur = kring->ring->cur = csb->tx_ring.cur; + kring->nr_hwcur = csb->tx_ring.hwcur; + kring->nr_hwtail = kring->rtail = kring->ring->tail = csb->tx_ring.hwtail; + } else { + //na->na_flags &= ~NAF_NETMAP_ON; + nm_clear_native_flags(na); + ret = vtnet_ptnetmap_ptctl(na->ifp, NET_PARAVIRT_PTCTL_UNREGIF); + } +out: + vtnet_init_locked(sc); /* also enable intr */ + VTNET_CORE_UNLOCK(sc); + return (ifp->if_drv_flags & IFF_DRV_RUNNING ? ret : 1); +} + +static int +vtnet_ptnetmap_bdg_attach(const char *bdg_name, struct netmap_adapter *na) +{ + return EOPNOTSUPP; +} + +static struct paravirt_csb * +vtnet_ptnetmap_getcsb(struct ifnet *ifp) +{ + struct netmap_pt_guest_adapter *ptna = (struct netmap_pt_guest_adapter *)NA(ifp); + + return ptna->csb; +} + +static uint32_t +vtnet_ptnetmap_ptctl(struct ifnet *ifp, uint32_t val) +{ + struct SOFTC_T *sc = ifp->if_softc; + device_t dev = sc->vtnet_dev; + uint32_t ret; + + D("PTCTL = %u", val); + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_PTCTL, val); + ret = vtnet_ptnetmap_ioread4(dev, PTNETMAP_VIRTIO_IO_PTSTS); + D("PTSTS = %u", ret); + + return ret; +} + +static uint32_t +vtnet_ptnetmap_features(struct SOFTC_T *sc) +{ + device_t dev = sc->vtnet_dev; + uint32_t features; + /* tell the device the features we support */ + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_PTFEAT, NET_PTN_FEATURES_BASE); + /* get back the acknowledged features */ + features = vtnet_ptnetmap_ioread4(dev, PTNETMAP_VIRTIO_IO_PTFEAT); + D("netmap passthrough: %s\n", + (features & NET_PTN_FEATURES_BASE) ? "base" : + "none"); + return features; +} + +static void +vtnet_ptnetmap_dtor(struct netmap_adapter *na) +{ + struct ifnet *ifp = na->ifp; + struct SOFTC_T *sc = ifp->if_softc; + + vtnet_ptnetmap_free_csb(sc); +} + +static struct netmap_pt_guest_ops vtnet_ptnetmap_ops = { + .nm_getcsb = vtnet_ptnetmap_getcsb, /* TODO: remove */ + .nm_ptctl = vtnet_ptnetmap_ptctl, +}; +#endif /* WITH_PTNETMAP_GUEST */ + static void vtnet_netmap_attach(struct SOFTC_T *sc) { @@ -422,6 +783,21 @@ na.nm_config = vtnet_netmap_config; na.num_tx_rings = na.num_rx_rings = sc->vtnet_max_vq_pairs; D("max rings %d", sc->vtnet_max_vq_pairs); +#ifdef WITH_PTNETMAP_GUEST + D("check ptnetmap support"); + if (virtio_with_feature(sc->vtnet_dev, VIRTIO_NET_F_PTNETMAP) && + (vtnet_ptnetmap_features(sc) & NET_PTN_FEATURES_BASE)) { + D("ptnetmap supported"); + na.nm_config = vtnet_ptnetmap_config; + na.nm_register = vtnet_ptnetmap_reg; + na.nm_txsync = vtnet_ptnetmap_txsync; + na.nm_rxsync = vtnet_ptnetmap_rxsync; + na.nm_dtor = vtnet_ptnetmap_dtor; + na.nm_bdg_attach = vtnet_ptnetmap_bdg_attach; /* XXX */ + netmap_pt_guest_attach(&na, &vtnet_ptnetmap_ops); + vtnet_ptnetmap_alloc_csb(sc); + } else +#endif /* WITH_PTNETMAP_GUEST */ netmap_attach(&na); D("virtio attached txq=%d, txd=%d rxq=%d, rxd=%d", Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h Tue Jun 23 18:55:08 2015 (r287502) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_kern.h Tue Jun 23 19:04:46 2015 (r287503) @@ -1785,6 +1785,7 @@ struct netmap_hw_adapter hwup; struct netmap_pt_guest_ops *pv_ops; + struct paravirt_csb *csb; }; int netmap_pt_guest_attach(struct netmap_adapter *, struct netmap_pt_guest_ops *); #endif /* WITH_PTNETMAP_GUEST */ Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_virt.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_virt.h Tue Jun 23 18:55:08 2015 (r287502) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/netmap_virt.h Tue Jun 23 19:04:46 2015 (r287503) @@ -213,6 +213,21 @@ #endif /* QEMU_PCI_H */ +/* ptnetmap virtio register */ +/* 32 bit r/w */ +#define PTNETMAP_VIRTIO_IO_PTFEAT 0 /* passthrough features */ +/* 32 bit w/o */ +#define PTNETMAP_VIRTIO_IO_PTCTL 4 /* passthrough control */ +/* 32 bit r/o */ +#define PTNETMAP_VIRTIO_IO_PTSTS 8 /* passthrough status */ +/* 32 bit w/o */ +#define PTNETMAP_VIRTIO_IO_CSBBAH 12 /* CSB Base Address High */ +/* 32 bit w/o */ +#define PTNETMAP_VIRTIO_IO_CSBBAL 16 /* CSB Base Address Low */ + +#define PTNEMTAP_VIRTIO_IO_SIZE 20 +#define PTNEMTAP_VIRTIO_IO_SIZE_32 5 + #endif /* NETMAP_VIRT_CSB */ #if defined(NETMAP_API) && !defined(NETMAP_VIRT_PTNETMAP) Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/ptnetmap.c ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/ptnetmap.c Tue Jun 23 18:55:08 2015 (r287502) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/ptnetmap.c Tue Jun 23 19:04:46 2015 (r287503) @@ -539,7 +539,7 @@ ptnetmap_tx_notify(struct ptnetmap_state *pts) { if (unlikely(!pts)) return; - + ND("TX notify"); ptn_kthread_wakeup_worker(pts->ptk_tx); IFRATE(pts->rate_ctx.new.btxwu++); } @@ -548,7 +548,7 @@ ptnetmap_rx_notify(struct ptnetmap_state *pts) { if (unlikely(!pts)) return; - + ND("RX notify"); ptn_kthread_wakeup_worker(pts->ptk_rx); IFRATE(pts->rate_ctx.new.brxwu++); } From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 19:11:10 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 712E1DCB for ; Tue, 23 Jun 2015 19:11:10 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4507AECC for ; Tue, 23 Jun 2015 19:11:10 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NJBA11057017 for ; Tue, 23 Jun 2015 19:11:10 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NJB9b9056999 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 19:11:09 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 19:11:09 GMT Message-Id: <201506231911.t5NJB9b9056999@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287504 - soc2015/stefano/ptnetmap/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 19:11:10 -0000 Author: stefano Date: Tue Jun 23 19:11:09 2015 New Revision: 287504 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287504 Log: [ptnetmap/virtio] fix iowrite/ioread and mbuf allocation change vtnet_ptnetmap_[iowrite4 | ioread4]: like in linux version, we write/read 1 byte each time use m_gethdr() instead of m_getjcl() to alloc the fake packet Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Tue Jun 23 19:04:46 2015 (r287503) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Tue Jun 23 19:11:09 2015 (r287504) @@ -427,13 +427,23 @@ static void inline vtnet_ptnetmap_iowrite4(device_t dev, uint32_t addr, uint32_t val) { - virtio_write_dev_config_4(dev, PTNETMAP_VIRTIO_IO_BASE + addr, val); + int i; + /* virtio_pci config_set use multiple iowrite8, we need to split the call and reverse the order */ + for (i = 3; i >= 0; i--) { + virtio_write_dev_config_1(dev, PTNETMAP_VIRTIO_IO_BASE + addr + i, *(((uint8_t *)&val) + i)); + } } static uint32_t inline vtnet_ptnetmap_ioread4(device_t dev, uint32_t addr) { - return virtio_read_dev_config_4(dev, PTNETMAP_VIRTIO_IO_BASE + addr); + uint32_t val; + int i; + + for (i = 0; i <= 3; i++) { + *(((uint8_t *)&val) + i) = virtio_read_dev_config_1(dev, PTNETMAP_VIRTIO_IO_BASE + addr + i); + } + return val; } static int @@ -460,8 +470,8 @@ ptna->csb->guest_csb_on = 1; /* Tell the device the CSB physical address. */ - vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAH, (csb_phyaddr >> 32)); - vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAL, (csb_phyaddr & 0x00000000ffffffffULL)); + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAH, (uint32_t)(csb_phyaddr >> 32)); + vtnet_ptnetmap_iowrite4(dev, PTNETMAP_VIRTIO_IO_CSBBAL, (uint32_t)(csb_phyaddr)); return 0; } @@ -664,7 +674,7 @@ for (i = 0; i < sc->vtnet_max_vq_pairs; i++) { struct vtnet_txq *txq = &sc->vtnet_txqs[i]; struct mbuf *m0; - m0 = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, 64); + m0 = m_gethdr(M_NOWAIT, MT_DATA); m0->m_len = 64; if (m0) { From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 19:12:45 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DDAF7DD2 for ; Tue, 23 Jun 2015 19:12:45 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC20CFAA for ; Tue, 23 Jun 2015 19:12:45 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NJCjhE061083 for ; Tue, 23 Jun 2015 19:12:45 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NJCjPY061077 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 19:12:45 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 19:12:45 GMT Message-Id: <201506231912.t5NJCjPY061077@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287505 - soc2015/stefano/ptnetmap/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 19:12:46 -0000 Author: stefano Date: Tue Jun 23 19:12:44 2015 New Revision: 287505 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287505 Log: [ptnetmap/virtio] call vtnet_init() only on UNREGIF If we call vtnet_init() during the regif, it removes the fake packets. Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Modified: soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Tue Jun 23 19:11:09 2015 (r287504) +++ soc2015/stefano/ptnetmap/head/sys/dev/netmap/if_vtnet_netmap.h Tue Jun 23 19:12:44 2015 (r287505) @@ -665,7 +665,6 @@ return EINVAL; VTNET_CORE_LOCK(sc); - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); /* enable or disable flags and callbacks in na and ifp */ if (onoff) { int i; @@ -678,7 +677,7 @@ m0->m_len = 64; if (m0) { - vtnet_txq_encap(txq, &m0); + ret = vtnet_txq_encap(txq, &m0); } } ret = vtnet_ptnetmap_ptctl(na->ifp, NET_PARAVIRT_PTCTL_REGIF); @@ -708,12 +707,13 @@ kring->nr_hwcur = csb->tx_ring.hwcur; kring->nr_hwtail = kring->rtail = kring->ring->tail = csb->tx_ring.hwtail; } else { + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); //na->na_flags &= ~NAF_NETMAP_ON; nm_clear_native_flags(na); ret = vtnet_ptnetmap_ptctl(na->ifp, NET_PARAVIRT_PTCTL_UNREGIF); + vtnet_init_locked(sc); /* also enable intr */ } out: - vtnet_init_locked(sc); /* also enable intr */ VTNET_CORE_UNLOCK(sc); return (ifp->if_drv_flags & IFF_DRV_RUNNING ? ret : 1); } From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 19:27:14 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8937E31 for ; Tue, 23 Jun 2015 19:27:14 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C509EA5 for ; Tue, 23 Jun 2015 19:27:14 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NJREhE076901 for ; Tue, 23 Jun 2015 19:27:14 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NJRDm3076880 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 19:27:13 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 19:27:13 GMT Message-Id: <201506231927.t5NJRDm3076880@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287506 - soc2015/stefano/ptnetmap/head/sys/dev/virtio/network MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 19:27:14 -0000 Author: stefano Date: Tue Jun 23 19:27:12 2015 New Revision: 287506 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287506 Log: [ptnetmap/virtio] enable ptnetmap feature Enable ptnetmap feature in virtio-net driver, to allow the negotiation with the host that implement ptnetmap. Modified: soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnetvar.h soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/virtio_net.h Modified: soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c Tue Jun 23 19:12:44 2015 (r287505) +++ soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c Tue Jun 23 19:27:12 2015 (r287506) @@ -267,6 +267,7 @@ { VIRTIO_NET_F_GUEST_ANNOUNCE, "GuestAnnounce" }, { VIRTIO_NET_F_MQ, "Multiqueue" }, { VIRTIO_NET_F_CTRL_MAC_ADDR, "SetMacAddress" }, + { VIRTIO_NET_F_PTNETMAP, "PTNetmap" }, { 0, NULL } }; Modified: soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnetvar.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnetvar.h Tue Jun 23 19:12:44 2015 (r287505) +++ soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnetvar.h Tue Jun 23 19:27:12 2015 (r287506) @@ -285,7 +285,8 @@ VIRTIO_NET_F_MRG_RXBUF | \ VIRTIO_NET_F_MQ | \ VIRTIO_RING_F_EVENT_IDX | \ - VIRTIO_RING_F_INDIRECT_DESC) + VIRTIO_RING_F_INDIRECT_DESC | \ + VIRTIO_NET_F_PTNETMAP) /* * The VIRTIO_NET_F_HOST_TSO[46] features permit us to send the host Modified: soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/virtio_net.h ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/virtio_net.h Tue Jun 23 19:12:44 2015 (r287505) +++ soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/virtio_net.h Tue Jun 23 19:27:12 2015 (r287506) @@ -53,6 +53,7 @@ #define VIRTIO_NET_F_GUEST_ANNOUNCE 0x200000 /* Announce device on network */ #define VIRTIO_NET_F_MQ 0x400000 /* Device supports RFS */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 0x800000 /* Set MAC address */ +#define VIRTIO_NET_F_PTNETMAP 0x1000000 /* ptnetmap available */ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ From owner-svn-soc-all@FreeBSD.ORG Tue Jun 23 19:28:52 2015 Return-Path: Delivered-To: svn-soc-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5C33E4E for ; Tue, 23 Jun 2015 19:28:52 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C40D8FDD for ; Tue, 23 Jun 2015 19:28:52 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5NJSqRb077857 for ; Tue, 23 Jun 2015 19:28:52 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5NJSqOK077841 for svn-soc-all@FreeBSD.org; Tue, 23 Jun 2015 19:28:52 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 23 Jun 2015 19:28:52 GMT Message-Id: <201506231928.t5NJSqOK077841@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287507 - soc2015/stefano/ptnetmap/head/sys/dev/virtio/network MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2015 19:28:52 -0000 Author: stefano Date: Tue Jun 23 19:28:51 2015 New Revision: 287507 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287507 Log: [ptnetmap/virtio] avoid infinite cycle on vtnet_rxq_eof() When the device is in ptnetmap mode, we left one packet in the used rx queue to enable interrupts. So, when we receive an interrupt, we must not call vtnet_rxq_enable_intr(rxq) beacuse it returns always false since there is the fake packet in the queue. Modified: soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c Modified: soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c Tue Jun 23 19:27:12 2015 (r287506) +++ soc2015/stefano/ptnetmap/head/sys/dev/virtio/network/if_vtnet.c Tue Jun 23 19:28:51 2015 (r287507) @@ -290,6 +290,8 @@ #ifdef DEV_NETMAP #include +#else +#define VTNET_PTNETMAP_ON(_na) 0 #endif /* DEV_NETMAP */ static driver_t vtnet_driver = { @@ -1857,7 +1859,7 @@ } more = vtnet_rxq_eof(rxq); - if (more || vtnet_rxq_enable_intr(rxq) != 0) { + if (!VTNET_PTNETMAP_ON(NA(ifp)) && (more || vtnet_rxq_enable_intr(rxq) != 0)) { if (!more) vtnet_rxq_disable_intr(rxq); /* @@ -1894,7 +1896,7 @@ } more = vtnet_rxq_eof(rxq); - if (more || vtnet_rxq_enable_intr(rxq) != 0) { + if (!VTNET_PTNETMAP_ON(NA(ifp)) && (more || vtnet_rxq_enable_intr(rxq) != 0)) { if (!more) vtnet_rxq_disable_intr(rxq); rxq->vtnrx_stats.vrxs_rescheduled++; From owner-svn-soc-all@freebsd.org Wed Jun 24 17:17:59 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 014EA915849 for ; Wed, 24 Jun 2015 17:17:59 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D96C31653 for ; Wed, 24 Jun 2015 17:17:58 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OHHwli015438 for ; Wed, 24 Jun 2015 17:17:58 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5OHHsOD015413 for svn-soc-all@FreeBSD.org; Wed, 24 Jun 2015 17:17:54 GMT (envelope-from clord@FreeBSD.org) Date: Wed, 24 Jun 2015 17:17:54 GMT Message-Id: <201506241717.t5OHHsOD015413@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287541 - in soc2015/clord/head/sys/boot: arm/uboot efi/loader mips/beri/loader pc98/loader powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc64/loader userboot/ficl userboot/... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 17:17:59 -0000 Author: clord Date: Wed Jun 24 17:17:53 2015 New Revision: 287541 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287541 Log: Change paths to ficl sources to reflect new location in sys/contrib/ficl. Modified: soc2015/clord/head/sys/boot/arm/uboot/Makefile soc2015/clord/head/sys/boot/efi/loader/Makefile soc2015/clord/head/sys/boot/mips/beri/loader/Makefile soc2015/clord/head/sys/boot/pc98/loader/Makefile soc2015/clord/head/sys/boot/powerpc/kboot/Makefile soc2015/clord/head/sys/boot/powerpc/ofw/Makefile soc2015/clord/head/sys/boot/powerpc/ps3/Makefile soc2015/clord/head/sys/boot/powerpc/uboot/Makefile soc2015/clord/head/sys/boot/sparc64/loader/Makefile soc2015/clord/head/sys/boot/userboot/ficl/Makefile soc2015/clord/head/sys/boot/userboot/userboot/Makefile Modified: soc2015/clord/head/sys/boot/arm/uboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/arm/uboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/arm/uboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -82,7 +82,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/arm LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/efi/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/efi/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/efi/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -47,8 +47,8 @@ .if ${MK_FORTH} != "no" BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH} LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/mips/beri/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/mips/beri/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/mips/beri/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -71,8 +71,8 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../ficl -CFLAGS+= -I${.CURDIR}/../../../ficl/mips +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../../contrib/ficl/mips LIBFICL= ${.OBJDIR}/../../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/pc98/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/pc98/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/pc98/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -30,7 +30,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/i386 LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/kboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/kboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/kboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -64,7 +64,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/ofw/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/ofw/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/ofw/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -63,7 +63,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/ps3/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/ps3/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/ps3/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -64,7 +64,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/powerpc/uboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/powerpc/uboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/powerpc/uboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -69,7 +69,7 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/powerpc +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/powerpc LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/sparc64/loader/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/sparc64/loader/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/sparc64/loader/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -59,8 +59,8 @@ .if ${MK_FORTH} != "no" # Enable BootForth BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/sparc64 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl/sparc64 LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif Modified: soc2015/clord/head/sys/boot/userboot/ficl/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/userboot/ficl/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/userboot/ficl/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -3,8 +3,8 @@ .include MK_SSP= no -.PATH: ${.CURDIR}/../../ficl -.PATH: ${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +.PATH: ${.CURDIR}/../../../contrib/ficl +.PATH: ${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ prefix.c search.c stack.c tools.c vm.c words.c @@ -40,7 +40,7 @@ .endif # Standard softwords -.PATH: ${.CURDIR}/../../ficl/softwords +.PATH: ${.CURDIR}/../../../contrib/ficl/softwords SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ ifbrack.fr # Optional OO extension softwords @@ -54,12 +54,12 @@ CFLAGS+= -m32 -mcpu=powerpc -I. .endif -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl +CFLAGS+= -I${.CURDIR}/../../../contrib/ficl/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../../common softcore.c: ${SOFTWORDS} softcore.awk - (cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \ + (cd ${.CURDIR}/../../../contrib/ficl/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} #.if ${MACHINE_CPUARCH} == "amd64" Modified: soc2015/clord/head/sys/boot/userboot/userboot/Makefile ============================================================================== --- soc2015/clord/head/sys/boot/userboot/userboot/Makefile Wed Jun 24 16:19:21 2015 (r287540) +++ soc2015/clord/head/sys/boot/userboot/userboot/Makefile Wed Jun 24 17:17:53 2015 (r287541) @@ -45,7 +45,7 @@ .if ${MK_FORTH} != "no" BOOT_FORTH= yes -CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../../contrib/ficl -I${.CURDIR}/../../../contrib/ficl/i386 CFLAGS+= -DBF_DICTSIZE=15000 LIBFICL= ${.OBJDIR}/../ficl/libficl.a LIBSTAND= ${.OBJDIR}/../libstand/libstand.a From owner-svn-soc-all@freebsd.org Wed Jun 24 17:31:22 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EDA9915B33 for ; Wed, 24 Jun 2015 17:31:22 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E1B71E3B for ; Wed, 24 Jun 2015 17:31:22 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OHVMLt028991 for ; Wed, 24 Jun 2015 17:31:22 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5OHVJoU028966 for svn-soc-all@FreeBSD.org; Wed, 24 Jun 2015 17:31:19 GMT (envelope-from mihai@FreeBSD.org) Date: Wed, 24 Jun 2015 17:31:19 GMT Message-Id: <201506241731.t5OHVJoU028966@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287542 - in soc2015/mihai/bhyve-on-arm-head/sys: arm/vmm modules/vmm-arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 17:31:22 -0000 Author: mihai Date: Wed Jun 24 17:31:19 2015 New Revision: 287542 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287542 Log: soc2015: mihai: bhyve-on-arm-head: sys: arm: vmm: add support for create HYP mappings and initialization code Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/init.S soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 17:17:53 2015 (r287541) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 17:31:19 2015 (r287542) @@ -1,12 +1,56 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include "mmu.h" +#include "arm.h" + +static MALLOC_DEFINE(M_HYP, "ARM VMM HYP", "ARM VMM HYP"); + +lpae_pd_entry_t hyp_l1pd[2 * LPAE_L1_ENTRIES]; +extern void _hypervisor_stub_trap(void *vect_addr); +char *stack = NULL; + static int arm_init(int ipinum) { + char *stack_top, *hyp_code; + + stack = malloc(PAGE_SIZE, M_HYP); + stack_top = stack + PAGE_SIZE; + + lpae_vmmmap_set(NULL, stack, ptophys(stack), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); + + /* Allocate a PAGE for the HYP code to be sure it's PAGE_SIZE aligned and doesn't cross a page boundary */ + hyp_code = malloc(PAGE_SIZE, M_HYP); + memcpy(hyp_code, _hyp_code_start, _hyp_code_stop - _hyp_code_start); + + /* Create two mappings: + * - one identity - VA == PA + * - one normal mappings to HYP pagetable */ + lpae_vmmmap_set(NULL, hyp_code, ptophys(hyp_code), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); + lpae_vmmmap_set(NULL, ptophys(hyp_code), ptophys(hyp_code), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); + + vmm_call_hyp(NULL, stack_top, &hyp_l1pd[0], &hyp_l1pd[0]); return 0; } static void -arm_vmcleanup(void *arg) +arm_cleanup(void *arg) { + lpae_vmcleanup(NULL); } static void Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Wed Jun 24 17:31:19 2015 (r287542) @@ -0,0 +1,9 @@ +#include "mmu.h" + +struct hyp { + lpae_pd_entry_t l1pd[2 * LPAE_L1_ENTRIES]; + struct vm *vm; +}; + +uint64_t vmm_call_hyp(void *hyp_func_addr, ...); + Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/init.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/init.S Wed Jun 24 17:31:19 2015 (r287542) @@ -0,0 +1,134 @@ +#include "assym.s" +#include +#include +#include +#include +#include +#include + +#define SYS_WRITE0 4 + +.text + .globl _hyp_code_start + .globl _hyp_code_end + .globl _hyp_vector + .globl _init_hyp_vector + +_hyp_code_start: + +__semi_call: + svc 0x123456 + mov pc, lr + +ASENTRY_NP(kvm_call_hyp) + hvc #0 + bx lr +END(kvm_call_hyp) + + .align 5 +_init_hyp_vector: + .word 0 /* Reset */ + .word 0 /* undev */ + .word 0 /* SVC */ + .word 0 /* PABT */ + .word 0 /* DABT */ + b hyp_init_hvc /* HYP-Mode */ + .word 0 /* FIQ */ + .word 0 /* IRQ */ + +hyp_init_hvc: + mov sp, r1 /* r1 contains the stack pointer */ + + /* Find the offset between the two vectors */ + adr r0, _init_hyp_vector + adr r1, _hyp_vector + sub r1, r1, r0 + + mrc p15, 4, r0, c12, c0, 0 @ get current HVBAR + add r0, r0, r1 @ find the address of the _hyp_vector + mcr p15, 4, r0, c12, c0, 0 @ set HVBAR to the new vector + + mcrr p15, 4, r2, r3, c2 @ set the HTTBR (r2 is the low word, r3 is the low word) + isb + + @ Flush the TLB of this page + adr r1, _hyp_code_start + mcr p15, 4, r0, c8, c7, 0 @ TLBIALLH + dsb ish + + eret + + .align 5 +_hyp_vector: + b hyp_reset /* Reset */ + b hyp_undef /* undef */ + b hyp_svc /* SVC */ + b hyp_pabt /* PABT */ + b hyp_dabt /* DABT */ + b hyp_hvc /* HYP-Mode */ + b hyp_fiq /* FIQ */ + b hyp_irq /* IRQ */ + + .align +hyp_reset: + b loop + + .align +hyp_undef: + mov r0, #SYS_WRITE0 + adr r1, und_die_str + bl __semi_call + mrs r0, ELR_hyp + b loop + + .align +hyp_svc: + mov r0, #SYS_WRITE0 + adr r1, svc_die_str + bl __semi_call + mrs r0, ELR_hyp + b loop + .align + +hyp_pabt: + mov r0, #SYS_WRITE0 + adr r1, pabt_die_str + bl __semi_call + mrs r0, ELR_hyp + mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) + mrc p15, 4, r2, c6, c0, 2 @ HIFAR (hyp instruction fault address) + b loop + + .align +hyp_dabt: + mov r0, #SYS_WRITE0 + adr r1, dabt_die_str + bl __semi_call + mrs r0, ELR_hyp + mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) + mrc p15, 4, r2, c6, c0, 0 @ HDFAR (hyp data fault address) + b loop + + .align +hyp_hvc: + + .align +hyp_fiq: + b loop + .align +hyp_irq: + b loop + .align +loop: + b loop + +und_die_str: + .ascii "unexpected undefined exception in Hyp mode at r0: %#08x\n" +pabt_die_str: + .ascii "unexpected prefetch abort in Hyp mode at r0: %#08x\n" +dabt_die_str: + .ascii "unexpected data abort in Hyp mode at r0: %#08x\n" +svc_die_str: + .ascii "unexpected HVC/SVC trap in Hyp mode at r0: %#08x\n" + +_hyp_code_end: Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c Wed Jun 24 17:31:19 2015 (r287542) @@ -0,0 +1,191 @@ +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include "mmu.h" +#include "arm.h" + +MALLOC_DECLARE(M_HYP); +extern lpae_pd_entry_t hyp_l1pd[]; +/* + * create_lpae_mapping + * - l1pd - the level 1 address of the PD (NULL for the HYP mode PD) + * - virt_start - a 32 bit virtual address to be mapped + * - phys_start - a 64 bit physical address to map to + * - len - the desired length mapping, but it will be truncated to the virt_start + * alignment + * - prot - the FreeBSD mapping permissions + * - returns the actual length of the mapping + * + * An l1pd or l2pd will have a size of 8K (2 * LPAE_Lx_ENTRIES * sizeof(lpae_pd_entry_t)). + * The first 4K will include the bits for the MMU (physical addresses and bit permissions) + * and the second 4K will be a mirror of the first one but will include the virtual + * addresses of allocated page tables needed for walking and clean-up. + * + */ +static int create_lpae_mapping(lpae_pd_entry_t *l1pd, + lpae_vm_vaddr_t virt_start, + lpae_vm_paddr_t phys_start, + size_t len, + vm_prot_t prot) +{ + lpae_pd_entry_t *l2pd, *l3pd, *l1pd_shadow, *l2pd_shadow, *pd; + int l1_index, l2_index, l3_index; + int mapped_size = 0; + bool is_hyp_pd = false; + + if (l1pd == NULL) { + l1pd = &hyp_l1pd[0]; + is_hyp_pd = true; + } + + l1_index = (virt_start >> LPAE_L1_SHIFT) & LPAE_L1_INDEX_MASK; + l2_index = (virt_start >> LPAE_L2_SHIFT) & LPAE_L2_INDEX_MASK; + l3_index = (virt_start >> LPAE_L3_SHIFT) & LPAE_L3_INDEX_MASK; + + if ((virt_start & LPAE_L1_B_ADDR_MASK) == virt_start) { + if (len > LPAE_L1_SIZE) { + mapped_size = LPAE_L1_SIZE; + } + } + if(!mapped_size && (virt_start & LPAE_L2_B_ADDR_MASK) == virt_start) { + if (len > LPAE_L2_SIZE) { + mapped_size = LPAE_L2_SIZE; + } + } + if(!mapped_size) { + mapped_size = LPAE_L3_SIZE; + } + + if (mapped_size == LPAE_L1_SIZE) { + pd = &l1pd[l1_index]; + /* See if this PD is a link and fallback to the next level */ + if ((*pd & LPAE_TYPE_LINK) == LPAE_TYPE_LINK) + mapped_size = LPAE_L2_SIZE; + else + goto set_prot; + } + + l1pd_shadow = &l1pd[LPAE_L1_ENTRIES]; + + if (l1pd[l1_index] == 0) { + l2pd = malloc(2 * PAGE_SIZE, M_HYP, M_WAITOK | M_ZERO); + l2pd_shadow = &l2pd[LPAE_L2_ENTRIES]; + + l1pd[l1_index] = (lpae_pd_entry_t) vtophys(l2pd); + l1pd[l1_index] |= LPAE_TYPE_LINK; + + l1pd_shadow[l1_index] = (lpae_pd_entry_t) l2pd; + + } else { + l2pd = (lpae_pd_entry_t *) (l1pd_shadow[l1_index]); + l2pd_shadow = &l2pd[LPAE_L2_ENTRIES]; + } + + if (mapped_size == LPAE_L2_SIZE) { + pd = &l2pd[l2_index]; + /* See if this PD is a link and fallback to the next level */ + if ((*pd & LPAE_TYPE_LINK) == LPAE_TYPE_LINK) + mapped_size = LPAE_L3_SIZE; + else + goto set_prot; + } + + if (l2pd[l2_index] == 0) { + l3pd = malloc(PAGE_SIZE, M_HYP, M_WAITOK | M_ZERO); + l2pd[l2_index] = vtophys(l3pd); + l2pd[l2_index] |= LPAE_TYPE_LINK; + + l2pd_shadow[l2_index] = (lpae_pd_entry_t) l3pd; + } else { + l3pd = (lpae_pd_entry_t *) (l2pd_shadow[l2_index]); + } + + pd = &l3pd[l3_index]; + +set_prot: + if (prot != VM_PROT_NONE) { + *pd = phys_start; + *pd |= LPAE_TYPE_BLOCK; + + if (is_hyp_pd) { /* PL-2 stage-1 table */ + if (prot & (VM_PROT_READ | VM_PROT_WRITE)) + *pd |= LPAE_AP_HYP_RW; + else /* Map read-only*/ + *pd |= LPAE_AP_HYP_RDONLY; + } else { /* VM stage-2 page table */ + if (prot & VM_PROT_READ) + *pd |= LPAE_HAP_READ; + if (prot & VM_PROT_WRITE) + *pd |= LPAE_HAP_WRITE; + } + } else { + *pd = 0; + } + + return mapped_size; +} + +int lpae_vmmmap_set(void *arg, + lpae_vm_vaddr_t virt_start, + lpae_vm_paddr_t phys_start, + size_t len, + vm_prot_t prot) +{ + size_t n; + struct hyp *vm_hyp; + lpae_pd_entry_t *l1pd = NULL; + vm_hyp = arg; + if (arg) + l1pd = &vm_hyp->l1pd[0]; + + while (len > 0) { + n = create_lpae_mapping(l1pd, virt_start, phys_start, len, prot); + len -= n; + virt_start += n; + phys_start += n; + } + return (0); +} + +void lpae_vmcleanup(void *arg) +{ + int i, j; + struct hyp *vm_hyp; + lpae_pd_entry_t *l1pd, *l1pd_shadow, *l2pd, *l2pd_shadow; + + vm_hyp = arg; + + if (arg) + l1pd = &vm_hyp->l1pd[0]; + else + l1pd = &hyp_l1pd[0]; + + l1pd_shadow = &l1pd[LPAE_L1_ENTRIES]; + + for (i = 0; i < LPAE_L1_ENTRIES; i++) { + if(l1pd_shadow[i]) { + l2pd = (lpae_pd_entry_t *) l1pd_shadow[i]; + l2pd_shadow = &l2pd[LPAE_L2_ENTRIES]; + for (j = 0; j < LPAE_L2_ENTRIES; j++) { + if (l2pd_shadow[j]) { + free((void *) l2pd_shadow[j], M_HYP); + } + } + free((void *) l1pd_shadow[i], M_HYP); + } + } +} Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h Wed Jun 24 17:31:19 2015 (r287542) @@ -0,0 +1,54 @@ +#ifndef _VMM_MMU_H_ +#define _VMM_MMU_H_ + +typedef uint64_t lpae_pd_entry_t; /* LPAE page directory entry */ +typedef uint64_t lpae_pt_entry_t; /* LPAE page table entry */ + +typedef uint64_t lpae_vm_paddr_t; /* LPAE VM paddr */ +typedef uint32_t lpae_vm_vaddr_t; /* LPAE VM vaddr */ + +int lpae_vmmmap_set(void *arg, + lpae_vm_vaddr_t virt_start, + lpae_vm_paddr_t phys_start, + size_t len, + vm_prot_t prot); + +void lpae_vmcleanup(void *arg); + +#define LPAE_NLEVELS 3 + +#define LPAE_L1_TABLE_SIZE 0x1000 /* 4K */ +#define LPAE_L1_ENTRIES (LPAE_L1_TABLE_SIZE / 8) /* 512 */ + +#define LPAE_L2_TABLE_SIZE 0x1000 /* 4K */ +#define LPAE_L2_ENTRIES (LPAE_L2_TABLE_SIZE / 8) /* 512 */ + +#define LPAE_L3_TABLE_SIZE 0x1000 /* 4K */ +#define LPAE_L3_ENTRIES (LPAE_L3_TABLE_SIZE / 8) /* 512 */ + +#define LPAE_L1_SHIFT 30 +#define LPAE_L1_SIZE (1 << 30) +#define LPAE_L1_INDEX_MASK 0x3 +#define LPAE_L1_T_ADDR_MASK ((uint64_t)0xFFFFFFF000) /* phys address of L2 Table */ +#define LPAE_L1_B_ADDR_MASK ((uint64_t)0xFFC0000000) /* phys address of Phys Block */ + +#define LPAE_L2_SHIFT 21 +#define LPAE_L2_SIZE (1 << 21) +#define LPAE_L2_INDEX_MASK 0x1FF +#define LPAE_L2_T_ADDR_MASK ((uint64_t)0xFFFFFFF000)/* phys address of L3 Table */ +#define LPAE_L2_B_ADDR_MASK ((uint64_t)0xFFFFE00000)/* phys address of Phys Block */ + +#define LPAE_L3_SHIFT 12 +#define LPAE_L3_SIZE (1 << 12) +#define LPAE_L3_INDEX_MASK 0x1FF + +#define LPAE_TYPE_LINK 0x03 +#define LPAE_TYPE_BLOCK 0x01 +#define LPAE_TYPE_MASK 0x03 /* mask of type bits */ + +#define LPAE_AP_HYP_RW (0x01 << 6) /* RW permissions for PL-2 stage 1*/ +#define LPAE_AP_HYP_RDONLY (0x03 << 6) /* RD permissions for PL-2 stage 1 */ + +#define LPAE_HAP_READ (0x01 << 6) /* read permissions for stage 2 */ +#define LPAE_HAP_WRITE (0x02 << 6) /* write permissions for stage 2*/ +#endif Modified: soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Wed Jun 24 17:17:53 2015 (r287541) +++ soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Wed Jun 24 17:31:19 2015 (r287542) @@ -9,7 +9,9 @@ .PATH: ${.CURDIR}/../../arm/vmm SRCS+= vmm.c \ vmm_dev.c \ - vmm_stat.c + mmu.c \ + vmm_stat.c \ + init.S .include From owner-svn-soc-all@freebsd.org Wed Jun 24 21:55:55 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 451BF91688A for ; Wed, 24 Jun 2015 21:55:55 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 357B211E6 for ; Wed, 24 Jun 2015 21:55:55 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OLttgH020488 for ; Wed, 24 Jun 2015 21:55:55 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5OLtrtA020483 for svn-soc-all@FreeBSD.org; Wed, 24 Jun 2015 21:55:53 GMT (envelope-from mihai@FreeBSD.org) Date: Wed, 24 Jun 2015 21:55:53 GMT Message-Id: <201506242155.t5OLtrtA020483@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287552 - in soc2015/mihai/bhyve-on-arm-head/sys: arm/vmm modules/vmm-arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 21:55:55 -0000 Author: mihai Date: Wed Jun 24 21:55:52 2015 New Revision: 287552 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287552 Log: soc2015: mihai: bhyve-on-arm-head: sys: arm: vmm: complete initialization part Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Deleted: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/init.S Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 20:51:48 2015 (r287551) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 21:55:52 2015 (r287552) @@ -21,29 +21,69 @@ lpae_pd_entry_t hyp_l1pd[2 * LPAE_L1_ENTRIES]; extern void _hypervisor_stub_trap(void *vect_addr); -char *stack = NULL; +extern void* _init_hyp_vector; + +char *stack; +char *hyp_code; static int arm_init(int ipinum) { - char *stack_top, *hyp_code; + char *stack_top; + size_t hyp_code_size; + uint64_t *phys_hyp_l1pd; stack = malloc(PAGE_SIZE, M_HYP); stack_top = stack + PAGE_SIZE; - lpae_vmmmap_set(NULL, stack, ptophys(stack), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); + lpae_vmmmap_set(NULL, stack, ptophys(stack), PAGE_SIZE, + VM_PROT_READ | VM_PROT_WRITE); + + /* + * Allocate a PAGE for the HYP code to be sure it's PAGE_SIZE + * aligned and doesn't cross a page boundary. + */ + hyp_code_size = _hyp_code_stop - _hyp_code_start; + hyp_code_size = (hyp_code_size + PAGE_SIZE) & PAGE_SIZE; + hyp_code = contigmalloc(hyp_code_size, M_HYP, 0, 0x0, + 0xffffffff, PAGE_SIZE, 0); + memcpy(hyp_code, _hyp_code_start, hyp_code_size); - /* Allocate a PAGE for the HYP code to be sure it's PAGE_SIZE aligned and doesn't cross a page boundary */ - hyp_code = malloc(PAGE_SIZE, M_HYP); - memcpy(hyp_code, _hyp_code_start, _hyp_code_stop - _hyp_code_start); + printf("%s hyp_code_size: %p, _hyp_code_start: %p, hyp_code: %p\n", __func__, (void*) _hyp_code_start, (void*) hyp_code); /* Create two mappings: * - one identity - VA == PA - * - one normal mappings to HYP pagetable */ - lpae_vmmmap_set(NULL, hyp_code, ptophys(hyp_code), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - lpae_vmmmap_set(NULL, ptophys(hyp_code), ptophys(hyp_code), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); + * - one normal mappings to HYP pagetable + */ + lpae_vmmmap_set(NULL, hyp_code, ptophys(hyp_code), hyp_code_size, + VM_PROT_READ | VM_PROT_WRITE); + lpae_vmmmap_set(NULL, ptophys(hyp_code), ptophys(hyp_code), hyp_code_size, + VM_PROT_READ | VM_PROT_WRITE); + + /* + * Flush all caches to be sure we have the + * code and tables in physical memory + */ + cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); + + /* + * Install the temporary vector from which + * will do the initialization part of VMM + */ + _hypervisor_stub_trap(vtophys(_init_hyp_vector)); + + /* + * Special init call to activate the MMU + * and change the exception vector. + * - r0 - first parameter unused + * - r1 - stack pointer + * - r2 - lower 32 bits for the HTTBR + * - r3 - upper 32 bits for the HTTBR + */ + phys_hyp_l1pd = vtophys(&hyp_l1pd[0]); + vmm_call_hyp(NULL, stack_top, LOW(phys_hyp_l1pd), HIGH(phys_hyp_l1pd); - vmm_call_hyp(NULL, stack_top, &hyp_l1pd[0], &hyp_l1pd[0]); return 0; } Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Wed Jun 24 20:51:48 2015 (r287551) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Wed Jun 24 21:55:52 2015 (r287552) @@ -7,3 +7,5 @@ uint64_t vmm_call_hyp(void *hyp_func_addr, ...); +#define HIGH(x) (x >> 32) +#define LOW(x) (x & ((1 << 32) - 1)) Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Wed Jun 24 21:55:52 2015 (r287552) @@ -0,0 +1,134 @@ +#include "assym.s" +#include +#include +#include +#include +#include +#include + +#define SYS_WRITE0 4 + +.text + .globl _hyp_code_start + .globl _hyp_code_end + .globl _hyp_vector + .globl _init_hyp_vector + +_hyp_code_start: + +__semi_call: + svc 0x123456 + mov pc, lr + +ASENTRY_NP(kvm_call_hyp) + hvc #0 + bx lr +END(kvm_call_hyp) + + .align 5 +_init_hyp_vector: + .word 0 /* Reset */ + .word 0 /* undev */ + .word 0 /* SVC */ + .word 0 /* PABT */ + .word 0 /* DABT */ + b hyp_init_hvc /* HYP-Mode */ + .word 0 /* FIQ */ + .word 0 /* IRQ */ + +hyp_init_hvc: + mov sp, r1 /* r1 contains the stack pointer */ + + /* Find the offset between the two vectors */ + adr r0, _init_hyp_vector + adr r1, _hyp_vector + sub r1, r1, r0 + + mrc p15, 4, r0, c12, c0, 0 @ get current HVBAR + add r0, r0, r1 @ find the address of the _hyp_vector + mcr p15, 4, r0, c12, c0, 0 @ set HVBAR to the new vector + + mcrr p15, 4, r2, r3, c2 @ set the HTTBR (r2 is the low word, r3 is the low word) + isb + + @ Flush the TLB of this page + adr r1, _hyp_code_start + mcr p15, 4, r0, c8, c7, 0 @ TLBIALLH + dsb ish + + eret + + .align 5 +_hyp_vector: + b hyp_reset /* Reset */ + b hyp_undef /* undef */ + b hyp_svc /* SVC */ + b hyp_pabt /* PABT */ + b hyp_dabt /* DABT */ + b hyp_hvc /* HYP-Mode */ + b hyp_fiq /* FIQ */ + b hyp_irq /* IRQ */ + + .align +hyp_reset: + b loop + + .align +hyp_undef: + mov r0, #SYS_WRITE0 + adr r1, und_die_str + bl __semi_call + mrs r0, ELR_hyp + b loop + + .align +hyp_svc: + mov r0, #SYS_WRITE0 + adr r1, svc_die_str + bl __semi_call + mrs r0, ELR_hyp + b loop + .align + +hyp_pabt: + mov r0, #SYS_WRITE0 + adr r1, pabt_die_str + bl __semi_call + mrs r0, ELR_hyp + mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) + mrc p15, 4, r2, c6, c0, 2 @ HIFAR (hyp instruction fault address) + b loop + + .align +hyp_dabt: + mov r0, #SYS_WRITE0 + adr r1, dabt_die_str + bl __semi_call + mrs r0, ELR_hyp + mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) + mrc p15, 4, r2, c6, c0, 0 @ HDFAR (hyp data fault address) + b loop + + .align +hyp_hvc: + + .align +hyp_fiq: + b loop + .align +hyp_irq: + b loop + .align +loop: + b loop + +und_die_str: + .ascii "unexpected undefined exception in Hyp mode at r0: %#08x\n" +pabt_die_str: + .ascii "unexpected prefetch abort in Hyp mode at r0: %#08x\n" +dabt_die_str: + .ascii "unexpected data abort in Hyp mode at r0: %#08x\n" +svc_die_str: + .ascii "unexpected HVC/SVC trap in Hyp mode at r0: %#08x\n" + +_hyp_code_end: Modified: soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Wed Jun 24 20:51:48 2015 (r287551) +++ soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Wed Jun 24 21:55:52 2015 (r287552) @@ -11,7 +11,7 @@ vmm_dev.c \ mmu.c \ vmm_stat.c \ - init.S + hyp.S .include From owner-svn-soc-all@freebsd.org Wed Jun 24 22:03:07 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53D91916977 for ; Wed, 24 Jun 2015 22:03:07 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 238AD18DD for ; Wed, 24 Jun 2015 22:03:07 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OM37d6062084 for ; Wed, 24 Jun 2015 22:03:07 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5OM36Rs062043 for svn-soc-all@FreeBSD.org; Wed, 24 Jun 2015 22:03:06 GMT (envelope-from mihai@FreeBSD.org) Date: Wed, 24 Jun 2015 22:03:06 GMT Message-Id: <201506242203.t5OM36Rs062043@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287554 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 22:03:07 -0000 Author: mihai Date: Wed Jun 24 22:03:05 2015 New Revision: 287554 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287554 Log: soc2015: mihai: bhyve-on-arm-head: sys: arm: vmm: remove alloc for the code area because it breaks the global pointers Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 21:30:35 2015 (r287553) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Wed Jun 24 22:03:05 2015 (r287554) @@ -30,7 +30,6 @@ arm_init(int ipinum) { char *stack_top; - size_t hyp_code_size; uint64_t *phys_hyp_l1pd; stack = malloc(PAGE_SIZE, M_HYP); @@ -39,25 +38,15 @@ lpae_vmmmap_set(NULL, stack, ptophys(stack), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - /* - * Allocate a PAGE for the HYP code to be sure it's PAGE_SIZE - * aligned and doesn't cross a page boundary. - */ - hyp_code_size = _hyp_code_stop - _hyp_code_start; - hyp_code_size = (hyp_code_size + PAGE_SIZE) & PAGE_SIZE; - hyp_code = contigmalloc(hyp_code_size, M_HYP, 0, 0x0, - 0xffffffff, PAGE_SIZE, 0); - memcpy(hyp_code, _hyp_code_start, hyp_code_size); - - printf("%s hyp_code_size: %p, _hyp_code_start: %p, hyp_code: %p\n", __func__, (void*) _hyp_code_start, (void*) hyp_code); + printf("%s _hyp_code_start: %p\n", __func__, (void*) _hyp_code_start); /* Create two mappings: * - one identity - VA == PA * - one normal mappings to HYP pagetable */ - lpae_vmmmap_set(NULL, hyp_code, ptophys(hyp_code), hyp_code_size, + lpae_vmmmap_set(NULL, hyp_code, ptophys(_hyp_code_start), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - lpae_vmmmap_set(NULL, ptophys(hyp_code), ptophys(hyp_code), hyp_code_size, + lpae_vmmmap_set(NULL, ptophys(_hyp_code_start), ptophys(_hyp_code_start), PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); /* Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Wed Jun 24 21:30:35 2015 (r287553) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Wed Jun 24 22:03:05 2015 (r287554) @@ -14,6 +14,7 @@ .globl _hyp_vector .globl _init_hyp_vector + .p2align 12 _hyp_code_start: __semi_call: From owner-svn-soc-all@freebsd.org Thu Jun 25 20:01:46 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BF9B98DDF5 for ; Thu, 25 Jun 2015 20:01:46 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0980312AD for ; Thu, 25 Jun 2015 20:01:46 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PK1jLa009658 for ; Thu, 25 Jun 2015 20:01:45 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5PK1jq9009305 for svn-soc-all@FreeBSD.org; Thu, 25 Jun 2015 20:01:45 GMT (envelope-from kczekirda@FreeBSD.org) Date: Thu, 25 Jun 2015 20:01:45 GMT Message-Id: <201506252001.t5PK1jq9009305@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287633 - in soc2015/kczekirda: dhcp tftp www MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 20:01:46 -0000 Author: kczekirda Date: Thu Jun 25 20:01:44 2015 New Revision: 287633 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287633 Log: infrastructure init Added: soc2015/kczekirda/dhcp/ soc2015/kczekirda/dhcp/dhcpd.conf (contents, props changed) soc2015/kczekirda/tftp/ soc2015/kczekirda/tftp/undionly.kpxe (contents, props changed) soc2015/kczekirda/www/ soc2015/kczekirda/www/menu.ipxe Added: soc2015/kczekirda/dhcp/dhcpd.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/kczekirda/dhcp/dhcpd.conf Thu Jun 25 20:01:44 2015 (r287633) @@ -0,0 +1,21 @@ +# dhcpd.conf + +authoritative; + +default-lease-time 3600; +max-lease-time 86400; + +option domain-name-servers 192.168.22.1; + +subnet 192.168.22.0 netmask 255.255.255.0 { + range 192.168.22.10 192.168.22.50; + option routers 192.168.22.1; + option domain-name-servers 192.168.22.1; + next-server 192.168.22.19; + if exists user-class and ( option user-class = "iPXE" ) { + filename "http://192.168.22.3/menu.ipxe"; + } + else { + filename "undionly.kpxe"; + } +} Added: soc2015/kczekirda/tftp/undionly.kpxe ============================================================================== Binary file. No diff available. Added: soc2015/kczekirda/www/menu.ipxe ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/kczekirda/www/menu.ipxe Thu Jun 25 20:01:44 2015 (r287633) @@ -0,0 +1,4 @@ +#!ipxe + +dhcp +shell From owner-svn-soc-all@freebsd.org Thu Jun 25 20:38:08 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F3F898DA5F for ; Thu, 25 Jun 2015 20:38:08 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FE9210E1 for ; Thu, 25 Jun 2015 20:38:08 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PKc8kB048194 for ; Thu, 25 Jun 2015 20:38:08 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5PKc7C9048186 for svn-soc-all@FreeBSD.org; Thu, 25 Jun 2015 20:38:07 GMT (envelope-from iateaca@FreeBSD.org) Date: Thu, 25 Jun 2015 20:38:07 GMT Message-Id: <201506252038.t5PKc7C9048186@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to iateaca@FreeBSD.org using -f From: iateaca@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287634 - soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 20:38:08 -0000 Author: iateaca Date: Thu Jun 25 20:38:07 2015 New Revision: 287634 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287634 Log: parse the input string parameter and get the tap name and mac address Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c ============================================================================== --- soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Thu Jun 25 20:01:44 2015 (r287633) +++ soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Thu Jun 25 20:38:07 2015 (r287634) @@ -6,6 +6,9 @@ #include #include #include +#include + +#include #include "pci_emul.h" #include "mevent.h" @@ -48,6 +51,7 @@ #define ED_RTL80X9_80X9ID1 0x0b #define ED_RTL8029_ID1 0x43 +#define MAX_INPUT_LEN 32 /* * NE2000 data structures @@ -126,6 +130,9 @@ static void ne2000_tap_callback(int fd, enum ev_type type, void *param); +static int +ne2000_parse_input(char *opts, char *tap_name, uint8_t *mac); + /* * NE2000 module function definitions */ @@ -253,26 +260,77 @@ } static int +ne2000_parse_input(char *opts, char *tap_name, uint8_t *mac) +{ + uint8_t len = 0; + char *delim = NULL; + char *p_mac = NULL; + struct ether_addr *addr = NULL; + + if (opts == NULL) + return 1; + + len = strlen(opts); + if (len >= MAX_INPUT_LEN) { + DPRINTF("The input len should be less than %d", MAX_INPUT_LEN); + return 1; + } + + /* search for mac address in the input string */ + delim = strchr(opts, ','); + + if (delim != NULL) { + /* mark the end of the tap name */ + *delim = 0; + + /* point to the start of the mac address */ + p_mac = delim + 1; + + /* parse the mac addres */ + addr = ether_aton(p_mac); + + /* if the mac address is valid overwrite the default one */ + if (addr != NULL) + memcpy(mac, addr, ETHER_ADDR_LEN); + else + DPRINTF("Invalid mac"); + } + + /* copy the tap name */ + strcpy(tap_name, opts); + + return 0; +} + +static int pci_ne2000_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts) { struct pci_ne2000_softc *sc = NULL; int err; + /* the default mac address is 00:a0:98:4a:0e:ee */ + uint8_t mac[ETHER_ADDR_LEN] = {0x00, 0xa0, 0x98, 0x4a, 0x0e, 0xee}; + char tap_name[MAX_INPUT_LEN]; + #if DEBUG_NE2000 == 1 dbg = fopen("/tmp/bhyve_ne2000.log", "w+"); #endif assert(ctx != NULL); assert(pi != NULL); - assert(opts != NULL); sc = calloc(1, sizeof(struct pci_ne2000_softc)); pi->pi_arg = sc; sc->asc_pi = pi; - /* TODO - implement a better parsing of the input opts and get the name - * of the tap interface */ - err = ne2000_tap_init(sc, "/dev/tap0"); + err = ne2000_parse_input(opts, tap_name, mac); + if (err != 0) { + printf("Use input param like: -s x:y,ne2000-net,tap_name[,mac address]"); + free(sc); + return 1; + } + + err = ne2000_tap_init(sc, tap_name); assert(err == 0); /* probe a RTL8029 PCI card as a generic NE2000 device */ @@ -293,12 +351,12 @@ ED_RTL80X9_CONFIG3, ED_RTL80X9_CF3_FUDUP); /* the NE2000 card has his MAC address located in the first 6 words of the RAM memory */ - sc->ram[0] = 0x00; - sc->ram[2] = 0xa0; - sc->ram[4] = 0x98; - sc->ram[6] = 0x4a; - sc->ram[8] = 0x0e; - sc->ram[10] = 0xee; + sc->ram[0] = mac[0]; + sc->ram[2] = mac[1]; + sc->ram[4] = mac[2]; + sc->ram[6] = mac[3]; + sc->ram[8] = mac[4]; + sc->ram[10] = mac[5]; return 0; } From owner-svn-soc-all@freebsd.org Fri Jun 26 10:14:55 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BBCB98C573 for ; Fri, 26 Jun 2015 10:14:55 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4B012D7 for ; Fri, 26 Jun 2015 10:14:55 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QAEt7C017023 for ; Fri, 26 Jun 2015 10:14:55 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5QAEtAG017022 for svn-soc-all@FreeBSD.org; Fri, 26 Jun 2015 10:14:55 GMT (envelope-from stefano@FreeBSD.org) Date: Fri, 26 Jun 2015 10:14:55 GMT Message-Id: <201506261014.t5QAEtAG017022@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287648 - soc2015/stefano/ptnetmap/stable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 10:14:55 -0000 Author: stefano Date: Fri Jun 26 10:14:54 2015 New Revision: 287648 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287648 Log: add stable dir Added: soc2015/stefano/ptnetmap/stable/ From owner-svn-soc-all@freebsd.org Fri Jun 26 10:15:30 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E84E98C585 for ; Fri, 26 Jun 2015 10:15:30 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 161E512F0 for ; Fri, 26 Jun 2015 10:15:30 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QAFT2R017771 for ; Fri, 26 Jun 2015 10:15:29 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5QAFTSr017739 for svn-soc-all@FreeBSD.org; Fri, 26 Jun 2015 10:15:29 GMT (envelope-from stefano@FreeBSD.org) Date: Fri, 26 Jun 2015 10:15:29 GMT Message-Id: <201506261015.t5QAFTSr017739@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287649 - soc2015/stefano/ptnetmap/stable/10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 10:15:30 -0000 Author: stefano Date: Fri Jun 26 10:15:29 2015 New Revision: 287649 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287649 Log: add stable/10 Added: soc2015/stefano/ptnetmap/stable/10/ (props changed) - copied from r287648, mirror/FreeBSD/stable/10/ From owner-svn-soc-all@freebsd.org Sat Jun 27 13:50:13 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2DAA98E4F6 for ; Sat, 27 Jun 2015 13:50:13 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D1ED81EA3 for ; Sat, 27 Jun 2015 13:50:13 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RDoD76054718 for ; Sat, 27 Jun 2015 13:50:13 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5RDo9qU054458 for svn-soc-all@FreeBSD.org; Sat, 27 Jun 2015 13:50:09 GMT (envelope-from mihai@FreeBSD.org) Date: Sat, 27 Jun 2015 13:50:09 GMT Message-Id: <201506271350.t5RDo9qU054458@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287668 - in soc2015/mihai/bhyve-on-arm-head/sys: arm/arm arm/vmm modules/vmm-arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 13:50:14 -0000 Author: mihai Date: Sat Jun 27 13:50:08 2015 New Revision: 287668 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287668 Log: soc2015: mihai: bhyve-on-arm: sys: arm: vmm: added support for VMM init and clean-up. Also enabled HYP MMU Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/hypervisor-stub.S soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/hypervisor-stub.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/hypervisor-stub.S Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/hypervisor-stub.S Sat Jun 27 13:50:08 2015 (r287668) @@ -6,7 +6,7 @@ #include #include -ASENTRY_NP(_hypervisor_stub_vect_install) +ASENTRY_NP(hypervisor_stub_vect_install) /* If we are not in SVC mode than return */ mrs r0, cpsr @@ -15,7 +15,7 @@ movne pc, lr /* Install hypervisor stub vectors. */ - ldr r0, =_hypervisor_stub_vect + ldr r0, =hypervisor_stub_vect mcr p15, 4, r0, c12, c0, 0 @ set HVBAR /* Disable all the traps in the hypervisor. */ @@ -31,9 +31,9 @@ mcr p15, 4, r0, c1, c1, 1 @ HDCR mov pc, lr -END(_hypervisor_stub_vect_install) +END(hypervisor_stub_vect_install) -ASENTRY_NP(_hypervisor_stub_trap) +ASENTRY_NP(hypervisor_stub_trap) /* * If the first parameter is -1 than return the * exception vector (HVBAR), otherwise set it to @@ -43,15 +43,15 @@ mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR mcrne p15, 4, r0, c12, c0, 0 @ set HVBAR eret -END(_hypervisor_stub_trap) +END(hypervisor_stub_trap) - -_C_LABEL(_hypervisor_stub_vect): + .globl hypervisor_stub_vect +_C_LABEL(hypervisor_stub_vect): .word 0 /* Reset */ .word 0 /* undev */ .word 0 /* SMC */ .word 0 /* PABT */ .word 0 /* DABT */ - b _hypervisor_stub_trap /* HYP-Mode */ + b hypervisor_stub_trap /* HYP-Mode */ .word 0 /* FIQ */ .word 0 /* IRQ */ Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/locore-v6.S Sat Jun 27 13:50:08 2015 (r287668) @@ -69,7 +69,7 @@ STOP_UNWINDING /* Can't unwind into the bootloader! */ # If HYP-MODE is active, install an exception vector stub - bl _hypervisor_stub_vect_install + bl hypervisor_stub_vect_install # Return to SVC mrs r0, cpsr Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.c Sat Jun 27 13:50:08 2015 (r287668) @@ -17,50 +17,67 @@ #include "mmu.h" #include "arm.h" -static MALLOC_DEFINE(M_HYP, "ARM VMM HYP", "ARM VMM HYP"); +MALLOC_DEFINE(M_HYP, "ARM VMM HYP", "ARM VMM HYP"); -lpae_pd_entry_t hyp_l1pd[2 * LPAE_L1_ENTRIES]; -extern void _hypervisor_stub_trap(void *vect_addr); -extern void* _init_hyp_vector; +extern char init_hyp_vector[]; +extern char hyp_vector[]; +extern char hyp_code_start[]; +extern char hypervisor_stub_vect[]; +lpae_pd_entry_t *hyp_l1pd; char *stack; -char *hyp_code; static int arm_init(int ipinum) { char *stack_top; - uint64_t *phys_hyp_l1pd; + lpae_vm_paddr_t phys_hyp_l1pd; - stack = malloc(PAGE_SIZE, M_HYP); + stack = malloc(PAGE_SIZE, M_HYP, M_WAITOK | M_ZERO); stack_top = stack + PAGE_SIZE; - lpae_vmmmap_set(NULL, stack, ptophys(stack), PAGE_SIZE, + hyp_l1pd = malloc(2 * LPAE_L1_ENTRIES * sizeof(lpae_pd_entry_t), M_HYP, M_WAITOK | M_ZERO); + + lpae_vmmmap_set(NULL, + (lpae_vm_vaddr_t)stack, + (lpae_vm_paddr_t)vtophys(stack), + PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - printf("%s _hyp_code_start: %p\n", __func__, (void*) _hyp_code_start); + printf("%s hyp_code_start: %p, phys_hyp_code_start: %p\n", __func__, (void*) hyp_code_start, (void*)vtophys(hyp_code_start)); - /* Create two mappings: + /* + * Create two mappings: * - one identity - VA == PA * - one normal mappings to HYP pagetable */ - lpae_vmmmap_set(NULL, hyp_code, ptophys(_hyp_code_start), PAGE_SIZE, + lpae_vmmmap_set(NULL, + (lpae_vm_vaddr_t)hyp_code_start, + (lpae_vm_paddr_t)vtophys(hyp_code_start), + PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - lpae_vmmmap_set(NULL, ptophys(_hyp_code_start), ptophys(_hyp_code_start), PAGE_SIZE, + + lpae_vmmmap_set(NULL, + (lpae_vm_vaddr_t)vtophys(hyp_code_start), + (lpae_vm_paddr_t)vtophys(hyp_code_start), + PAGE_SIZE, VM_PROT_READ | VM_PROT_WRITE); - /* - * Flush all caches to be sure we have the - * code and tables in physical memory + /* + * Flush all caches to be sure we tables in physical memory */ cpu_idcache_wbinv_all(); cpu_l2cache_wbinv_all(); + dump_lpae_mapping(NULL); + /* * Install the temporary vector from which * will do the initialization part of VMM */ - _hypervisor_stub_trap(vtophys(_init_hyp_vector)); + printf("%s init_hyp_vector: %p\n", __func__, (void*) &init_hyp_vector[0]); + + vmm_call_hyp((void *)vtophys(&init_hyp_vector[0])); /* * Special init call to activate the MMU @@ -70,23 +87,42 @@ * - r2 - lower 32 bits for the HTTBR * - r3 - upper 32 bits for the HTTBR */ - phys_hyp_l1pd = vtophys(&hyp_l1pd[0]); - vmm_call_hyp(NULL, stack_top, LOW(phys_hyp_l1pd), HIGH(phys_hyp_l1pd); + + phys_hyp_l1pd = (lpae_vm_paddr_t)vtophys(hyp_l1pd); + + printf("%s hyp_l1pd: %p, phys_hyp_l1pd %p\n", __func__, (void*) hyp_l1pd, (void*)phys_hyp_l1pd); + vmm_call_hyp(&hyp_vector[0], stack_top, LOW(phys_hyp_l1pd), HIGH(phys_hyp_l1pd)); return 0; } -static void -arm_cleanup(void *arg) +static int +arm_cleanup(void) { + printf("%s before vmm_call_hyp\n", __func__); + + vmm_call_hyp((void *) vtophys(vmm_stub_install), (void *)vtophys(&hypervisor_stub_vect[0])); + printf("%s after vmm_call_hyp\n", __func__); + + printf("%s before freestack\n", __func__); + + free(stack, M_HYP); + printf("%s before lpae_vmcleanup\n", __func__); + lpae_vmcleanup(NULL); + printf("%s before vmm_call_hyp\n", __func__); + + free(hyp_l1pd, M_HYP); + + + return 0; } static void arm_restore(void) { - arm_enable(NULL); + ; } static void * Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/arm.h Sat Jun 27 13:50:08 2015 (r287668) @@ -7,5 +7,7 @@ uint64_t vmm_call_hyp(void *hyp_func_addr, ...); -#define HIGH(x) (x >> 32) -#define LOW(x) (x & ((1 << 32) - 1)) +void vmm_stub_install(void *hypervisor_stub_vect); + +#define LOW(x) (x & 0xFFFFFFFF) +#define HIGH(x) LOW(x >> 32) Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Sat Jun 27 13:50:08 2015 (r287668) @@ -6,28 +6,65 @@ #include #include -#define SYS_WRITE0 4 +#include "hyp.h" + .text - .globl _hyp_code_start - .globl _hyp_code_end - .globl _hyp_vector - .globl _init_hyp_vector + .globl hyp_code_start + .globl hyp_code_end + .globl hyp_vector + .globl init_hyp_vector .p2align 12 -_hyp_code_start: +hyp_code_start: __semi_call: svc 0x123456 mov pc, lr -ASENTRY_NP(kvm_call_hyp) +ENTRY(vmm_call_hyp) hvc #0 bx lr -END(kvm_call_hyp) +END(vmm_call_hyp) + +/* + * void vmm_stub_install(void *hypervisor_stub_vect); + * - r0 - the pointer to the stub vector + */ +ENTRY(vmm_stub_install) + + /* Install hypervisor stub vectors. */ + mcr p15, 4, r0, c12, c0, 0 @ set HVBAR + + /* Disable all the traps in the hypervisor. */ + mov r0, #0 + mcr p15, 4, r0, c1, c1, 0 @ HCR + mcr p15, 4, r0, c1, c1, 2 @ HCPTR + mcr p15, 4, r0, c1, c1, 3 @ HSTR + mcr p15, 4, r0, c1, c0, 0 @ HSCTLR + + /* Don't disable access to perf-mon from PL0,1 */ + mrc p15, 4, r0, c1, c1, 1 @ HDCR + and r0, #0x1f @ Preserve HPMN + mcr p15, 4, r0, c1, c1, 1 @ HDCR + + eret +END(vmm_stub_install) + +ENTRY(vmm_set_get_hvbar) + /* + * If the first parameter is -1 than return the + * exception vector (HVBAR), otherwise set it to + * the value of it. + */ + cmp r0, #-1 + mrceq p15, 4, r0, c12, c0, 0 @ get HVBAR + mcrne p15, 4, r0, c12, c0, 0 @ set HVBAR + bx lr +END(vmm_set_get_hvbar) .align 5 -_init_hyp_vector: +init_hyp_vector: .word 0 /* Reset */ .word 0 /* undev */ .word 0 /* SVC */ @@ -38,29 +75,56 @@ .word 0 /* IRQ */ hyp_init_hvc: - mov sp, r1 /* r1 contains the stack pointer */ - - /* Find the offset between the two vectors */ - adr r0, _init_hyp_vector - adr r1, _hyp_vector - sub r1, r1, r0 - - mrc p15, 4, r0, c12, c0, 0 @ get current HVBAR - add r0, r0, r1 @ find the address of the _hyp_vector - mcr p15, 4, r0, c12, c0, 0 @ set HVBAR to the new vector - - mcrr p15, 4, r2, r3, c2 @ set the HTTBR (r2 is the low word, r3 is the low word) + mcr p15, 4, r0, c12, c0, 0 @ set HVBAR to the new vector + mov sp, r1 @ set SP. r1 contains the stack pointer + mcrr p15, 4, r2, r3, c2 @ set the HTTBR (r2 is the low word, r3 is the low word) isb - @ Flush the TLB of this page - adr r1, _hyp_code_start - mcr p15, 4, r0, c8, c7, 0 @ TLBIALLH + @ Set HTCR.T0SZ=0 so x=5 (ARM man: B4.1.76) + @ Set HTCR.ORGN0/.IRGN0/.SH0 to 0 to disable cacheability and shareability + @ HTCR_MASK contains all the above bits + mrc p15, 4, r0, c2, c0, 2 @ HTCR + ldr r1,=HTCR_MASK + bic r0, r0, r1 + mcr p15, 4, r0, c2, c0, 2 @ HTCR + + @ TODO configure the VTCR for supporting 32/40 bit IPA +/* + mrc p15, 4, r1, c2, c1, 2 @ VTCR + ldr r2, =VTCR_MASK + bic r1, r1, r2 + bic r0, r0, #(~VTCR_HTCR_SH) @ clear non-reusable HTCR bits + orr r1, r0, r1 + orr r1, r1, #(VTCR_SL_L1 | VTCR_T0SZ | KVM_VTCR_S) + mcr p15, 4, r1, c2, c1, 2 @ VTCR +*/ + @ Set the HMAIR0/1 (same as MAIR0/1) registers for AttrIndx[2:0] + ldr r0, =HMAIR0 + mcr p15, 4, r0, c10, c2, 0 + ldr r0, =HMAIR1 + mcr p15, 4, r0, c10, c2, 1 + + @ Flush the TLB entries from Hyp-Mode + mcr p15, 4, r0, c8, c7, 0 @ TLBIALLH dsb ish + mrc p15, 4, r0, c1, c0, 0 @ Read current HSCTLR + ldr r2, =HSCTLR_MASK + bic r0, r0, r2 + + mrc p15, 0, r1, c1, c0, 0 @ Read the current SCTLR + ldr r2, =(HSCTLR_EE | HSCTLR_FI | HSCTLR_I | HSCTLR_C) + and r1, r1, r2 + ldr r2, =(HSCTLR_M | HSCTLR_A) + orr r1, r1, r2 + orr r0, r0, r1 + isb + mcr p15, 4, r0, c1, c0, 0 @ Set the new HSCTLR + eret .align 5 -_hyp_vector: +hyp_vector: b hyp_reset /* Reset */ b hyp_undef /* undef */ b hyp_svc /* SVC */ @@ -69,8 +133,8 @@ b hyp_hvc /* HYP-Mode */ b hyp_fiq /* FIQ */ b hyp_irq /* IRQ */ - .align + hyp_reset: b loop @@ -81,6 +145,8 @@ bl __semi_call mrs r0, ELR_hyp b loop +und_die_str: + .ascii "unexpected undefined exception in Hyp mode at r0: %#08x\n" .align hyp_svc: @@ -89,16 +155,23 @@ bl __semi_call mrs r0, ELR_hyp b loop - .align +svc_die_str: + .ascii "unexpected HVC/SVC trap in Hyp mode at r0: %#08x\n" + + .align hyp_pabt: mov r0, #SYS_WRITE0 adr r1, pabt_die_str + mov r2, lr bl __semi_call - mrs r0, ELR_hyp - mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) - mrc p15, 4, r2, c6, c0, 2 @ HIFAR (hyp instruction fault address) - b loop +// mrs r0, ELR_hyp +// mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) +// mrc p15, 4, r2, c6, c0, 2 @ HIFAR (hyp instruction fault address) + mov pc, r2 +# b loop +pabt_die_str: + .ascii "unexpected prefetch abort in Hyp mode at r0: %#08x\n" .align hyp_dabt: @@ -106,13 +179,44 @@ adr r1, dabt_die_str bl __semi_call mrs r0, ELR_hyp - mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) - mrc p15, 4, r2, c6, c0, 0 @ HDFAR (hyp data fault address) + mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) + mrc p15, 4, r2, c6, c0, 0 @ HDFAR (hyp data fault address) b loop +dabt_die_str: + .ascii "unexpected data abort in Hyp mode at r0: %#08x\n" .align hyp_hvc: - + push {r0, r1, r2} @ Save registers in order to use them + mrc p15, 4, r1, c5, c2, 0 @ Check HSR for explicit HVC call + lsr r0, r1, #HSR_EC_SHIFT + cmp r0, #HSR_EC_HVC + bne guest_trap + + mrrc p15, 6, r0, r1, c2 @ Check VMID=0 to be sure that host called HVC + lsr r1, r1, #VTTBR_VMID_SHIFT + and r1, r1, #VTTBR_VMID_MASK + cmp r1, #0 + bne guest_trap + +host_called_hyp: + pop {r0, r1, r2} @ Restore registers + push {lr} + mrs lr, SPSR + push {lr} + + mov lr, r0 + mov r0, r1 + mov r1, r2 + mov r2, r3 + blx lr + pop {lr} + msr SPSR_csxf, lr + pop {lr} + eret + +guest_trap: + b loop .align hyp_fiq: b loop @@ -123,13 +227,4 @@ loop: b loop -und_die_str: - .ascii "unexpected undefined exception in Hyp mode at r0: %#08x\n" -pabt_die_str: - .ascii "unexpected prefetch abort in Hyp mode at r0: %#08x\n" -dabt_die_str: - .ascii "unexpected data abort in Hyp mode at r0: %#08x\n" -svc_die_str: - .ascii "unexpected HVC/SVC trap in Hyp mode at r0: %#08x\n" - -_hyp_code_end: +hyp_code_end: Added: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h Sat Jun 27 13:50:08 2015 (r287668) @@ -0,0 +1,73 @@ + +#define SYS_WRITE0 4 + +#define HSR_EC_SHIFT 26 +#define HSR_EC_HVC 0x12 +#define VTTBR_VMID_SHIFT 16 +#define VTTBR_VMID_MASK 0xff + +/* Hyp System Control Register (HSCTLR) bits */ +#define HSCTLR_TE (1 << 30) +#define HSCTLR_EE (1 << 25) +#define HSCTLR_FI (1 << 21) +#define HSCTLR_WXN (1 << 19) +#define HSCTLR_I (1 << 12) +#define HSCTLR_C (1 << 2) +#define HSCTLR_A (1 << 1) +#define HSCTLR_M (1 << 0) +#define HSCTLR_MASK (HSCTLR_M | HSCTLR_A | HSCTLR_C | HSCTLR_I | HSCTLR_WXN | HSCTLR_FI | HSCTLR_EE | HSCTLR_TE) + +/* TTBCR and HTCR Registers bits */ +#define TTBCR_EAE (1 << 31) +#define TTBCR_IMP (1 << 30) +#define TTBCR_SH1 (3 << 28) +#define TTBCR_ORGN1 (3 << 26) +#define TTBCR_IRGN1 (3 << 24) +#define TTBCR_EPD1 (1 << 23) +#define TTBCR_A1 (1 << 22) +#define TTBCR_T1SZ (7 << 16) +#define TTBCR_SH0 (3 << 12) +#define TTBCR_ORGN0 (3 << 10) +#define TTBCR_IRGN0 (3 << 8) +#define TTBCR_EPD0 (1 << 7) +#define TTBCR_T0SZ (7 << 0) +#define HTCR_MASK (TTBCR_T0SZ | TTBCR_IRGN0 | TTBCR_ORGN0 | TTBCR_SH0) + +/* Virtualization Translation Control Register (VTCR) bits */ +#define VTCR_SH0 (3 << 12) +#define VTCR_ORGN0 (3 << 10) +#define VTCR_IRGN0 (3 << 8) +#define VTCR_SL0 (3 << 6) +#define VTCR_S (1 << 4) +#define VTCR_T0SZ (0xf) +#define VTCR_MASK (VTCR_SH0 | VTCR_ORGN0 | VTCR_IRGN0 | VTCR_SL0 | VTCR_S | VTCR_T0SZ) +#define VTCR_HTCR_SH (VTCR_SH0 | VTCR_ORGN0 | VTCR_IRGN0) +#define VTCR_SL_L2 (0 << 6) /* Starting-level: 2 */ +#define VTCR_SL_L1 (1 << 6) /* Starting-level: 1 */ + + +/* + * Memory region attributes for LPAE (defined in pgtable-3level.h): + * + * n = AttrIndx[2:0] + * + * n MAIR + * UNCACHED 000 00000000 + * BUFFERABLE 001 01000100 + * DEV_WC 001 01000100 + * WRITETHROUGH 010 10101010 + * WRITEBACK 011 11101110 + * DEV_CACHED 011 11101110 + * DEV_SHARED 100 00000100 + * DEV_NONSHARED 100 00000100 + * unused 101 + * unused 110 + * WRITEALLOC 111 11111111 + */ +#define MAIR0 0xeeaa4400 +#define MAIR1 0xff000004 +#define HMAIR0 MAIR0 +#define HMAIR1 MAIR1 + + + Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.c Sat Jun 27 13:50:08 2015 (r287668) @@ -19,7 +19,7 @@ #include "arm.h" MALLOC_DECLARE(M_HYP); -extern lpae_pd_entry_t hyp_l1pd[]; +extern lpae_pd_entry_t *hyp_l1pd; /* * create_lpae_mapping * - l1pd - the level 1 address of the PD (NULL for the HYP mode PD) @@ -57,12 +57,12 @@ l3_index = (virt_start >> LPAE_L3_SHIFT) & LPAE_L3_INDEX_MASK; if ((virt_start & LPAE_L1_B_ADDR_MASK) == virt_start) { - if (len > LPAE_L1_SIZE) { + if (len >= LPAE_L1_SIZE) { mapped_size = LPAE_L1_SIZE; } } if(!mapped_size && (virt_start & LPAE_L2_B_ADDR_MASK) == virt_start) { - if (len > LPAE_L2_SIZE) { + if (len >= LPAE_L2_SIZE) { mapped_size = LPAE_L2_SIZE; } } @@ -119,7 +119,11 @@ set_prot: if (prot != VM_PROT_NONE) { *pd = phys_start; - *pd |= LPAE_TYPE_BLOCK; + *pd |= LPAE_AF; + if (mapped_size == LPAE_L3_SIZE) + *pd |= LPAE_L3_TYPE_BLOCK; + else + *pd |= LPAE_L12_TYPE_BLOCK; if (is_hyp_pd) { /* PL-2 stage-1 table */ if (prot & (VM_PROT_READ | VM_PROT_WRITE)) @@ -139,6 +143,41 @@ return mapped_size; } +void dump_lpae_mapping(void *arg) +{ + int i, j, k; + struct hyp *vm_hyp; + lpae_pd_entry_t *l1pd, *l1pd_shadow, *l2pd, *l2pd_shadow, *l3pd; + + vm_hyp = arg; + + if (arg) + l1pd = &vm_hyp->l1pd[0]; + else + l1pd = &hyp_l1pd[0]; + + l1pd_shadow = &l1pd[LPAE_L1_ENTRIES]; + + printf("l1pd = %x\n", vtophys(l1pd)); + + for (i = 0; i < LPAE_L1_ENTRIES; i++) { + if(l1pd_shadow[i]) { + printf("\t %d: l2pd = %llx\n", i, l1pd[i]); + l2pd = (lpae_pd_entry_t *) l1pd_shadow[i]; + l2pd_shadow = &l2pd[LPAE_L2_ENTRIES]; + for (j = 0; j < LPAE_L2_ENTRIES; j++) { + if (l2pd_shadow[j]) { + printf("\t\t %d: l3pd = %llx\n", j, l2pd[j]); + l3pd = (lpae_pd_entry_t *) l2pd_shadow[j]; + for (k = 0; k < LPAE_L3_ENTRIES; k++) { + if (l3pd[k]) + printf("\t\t\t %d: l3_entry = %llx\n", k, l3pd[k]); + } + } + } + } + } +} int lpae_vmmmap_set(void *arg, lpae_vm_vaddr_t virt_start, lpae_vm_paddr_t phys_start, Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/mmu.h Sat Jun 27 13:50:08 2015 (r287668) @@ -14,6 +14,7 @@ vm_prot_t prot); void lpae_vmcleanup(void *arg); +void dump_lpae_mapping(void *arg); #define LPAE_NLEVELS 3 @@ -42,13 +43,17 @@ #define LPAE_L3_SIZE (1 << 12) #define LPAE_L3_INDEX_MASK 0x1FF -#define LPAE_TYPE_LINK 0x03 -#define LPAE_TYPE_BLOCK 0x01 -#define LPAE_TYPE_MASK 0x03 /* mask of type bits */ +#define LPAE_TYPE_LINK 0x03 +#define LPAE_L12_TYPE_BLOCK 0x01 +#define LPAE_L3_TYPE_BLOCK 0x03 +#define LPAE_TYPE_MASK 0x03 /* mask of type bits */ #define LPAE_AP_HYP_RW (0x01 << 6) /* RW permissions for PL-2 stage 1*/ #define LPAE_AP_HYP_RDONLY (0x03 << 6) /* RD permissions for PL-2 stage 1 */ #define LPAE_HAP_READ (0x01 << 6) /* read permissions for stage 2 */ #define LPAE_HAP_WRITE (0x02 << 6) /* write permissions for stage 2*/ + +#define LPAE_AF (0x1 << 10) /* Access Flag */ + #endif Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/vmm.c Sat Jun 27 13:50:08 2015 (r287668) @@ -198,7 +198,7 @@ static int vmm_init(void) { - ops = NULL; + ops = &vmm_ops_arm; return (VMM_INIT(0)); } @@ -218,7 +218,9 @@ case MOD_UNLOAD: error = vmmdev_cleanup(); if (error == 0) { - vmm_initialized = 0; + error = VMM_CLEANUP(); + if (error) + vmm_initialized = 0; } break; default: Modified: soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Sat Jun 27 12:37:09 2015 (r287667) +++ soc2015/mihai/bhyve-on-arm-head/sys/modules/vmm-arm/Makefile Sat Jun 27 13:50:08 2015 (r287668) @@ -11,6 +11,7 @@ vmm_dev.c \ mmu.c \ vmm_stat.c \ + arm.c \ hyp.S From owner-svn-soc-all@freebsd.org Sat Jun 27 22:20:13 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74B0098E11F for ; Sat, 27 Jun 2015 22:20:13 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 656C51C63 for ; Sat, 27 Jun 2015 22:20:13 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5RMKDAf010330 for ; Sat, 27 Jun 2015 22:20:13 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5RMKCLk010310 for svn-soc-all@FreeBSD.org; Sat, 27 Jun 2015 22:20:12 GMT (envelope-from mihai@FreeBSD.org) Date: Sat, 27 Jun 2015 22:20:12 GMT Message-Id: <201506272220.t5RMKCLk010310@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287673 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2015 22:20:13 -0000 Author: mihai Date: Sat Jun 27 22:20:11 2015 New Revision: 287673 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287673 Log: soc2015: mihai: bhyve-on-arm: panic in HOST when entering critical exceptions in HYP-Mode Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Sat Jun 27 20:39:13 2015 (r287672) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S Sat Jun 27 22:20:11 2015 (r287673) @@ -17,11 +17,6 @@ .p2align 12 hyp_code_start: - -__semi_call: - svc 0x123456 - mov pc, lr - ENTRY(vmm_call_hyp) hvc #0 bx lr @@ -120,7 +115,6 @@ orr r0, r0, r1 isb mcr p15, 4, r0, c1, c0, 0 @ Set the new HSCTLR - eret .align 5 @@ -140,50 +134,35 @@ .align hyp_undef: - mov r0, #SYS_WRITE0 - adr r1, und_die_str - bl __semi_call - mrs r0, ELR_hyp - b loop + ldr r0, =und_die_str + mov r1, #EXCEPTION_UNDEF + bl handle_bad_exception und_die_str: - .ascii "unexpected undefined exception in Hyp mode at r0: %#08x\n" + .ascii "unexpected undefined exception in Hyp mode at: %#08x\n" .align hyp_svc: - mov r0, #SYS_WRITE0 - adr r1, svc_die_str - bl __semi_call - mrs r0, ELR_hyp - b loop + ldr r0, =svc_die_str + mov r1, #EXCEPTION_SVC + bl handle_bad_exception svc_die_str: - .ascii "unexpected HVC/SVC trap in Hyp mode at r0: %#08x\n" - + .ascii "unexpected HVC/SVC trap in Hyp mode at: %#08x\n" .align hyp_pabt: - mov r0, #SYS_WRITE0 - adr r1, pabt_die_str - mov r2, lr - bl __semi_call -// mrs r0, ELR_hyp -// mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) -// mrc p15, 4, r2, c6, c0, 2 @ HIFAR (hyp instruction fault address) - mov pc, r2 -# b loop + ldr r0, =pabt_die_str + mov r1, #EXCEPTION_PABT + bl handle_bad_exception pabt_die_str: - .ascii "unexpected prefetch abort in Hyp mode at r0: %#08x\n" + .ascii "unexpected prefetch abort in Hyp mode at: %#08x\n" .align hyp_dabt: - mov r0, #SYS_WRITE0 - adr r1, dabt_die_str - bl __semi_call - mrs r0, ELR_hyp - mrc p15, 4, r1, c5, c2, 0 @ HSR (syndrome register) - mrc p15, 4, r2, c6, c0, 0 @ HDFAR (hyp data fault address) - b loop + ldr r0, =dabt_die_str + mov r1, #EXCEPTION_DABT + bl handle_bad_exception dabt_die_str: - .ascii "unexpected data abort in Hyp mode at r0: %#08x\n" + .ascii "unexpected data abort in Hyp mode at: %#08x\n" .align hyp_hvc: @@ -224,6 +203,27 @@ hyp_irq: b loop .align + +ENTRY(handle_bad_exception) + /* We have in r0 pointer to the panic string and in r1 the exception code */ + mrrc p15, 6, r3, r2, c2 @ Read VTTBR + lsr r2, r2, #16 + ands r2, r2, #0xff + bne guest_bad_exception + + mrs r2, cpsr + bic r2, r2, #PSR_MODE + orr r2, r2, #PSR_SVC32_MODE + msr spsr_cxsf, r2 + mrs r1, ELR_hyp @ We don't need anymore the exception code, we store 2nd param for panic */ + ldr r3, =panic + msr ELR_hyp, r3 + eret + +guest_bad_exception: + b loop +END(handle_bad_exception) + loop: b loop Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h Sat Jun 27 20:39:13 2015 (r287672) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.h Sat Jun 27 22:20:11 2015 (r287673) @@ -1,5 +1,15 @@ +#ifndef _VMM_HYP_H_ +#define _VMM_HYP_H_ -#define SYS_WRITE0 4 +/* Hyp Exceptions */ +#define EXCEPTION_RESET 0 +#define EXCEPTION_UNDEF 1 +#define EXCEPTION_SVC 2 +#define EXCEPTION_PABT 3 +#define EXCEPTION_DABT 4 +#define EXCEPTION_HVC 5 +#define EXCEPTION_FIQ 6 +#define EXCEPTION_IRQ 7 #define HSR_EC_SHIFT 26 #define HSR_EC_HVC 0x12 @@ -69,5 +79,4 @@ #define HMAIR0 MAIR0 #define HMAIR1 MAIR1 - - +#endif