Re: svn commit: r289834 - head/sys/x86/x86

2015-11-02 Thread Oliver Pinter 
On 11/2/15, Roger Pau Monné  wrote:
> El 29/10/15 a les 22.48, Oliver Pinter ha escrit:
>> Yes, at next week I have time for the test.  Please ping me again at
>> Monday.
>
> Ping :).

Pong. :) I now stared a new build with the patch, so I will report
back 1-2 hours from now.
>
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289834 - head/sys/x86/x86

2015-11-02 Thread Roger Pau Monné 
El 29/10/15 a les 22.48, Oliver Pinter ha escrit:
> Yes, at next week I have time for the test.  Please ping me again at
> Monday.

Ping :).

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289834 - head/sys/x86/x86

2015-11-02 Thread Oliver Pinter 
On Mon, Nov 2, 2015 at 2:44 PM, Oliver Pinter
<oliver.pin...@hardenedbsd.org> wrote:
> On 11/2/15, Roger Pau Monné <roy...@freebsd.org> wrote:
>> El 29/10/15 a les 22.48, Oliver Pinter ha escrit:
>>> Yes, at next week I have time for the test.  Please ping me again at
>>> Monday.
>>
>> Ping :).
>
> Pong. :) I now stared a new build with the patch, so I will report
> back 1-2 hours from now.

It's better. :)

root@nyi-01 src# git show | head -30
commit 8f6110bd2e258b3f4224eb580e99fa142bebc727
Author: Roger Pau Monne <roger@citrix.com>
Date:   Thu Oct 29 12:58:23 2015 +0100

x86/dma_bounce: rework _bus_dmamap_load_ma implementation

The implementation of bus_dmamap_load_ma_triv currently calls
_bus_dmamap_load_phys on each page that is part of the passed in buffer.
Since each page is treated as an individual buffer, the resulting behaviour
is different from the behaviour of _bus_dmamap_load_buffer. This breaks
certain drivers, like Xen blkfront.

If an unmapped buffer of size 4096 that starts at offset 13 into the first
page is passed to the current _bus_dmamap_load_ma implementation (so the ma
array contains two pages), the result is that two segments are created, one
with a size of 4083 and the other with size 13 (because two independant
calls to _bus_dmamap_load_phys are performed, one for each physical page).
If the same is done with a mapped buffer and calling _bus_dmamap_load_buffer
the result is that only one segment is created, with a size of 4096.

This patch relegates the usage of bus_dmamap_load_ma_triv in x86 bounce
buffer code to drivers requesting BUS_DMA_KEEP_PG_OFFSET and implements
_bus_dmamap_load_ma so that it's behaviour is the same as the mapped version
(_bus_dmamap_load_buffer). This patch only modifies the x86 bounce buffer
code, other arches are left untouched.

Reviewed by:kib, jah
Differential Revision:  https://reviews.freebsd.org/D888
Sponsored by:   Citrix Systems R

root@nyi-01 src# uname -a
FreeBSD nyi-01.build.hardenedbsd.org 11.0-CURRENT-HBSD FreeBSD
11.0-CURRENT-HBSD #14 8f6110b(jenkins-world-kernel-20151102): Mon Nov
2 09:42:26 EST 2015
r...@nyi-01.build.hardenedbsd.org:/usr/obj/usr/src/sys/JENKINS  amd64
root@nyi-01 src# uptime
10:05AM  up 3 mins, 2 users, load averages: 0.46, 1.09, 0.57
root@nyi-01 src#

Now I started a new jenkins build to see the patch under stress.

>>
>>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290245 - in head/sys/contrib/vchiq/interface: vchi vchiq_arm

2015-11-02 Thread Adrian Chadd 
On 2 November 2015 at 09:18, Andriy Gapon  wrote:
> On 02/11/2015 18:13, Adrian Chadd wrote:
>> The same reason we don't use it for dri, etc.
>>
>> The vendor driver isn't portable by any stretch. We could put it
>> there, but then we'd have to maintain the vendor changes on top of it
>> in subversion and I kinda dont want to think about how that'll work
>> out.. :)
>
> Same as, say, ZFS?

Well, we're getting paid approximately $0 to try and keep this cleaner. :-)

at some point yeah, we may do it the vendor branch way.




-adrian
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289759 - in head/sys/arm: arm include

2015-11-02 Thread Jason Harmening 
On Sun, Nov 1, 2015 at 8:11 AM, Ian Lepore  wrote:

>
> It's almost certainly not related to sysinit ordering.  This exception
> is happening during mmc probing after interrupts are enabled.
>
> It appears that the problem is the faulting code is running on one of
> the very early pre-allocated kernel stacks (perhaps in an interrupt
> handler on an idle thread stack), and these stacks are not in memory
> represented in the vm page arrays.  The mmc code is using a 64-byte
> buffer on the stack and mapping it for DMA.  Normally that causes a
> bounce for cacheline alignment, but unluckily in this case that buffer
> on the stack just happened to be aligned to a cacheline boundary and a
> multiple of the cacheline size, so no bounce.  That causes the new sync
> logic that is based on keeping vm_page_t pointers and offsets to get a
> NULL pointer back from PHYS_TO_VM_PAGE when mapping, then it dies at
> sync time trying to dereference that.  It used to work because the sync
> logic used to use the vaddr, not a page pointer.
>
> Michal was working on a patch yesterday.
>
>
Ah, thanks for pointing that out Ian.  I was left scratching my head
(admittedly on the road and w/o easy access to the code) wondering what on
earth would be trying to do DMA during SI_SUB_CPU.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290275 - in head: lib/libdpv lib/libfigpar sys/sys

2015-11-02 Thread Devin Teske 
Author: dteske
Date: Mon Nov  2 20:03:59 2015
New Revision: 290275
URL: https://svnweb.freebsd.org/changeset/base/290275

Log:
  Make figpar(3) types/macros [more] unique (s/fp_/figpar_/gi)

Modified:
  head/lib/libdpv/dialogrc.c
  head/lib/libdpv/dialogrc.h
  head/lib/libfigpar/figpar.3
  head/lib/libfigpar/figpar.c
  head/lib/libfigpar/figpar.h
  head/sys/sys/param.h

Modified: head/lib/libdpv/dialogrc.c
==
--- head/lib/libdpv/dialogrc.c  Mon Nov  2 17:41:15 2015(r290274)
+++ head/lib/libdpv/dialogrc.c  Mon Nov  2 20:03:59 2015(r290275)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013-2014 Devin Teske 
+ * Copyright (c) 2013-2015 Devin Teske 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,58 +49,58 @@ char gauge_color[STR_BUFSIZE]   = "47b"; /
 char separator[STR_BUFSIZE]= "";
 
 /* Function prototypes */
-static int setattr(struct fp_config *, uint32_t, char *, char *);
-static int setbool(struct fp_config *, uint32_t, char *, char *);
-static int setnum(struct fp_config *, uint32_t, char *, char *);
-static int setstr(struct fp_config *, uint32_t, char *, char *);
+static int setattr(struct figpar_config *, uint32_t, char *, char *);
+static int setbool(struct figpar_config *, uint32_t, char *, char *);
+static int setnum(struct figpar_config *, uint32_t, char *, char *);
+static int setstr(struct figpar_config *, uint32_t, char *, char *);
 
 /*
  * Anatomy of DIALOGRC (~/.dialogrc by default)
  * NOTE: Must appear after private function prototypes (above)
  * NB: Brace-initialization of union requires cast to *first* member of union
  */
-static struct fp_config dialogrc_config[] = {
-/* TYPEDirective DEFAULTHANDLER */
-{FP_TYPE_INT,  "aspect", {(void *)0},   },
-{FP_TYPE_STR,  "separate_widget",{separator},   },
-{FP_TYPE_INT,  "tab_len",{(void *)0},   },
-{FP_TYPE_BOOL, "visit_items",{(void *)0},   },
-{FP_TYPE_BOOL, "use_shadow", {(void *)1},   },
-{FP_TYPE_BOOL, "use_colors", {(void *)1},   },
-{FP_TYPE_STR,  "screen_color",   {NULL},},
-{FP_TYPE_STR,  "shadow_color",   {NULL},},
-{FP_TYPE_STR,  "dialog_color",   {NULL},},
-{FP_TYPE_STR,  "title_color",{NULL},},
-{FP_TYPE_STR,  "border_color",   {NULL},},
-{FP_TYPE_STR,  "button_active_color",{NULL},},
-{FP_TYPE_STR,  "button_inactive_color",  {NULL},},
-{FP_TYPE_STR,  "button_key_active_color",{NULL},},
-{FP_TYPE_STR,  "button_key_inactive_color",  {NULL},},
-{FP_TYPE_STR,  "button_label_active_color",  {NULL},},
-{FP_TYPE_STR,  "button_label_inactive_color",{NULL},},
-{FP_TYPE_STR,  "inputbox_color", {NULL},},
-{FP_TYPE_STR,  "inputbox_border_color",  {NULL},},
-{FP_TYPE_STR,  "searchbox_color",{NULL},},
-{FP_TYPE_STR,  "searchbox_title_color",  {NULL},},
-{FP_TYPE_STR,  "searchbox_border_color", {NULL},},
-{FP_TYPE_STR,  "position_indicator_color",   {NULL},},
-{FP_TYPE_STR,  "menubox_color",  {NULL},},
-{FP_TYPE_STR,  "menubox_border_color",   {NULL},},
-{FP_TYPE_STR,  "item_color", {NULL},},
-{FP_TYPE_STR,  "item_selected_color",{NULL},},
-{FP_TYPE_STR,  "tag_color",  {NULL},},
-{FP_TYPE_STR,  "tag_selected_color", {NULL},},
-{FP_TYPE_STR,  "tag_key_color",  {NULL},},
-{FP_TYPE_STR,  "tag_key_selected_color", {NULL},},
-{FP_TYPE_STR,  "check_color",{NULL},},
-{FP_TYPE_STR,  "check_selected_color",   {NULL},},
-{FP_TYPE_STR,  "uarrow_color",   {NULL},},
-{FP_TYPE_STR,  "darrow_color",   {NULL},},
-{FP_TYPE_STR,  "itemhelp_color", {NULL},},
-{FP_TYPE_STR,  "form_active_text_color", {NULL},},
-{FP_TYPE_STR,  "form_text_color",{NULL},},
-{FP_TYPE_STR,  "form_item_readonly_color",   {NULL},},
-{FP_TYPE_STR,  "gauge_color",{gauge_color}, },
+static struct figpar_config dialogrc_config[] = {
+/* TYPEDIRECTIVE  DEFAULTHANDLER */
+{FIGPAR_TYPE_INT,  "aspect",  {(void *)0},   },
+{FIGPAR_TYPE_STR,  "separate_widget", {separator},   },
+{FIGPAR_TYPE_INT,  "tab_len", {(void *)0},   },
+{FIGPAR_TYPE_BOOL, "visit_items",

Re: svn commit: r290245 - in head/sys/contrib/vchiq/interface: vchi vchiq_arm

2015-11-02 Thread Oleksandr Tymoshenko 

> On Nov 2, 2015, at 1:36 AM, Andrew Turner  wrote:
> 
> On Sun, 1 Nov 2015 22:17:39 + (UTC)
> Oleksandr Tymoshenko  wrote:
> 
>> Author: gonzo
>> Date: Sun Nov  1 22:17:39 2015
>> New Revision: 290245
>> URL: https://svnweb.freebsd.org/changeset/base/290245
>> 
>> Log:
>>  Synchronize with latest upstream VCHI code:
>> 
>>  - Add LIB_VERSION ioctl
>>  - Add CLOSE_DELIVERED ioctl
>>  - Bump code version
>> 
>>  Upstream version: 3782f2ad42c08f4d32f64138f8be7341afc380f5
> 
> Was there a reason we don't use the vendor-sys area for vchiq?

What Adrian said: original code is not very portable and I have to go through 
manual merge in my staging repo and only then merge to sys/ area 

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290264 - head/usr.sbin/makefs

2015-11-02 Thread Garrett Cooper 
Author: ngie
Date: Mon Nov  2 08:43:15 2015
New Revision: 290264
URL: https://svnweb.freebsd.org/changeset/base/290264

Log:
  Limit isoLevel to 1 and 2 to avoid segfaulting when isoLevel is set to 3 by
  dereferencing a NULL function pointer
  
  Add some asserts to ensure that isolevel is always either 1 or 2.
  
  PR: 203645
  Reported by: Thomas Schmitt 
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/makefs/cd9660.c

Modified: head/usr.sbin/makefs/cd9660.c
==
--- head/usr.sbin/makefs/cd9660.c   Mon Nov  2 07:59:17 2015
(r290263)
+++ head/usr.sbin/makefs/cd9660.c   Mon Nov  2 08:43:15 2015
(r290264)
@@ -296,8 +296,8 @@ cd9660_parse_opts(const char *option, fs
int rv;
/* Set up allowed options - integer options ONLY */
option_t cd9660_options[] = {
-   { "l", , 1, 3, "ISO Level" },
-   { "isolevel", , 1, 3, "ISO Level" },
+   { "l", , 1, 2, "ISO Level" },
+   { "isolevel", , 1, 2, "ISO Level" },
{ "verbose",  _level, 0, 2,
  "Turns on verbose output" },
{ "v", _level, 0 , 2,
@@ -1055,6 +1055,7 @@ cd9660_rename_filename(cd9660node *iter,
if (diskStructure.verbose_level > 0)
printf("Rename_filename called\n");
 
+   assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2);
/* TODO : A LOT of chanes regarding 8.3 filenames */
if (diskStructure.isoLevel == 1)
maxlength = 8;
@@ -1730,6 +1731,7 @@ cd9660_joliet_convert_filename(const cha
 static int
 cd9660_convert_filename(const char *oldname, char *newname, int is_file)
 {
+   assert(1 <= diskStructure.isoLevel && diskStructure.isoLevel <= 2);
/* NEW */
cd9660_filename_conversion_functor conversion_function = 0;
if (diskStructure.isoLevel == 1)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290272 - head/sys/arm64/arm64

2015-11-02 Thread Andrew Turner 
Author: andrew
Date: Mon Nov  2 16:43:26 2015
New Revision: 290272
URL: https://svnweb.freebsd.org/changeset/base/290272

Log:
  Make the arm64_cpu driver quiet as it adds no new information.
  Only report the register used to start each cpu in bootverbose.
  
  Sponsored by: ABT Systems Ltd

Modified:
  head/sys/arm64/arm64/mp_machdep.c

Modified: head/sys/arm64/arm64/mp_machdep.c
==
--- head/sys/arm64/arm64/mp_machdep.c   Mon Nov  2 13:14:27 2015
(r290271)
+++ head/sys/arm64/arm64/mp_machdep.c   Mon Nov  2 16:43:26 2015
(r290272)
@@ -137,6 +137,7 @@ arm64_cpu_probe(device_t dev)
if (cpuid >= MAXCPU || cpuid > mp_maxid)
return (EINVAL);
 
+   device_quiet(dev);
return (0);
 }
 
@@ -158,10 +159,12 @@ arm64_cpu_attach(device_t dev)
if (reg == NULL)
return (EINVAL);
 
-   device_printf(dev, "Found register:");
-   for (i = 0; i < reg_size; i++)
-   printf(" %x", reg[i]);
-   printf("\n");
+   if (bootverbose) {
+   device_printf(dev, "register <");
+   for (i = 0; i < reg_size; i++)
+   printf("%s%x", (i == 0) ? "" : " ", reg[i]);
+   printf(">\n");
+   }
 
/* Set the device to start it later */
cpu_list[cpuid] = dev;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290259 - head/usr.sbin/makefs

2015-11-02 Thread Benjamin Kaduk 
On Mon, Nov 2, 2015 at 1:36 AM, Garrett Cooper  wrote:

> Author: ngie
> Date: Mon Nov  2 07:36:42 2015
> New Revision: 290259
> URL: https://svnweb.freebsd.org/changeset/base/290259
>
> Log:
>   Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8@1.53
>
>   Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs)
> and
>   options have been omitted.
>
>   MFC after: 1 week
>   Obtained from: NetBSD
>   Sponsored by: EMC / Isilon Storage Division
>
> Modified:
>   head/usr.sbin/makefs/makefs.8
>
> Modified: head/usr.sbin/makefs/makefs.8
>
> ==
> --- head/usr.sbin/makefs/makefs.8   Mon Nov  2 03:36:15 2015
> (r290258)
> +++ head/usr.sbin/makefs/makefs.8   Mon Nov  2 07:36:42 2015
> (r290259)
> @@ -339,7 +341,7 @@ Load a generic boot image into the first
>  .It Sy hard-disk-boot
>  Boot image is a hard disk image.
>  .It Sy keep-bad-images
> -Do not throw away images whose write was aborted due to an error.
> +Don't throw away images whose write was aborted due to an error.
>

Documentation style is to not use contractions.  (Also, "discard" might be
better than "throw away", while you're on this line.)


>  For debugging purposes.
>  .It Sy label
>  Label name of the image.
> @@ -372,11 +374,12 @@ The
>  utility appeared in
>  .Nx 1.6 .
>  .Sh AUTHORS
> -.An Luke Mewburn Aq Mt lu...@netbsd.org
> -(original program)
> -.An Daniel Watt
> -.An Walter Deignan
> -.An Ryan Gabrys
> -.An Alan Perez-Rathke
> +.An Luke Mewburn
> +.Aq lu...@netbsd.org
>

mdoc(7) itself lists An ... Aq ... on the same line; please do not split
them like this.

-Ben


> +(original program),
> +.An Daniel Watt ,
> +.An Walter Deignan ,
> +.An Ryan Gabrys ,
> +.An Alan Perez-Rathke ,
>  .An Ram Vedam
>  (cd9660 support)
> ___
> svn-src-...@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290245 - in head/sys/contrib/vchiq/interface: vchi vchiq_arm

2015-11-02 Thread Adrian Chadd 
The same reason we don't use it for dri, etc.

The vendor driver isn't portable by any stretch. We could put it
there, but then we'd have to maintain the vendor changes on top of it
in subversion and I kinda dont want to think about how that'll work
out.. :)




-adrian
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290273 - in head/sys/arm: arm include

2015-11-02 Thread Zbigniew Bodek 
Author: zbb
Date: Mon Nov  2 16:56:34 2015
New Revision: 290273
URL: https://svnweb.freebsd.org/changeset/base/290273

Log:
  Add support for branch instruction on armv7 with ptrace single step
  
  Previous code supported only "continuous" code without any kind of
  branch instructions. To change that, new function was implemented
  which parses current instruction and returns an addres where
  the jump might happen (alternative addr).
  mdthread structure was extended to support two breakpoints
  (one directly below current instruction and the second placed
  at the alternative location).
  One of them must trigger regardless the instruction has or has not been
  executed due to condition field.
  Upon cleanup, both software breakpoints are removed.
  
  This implementation parses only the most common instructions
  that are present in the code (like 99.99% of all), but there
  is a chance there are some left, not covered by the parsing routine.
  Parsing is done only for 32-bit instruction, no Thumb nor Thumb-2
  support is provided.
  
  Reviewed by:   kib
  Submitted by:  Wojciech Macek 
  Obtained from: Semihalf
  Sponsored by:  Juniper Networks Inc.
  Differential Revision: https://reviews.freebsd.org/D4021

Modified:
  head/sys/arm/arm/db_interface.c
  head/sys/arm/arm/machdep.c
  head/sys/arm/include/armreg.h
  head/sys/arm/include/db_machdep.h
  head/sys/arm/include/machdep.h
  head/sys/arm/include/proc.h

Modified: head/sys/arm/arm/db_interface.c
==
--- head/sys/arm/arm/db_interface.c Mon Nov  2 16:43:26 2015
(r290272)
+++ head/sys/arm/arm/db_interface.c Mon Nov  2 16:56:34 2015
(r290273)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -291,94 +292,35 @@ db_fetch_reg(int reg)
}
 }
 
+static u_int
+db_branch_taken_read_int(void *cookie __unused, vm_offset_t offset, u_int *val)
+{
+   u_int ret;
+
+   db_read_bytes(offset, 4, (char *));
+   *val = ret;
+
+   return (0);
+}
+
+static u_int
+db_branch_taken_fetch_reg(void *cookie __unused, int reg)
+{
+
+   return (db_fetch_reg(reg));
+}
+
 u_int
 branch_taken(u_int insn, db_addr_t pc)
 {
-   u_int addr, nregs, offset = 0;
+   register_t new_pc;
+   int ret;
 
-   switch ((insn >> 24) & 0xf) {
-   case 0x2:   /* add pc, reg1, #value */
-   case 0x0:   /* add pc, reg1, reg2, lsl #offset */
-   addr = db_fetch_reg((insn >> 16) & 0xf);
-   if (((insn >> 16) & 0xf) == 15)
-   addr += 8;
-   if (insn & 0x020) {
-   offset = (insn >> 7) & 0x1e;
-   offset = (insn & 0xff) << (32 - offset) |
-   (insn & 0xff) >> offset;
-   } else {
-
-   offset = db_fetch_reg(insn & 0x0f);
-   if ((insn & 0xff0) != 0x) {
-   if (insn & 0x10)
-   nregs = db_fetch_reg((insn >> 8) & 0xf);
-   else
-   nregs = (insn >> 7) & 0x1f;
-   switch ((insn >> 5) & 3) {
-   case 0:
-   /* lsl */
-   offset = offset << nregs;
-   break;
-   case 1:
-   /* lsr */
-   offset = offset >> nregs;
-   break;
-   default:
-   break; /* XXX */
-   }
-   }
-   return (addr + offset);
-   }
-   case 0xa:   /* b ... */
-   case 0xb:   /* bl ... */
-   addr = ((insn << 2) & 0x03ff);
-   if (addr & 0x0200)
-   addr |= 0xfc00;
-   return (pc + 8 + addr);
-   case 0x7:   /* ldr pc, [pc, reg, lsl #2] */
-   addr = db_fetch_reg(insn & 0xf);
-   addr = pc + 8 + (addr << 2);
-   db_read_bytes(addr, 4, (char *));
-   return (addr);
-   case 0x1:   /* mov pc, reg */
-   addr = db_fetch_reg(insn & 0xf);
-   return (addr);
-   case 0x4:
-   case 0x5:   /* ldr pc, [reg] */
-   addr = db_fetch_reg((insn >> 16) & 0xf);
-   /* ldr pc, [reg, #offset] */
-   if (insn & (1 << 24))
-   offset = insn & 0xfff;
-   if (insn & 0x0080)
-   addr += offset;
-   else
-   addr -= offset;
-   db_read_bytes(addr, 4, (char *));
-

Re: svn commit: r290245 - in head/sys/contrib/vchiq/interface: vchi vchiq_arm

2015-11-02 Thread Andriy Gapon 
On 02/11/2015 18:13, Adrian Chadd wrote:
> The same reason we don't use it for dri, etc.
> 
> The vendor driver isn't portable by any stretch. We could put it
> there, but then we'd have to maintain the vendor changes on top of it
> in subversion and I kinda dont want to think about how that'll work
> out.. :)

Same as, say, ZFS?


-- 
Andriy Gapon
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289834 - head/sys/x86/x86

2015-11-02 Thread Oliver Pinter 
On Mon, Nov 2, 2015 at 4:06 PM, Oliver Pinter
<oliver.pin...@hardenedbsd.org> wrote:
> On Mon, Nov 2, 2015 at 2:44 PM, Oliver Pinter
> <oliver.pin...@hardenedbsd.org> wrote:
>> On 11/2/15, Roger Pau Monné <roy...@freebsd.org> wrote:
>>> El 29/10/15 a les 22.48, Oliver Pinter ha escrit:
>>>> Yes, at next week I have time for the test.  Please ping me again at
>>>> Monday.
>>>
>>> Ping :).
>>
>> Pong. :) I now stared a new build with the patch, so I will report
>> back 1-2 hours from now.
>
> It's better. :)
>
> root@nyi-01 src# git show | head -30
> commit 8f6110bd2e258b3f4224eb580e99fa142bebc727
> Author: Roger Pau Monne <roger@citrix.com>
> Date:   Thu Oct 29 12:58:23 2015 +0100
>
> x86/dma_bounce: rework _bus_dmamap_load_ma implementation
>
> The implementation of bus_dmamap_load_ma_triv currently calls
> _bus_dmamap_load_phys on each page that is part of the passed in buffer.
> Since each page is treated as an individual buffer, the resulting 
> behaviour
> is different from the behaviour of _bus_dmamap_load_buffer. This breaks
> certain drivers, like Xen blkfront.
>
> If an unmapped buffer of size 4096 that starts at offset 13 into the first
> page is passed to the current _bus_dmamap_load_ma implementation (so the 
> ma
> array contains two pages), the result is that two segments are created, 
> one
> with a size of 4083 and the other with size 13 (because two independant
> calls to _bus_dmamap_load_phys are performed, one for each physical page).
> If the same is done with a mapped buffer and calling 
> _bus_dmamap_load_buffer
> the result is that only one segment is created, with a size of 4096.
>
> This patch relegates the usage of bus_dmamap_load_ma_triv in x86 bounce
> buffer code to drivers requesting BUS_DMA_KEEP_PG_OFFSET and implements
> _bus_dmamap_load_ma so that it's behaviour is the same as the mapped 
> version
> (_bus_dmamap_load_buffer). This patch only modifies the x86 bounce buffer
> code, other arches are left untouched.
>
> Reviewed by:kib, jah
> Differential Revision:  https://reviews.freebsd.org/D888
> Sponsored by:   Citrix Systems R
>
> root@nyi-01 src# uname -a
> FreeBSD nyi-01.build.hardenedbsd.org 11.0-CURRENT-HBSD FreeBSD
> 11.0-CURRENT-HBSD #14 8f6110b(jenkins-world-kernel-20151102): Mon Nov
> 2 09:42:26 EST 2015
> r...@nyi-01.build.hardenedbsd.org:/usr/obj/usr/src/sys/JENKINS  amd64
> root@nyi-01 src# uptime
> 10:05AM  up 3 mins, 2 users, load averages: 0.46, 1.09, 0.57
> root@nyi-01 src#
>
> Now I started a new jenkins build to see the patch under stress.

Okay, the server survived a full buildworld + installer generation
with the new patch.

>
>>>
>>>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289834 - head/sys/x86/x86

2015-11-02 Thread Roger Pau Monné 
El 02/11/15 a les 17.41, Oliver Pinter ha escrit:
> Okay, the server survived a full buildworld + installer generation
> with the new patch.

Thanks for the heads up! I will wait a couple more days and then commit it.

Roger.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289279 - in head/sys: kern vm

2015-11-02 Thread Adrian Chadd 
Hi,

try this?

adrian@victoria:~/work/freebsd/head-embedded/src/sys/kern % svn diff vfs_bio.c
Index: vfs_bio.c
===
--- vfs_bio.c   (revision 290048)
+++ vfs_bio.c   (working copy)
@@ -3623,6 +3623,13 @@
if (bp == NULL) {
if (slpflag || slptimeo)
return NULL;
+   /*
+* Yield so the bufdaemon has a chance to run and
+* clean some buffers; otherwise we'll get stuck in
+* a tight loop with no sleeping; we'll wake up the
+* buffer daemon but never give it a slice to run.
+*/
+   kern_yield(PRI_USER);
goto loop;
}




-a


On 29 October 2015 at 13:25, Tijl Coosemans  wrote:
> On Wed, 14 Oct 2015 02:10:07 + (UTC) Jeff Roberson  
> wrote:
>> Author: jeff
>> Date: Wed Oct 14 02:10:07 2015
>> New Revision: 289279
>> URL: https://svnweb.freebsd.org/changeset/base/289279
>>
>> Log:
>>   Parallelize the buffer cache and rewrite getnewbuf().  This results in a
>>   8x performance improvement in a micro benchmark on a 4 socket machine.
>>
>>- Get buffer headers from a per-cpu uma cache that sits in from of the
>>  free queue.
>>- Use a per-cpu quantum cache in vmem to eliminate contention for kva.
>>- Use multiple clean queues according to buffer cache size to eliminate
>>  clean queue lock contention.
>>- Introduce a bufspace daemon that attempts to prevent getnewbuf() callers
>>  from blocking or doing direct recycling.
>>- Close some bufspace allocation races that could lead to endless
>>  recycling.
>>- Further the transition to a more modern style of small functions grouped
>>  by prefix in order to improve growing complexity.
>
> I have an i386 system that locks up easily after this commit.  Booting
> into single user and running make installkernel triggers it consistently.
> I haven't been able to reproduce it on amd64.  Examining threads with
> DDB shows that they are all at sched_switch (a few at fork_trampoline).
> The only lock being held is Giant (by the interrupt handler for
> ctrl+alt+esc I think).  So it doesn't look like a dead lock.  It's more
> a sleeping beauty situation.  All threads in the castle are sleeping and
> there's no prince to wake them up.
>
> (kgdb) info thread
>   Id   Target Id Frame
>
> These are from make installkernel:
>
>   72   Thread 100071 (PID=107: install) sched_switch (td=0xc667d000,
> newtd=0xc6407000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   71   Thread 100070 (PID=81: make) sched_switch (td=0xc667d340,
> newtd=0xc667d000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   70   Thread 100067 (PID=30: make) sched_switch (td=0xc667e000,
> newtd=0xc667d340, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   69   Thread 100066 (PID=25: make) sched_switch (td=0xc667e340,
> newtd=0xc667e000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>
> Single user shell:
>
>   68   Thread 100065 (PID=17: sh) sched_switch (td=0xc6406000,
> newtd=0xc667e340, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>
> Kernel threads:
>
>   67   Thread 100063 (PID=16: vnlru) sched_switch (td=0xc6406680,
> newtd=0xc6407340, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   66   Thread 100062 (PID=9: syncer) sched_switch (td=0xc64069c0,
> newtd=0xc667d000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   65   Thread 100061 (PID=8: bufspacedaemon) sched_switch (td=0xc6407000,
> newtd=0xc62dc000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   64   Thread 100060 (PID=7: bufdaemon) sched_switch (td=0xc6407340,
> newtd=0xc6408000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   63   Thread 100068 (PID=7: bufdaemon//var worker) sched_switch (
> td=0xc667d9c0, newtd=0xc6407000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   62   Thread 100069 (PID=7: bufdaemon//usr worker) sched_switch (
> td=0xc667d680, newtd=0xc667d000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   61   Thread 100059 (PID=6: pagezero) sched_switch (td=0xc6407680,
> newtd=0xc55ba680, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   60   Thread 100058 (PID=5: vmdaemon) sched_switch (td=0xc64079c0,
> newtd=0xc6407340, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   59   Thread 100057 (PID=4: pagedaemon) sched_switch (td=0xc6408000,
> newtd=0xc6407000, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   58   Thread 100064 (PID=4: pagedaemon/uma) sched_switch (td=0xc6406340,
> newtd=0xc55b9340, flags=)
> at /usr/src/sys/kern/sched_ule.c:1969
>   57   Thread 100050 (PID=15: acpi_cooling0) sched_switch (td=0xc62dc340,
> newtd=0xc6407000, flags=)
> at

svn commit: r290276 - head/sys/net

2015-11-02 Thread Randall Stewart 
Author: rrs
Date: Mon Nov  2 21:21:00 2015
New Revision: 290276
URL: https://svnweb.freebsd.org/changeset/base/290276

Log:
  Fix three flowtable bugs, a) one lookup issue, b) a two cleaner issue.
  MFC after:3 days
  Sponsored by: Netflix Inc.
  Differential Revision:https://reviews.freebsd.org/D4014

Modified:
  head/sys/net/flowtable.c

Modified: head/sys/net/flowtable.c
==
--- head/sys/net/flowtable.cMon Nov  2 20:03:59 2015(r290275)
+++ head/sys/net/flowtable.cMon Nov  2 21:21:00 2015(r290276)
@@ -435,8 +435,7 @@ static int
 flow_stale(struct flowtable *ft, struct flentry *fle, int maxidle)
 {
 
-   if (((fle->f_rt->rt_flags & RTF_HOST) &&
-   ((fle->f_rt->rt_flags & (RTF_UP)) != (RTF_UP))) ||
+   if (((fle->f_rt->rt_flags & RTF_UP) == 0) ||
(fle->f_rt->rt_ifp == NULL) ||
!RT_LINK_IS_UP(fle->f_rt->rt_ifp) ||
(fle->f_lle->la_flags & LLE_VALID) == 0)
@@ -477,7 +476,7 @@ flow_matches(struct flentry *fle, uint32
CRITICAL_ASSERT(curthread);
 
/* Microoptimization for IPv4: don't use bcmp(). */
-   if (((keylen == sizeof(uint32_t) && (fle->f_key[0] != key[0])) ||
+   if (((keylen == sizeof(uint32_t) && (fle->f_key[0] == key[0])) ||
(bcmp(fle->f_key, key, keylen) == 0)) &&
fibnum == fle->f_fibnum &&
 #ifdef FLOWTABLE_HASH_ALL
@@ -818,8 +817,6 @@ flowtable_free_stale(struct flowtable *f
critical_exit();
 
bit_clear(tmpmask, curbit);
-   tmpmask += (curbit / 8);
-   tmpsize -= (curbit / 8) * 8;
bit_ffs(tmpmask, tmpsize, );
}
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r289279 - in head/sys: kern vm

2015-11-02 Thread Adrian Chadd 
Hi Tijl, and others;

Here's something that Jeff came up with that fixes my problem:

adrian@victoria:~/work/freebsd/head-embedded/src % svn diff sys/kern/
Index: sys/kern/vfs_bio.c
===
--- sys/kern/vfs_bio.c  (revision 290048)
+++ sys/kern/vfs_bio.c  (working copy)
@@ -2910,7 +2910,7 @@
} while(buf_scan(false) == 0);

if (reserved)
-   bufspace_release(maxsize);
+   atomic_subtract_long(, maxsize);
if (bp != NULL) {
bp->b_flags |= B_INVAL;
brelse(bp);


Would you/others please try this and see if it improves things? It
improves things for me on these memory-starved MIPS boards.



-a
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290298 - head/lib/libedit

2015-11-02 Thread Brooks Davis 
Author: brooks
Date: Mon Nov  2 22:21:02 2015
New Revision: 290298
URL: https://svnweb.freebsd.org/changeset/base/290298

Log:
  The ops EL_SIGNAL, EL_EDITMODE, EL_UNBUFFERED, and EL_PREP_TERM all take
  an int, not an int*.
  
  Sponsored by: DARPA, AFRL
  Discovered with:  CHERI
  Differential Revision:https://reviews.freebsd.org/D4071

Modified:
  head/lib/libedit/eln.c

Modified: head/lib/libedit/eln.c
==
--- head/lib/libedit/eln.c  Mon Nov  2 22:12:51 2015(r290297)
+++ head/lib/libedit/eln.c  Mon Nov  2 22:21:02 2015(r290298)
@@ -325,11 +325,11 @@ el_get(EditLine *el, int op, ...)
ret = el_wget(el, op, va_arg(ap, const char **));
break;
 
-   case EL_SIGNAL: /* int * */
+   case EL_SIGNAL: /* int */
case EL_EDITMODE:
case EL_UNBUFFERED:
case EL_PREP_TERM:
-   ret = el_wget(el, op, va_arg(ap, int *));
+   ret = el_wget(el, op, va_arg(ap, int));
break;
 
case EL_GETTC: {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290265 - head/usr.sbin/makefs/tests

2015-11-02 Thread Garrett Cooper 
Author: ngie
Date: Mon Nov  2 09:16:51 2015
New Revision: 290265
URL: https://svnweb.freebsd.org/changeset/base/290265

Log:
  Add testcases for -t cd9660 -o isolevel=[1-3]
  
  -- -o isolevel=1 currently fails because of path comparison issues,
 so mark it as an expected failure.
  -- -o isolevel=3 is not implemented, so expect it to fail as an out
 of bounds value [*].
  
  PR: 203645
  MFC after: 1 week
  X-MFC with: r290264
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh

Modified: head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
==
--- head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh   Mon Nov  2 08:43:15 
2015(r290264)
+++ head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh   Mon Nov  2 09:16:51 
2015(r290265)
@@ -208,6 +208,61 @@ o_flag_allow_max_name_cleanup()
common_cleanup
 }
 
+atf_test_case o_flag_isolevel_1 cleanup
+o_flag_isolevel_1_body()
+{
+   atf_expect_fail "this testcase needs work; the filenames generated seem 
incorrect/corrupt"
+
+   create_test_inputs
+
+   atf_check -e empty -o empty -s exit:0 \
+   $MAKEFS -o isolevel=1 $TEST_IMAGE $TEST_INPUTS_DIR
+
+   mount_image
+   check_base_iso9660_image_contents
+}
+o_flag_isolevel_1_cleanup()
+{
+   common_cleanup
+}
+
+atf_test_case o_flag_isolevel_2 cleanup
+o_flag_isolevel_2_body()
+{
+   create_test_inputs
+
+   atf_check -e empty -o empty -s exit:0 \
+   $MAKEFS -o isolevel=2 $TEST_IMAGE $TEST_INPUTS_DIR
+
+   mount_image
+   check_base_iso9660_image_contents
+}
+o_flag_isolevel_2_cleanup()
+{
+   common_cleanup
+}
+
+atf_test_case o_flag_isolevel_3 cleanup
+o_flag_isolevel_3_body()
+{
+   create_test_inputs
+
+   # XXX: isolevel=3 isn't implemented yet. See FreeBSD bug # 203645
+   if true; then
+   atf_check -e match:'makefs: ISO Level 3 is greater than 2\.' -o empty 
-s not-exit:0 \
+   $MAKEFS -o isolevel=3 $TEST_IMAGE $TEST_INPUTS_DIR
+   else
+   atf_check -e empty -o empty -s exit:0 \
+   $MAKEFS -o isolevel=3 $TEST_IMAGE $TEST_INPUTS_DIR
+   mount_image
+   check_base_iso9660_image_contents
+   fi
+}
+o_flag_isolevel_3_cleanup()
+{
+   common_cleanup
+}
+
 atf_test_case o_flag_preparer
 o_flag_preparer_body()
 {
@@ -308,6 +363,9 @@ atf_init_test_cases()
 
atf_add_test_case o_flag_allow_deep_trees
atf_add_test_case o_flag_allow_max_name
+   atf_add_test_case o_flag_isolevel_1
+   atf_add_test_case o_flag_isolevel_2
+   atf_add_test_case o_flag_isolevel_3
atf_add_test_case o_flag_preparer
atf_add_test_case o_flag_publisher
atf_add_test_case o_flag_rockridge
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290266 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

2015-11-02 Thread Andriy Gapon 
Author: avg
Date: Mon Nov  2 10:07:21 2015
New Revision: 290266
URL: https://svnweb.freebsd.org/changeset/base/290266

Log:
  zfs: allow the lookup of extended attributes of an unlinked file
  
  That's required for extattr_get_fd(2) and the like to work properly.
  
  PR:   203201
  MFC after:17 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c   Mon Nov 
 2 09:16:51 2015(r290265)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c   Mon Nov 
 2 10:07:21 2015(r290266)
@@ -222,7 +222,7 @@ zfs_dirent_lock(zfs_dirlock_t **dlpp, zn
 
mutex_enter(>z_lock);
for (;;) {
-   if (dzp->z_unlinked) {
+   if (dzp->z_unlinked && !(flag & ZXATTR)) {
mutex_exit(>z_lock);
if (!(flag & ZHAVELOCK))
rw_exit(>z_name_lock);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290245 - in head/sys/contrib/vchiq/interface: vchi vchiq_arm

2015-11-02 Thread Andrew Turner 
On Sun, 1 Nov 2015 22:17:39 + (UTC)
Oleksandr Tymoshenko  wrote:

> Author: gonzo
> Date: Sun Nov  1 22:17:39 2015
> New Revision: 290245
> URL: https://svnweb.freebsd.org/changeset/base/290245
> 
> Log:
>   Synchronize with latest upstream VCHI code:
>   
>   - Add LIB_VERSION ioctl
>   - Add CLOSE_DELIVERED ioctl
>   - Bump code version
>   
>   Upstream version: 3782f2ad42c08f4d32f64138f8be7341afc380f5

Was there a reason we don't use the vendor-sys area for vchiq?

Andrew
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290267 - head/usr.sbin/makefs/tests

2015-11-02 Thread Garrett Cooper 
Author: ngie
Date: Mon Nov  2 10:08:00 2015
New Revision: 290267
URL: https://svnweb.freebsd.org/changeset/base/290267

Log:
  Clean up mtree keyword support a slight bit and add a few more default 
keywords
  
  - Parameterize the mtree keywords as $DEFAULT_MTREE_KEYWORDS
  - Test with the extra mtree keywords, `mode,gid,uid`.
  - Add a note about mtrees with time support not working with makefs right now
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
  head/usr.sbin/makefs/tests/makefs_ffs_tests.sh
  head/usr.sbin/makefs/tests/makefs_tests_common.sh

Modified: head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
==
--- head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh   Mon Nov  2 10:07:21 
2015(r290266)
+++ head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh   Mon Nov  2 10:08:00 
2015(r290267)
@@ -113,7 +113,7 @@ from_mtree_spec_file_body()
create_test_inputs
 
atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
-   mtree -c -k type,link,size -p $TEST_INPUTS_DIR
+   mtree -c -k "$DEFAULT_MTREE_KEYWORDS" -p $TEST_INPUTS_DIR
cd $TEST_INPUTS_DIR
atf_check -e empty -o empty -s exit:0 \
$MAKEFS $TEST_IMAGE $TEST_SPEC_FILE

Modified: head/usr.sbin/makefs/tests/makefs_ffs_tests.sh
==
--- head/usr.sbin/makefs/tests/makefs_ffs_tests.sh  Mon Nov  2 10:07:21 
2015(r290266)
+++ head/usr.sbin/makefs/tests/makefs_ffs_tests.sh  Mon Nov  2 10:08:00 
2015(r290267)
@@ -105,7 +105,7 @@ from_mtree_spec_file_body()
create_test_inputs
 
atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
-   mtree -c -k type,link,size -p $TEST_INPUTS_DIR
+   mtree -c -k "$DEFAULT_MTREE_KEYWORDS" -p $TEST_INPUTS_DIR
 
cd $TEST_INPUTS_DIR
atf_check -e empty -o not-empty -s exit:0 \

Modified: head/usr.sbin/makefs/tests/makefs_tests_common.sh
==
--- head/usr.sbin/makefs/tests/makefs_tests_common.sh   Mon Nov  2 10:07:21 
2015(r290266)
+++ head/usr.sbin/makefs/tests/makefs_tests_common.sh   Mon Nov  2 10:08:00 
2015(r290267)
@@ -29,6 +29,13 @@
 
 KB=1024
 : ${TMPDIR=/tmp}
+# TODO: add mtree `time` support; get a lot of errors like this right now when
+# passing generating disk images with keyword mtree support, like:
+#
+# `[...]/mtree.spec:8: error: time: invalid value '1446458503'`
+#
+#DEFAULT_MTREE_KEYWORDS="type,mode,gid,uid,size,link,time"
+DEFAULT_MTREE_KEYWORDS="type,mode,gid,uid,size,link"
 TEST_IMAGE="$TMPDIR/test.img"
 TEST_INPUTS_DIR="$TMPDIR/inputs"
 TEST_MD_DEVICE_FILE="$TMPDIR/md.output"
@@ -39,7 +46,7 @@ check_image_contents()
 {
local directories=$TEST_INPUTS_DIR
local excludes mtree_excludes_arg mtree_file
-   local mtree_keywords="type,link,size"
+   local mtree_keywords="$DEFAULT_MTREE_KEYWORDS"
 
while getopts "d:f:m:X:" flag; do
case "$flag" in
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290268 - head/usr.sbin/makefs/ffs

2015-11-02 Thread Garrett Cooper 
Author: ngie
Date: Mon Nov  2 10:09:09 2015
New Revision: 290268
URL: https://svnweb.freebsd.org/changeset/base/290268

Log:
  Sync minor whitespace / type changes in ffs_csum_swap and ffs_sb_swap with
  src/sys/ufs/ffs/ffs_bswap.c@1.39
  
  Obtained from: NetBSD
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/makefs/ffs/ffs_bswap.c

Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c
==
--- head/usr.sbin/makefs/ffs/ffs_bswap.cMon Nov  2 10:08:00 2015
(r290267)
+++ head/usr.sbin/makefs/ffs/ffs_bswap.cMon Nov  2 10:09:09 2015
(r290268)
@@ -67,7 +67,7 @@ void ffs_csumtotal_swap(struct csum_tota
 void
 ffs_sb_swap(struct fs *o, struct fs *n)
 {
-   int i;
+   size_t i;
u_int32_t *o32, *n32;
 
/*
@@ -97,7 +97,7 @@ ffs_sb_swap(struct fs *o, struct fs *n)
n->fs_csaddr = bswap64(o->fs_csaddr);
n->fs_pendingblocks = bswap64(o->fs_pendingblocks);
n->fs_pendinginodes = bswap32(o->fs_pendinginodes);
-   
+
/* These fields overlap with the second half of the
 * historic FS_42POSTBLFMT postbl table
 */
@@ -171,9 +171,9 @@ ffs_dinode2_swap(struct ufs2_dinode *o, 
 void
 ffs_csum_swap(struct csum *o, struct csum *n, int size)
 {
-   int i;
+   size_t i;
u_int32_t *oint, *nint;
-   
+
oint = (u_int32_t*)o;
nint = (u_int32_t*)n;
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290276 - head/sys/net

2015-11-02 Thread Juli Mallett 
On Mon, Nov 2, 2015 at 1:21 PM, Randall Stewart  wrote:

> Author: rrs
> Date: Mon Nov  2 21:21:00 2015
> New Revision: 290276
> URL: https://svnweb.freebsd.org/changeset/base/290276
>
> Log:
>   Fix three flowtable bugs, a) one lookup issue, b) a two cleaner issue.
>

This commit message is not helpful, but the review is; it seems like the
summary there might have been better for the commit message than naming the
number of bugs.  Should we assume the three hunks each fix a bug, or what?
What if there were four hunks, or two?  That kind of ambiguity and
obscurity is especially confusing as time passes.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290316 - in head/sys: arm64/arm64 powerpc/powerpc sparc64/sparc64 x86/x86

2015-11-02 Thread Ian Lepore 
Author: ian
Date: Mon Nov  2 23:37:19 2015
New Revision: 290316
URL: https://svnweb.freebsd.org/changeset/base/290316

Log:
  Fix an alignment check that is wrong in half the busdma implementations.
  This will enable the elimination of a workaround in the USB driver that
  artifically allocates buffers twice as big as they need to be (which
  actually saves memory for very small buffers on the buggy platforms).
  
  When deciding how to allocate a dma buffer, armv4, armv6, mips, and
  x86/iommu all correctly check for the tag alignment <= maxsize as enabling
  simple uma/malloc based allocation.  Powerpc, sparc64, x86/bounce, and
  arm64/bounce were all checking for alignment < maxsize; on those platforms
  when alignment was equal to the max size it would fall back to page-based
  allocators even for very small buffers.
  
  This change makes all platforms use the <= check.  It should be noted that
  on all platforms other than arm[v6] and mips, this check is relying on
  undocumented behavior in malloc(9) that if you allocate a block of a given
  size it will be aligned to the next larger power-of-2 boundary.  There is
  nothing in the malloc(9) man page that makes that explicit promise (but the
  busdma code has been relying on this behavior all along so I guess it works).
  
  Arm and mips code uses the allocator in kern/subr_busdma_buffalloc.c, which
  does explicitly implement this promise about size and alignment.  Other
  platforms probably should switch to the aligned allocator.

Modified:
  head/sys/arm64/arm64/busdma_bounce.c
  head/sys/powerpc/powerpc/busdma_machdep.c
  head/sys/sparc64/sparc64/bus_machdep.c
  head/sys/x86/x86/busdma_bounce.c

Modified: head/sys/arm64/arm64/busdma_bounce.c
==
--- head/sys/arm64/arm64/busdma_bounce.cMon Nov  2 23:09:21 2015
(r290315)
+++ head/sys/arm64/arm64/busdma_bounce.cMon Nov  2 23:37:19 2015
(r290316)
@@ -401,14 +401,14 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dm
 
/*
 * XXX:
-* (dmat->alignment < dmat->maxsize) is just a quick hack; the exact
+* (dmat->alignment <= dmat->maxsize) is just a quick hack; the exact
 * alignment guarantees of malloc need to be nailed down, and the
 * code below should be rewritten to take that into account.
 *
 * In the meantime, we'll warn the user if malloc gets it wrong.
 */
if ((dmat->common.maxsize <= PAGE_SIZE) &&
-  (dmat->common.alignment < dmat->common.maxsize) &&
+  (dmat->common.alignment <= dmat->common.maxsize) &&
dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
attr == VM_MEMATTR_DEFAULT) {
*vaddr = malloc(dmat->common.maxsize, M_DEVBUF, mflags);

Modified: head/sys/powerpc/powerpc/busdma_machdep.c
==
--- head/sys/powerpc/powerpc/busdma_machdep.c   Mon Nov  2 23:09:21 2015
(r290315)
+++ head/sys/powerpc/powerpc/busdma_machdep.c   Mon Nov  2 23:37:19 2015
(r290316)
@@ -514,14 +514,14 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
 
/* 
 * XXX:
-* (dmat->alignment < dmat->maxsize) is just a quick hack; the exact
+* (dmat->alignment <= dmat->maxsize) is just a quick hack; the exact
 * alignment guarantees of malloc need to be nailed down, and the
 * code below should be rewritten to take that into account.
 *
 * In the meantime, we'll warn the user if malloc gets it wrong.
 */
if ((dmat->maxsize <= PAGE_SIZE) &&
-  (dmat->alignment < dmat->maxsize) &&
+  (dmat->alignment <= dmat->maxsize) &&
dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
attr == VM_MEMATTR_DEFAULT) {
*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);

Modified: head/sys/sparc64/sparc64/bus_machdep.c
==
--- head/sys/sparc64/sparc64/bus_machdep.c  Mon Nov  2 23:09:21 2015
(r290315)
+++ head/sys/sparc64/sparc64/bus_machdep.c  Mon Nov  2 23:37:19 2015
(r290316)
@@ -518,14 +518,14 @@ nexus_dmamem_alloc(bus_dma_tag_t dmat, v
 
/*
 * XXX:
-* (dmat->dt_alignment < dmat->dt_maxsize) is just a quick hack; the
+* (dmat->dt_alignment <= dmat->dt_maxsize) is just a quick hack; the
 * exact alignment guarantees of malloc need to be nailed down, and
 * the code below should be rewritten to take that into account.
 *
 * In the meantime, we'll warn the user if malloc gets it wrong.
 */
if (dmat->dt_maxsize <= PAGE_SIZE &&
-   dmat->dt_alignment < dmat->dt_maxsize)
+   dmat->dt_alignment <= dmat->dt_maxsize)
*vaddr = malloc(dmat->dt_maxsize, M_DEVBUF, mflags);
else {
/*

svn commit: r290309 - in head/sys/arm: arm include xscale/ixp425

2015-11-02 Thread Ian Lepore 
Author: ian
Date: Mon Nov  2 22:49:39 2015
New Revision: 290309
URL: https://svnweb.freebsd.org/changeset/base/290309

Log:
  Eliminate the last dregs of the old global arm_root_dma_tag.
  
  In the old days, device drivers passed NULL for the parent tag when creating
  a new tag, and on arm platforms that resulted in a global tag representing
  overall platform constraints being substituted in the busdma code.  Now all
  drivers use bus_get_dma_tag() and if there is a need to represent overall
  platform constraints they will be inherited from a tag supplied by nexus or
  some bus driver in the hierarchy.
  
  The only arm platforms still relying on the old global-tag scheme were some
  xscale boards with special PCI-bus constraints.  This change provides those
  constraints through a tag supplied by the xscale PCI bus driver, and
  eliminates the few remaining references to the old global var.
  
  Reviewed by:  cognet

Modified:
  head/sys/arm/arm/busdma_machdep-v6.c
  head/sys/arm/arm/busdma_machdep.c
  head/sys/arm/include/bus_dma.h
  head/sys/arm/xscale/ixp425/ixp425_pci.c

Modified: head/sys/arm/arm/busdma_machdep-v6.c
==
--- head/sys/arm/arm/busdma_machdep-v6.cMon Nov  2 22:42:07 2015
(r290308)
+++ head/sys/arm/arm/busdma_machdep-v6.cMon Nov  2 22:49:39 2015
(r290309)
@@ -473,11 +473,6 @@ bus_dma_tag_create(bus_dma_tag_t parent,
bus_dma_tag_t newtag;
int error = 0;
 
-#if 0
-   if (!parent)
-   parent = arm_root_dma_tag;
-#endif
-
/* Basic sanity checking. */
KASSERT(boundary == 0 || powerof2(boundary),
("dma tag boundary %lu, must be a power of 2", boundary));

Modified: head/sys/arm/arm/busdma_machdep.c
==
--- head/sys/arm/arm/busdma_machdep.c   Mon Nov  2 22:42:07 2015
(r290308)
+++ head/sys/arm/arm/busdma_machdep.c   Mon Nov  2 22:49:39 2015
(r290309)
@@ -224,9 +224,6 @@ static void free_bounce_page(bus_dma_tag
 static void bus_dmamap_sync_sl(struct sync_list *sl, bus_dmasync_op_t op,
 int bufaligned);
 
-/* Default tag, as most drivers provide no parent tag. */
-bus_dma_tag_t arm_root_dma_tag;
-
 /*
  * 
  * Begin block of code useful to transplant to other implementations.
@@ -406,8 +403,6 @@ bus_dma_tag_create(bus_dma_tag_t parent,
int error = 0;
/* Return a NULL tag on failure */
*dmat = NULL;
-   if (!parent)
-   parent = arm_root_dma_tag;
 
newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_BUSDMA, M_NOWAIT);
if (newtag == NULL) {

Modified: head/sys/arm/include/bus_dma.h
==
--- head/sys/arm/include/bus_dma.h  Mon Nov  2 22:42:07 2015
(r290308)
+++ head/sys/arm/include/bus_dma.h  Mon Nov  2 22:49:39 2015
(r290309)
@@ -94,8 +94,6 @@ struct arm32_dma_range {
 struct arm32_dma_range *bus_dma_get_range(void);
 intbus_dma_get_range_nb(void);
 
-extern bus_dma_tag_t arm_root_dma_tag;
-
 #endif /* _ARM32_BUS_DMA_PRIVATE */
 
 #endif /* _ARM_BUS_DMA_H */

Modified: head/sys/arm/xscale/ixp425/ixp425_pci.c
==
--- head/sys/arm/xscale/ixp425/ixp425_pci.c Mon Nov  2 22:42:07 2015
(r290308)
+++ head/sys/arm/xscale/ixp425/ixp425_pci.c Mon Nov  2 22:49:39 2015
(r290309)
@@ -136,14 +136,6 @@ ixppcib_attach(device_t dev)
NULL, NULL, >sc_dmat))
panic("couldn't create the PCI dma tag !");
/*
-* The PCI bus can only address 64MB. However, due to the way our
-* implementation of busdma works, busdma can't tell if a device
-* is a PCI device or not. So defaults to the PCI dma tag, which
-* restrict the DMA'able memory to the first 64MB, and explicitely
-* create less restrictive tags for non-PCI devices.
-*/
-   arm_root_dma_tag = sc->sc_dmat;
-   /*
 * Initialize the bus space tags.
 */
ixp425_io_bs_init(>sc_pci_iot, sc);
@@ -361,6 +353,14 @@ ixppcib_release_resource(device_t bus, d
return (ENXIO);
 }
 
+static bus_dma_tag_t
+ixppcib_get_dma_tag(device_t bus, device_t child)
+{
+   struct ixppcib_softc *sc = device_get_softc(bus);
+
+   return (sc->sc_dmat);
+}
+
 static void
 ixppcib_conf_setup(struct ixppcib_softc *sc, int bus, int slot, int func,
 int reg)
@@ -459,7 +459,7 @@ static device_method_t ixppcib_methods[]
DEVMETHOD(bus_activate_resource,ixppcib_activate_resource),
DEVMETHOD(bus_deactivate_resource,  ixppcib_deactivate_resource),
DEVMETHOD(bus_release_resource, ixppcib_release_resource),
-   /* DEVMETHOD(bus_get_dma_tag,

svn commit: r290317 - head/sys/powerpc/mpc85xx

2015-11-02 Thread Justin Hibbits 
Author: jhibbits
Date: Tue Nov  3 00:21:23 2015
New Revision: 290317
URL: https://svnweb.freebsd.org/changeset/base/290317

Log:
  Use the correct space (PCI addresses) for the I/O and memory ranges.
  
  PCIR_IOBASE/IOLIMIT/... all use PCI-space addresses, not host addresses.

Modified:
  head/sys/powerpc/mpc85xx/pci_mpc85xx.c

Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c
==
--- head/sys/powerpc/mpc85xx/pci_mpc85xx.c  Mon Nov  2 23:37:19 2015
(r290316)
+++ head/sys/powerpc/mpc85xx/pci_mpc85xx.c  Tue Nov  3 00:21:23 2015
(r290317)
@@ -782,9 +782,9 @@ fsl_pcib_decode_win(phandle_t node, stru
sc->pci_sc.sc_range[i].host,
sc->pci_sc.sc_range[i].size,
sc->pci_sc.sc_range[i].pci);
-   sc->sc_ioport_start = sc->pci_sc.sc_range[i].host;
-   sc->sc_ioport_end = sc->pci_sc.sc_range[i].host +
-   sc->pci_sc.sc_range[i].size;
+   sc->sc_ioport_start = sc->pci_sc.sc_range[i].pci;
+   sc->sc_ioport_end = sc->pci_sc.sc_range[i].pci +
+   sc->pci_sc.sc_range[i].size - 1;
sc->sc_ioport_alloc = 0x1000 + 
sc->pci_sc.sc_range[i].pci;
break;
case OFW_PCI_PHYS_HI_SPACE_MEM32:
@@ -794,9 +794,9 @@ fsl_pcib_decode_win(phandle_t node, stru
sc->pci_sc.sc_range[i].host,
sc->pci_sc.sc_range[i].size,
sc->pci_sc.sc_range[i].pci);
-   sc->sc_iomem_start = sc->pci_sc.sc_range[i].host;
-   sc->sc_iomem_end = sc->pci_sc.sc_range[i].host +
-   sc->pci_sc.sc_range[i].size;
+   sc->sc_iomem_start = sc->pci_sc.sc_range[i].pci;
+   sc->sc_iomem_end = sc->pci_sc.sc_range[i].pci +
+   sc->pci_sc.sc_range[i].size - 1;
sc->sc_iomem_alloc = sc->pci_sc.sc_range[i].pci;
break;
default:
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290234 - head/share/misc

2015-11-02 Thread Gleb Smirnoff 
On Mon, Nov 02, 2015 at 07:13:46AM +, Alexey Dokuchaev wrote:
A> On Sun, Nov 01, 2015 at 04:54:55PM +, Michal Meloun wrote:
A> > New Revision: 290234
A> > URL: https://svnweb.freebsd.org/changeset/base/290234
A> > 
A> > Log:
A> >   Install myself as src committer.
A> >   
A> >   Approved by: kib (mentor)
A> >   > Description of fields to fill in above: 76 columns 
--|
A> >   [ garbage omitteed ]
A> 
A> Here is a small advice: do not rely on "svn ci" calling your $EDITOR for
A> you, compose the message yourself first and then do "svn ci -F $logfile".
A> For one-liners, "svn ci -m message" works even better.

Alternatively: rely on $EDITOR, but don't trust the line:

--This line, and those below, will be ignored--

Finalize your message manually.

P.S. Not that there is bugs in the svn, but you can have touched the
line.

-- 
Totus tuus, Glebius.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290270 - head/usr.sbin/makefs/tests

2015-11-02 Thread Garrett Cooper 
Author: ngie
Date: Mon Nov  2 11:06:51 2015
New Revision: 290270
URL: https://svnweb.freebsd.org/changeset/base/290270

Log:
  Add testcases for -t ffs -o version=[12]
  
  Verify the filesystem type using dumpfs. Add preliminary support
  for NetBSD (needs to be validated)
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/makefs/tests/makefs_ffs_tests.sh

Modified: head/usr.sbin/makefs/tests/makefs_ffs_tests.sh
==
--- head/usr.sbin/makefs/tests/makefs_ffs_tests.sh  Mon Nov  2 10:39:26 
2015(r290269)
+++ head/usr.sbin/makefs/tests/makefs_ffs_tests.sh  Mon Nov  2 11:06:51 
2015(r290270)
@@ -158,6 +158,70 @@ from_single_dir_cleanup()
common_cleanup
 }
 
+atf_test_case o_flag_version_1 cleanup
+o_flag_version_1_body()
+{
+   ffs_version=1
+
+   platform=$(uname)
+   case "$platform" in
+   FreeBSD)
+   ffs_label=UFS${ffs_version}
+   ;;
+   NetBSD)
+   ffs_label=FFSv${ffs_version}
+   ;;
+   *)
+   atf_skip "Unsupported platform"
+   ;;
+   esac
+
+   create_test_inputs
+
+   atf_check -e empty -o not-empty -s exit:0 \
+   $MAKEFS -M 1m -o version=$ffs_version $TEST_IMAGE $TEST_INPUTS_DIR
+
+   mount_image
+   atf_check -e empty -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
+   check_ffs_image_contents
+}
+o_flag_version_1_cleanup()
+{
+   common_cleanup
+}
+
+atf_test_case o_flag_version_2 cleanup
+o_flag_version_2_body()
+{
+   ffs_version=2
+
+   platform=$(uname)
+   case "$platform" in
+   FreeBSD)
+   ffs_label=UFS${ffs_version}
+   ;;
+   NetBSD)
+   ffs_label=FFSv${ffs_version}
+   ;;
+   *)
+   atf_skip "Unsupported platform"
+   ;;
+   esac
+
+   create_test_inputs
+
+   atf_check -e empty -o not-empty -s exit:0 \
+   $MAKEFS -M 1m -o version=$ffs_version $TEST_IMAGE $TEST_INPUTS_DIR
+
+   mount_image
+   atf_check -e empty -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
+   check_ffs_image_contents
+}
+o_flag_version_2_cleanup()
+{
+   common_cleanup
+}
+
 atf_init_test_cases()
 {
 
@@ -168,5 +232,6 @@ atf_init_test_cases()
atf_add_test_case from_multiple_dirs
atf_add_test_case from_single_dir
 
-
+   atf_add_test_case o_flag_version_1
+   atf_add_test_case o_flag_version_2
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290234 - head/share/misc

2015-11-02 Thread Michal Meloun 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Dne 02.11.2015 v 11:37 Gleb Smirnoff napsal(a):
> On Mon, Nov 02, 2015 at 07:13:46AM +, Alexey Dokuchaev wrote: 
> A> On Sun, Nov 01, 2015 at 04:54:55PM +, Michal Meloun wrote: 
> A> > New Revision: 290234 A> > URL:
> https://svnweb.freebsd.org/changeset/base/290234 A> > A> > Log: A>
> >   Install myself as src committer. A> > A> >   Approved by: kib
> (mentor) A> >   > Description of fields to fill in above:
> 76 columns --| A> >   [ garbage omitteed ] A> A> Here is a small
> advice: do not rely on "svn ci" calling your $EDITOR for A> you,
> compose the message yourself first and then do "svn ci -F
> $logfile". A> For one-liners, "svn ci -m message" works even
> better.
> 
> Alternatively: rely on $EDITOR, but don't trust the line:
> 
> --This line, and those below, will be ignored--
> 
> Finalize your message manually.
> 
> P.S. Not that there is bugs in the svn, but you can have touched
> the line.
> 

I'm sorry to all, it’s my bug.
Commit using editor (but using git) is standard practice here @work.
So I automatically select same workflow for FreeBSD.
Anyway, I already got hit from kib@, so I'll use a file for commit log
next time.

But i'm pretty sure that i have not touched template.
I only deleted all prepared unfilled lines (for PR:, MFC: ...)
and then i paste commit message.
And, ironically, only

- --This line, and those below, will be ignored--

line has been omitted from real commit log.

Michal




-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQEcBAEBCAAGBQJWN01GAAoJEGkesmtexaqqGvEIAICYBFTeblZZ+C3Y82JqN97h
fnFHNG0wyJEhj9a4jDBWyAJldU4kesa2XHw2I8dGIUB9Iz+Vp0nnib5WIvhWPL7S
t1NdQDyy9MELAXx0v4wNnyDexl+YYM9nEGvQokesFV/V0vI+6WctjMM8S8tnRs1e
hVu80ZgbvJOTTV6OuNl9/Cjo4oPeh3IWZMlLuYP95pV4vzlgoF6CPimrdki8gVMX
dW/9DUIJd1bX73LYoCtwfM0WZEFFbbgrpBO8DJbSWEmx1hJUQmk5mYE8jUYDk9Ot
8wxE+3n1g5ovZUQGREiR5s+3xu7MJ8PSroLIM69kJUvER0pAedXkDphYm/l8v8g=
=s8VI
-END PGP SIGNATURE-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290318 - head/lib/libc/net

2015-11-02 Thread Hiroki Sato 
Author: hrs
Date: Tue Nov  3 00:46:06 2015
New Revision: 290318
URL: https://svnweb.freebsd.org/changeset/base/290318

Log:
  sdl->sdl_len in sockaddr_dl can be longer than
  sizeof(struct sockaddr_dl).

Modified:
  head/lib/libc/net/getnameinfo.c

Modified: head/lib/libc/net/getnameinfo.c
==
--- head/lib/libc/net/getnameinfo.c Tue Nov  3 00:21:23 2015
(r290317)
+++ head/lib/libc/net/getnameinfo.c Tue Nov  3 00:46:06 2015
(r290318)
@@ -122,7 +122,8 @@ getnameinfo(const struct sockaddr *sa, s
afd = find_afd(sa->sa_family);
if (afd == NULL)
return (EAI_FAMILY);
-   if (sa->sa_family == PF_LOCAL) {
+   switch (sa->sa_family) {
+   case PF_LOCAL:
/*
 * PF_LOCAL uses variable sa->sa_len depending on the
 * content length of sun_path.  Require 1 byte in
@@ -132,8 +133,17 @@ getnameinfo(const struct sockaddr *sa, s
salen <= afd->a_socklen -
sizeofmember(struct sockaddr_un, sun_path))
return (EAI_FAIL);
-   } else if (salen != afd->a_socklen)
-   return (EAI_FAIL);
+   break;
+   case PF_LINK:
+   if (salen <= afd->a_socklen -
+   sizeofmember(struct sockaddr_dl, sdl_data))
+   return (EAI_FAIL);
+   break;
+   default:
+   if (salen != afd->a_socklen)
+   return (EAI_FAIL);
+   break;
+   }
 
return ((*afd->a_func)(afd, sa, salen, host, hostlen,
serv, servlen, flags));
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290319 - head/sys/powerpc/mpc85xx

2015-11-02 Thread Justin Hibbits 
Author: jhibbits
Date: Tue Nov  3 00:54:14 2015
New Revision: 290319
URL: https://svnweb.freebsd.org/changeset/base/290319

Log:
  Use 64-bit addresses for configuring inbound and outbound address windows.
  
  This allows using the full host and PCI ranges in the controller 
configuration.

Modified:
  head/sys/powerpc/mpc85xx/pci_mpc85xx.c

Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c
==
--- head/sys/powerpc/mpc85xx/pci_mpc85xx.c  Tue Nov  3 00:46:06 2015
(r290318)
+++ head/sys/powerpc/mpc85xx/pci_mpc85xx.c  Tue Nov  3 00:54:14 2015
(r290319)
@@ -129,11 +129,11 @@ static void fsl_pcib_cfgwrite(struct fsl
 u_int, uint32_t, int);
 static int fsl_pcib_decode_win(phandle_t, struct fsl_pcib_softc *);
 static void fsl_pcib_err_init(device_t);
-static void fsl_pcib_inbound(struct fsl_pcib_softc *, int, int, u_long,
-u_long, u_long);
+static void fsl_pcib_inbound(struct fsl_pcib_softc *, int, int, uint64_t,
+uint64_t, uint64_t);
 static int fsl_pcib_init(struct fsl_pcib_softc *, int, int);
-static void fsl_pcib_outbound(struct fsl_pcib_softc *, int, int, u_long,
-u_long, u_long);
+static void fsl_pcib_outbound(struct fsl_pcib_softc *, int, int, uint64_t,
+uint64_t, uint64_t);
 
 /* Forward declerations. */
 static int fsl_pcib_attach(device_t);
@@ -645,8 +645,8 @@ fsl_pcib_init(struct fsl_pcib_softc *sc,
 }
 
 static void
-fsl_pcib_inbound(struct fsl_pcib_softc *sc, int wnd, int tgt, u_long start,
-u_long size, u_long pci_start)
+fsl_pcib_inbound(struct fsl_pcib_softc *sc, int wnd, int tgt, uint64_t start,
+uint64_t size, uint64_t pci_start)
 {
uint32_t attr, bar, tar;
 
@@ -671,8 +671,8 @@ fsl_pcib_inbound(struct fsl_pcib_softc *
 }
 
 static void
-fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, u_long start,
-u_long size, u_long pci_start)
+fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, uint64_t start,
+uint64_t size, uint64_t pci_start)
 {
uint32_t attr, bar, tar;
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290321 - head/sys/boot/fdt/dts/arm

2015-11-02 Thread Oleksandr Tymoshenko 
Author: gonzo
Date: Tue Nov  3 04:50:58 2015
New Revision: 290321
URL: https://svnweb.freebsd.org/changeset/base/290321

Log:
  Raspberry Pi firmware passes cache line size as a DTB parameter
  
  - Add cache-line-size paramter to vchiq node
  - Add cache_line_size DTB parameter referencing to
  .../vchiq/cache-line-size property

Modified:
  head/sys/boot/fdt/dts/arm/bcm2835.dtsi
  head/sys/boot/fdt/dts/arm/bcm2836.dtsi
  head/sys/boot/fdt/dts/arm/rpi.dts
  head/sys/boot/fdt/dts/arm/rpi2.dts

Modified: head/sys/boot/fdt/dts/arm/bcm2835.dtsi
==
--- head/sys/boot/fdt/dts/arm/bcm2835.dtsi  Tue Nov  3 03:29:35 2015
(r290320)
+++ head/sys/boot/fdt/dts/arm/bcm2835.dtsi  Tue Nov  3 04:50:58 2015
(r290321)
@@ -474,11 +474,12 @@
reg-shift = <2>;
};
 
-   vchiq {
+   vchiq: vchiq {
compatible = "broadcom,bcm2835-vchiq";
reg = <0xB800 0x50>;
interrupts = <2>;
interrupt-parent = <>;
+   cache-line-size = <32>;
};
 
usb {

Modified: head/sys/boot/fdt/dts/arm/bcm2836.dtsi
==
--- head/sys/boot/fdt/dts/arm/bcm2836.dtsi  Tue Nov  3 03:29:35 2015
(r290320)
+++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi  Tue Nov  3 04:50:58 2015
(r290321)
@@ -456,11 +456,12 @@
reg-shift = <2>;
};
 
-   vchiq {
+   vchiq: vchiq {
compatible = "broadcom,bcm2835-vchiq";
reg = <0xB800 0x50>;
interrupts = <2>;
interrupt-parent = <>;
+   cache-line-size = <32>;
};
 
usb {

Modified: head/sys/boot/fdt/dts/arm/rpi.dts
==
--- head/sys/boot/fdt/dts/arm/rpi.dts   Tue Nov  3 03:29:35 2015
(r290320)
+++ head/sys/boot/fdt/dts/arm/rpi.dts   Tue Nov  3 04:50:58 2015
(r290321)
@@ -389,4 +389,7 @@
stdout = "uart0";
};
 
+   __overrides__ {
+   cache_line_size  = <>, "cache-line-size:0";
+   };
 };

Modified: head/sys/boot/fdt/dts/arm/rpi2.dts
==
--- head/sys/boot/fdt/dts/arm/rpi2.dts  Tue Nov  3 03:29:35 2015
(r290320)
+++ head/sys/boot/fdt/dts/arm/rpi2.dts  Tue Nov  3 04:50:58 2015
(r290321)
@@ -400,4 +400,7 @@
stdout = "uart0";
};
 
+   __overrides__ {
+   cache_line_size  = <>, "cache-line-size:0";
+   };
 };
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r290234 - head/share/misc

2015-11-02 Thread Konstantin Belousov 
On Mon, Nov 02, 2015 at 12:47:18PM +0100, Michal Meloun wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
> 
> Dne 02.11.2015 v 11:37 Gleb Smirnoff napsal(a):
> > On Mon, Nov 02, 2015 at 07:13:46AM +, Alexey Dokuchaev wrote: 
> > A> On Sun, Nov 01, 2015 at 04:54:55PM +, Michal Meloun wrote: 
> > A> > New Revision: 290234 A> > URL:
> > https://svnweb.freebsd.org/changeset/base/290234 A> > A> > Log: A>
> > >   Install myself as src committer. A> > A> >   Approved by:   kib
> > (mentor) A> >   > Description of fields to fill in above:
> > 76 columns --| A> >   [ garbage omitteed ] A> A> Here is a small
> > advice: do not rely on "svn ci" calling your $EDITOR for A> you,
> > compose the message yourself first and then do "svn ci -F
> > $logfile". A> For one-liners, "svn ci -m message" works even
> > better.
> > 
> > Alternatively: rely on $EDITOR, but don't trust the line:
> > 
> > --This line, and those below, will be ignored--
> > 
> > Finalize your message manually.
> > 
> > P.S. Not that there is bugs in the svn, but you can have touched
> > the line.
> > 
> 
> I'm sorry to all, it?s my bug.
> Commit using editor (but using git) is standard practice here @work.
> So I automatically select same workflow for FreeBSD.
> Anyway, I already got hit from kib@, so I'll use a file for commit log
I hope you mean 'hint'.

> next time.
> 
> But i'm pretty sure that i have not touched template.
> I only deleted all prepared unfilled lines (for PR:, MFC: ...)
> and then i paste commit message.
> And, ironically, only
> 
> - --This line, and those below, will be ignored--
> 
> line has been omitted from real commit log.
> 
> Michal
> 
> 
> 
> 
> -BEGIN PGP SIGNATURE-
> Version: GnuPG v2
> 
> iQEcBAEBCAAGBQJWN01GAAoJEGkesmtexaqqGvEIAICYBFTeblZZ+C3Y82JqN97h
> fnFHNG0wyJEhj9a4jDBWyAJldU4kesa2XHw2I8dGIUB9Iz+Vp0nnib5WIvhWPL7S
> t1NdQDyy9MELAXx0v4wNnyDexl+YYM9nEGvQokesFV/V0vI+6WctjMM8S8tnRs1e
> hVu80ZgbvJOTTV6OuNl9/Cjo4oPeh3IWZMlLuYP95pV4vzlgoF6CPimrdki8gVMX
> dW/9DUIJd1bX73LYoCtwfM0WZEFFbbgrpBO8DJbSWEmx1hJUQmk5mYE8jUYDk9Ot
> 8wxE+3n1g5ovZUQGREiR5s+3xu7MJ8PSroLIM69kJUvER0pAedXkDphYm/l8v8g=
> =s8VI
> -END PGP SIGNATURE-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r290320 - head/sys/kern

2015-11-02 Thread Mark Johnston 
Author: markj
Date: Tue Nov  3 03:29:35 2015
New Revision: 290320
URL: https://svnweb.freebsd.org/changeset/base/290320

Log:
  Have elf_lookup() return an error if the specified non-weak symbol could
  not be found. Otherwise, relocations against such symbols will be silently
  ignored instead of causing an error to be raised.
  
  Reviewed by:  kib
  MFC after:1 week

Modified:
  head/sys/kern/link_elf.c

Modified: head/sys/kern/link_elf.c
==
--- head/sys/kern/link_elf.cTue Nov  3 00:54:14 2015(r290319)
+++ head/sys/kern/link_elf.cTue Nov  3 03:29:35 2015(r290320)
@@ -1594,6 +1594,10 @@ elf_lookup(linker_file_t lf, Elf_Size sy
}
 
addr = ((Elf_Addr)linker_file_lookup_symbol(lf, symbol, deps));
+   if (addr == 0 && ELF_ST_BIND(sym->st_info) != STB_WEAK) {
+   *res = 0;
+   return (EINVAL);
+   }
 
if (elf_set_find(_pcpu_list, addr, , ))
addr = addr - start + base;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"