Re: svn commit: r270294 - stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace
On Thu, Aug 21, 2014 at 07:45:52PM +, Mark Johnston wrote: > Author: markj > Date: Thu Aug 21 19:45:52 2014 > New Revision: 270294 > URL: http://svnweb.freebsd.org/changeset/base/270294 > > Log: > MFC r269525: > Return 0 for the PPID of threads in process 0, as process 0 doesn't have a > parent process. > > Modified: > stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c > == > --- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu Aug > 21 19:42:24 2014(r270293) > +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu Aug > 21 19:45:52 2014(r270294) > @@ -3415,7 +3415,10 @@ dtrace_dif_variable(dtrace_mstate_t *mst >*/ > return ((uint64_t)curthread->t_procp->p_ppid); > #else > - return ((uint64_t)curproc->p_pptr->p_pid); > + if (curproc->p_pid == proc0.p_pid) > + return (curproc->p_pid); > + else > + return (curproc->p_pptr->p_pid); > #endif > > case DIF_VAR_TID: BTW, does the code look for the parent, or for the debugger of the current process ? I mean, should the snippet above use p_pptr or real_parent() ? pgpTi8QS09Pjz.pgp Description: PGP signature
Re: svn commit: r270249 - head/sys/cam/ata
Hi Warner,
On Thu, Aug 21, 2014 at 10:34 PM, Warner Losh wrote:
>
> On Aug 21, 2014, at 10:31 PM, Neel Natu wrote:
>
>> Hi Warner,
>>
>> On Wed, Aug 20, 2014 at 3:58 PM, Warner Losh wrote:
>>> Author: imp
>>> Date: Wed Aug 20 22:58:12 2014
>>> New Revision: 270249
>>> URL: http://svnweb.freebsd.org/changeset/base/270249
>>>
>>> Log:
>>> Turns out that IDENTIFY DEVICE and IDENTIFY PACKET DEVICE return data
>>> that's only mostly similar. Specifically word 78 bits are defined for
>>> IDENTIFY DEVICE as
>>>5 Supports Hardware Feature Control
>>> while a IDENTIFY PACKET DEVICE defines them as
>>>5 Asynchronous notification supported
>>> Therefore, only pay attention to bit 5 when we're talking to ATAPI
>>> devices (we don't use the hardware feature control at this time).
>>> Ignore it for ATA devices. Remove kludge that papered over this issue
>>> for Samsung SATA SSDs, since Micron drives also have the bit set and
>>> the error was caused by this bad interpretation of the spec (which is
>>> quite easy to do, since bits aren't normally overlapping like this).
>>>
>>> Modified:
>>> head/sys/cam/ata/ata_xpt.c
>>>
>>> Modified: head/sys/cam/ata/ata_xpt.c
>>> ==
>>> --- head/sys/cam/ata/ata_xpt.c Wed Aug 20 22:39:26 2014(r270248)
>>> +++ head/sys/cam/ata/ata_xpt.c Wed Aug 20 22:58:12 2014(r270249)
>>> @@ -458,12 +458,18 @@ negotiate:
>>>0, 0x02);
>>>break;
>>>case PROBE_SETAN:
>>> - /* Remember what transport thinks about AEN. */
>>> - if (softc->caps & CTS_SATA_CAPS_H_AN)
>>> + /*
>>> +* Only ATAPI defines this bit to mean AEN, but remember
>>> +* what transport thinks about AEN.
>>> +*/
>>> + if ((softc->caps & CTS_SATA_CAPS_H_AN) &&
>>> + periph->path->device->protocol == PROTO_ATAPI)
>>>path->device->inq_flags |= SID_AEN;
>>>else
>>>path->device->inq_flags &= ~SID_AEN;
>>>xpt_async(AC_GETDEV_CHANGED, path, NULL);
>>> + if (periph->path->device->protocol != PROTO_ATAPI)
>>> + break;
>>>cam_fill_ataio(ataio,
>>>1,
>>>probedone,
>>> @@ -750,14 +756,6 @@ out:
>>>goto noerror;
>>>
>>>/*
>>> -* Some Samsung SSDs report supported Asynchronous
>>> Notification,
>>> -* but return ABORT on attempt to enable it.
>>> -*/
>>> - } else if (softc->action == PROBE_SETAN &&
>>> - status == CAM_ATA_STATUS_ERROR) {
>>> - goto noerror;
>>> -
>>> - /*
>>> * SES and SAF-TE SEPs have different IDENTIFY commands,
>>> * but SATA specification doesn't tell how to identify them.
>>> * Until better way found, just try another if first fail.
>>>
>>
>> This change causes a panic for me on boot. Here is the boot log:
>>
>> ahci0: port
>> 0xf050-0xf057,0xf040-0xf043,0xf030-0xf037,0xf020-0xf023,0xf000-0xf01f
>> mem 0xfbb21000-0xfbb217ff irq 18 at device 31.2 on pci0
>> ahci0: AHCI v1.30 with 6 6Gbps ports, Port Multiplier not supported
>> ahcich0: at channel 0 on ahci0
>> ahcich1: at channel 1 on ahci0
>> ahcich2: at channel 2 on ahci0
>> ahcich3: at channel 3 on ahci0
>> ahcich4: at channel 4 on ahci0
>> ahcich5: at channel 5 on ahci0
>> ahciem0: on ahci0
>> ...
>> xpt_action_default: CCB type 0xdeadc0de not supported
>> ...
>> run_interrupt_driven_hooks: still waiting after 60 seconds for xpt_config
>> run_interrupt_driven_hooks: still waiting after 120 seconds for xpt_config
>> run_interrupt_driven_hooks: still waiting after 180 seconds for xpt_config
>> run_interrupt_driven_hooks: still waiting after 240 seconds for xpt_config
>> run_interrupt_driven_hooks: still waiting after 300 seconds for xpt_config
>> panic: run_interrupt_driven_config_hooks: waited too long
>> cpuid = 0
>> KDB: stack backtrace:
>> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame
>> 0x81d92920
>> kdb_backtrace() at kdb_backtrace+0x39/frame 0x81d929d0
>> vpanic() at vpanic+0x189/frame 0x81d92a50
>> kassert_panic() at kassert_panic+0x139/frame 0x81d92ac0
>> boot_run_interrupt_driven_config_hooks() at
>> boot_run_interrupt_driven_config_hooks+0x111/frame 0x81d92b50
>> mi_startup()f81d92b70
>> btext() at btext+0x2c
>> KDB: enter: panic
>> [ thread pid 0 tid 10 ]
>> Stopped at kdb_enter+0x3e: movq$0,kdb_why
>> db>
>>
>> The peripheral in question is a SATA attached CDROM:
>>
>> % camcontrol devlist
>> at scbus0 target 0 lun 0 (pass0,ada0)
>>at scbus2 target 0 lun 0 (cd0,pass1)
>> at scbus3 target 0 lun 0 (pass2,ada1)
>
Re: svn commit: r270249 - head/sys/cam/ata
On Aug 21, 2014, at 10:31 PM, Neel Natu wrote:
> Hi Warner,
>
> On Wed, Aug 20, 2014 at 3:58 PM, Warner Losh wrote:
>> Author: imp
>> Date: Wed Aug 20 22:58:12 2014
>> New Revision: 270249
>> URL: http://svnweb.freebsd.org/changeset/base/270249
>>
>> Log:
>> Turns out that IDENTIFY DEVICE and IDENTIFY PACKET DEVICE return data
>> that's only mostly similar. Specifically word 78 bits are defined for
>> IDENTIFY DEVICE as
>>5 Supports Hardware Feature Control
>> while a IDENTIFY PACKET DEVICE defines them as
>>5 Asynchronous notification supported
>> Therefore, only pay attention to bit 5 when we're talking to ATAPI
>> devices (we don't use the hardware feature control at this time).
>> Ignore it for ATA devices. Remove kludge that papered over this issue
>> for Samsung SATA SSDs, since Micron drives also have the bit set and
>> the error was caused by this bad interpretation of the spec (which is
>> quite easy to do, since bits aren't normally overlapping like this).
>>
>> Modified:
>> head/sys/cam/ata/ata_xpt.c
>>
>> Modified: head/sys/cam/ata/ata_xpt.c
>> ==
>> --- head/sys/cam/ata/ata_xpt.c Wed Aug 20 22:39:26 2014(r270248)
>> +++ head/sys/cam/ata/ata_xpt.c Wed Aug 20 22:58:12 2014(r270249)
>> @@ -458,12 +458,18 @@ negotiate:
>>0, 0x02);
>>break;
>>case PROBE_SETAN:
>> - /* Remember what transport thinks about AEN. */
>> - if (softc->caps & CTS_SATA_CAPS_H_AN)
>> + /*
>> +* Only ATAPI defines this bit to mean AEN, but remember
>> +* what transport thinks about AEN.
>> +*/
>> + if ((softc->caps & CTS_SATA_CAPS_H_AN) &&
>> + periph->path->device->protocol == PROTO_ATAPI)
>>path->device->inq_flags |= SID_AEN;
>>else
>>path->device->inq_flags &= ~SID_AEN;
>>xpt_async(AC_GETDEV_CHANGED, path, NULL);
>> + if (periph->path->device->protocol != PROTO_ATAPI)
>> + break;
>>cam_fill_ataio(ataio,
>>1,
>>probedone,
>> @@ -750,14 +756,6 @@ out:
>>goto noerror;
>>
>>/*
>> -* Some Samsung SSDs report supported Asynchronous
>> Notification,
>> -* but return ABORT on attempt to enable it.
>> -*/
>> - } else if (softc->action == PROBE_SETAN &&
>> - status == CAM_ATA_STATUS_ERROR) {
>> - goto noerror;
>> -
>> - /*
>> * SES and SAF-TE SEPs have different IDENTIFY commands,
>> * but SATA specification doesn't tell how to identify them.
>> * Until better way found, just try another if first fail.
>>
>
> This change causes a panic for me on boot. Here is the boot log:
>
> ahci0: port
> 0xf050-0xf057,0xf040-0xf043,0xf030-0xf037,0xf020-0xf023,0xf000-0xf01f
> mem 0xfbb21000-0xfbb217ff irq 18 at device 31.2 on pci0
> ahci0: AHCI v1.30 with 6 6Gbps ports, Port Multiplier not supported
> ahcich0: at channel 0 on ahci0
> ahcich1: at channel 1 on ahci0
> ahcich2: at channel 2 on ahci0
> ahcich3: at channel 3 on ahci0
> ahcich4: at channel 4 on ahci0
> ahcich5: at channel 5 on ahci0
> ahciem0: on ahci0
> ...
> xpt_action_default: CCB type 0xdeadc0de not supported
> ...
> run_interrupt_driven_hooks: still waiting after 60 seconds for xpt_config
> run_interrupt_driven_hooks: still waiting after 120 seconds for xpt_config
> run_interrupt_driven_hooks: still waiting after 180 seconds for xpt_config
> run_interrupt_driven_hooks: still waiting after 240 seconds for xpt_config
> run_interrupt_driven_hooks: still waiting after 300 seconds for xpt_config
> panic: run_interrupt_driven_config_hooks: waited too long
> cpuid = 0
> KDB: stack backtrace:
> db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0x81d92920
> kdb_backtrace() at kdb_backtrace+0x39/frame 0x81d929d0
> vpanic() at vpanic+0x189/frame 0x81d92a50
> kassert_panic() at kassert_panic+0x139/frame 0x81d92ac0
> boot_run_interrupt_driven_config_hooks() at
> boot_run_interrupt_driven_config_hooks+0x111/frame 0x81d92b50
> mi_startup()f81d92b70
> btext() at btext+0x2c
> KDB: enter: panic
> [ thread pid 0 tid 10 ]
> Stopped at kdb_enter+0x3e: movq$0,kdb_why
> db>
>
> The peripheral in question is a SATA attached CDROM:
>
> % camcontrol devlist
> at scbus0 target 0 lun 0 (pass0,ada0)
>at scbus2 target 0 lun 0 (cd0,pass1)
> at scbus3 target 0 lun 0 (pass2,ada1)
> at scbus4 target 0 lun 0 (pass3,ada2)
>at scbus6 target 0 lun 0 (ses0,pass4)
>
> pass1 at ahcich2 bus 0 scbus2 target 0 lun 0
> pass1: Removable CD-ROM SCSI-0 devi
svn commit: r270318 - head/sys/kern
Author: hrs
Date: Fri Aug 22 05:03:30 2014
New Revision: 270318
URL: http://svnweb.freebsd.org/changeset/base/270318
Log:
Fix a panic which occurs in a VIMAGE-enabled kernel after r270158, and
separate socket_hhook_register() part and put it into VNET_SYS{,UN}INIT()
handler.
Discussed with: marcel
Modified:
head/sys/kern/uipc_socket.c
Modified: head/sys/kern/uipc_socket.c
==
--- head/sys/kern/uipc_socket.c Fri Aug 22 01:23:38 2014(r270317)
+++ head/sys/kern/uipc_socket.c Fri Aug 22 05:03:30 2014(r270318)
@@ -271,9 +271,16 @@ socket_hhook_register(int subtype)
}
static void
+socket_hhook_deregister(int subtype)
+{
+
+ if (hhook_head_deregister(V_socket_hhh[subtype]) != 0)
+ printf("%s: WARNING: unable to deregister hook\n", __func__);
+}
+
+static void
socket_init(void *tag)
{
- int i;
socket_zone = uma_zcreate("socket", sizeof(struct socket), NULL, NULL,
NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
@@ -281,13 +288,31 @@ socket_init(void *tag)
uma_zone_set_warning(socket_zone, "kern.ipc.maxsockets limit reached");
EVENTHANDLER_REGISTER(maxsockets_change, socket_zone_change, NULL,
EVENTHANDLER_PRI_FIRST);
+}
+SYSINIT(socket, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY, socket_init, NULL);
+
+static void
+socket_vnet_init(const void *unused __unused)
+{
+ int i;
/* We expect a contiguous range */
- for (i = 0; i <= HHOOK_SOCKET_LAST; i++) {
+ for (i = 0; i <= HHOOK_SOCKET_LAST; i++)
socket_hhook_register(i);
- }
}
-SYSINIT(socket, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY, socket_init, NULL);
+VNET_SYSINIT(socket_vnet_init, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY,
+socket_vnet_init, NULL);
+
+static void
+socket_vnet_uninit(const void *unused __unused)
+{
+ int i;
+
+ for (i = 0; i <= HHOOK_SOCKET_LAST; i++)
+ socket_hhook_deregister(i);
+}
+VNET_SYSUNINIT(socket_vnet_uninit, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY,
+socket_vnet_uninit, NULL);
/*
* Initialise maxsockets. This SYSINIT must be run after
@@ -376,12 +401,15 @@ soalloc(struct vnet *vnet)
#endif
mtx_unlock(&so_global_mtx);
+ CURVNET_SET(vnet);
/* We shouldn't need the so_global_mtx */
if (V_socket_hhh[HHOOK_SOCKET_CREATE]->hhh_nhooks > 0) {
if (hhook_run_socket(so, NULL, HHOOK_SOCKET_CREATE))
/* Do we need more comprehensive error returns? */
- return (NULL);
+ so = NULL;
}
+ CURVNET_RESTORE();
+
return (so);
}
@@ -418,8 +446,10 @@ sodealloc(struct socket *so)
#ifdef MAC
mac_socket_destroy(so);
#endif
+ CURVNET_SET(so->so_vnet);
if (V_socket_hhh[HHOOK_SOCKET_CLOSE]->hhh_nhooks > 0)
hhook_run_socket(so, NULL, HHOOK_SOCKET_CLOSE);
+ CURVNET_RESTORE();
crfree(so->so_cred);
khelp_destroy_osd(&so->osd);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270249 - head/sys/cam/ata
Hi Warner,
On Wed, Aug 20, 2014 at 3:58 PM, Warner Losh wrote:
> Author: imp
> Date: Wed Aug 20 22:58:12 2014
> New Revision: 270249
> URL: http://svnweb.freebsd.org/changeset/base/270249
>
> Log:
> Turns out that IDENTIFY DEVICE and IDENTIFY PACKET DEVICE return data
> that's only mostly similar. Specifically word 78 bits are defined for
> IDENTIFY DEVICE as
> 5 Supports Hardware Feature Control
> while a IDENTIFY PACKET DEVICE defines them as
> 5 Asynchronous notification supported
> Therefore, only pay attention to bit 5 when we're talking to ATAPI
> devices (we don't use the hardware feature control at this time).
> Ignore it for ATA devices. Remove kludge that papered over this issue
> for Samsung SATA SSDs, since Micron drives also have the bit set and
> the error was caused by this bad interpretation of the spec (which is
> quite easy to do, since bits aren't normally overlapping like this).
>
> Modified:
> head/sys/cam/ata/ata_xpt.c
>
> Modified: head/sys/cam/ata/ata_xpt.c
> ==
> --- head/sys/cam/ata/ata_xpt.c Wed Aug 20 22:39:26 2014(r270248)
> +++ head/sys/cam/ata/ata_xpt.c Wed Aug 20 22:58:12 2014(r270249)
> @@ -458,12 +458,18 @@ negotiate:
> 0, 0x02);
> break;
> case PROBE_SETAN:
> - /* Remember what transport thinks about AEN. */
> - if (softc->caps & CTS_SATA_CAPS_H_AN)
> + /*
> +* Only ATAPI defines this bit to mean AEN, but remember
> +* what transport thinks about AEN.
> +*/
> + if ((softc->caps & CTS_SATA_CAPS_H_AN) &&
> + periph->path->device->protocol == PROTO_ATAPI)
> path->device->inq_flags |= SID_AEN;
> else
> path->device->inq_flags &= ~SID_AEN;
> xpt_async(AC_GETDEV_CHANGED, path, NULL);
> + if (periph->path->device->protocol != PROTO_ATAPI)
> + break;
> cam_fill_ataio(ataio,
> 1,
> probedone,
> @@ -750,14 +756,6 @@ out:
> goto noerror;
>
> /*
> -* Some Samsung SSDs report supported Asynchronous
> Notification,
> -* but return ABORT on attempt to enable it.
> -*/
> - } else if (softc->action == PROBE_SETAN &&
> - status == CAM_ATA_STATUS_ERROR) {
> - goto noerror;
> -
> - /*
> * SES and SAF-TE SEPs have different IDENTIFY commands,
> * but SATA specification doesn't tell how to identify them.
> * Until better way found, just try another if first fail.
>
This change causes a panic for me on boot. Here is the boot log:
ahci0: port
0xf050-0xf057,0xf040-0xf043,0xf030-0xf037,0xf020-0xf023,0xf000-0xf01f
mem 0xfbb21000-0xfbb217ff irq 18 at device 31.2 on pci0
ahci0: AHCI v1.30 with 6 6Gbps ports, Port Multiplier not supported
ahcich0: at channel 0 on ahci0
ahcich1: at channel 1 on ahci0
ahcich2: at channel 2 on ahci0
ahcich3: at channel 3 on ahci0
ahcich4: at channel 4 on ahci0
ahcich5: at channel 5 on ahci0
ahciem0: on ahci0
...
xpt_action_default: CCB type 0xdeadc0de not supported
...
run_interrupt_driven_hooks: still waiting after 60 seconds for xpt_config
run_interrupt_driven_hooks: still waiting after 120 seconds for xpt_config
run_interrupt_driven_hooks: still waiting after 180 seconds for xpt_config
run_interrupt_driven_hooks: still waiting after 240 seconds for xpt_config
run_interrupt_driven_hooks: still waiting after 300 seconds for xpt_config
panic: run_interrupt_driven_config_hooks: waited too long
cpuid = 0
KDB: stack backtrace:
db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0x81d92920
kdb_backtrace() at kdb_backtrace+0x39/frame 0x81d929d0
vpanic() at vpanic+0x189/frame 0x81d92a50
kassert_panic() at kassert_panic+0x139/frame 0x81d92ac0
boot_run_interrupt_driven_config_hooks() at
boot_run_interrupt_driven_config_hooks+0x111/frame 0x81d92b50
mi_startup()f81d92b70
btext() at btext+0x2c
KDB: enter: panic
[ thread pid 0 tid 10 ]
Stopped at kdb_enter+0x3e: movq$0,kdb_why
db>
The peripheral in question is a SATA attached CDROM:
% camcontrol devlist
at scbus0 target 0 lun 0 (pass0,ada0)
at scbus2 target 0 lun 0 (cd0,pass1)
at scbus3 target 0 lun 0 (pass2,ada1)
at scbus4 target 0 lun 0 (pass3,ada2)
at scbus6 target 0 lun 0 (ses0,pass4)
pass1 at ahcich2 bus 0 scbus2 target 0 lun 0
pass1: Removable CD-ROM SCSI-0 device
pass1: Serial Number 3524472 2N8225501140
pass1: 150.000MB/s transfers (SATA 1.x, UDMA5, ATAPI 12bytes, PIO 8192bytes)
The following patch fixes the panic.
Index: sys/cam/ata/ata_xpt.c
=
svn commit: r270317 - head/cddl/usr.sbin/lockstat
Author: delphij
Date: Fri Aug 22 01:23:38 2014
New Revision: 270317
URL: http://svnweb.freebsd.org/changeset/base/270317
Log:
Fix powerpc build:
Chase r270227 and compile lockstat with C99 standard.
Suggested by: bde
Modified:
head/cddl/usr.sbin/lockstat/Makefile
Modified: head/cddl/usr.sbin/lockstat/Makefile
==
--- head/cddl/usr.sbin/lockstat/MakefileFri Aug 22 00:54:00 2014
(r270316)
+++ head/cddl/usr.sbin/lockstat/MakefileFri Aug 22 01:23:38 2014
(r270317)
@@ -18,6 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
-I${.CURDIR}/../../../sys
CFLAGS+= -DNEED_ERRLOC -g
+CSTD?= gnu99
#YFLAGS+= -d
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270316 - stable/10/etc
Author: gjb
Date: Fri Aug 22 00:54:00 2014
New Revision: 270316
URL: http://svnweb.freebsd.org/changeset/base/270316
Log:
Use 'WITHOUT_TESTS=1' instead of 'MK_TESTS=no' in the
'distribute' target of etc/Makefile, because we do not
allow command-line use of 'make MK_TESTS=no' in stable/10.
This fixes a regression introduced in r270187 that causes
the release build to fail, and a direct commit to stable/10.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/etc/Makefile
Modified: stable/10/etc/Makefile
==
--- stable/10/etc/Makefile Thu Aug 21 22:53:14 2014(r270315)
+++ stable/10/etc/Makefile Fri Aug 22 00:54:00 2014(r270316)
@@ -176,7 +176,7 @@ afterinstall:
distribute:
# Avoid installing tests here; "make distribution" will do this and
# correctly place them in the right location.
- ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
+ ${_+_}cd ${.CURDIR} ; ${MAKE} WITHOUT_TESTS=1 install \
DESTDIR=${DISTDIR}/${DISTRIBUTION}
${_+_}cd ${.CURDIR} ; ${MAKE} distribution
DESTDIR=${DISTDIR}/${DISTRIBUTION}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270315 - head/cddl/contrib/opensolaris/cmd/lockstat
Author: delphij Date: Thu Aug 21 22:53:14 2014 New Revision: 270315 URL: http://svnweb.freebsd.org/changeset/base/270315 Log: Include two headers to provide prototype for modfind(2) and kldload(2). MFC after:2 weeks Modified: head/cddl/contrib/opensolaris/cmd/lockstat/sym.c Modified: head/cddl/contrib/opensolaris/cmd/lockstat/sym.c == --- head/cddl/contrib/opensolaris/cmd/lockstat/sym.cThu Aug 21 22:49:41 2014(r270314) +++ head/cddl/contrib/opensolaris/cmd/lockstat/sym.cThu Aug 21 22:53:14 2014(r270315) @@ -50,6 +50,9 @@ /* FreeBSD */ #include #include +#include +#include +#include #endif #include ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270314 - stable/10
Author: ian Date: Thu Aug 21 22:49:41 2014 New Revision: 270314 URL: http://svnweb.freebsd.org/changeset/base/270314 Log: Commit of mergeinfo only to record the fact that r270311 changes are in 10-stable (I did the commit to the wrong branch first). Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270313 - in stable/10/sys/cam: ata scsi
Author: smh
Date: Thu Aug 21 22:47:03 2014
New Revision: 270313
URL: http://svnweb.freebsd.org/changeset/base/270313
Log:
MFC r269974 - Added 4K quirks for Corsair Force GT and Samsung 840 SSDs
Sponsored by: Multiplay
Modified:
stable/10/sys/cam/ata/ata_da.c
stable/10/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ata/ata_da.c
==
--- stable/10/sys/cam/ata/ata_da.c Thu Aug 21 22:44:08 2014
(r270312)
+++ stable/10/sys/cam/ata/ata_da.c Thu Aug 21 22:47:03 2014
(r270313)
@@ -299,10 +299,10 @@ static struct ada_quirk_entry ada_quirk_
},
{
/*
-* Corsair Force GT SSDs
+* Corsair Force GT & GS SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force GT*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force G*", "*" },
/*quirks*/ADA_Q_4K
},
{
@@ -443,6 +443,14 @@ static struct ada_quirk_entry ada_quirk_
},
{
/*
+* Samsung 840 SSDs
+* 4k optimised
+*/
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 840*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
* SuperTalent TeraDrive CT SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
*/
Modified: stable/10/sys/cam/scsi/scsi_da.c
==
--- stable/10/sys/cam/scsi/scsi_da.cThu Aug 21 22:44:08 2014
(r270312)
+++ stable/10/sys/cam/scsi/scsi_da.cThu Aug 21 22:47:03 2014
(r270313)
@@ -967,10 +967,10 @@ static struct da_quirk_entry da_quirk_ta
},
{
/*
-* Corsair Force GT SSDs
+* Corsair Force GT & GS SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
*/
- { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force GT*", "*" },
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force G*", "*" },
/*quirks*/DA_Q_4K
},
{
@@ -,6 +,14 @@ static struct da_quirk_entry da_quirk_ta
},
{
/*
+* Samsung 840 SSDs
+* 4k optimised & trim only works in 4k requests + 4k aligned
+*/
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 840*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
* SuperTalent TeraDrive CT SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
*/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270312 - in stable/10/sys/cddl: compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs contrib/opensolaris/uts/common/fs/zfs/sys
Author: smh
Date: Thu Aug 21 22:44:08 2014
New Revision: 270312
URL: http://svnweb.freebsd.org/changeset/base/270312
Log:
MFC r265152 - Reintroduce priority for the TRIM ZIOs instead of using the
"NOW" priority
MFC r265321 - Fix double fault panic when returning EOPNOTSUPP
MFC r269407 - Don't return ZIO_PIPELINE_CONTINUE from vdev_op_io_start methods
Sponsored by: Multiplay
Modified:
stable/10/sys/cddl/compat/opensolaris/sys/dkio.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/compat/opensolaris/sys/dkio.h
==
--- stable/10/sys/cddl/compat/opensolaris/sys/dkio.hThu Aug 21 22:42:02
2014(r270311)
+++ stable/10/sys/cddl/compat/opensolaris/sys/dkio.hThu Aug 21 22:44:08
2014(r270312)
@@ -75,8 +75,6 @@ extern "C" {
*/
#defineDKIOCFLUSHWRITECACHE(DKIOC|34) /* flush cache to phys
medium */
-#defineDKIOCTRIM (DKIOC|35) /* TRIM a block */
-
struct dk_callback {
void (*dkc_callback)(void *dkc_cookie, int error);
void *dkc_cookie;
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Thu Aug
21 22:42:02 2014(r270311)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Thu Aug
21 22:44:08 2014(r270312)
@@ -146,9 +146,10 @@ typedef enum zio_priority {
ZIO_PRIORITY_ASYNC_READ,/* prefetch */
ZIO_PRIORITY_ASYNC_WRITE, /* spa_sync() */
ZIO_PRIORITY_SCRUB, /* asynchronous scrub/resilver reads */
+ ZIO_PRIORITY_TRIM, /* free requests used for TRIM */
ZIO_PRIORITY_NUM_QUEUEABLE,
- ZIO_PRIORITY_NOW/* non-queued i/os (e.g. free) */
+ ZIO_PRIORITY_NOW/* non-queued I/Os (e.g. ioctl) */
} zio_priority_t;
#defineZIO_PIPELINE_CONTINUE 0x100
@@ -361,7 +362,7 @@ typedef struct zio_transform {
struct zio_transform*zt_next;
} zio_transform_t;
-typedef int zio_pipe_stage_t(zio_t **ziop);
+typedef int zio_pipe_stage_t(zio_t *zio);
/*
* The io_reexecute flags are distinct from io_flags because the child must
@@ -520,7 +521,7 @@ extern zio_t *zio_claim(zio_t *pio, spa_
extern zio_t *zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd,
uint64_t offset, uint64_t size, zio_done_func_t *done, void *priv,
-enum zio_flag flags);
+zio_priority_t priority, enum zio_flag flags);
extern zio_t *zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
uint64_t size, void *data, int checksum,
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
Thu Aug 21 22:42:02 2014(r270311)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
Thu Aug 21 22:44:08 2014(r270312)
@@ -215,6 +215,10 @@ enum zio_stage {
ZIO_STAGE_FREE_BP_INIT |\
ZIO_STAGE_DVA_FREE)
+#defineZIO_FREE_PHYS_PIPELINE \
+ (ZIO_INTERLOCK_STAGES | \
+ ZIO_VDEV_IO_STAGES)
+
#defineZIO_DDT_FREE_PIPELINE \
(ZIO_INTERLOCK_STAGES | \
ZIO_STAGE_FREE_BP_INIT |\
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
==
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c Thu Aug
21 22:42:02 2014(r270311)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c Thu Aug
21 22:44:08 2014(r270312)
@@ -449,7 +449,7 @@ trim_map_vdev_commit(spa_t *spa, zio_t *
{
trim_map_t *tm = vd->vdev_trimmap;
trim_seg_t *ts;
- uint64_t size, txgtarget, txgsafe;
+ uint64_t size, off
Re: svn commit: r270306 - stable/10/sys/modules/aic7xxx/ahc/ahc_eisa
On Thu, 2014-08-21 at 21:36 +, Ian Lepore wrote:
> Author: ian
> Date: Thu Aug 21 21:36:06 2014
> New Revision: 270306
> URL: http://svnweb.freebsd.org/changeset/base/270306
>
> Log:
> This module requires pci_if.h, add it to the SRCS list.
>
> We haven't noticed that it was missing because eisa has been disabled for
> a while in -current, but it became apparent when some parallel-build stuff
> was MFC'd to 10-stable and this module failed to build there.
>
> Modified:
> stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
>
> Modified: stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
> ==
> --- stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile Thu Aug 21
> 21:05:58 2014(r270305)
> +++ stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile Thu Aug 21
> 21:36:06 2014(r270306)
> @@ -5,7 +5,7 @@
> KMOD=ahc_eisa
>
> SRCS=ahc_eisa.c
> -SRCS+= device_if.h bus_if.h eisa_if.h
> +SRCS+= device_if.h bus_if.h eisa_if.h pci_if.h
> SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h
>
> CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
>
I just discovered I committed this directly to 10-stable. I had
intended to commit it to -current and then insta-mfc it (it fixes a
problem that is masked on -current by the fact that eisa is disabled by
default there).
-- Ian
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270311 - head/sys/modules/aic7xxx/ahc/ahc_eisa
Author: ian
Date: Thu Aug 21 22:42:02 2014
New Revision: 270311
URL: http://svnweb.freebsd.org/changeset/base/270311
Log:
This module requires pci_if.h, add it to the SRCS list.
We haven't noticed that it was missing because eisa has been disabled for
a while in -current, but it became apparent when some parallel-build stuff
was MFC'd to 10-stable and this module failed to build there.
Modified:
head/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
Modified: head/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
==
--- head/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile Thu Aug 21 22:04:17
2014(r270310)
+++ head/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile Thu Aug 21 22:42:02
2014(r270311)
@@ -5,7 +5,7 @@
KMOD= ahc_eisa
SRCS= ahc_eisa.c
-SRCS+= device_if.h bus_if.h eisa_if.h
+SRCS+= device_if.h bus_if.h eisa_if.h pci_if.h
SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h
CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270310 - stable/10/share/vt/keymaps
Author: se Date: Thu Aug 21 22:04:17 2014 New Revision: 270310 URL: http://svnweb.freebsd.org/changeset/base/270310 Log: MFC: 269950, 269952, 269973, 270114, 270119, 270142, 270156, 270200, 270229 Add fonts converted from SYSCONS with help of tools/tools/vt/keymaps for use with NEWCONS. The mapping from SYSCONS name to NEWCONS name is documented in KBDFILES.map in the tools directory. A few of the files where modified by Ed Maste (ca.kbd, ca-fr.kbd). Added: stable/10/share/vt/keymaps/INDEX.keymaps - copied, changed from r270114, head/share/vt/keymaps/INDEX.keymaps stable/10/share/vt/keymaps/am.kbd - copied, changed from r270114, head/share/vt/keymaps/am.kbd stable/10/share/vt/keymaps/be.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/be.acc.kbd stable/10/share/vt/keymaps/be.kbd (contents, props changed) - copied, changed from r269950, head/share/vt/keymaps/be.kbd stable/10/share/vt/keymaps/bg.bds.kbd - copied unchanged from r270114, head/share/vt/keymaps/bg.bds.kbd stable/10/share/vt/keymaps/bg.phonetic.kbd - copied unchanged from r270300, head/share/vt/keymaps/bg.phonetic.kbd stable/10/share/vt/keymaps/br.kbd - copied unchanged from r270156, head/share/vt/keymaps/br.kbd stable/10/share/vt/keymaps/br.noacc.kbd - copied unchanged from r270156, head/share/vt/keymaps/br.noacc.kbd stable/10/share/vt/keymaps/by.kbd - copied unchanged from r270156, head/share/vt/keymaps/by.kbd stable/10/share/vt/keymaps/ca-fr.kbd - copied, changed from r270119, head/share/vt/keymaps/ca-fr.kbd stable/10/share/vt/keymaps/ca.kbd - copied, changed from r270142, head/share/vt/keymaps/ca.kbd stable/10/share/vt/keymaps/centraleuropean.kbd - copied, changed from r270114, head/share/vt/keymaps/centraleuropean.kbd stable/10/share/vt/keymaps/centraleuropean.qwerty.kbd - copied unchanged from r270229, head/share/vt/keymaps/centraleuropean.qwerty.kbd stable/10/share/vt/keymaps/ch-fr.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/ch-fr.acc.kbd stable/10/share/vt/keymaps/ch-fr.kbd - copied, changed from r270114, head/share/vt/keymaps/ch-fr.kbd stable/10/share/vt/keymaps/ch.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/ch.acc.kbd stable/10/share/vt/keymaps/ch.kbd - copied, changed from r270114, head/share/vt/keymaps/ch.kbd stable/10/share/vt/keymaps/ch.macbook.acc.kbd - copied unchanged from r270114, head/share/vt/keymaps/ch.macbook.acc.kbd stable/10/share/vt/keymaps/colemak.acc.kbd - copied unchanged from r270300, head/share/vt/keymaps/colemak.acc.kbd stable/10/share/vt/keymaps/cz.kbd - copied, changed from r270114, head/share/vt/keymaps/cz.kbd stable/10/share/vt/keymaps/de.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/de.acc.kbd stable/10/share/vt/keymaps/de.kbd - copied unchanged from r270229, head/share/vt/keymaps/de.kbd stable/10/share/vt/keymaps/de.noacc.kbd - copied unchanged from r270229, head/share/vt/keymaps/de.noacc.kbd stable/10/share/vt/keymaps/dk.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/dk.acc.kbd stable/10/share/vt/keymaps/dk.kbd - copied, changed from r270114, head/share/vt/keymaps/dk.kbd stable/10/share/vt/keymaps/dk.macbook.kbd - copied, changed from r270114, head/share/vt/keymaps/dk.macbook.kbd stable/10/share/vt/keymaps/ee.kbd - copied unchanged from r270114, head/share/vt/keymaps/ee.kbd stable/10/share/vt/keymaps/es.acc.kbd - copied unchanged from r270114, head/share/vt/keymaps/es.acc.kbd stable/10/share/vt/keymaps/es.dvorak.kbd - copied, changed from r270114, head/share/vt/keymaps/es.dvorak.kbd stable/10/share/vt/keymaps/es.kbd - copied unchanged from r270114, head/share/vt/keymaps/es.kbd stable/10/share/vt/keymaps/fi.kbd - copied, changed from r270114, head/share/vt/keymaps/fi.kbd stable/10/share/vt/keymaps/fr.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/fr.acc.kbd stable/10/share/vt/keymaps/fr.dvorak.acc.kbd - copied, changed from r270114, head/share/vt/keymaps/fr.dvorak.acc.kbd stable/10/share/vt/keymaps/fr.dvorak.kbd - copied, changed from r270114, head/share/vt/keymaps/fr.dvorak.kbd stable/10/share/vt/keymaps/fr.kbd (contents, props changed) - copied, changed from r269950, head/share/vt/keymaps/fr.kbd stable/10/share/vt/keymaps/fr.macbook.kbd - copied, changed from r270114, head/share/vt/keymaps/fr.macbook.kbd stable/10/share/vt/keymaps/gr.101.acc.kbd - copied unchanged from r270114, head/share/vt/keymaps/gr.101.acc.kbd stable/10/share/vt/keymaps/gr.elot.acc.kbd - copied unchanged from r270114, head/share/vt/keymaps/gr.elot.acc.kbd stable/10/share/vt/keymaps/gr.kbd - copied unchanged from r270114, head/share/vt/keymaps/gr.kbd stable/10/share/vt/keymaps/hr.kbd (contents, props changed) - copied, change
svn commit: r270309 - stable/10/usr.sbin/kbdmap
Author: se
Date: Thu Aug 21 21:57:18 2014
New Revision: 270309
URL: http://svnweb.freebsd.org/changeset/base/270309
Log:
MFC 269976.
Add support for NEWCONS to kbdmap and vidfont.
Modified:
stable/10/usr.sbin/kbdmap/kbdmap.c
stable/10/usr.sbin/kbdmap/kbdmap.h
Modified: stable/10/usr.sbin/kbdmap/kbdmap.c
==
--- stable/10/usr.sbin/kbdmap/kbdmap.c Thu Aug 21 21:53:43 2014
(r270308)
+++ stable/10/usr.sbin/kbdmap/kbdmap.c Thu Aug 21 21:57:18 2014
(r270309)
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
@@ -47,10 +48,10 @@ static const char *lang_default = DEFAUL
static const char *font;
static const char *lang;
static const char *program;
-static const char *keymapdir = DEFAULT_KEYMAP_DIR;
-static const char *fontdir = DEFAULT_FONT_DIR;
+static const char *keymapdir = DEFAULT_VT_KEYMAP_DIR;
+static const char *fontdir = DEFAULT_VT_FONT_DIR;
+static const char *font_default = DEFAULT_VT_FONT;
static const char *sysconfig = DEFAULT_SYSCONFIG;
-static const char *font_default = DEFAULT_FONT;
static const char *font_current;
static const char *dir;
static const char *menu = "";
@@ -146,6 +147,22 @@ add_keymap(const char *desc, int mark, c
}
/*
+ * Return 0 if syscons is in use (to select legacy defaults).
+ */
+static int
+check_newcons(void)
+{
+ size_t len;
+ char term[3];
+
+ len = 3;
+ if (sysctlbyname("kern.vty", &term, &len, NULL, 0) != 0 ||
+ strcmp(term, "vt") != 0)
+ return 0;
+ return -1;
+}
+
+/*
* Figure out the default language to use.
*/
static const char *
@@ -815,6 +832,12 @@ main(int argc, char **argv)
sleep(2);
}
+ if (check_newcons() == 0) {
+ keymapdir = DEFAULT_SC_KEYMAP_DIR;
+ fontdir = DEFAULT_SC_FONT_DIR;
+ font_default = DEFAULT_SC_FONT;
+ }
+
SLIST_INIT(&head);
lang = get_locale();
Modified: stable/10/usr.sbin/kbdmap/kbdmap.h
==
--- stable/10/usr.sbin/kbdmap/kbdmap.h Thu Aug 21 21:53:43 2014
(r270308)
+++ stable/10/usr.sbin/kbdmap/kbdmap.h Thu Aug 21 21:57:18 2014
(r270309)
@@ -28,7 +28,12 @@
#define DEFAULT_LANG "en"
-#define DEFAULT_KEYMAP_DIR "/usr/share/syscons/keymaps"
-#define DEFAULT_FONT_DIR "/usr/share/syscons/fonts"
#define DEFAULT_SYSCONFIG "/etc/rc.conf"
-#define DEFAULT_FONT "cp437-8x16.fnt"
+
+#define DEFAULT_SC_KEYMAP_DIR "/usr/share/syscons/keymaps"
+#define DEFAULT_SC_FONT_DIR"/usr/share/syscons/fonts"
+#define DEFAULT_SC_FONT"cp437-8x16.fnt"
+
+#define DEFAULT_VT_KEYMAP_DIR "/usr/share/vt/keymaps"
+#define DEFAULT_VT_FONT_DIR"/usr/share/vt/fonts"
+#define DEFAULT_VT_FONT"vgarom-thin-8x16.fnt"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270308 - stable/10/tools/tools/vt/keymaps
Author: se Date: Thu Aug 21 21:53:43 2014 New Revision: 270308 URL: http://svnweb.freebsd.org/changeset/base/270308 Log: MFC 270131, 270152, 270199, 270232: Add converter from SYSCONS keymap format to NEWCONS and configuration files. The convert-keymap.pl script can be used to convert private SYSCONS keymaps ro NEWCONS format. Added: stable/10/tools/tools/vt/keymaps/ - copied from r270131, head/tools/tools/vt/keymaps/ Modified: stable/10/tools/tools/vt/keymaps/KBDFILES.map stable/10/tools/tools/vt/keymaps/convert-keymap.pl stable/10/tools/tools/vt/keymaps/convert-keymaps.pl Modified: stable/10/tools/tools/vt/keymaps/KBDFILES.map == --- head/tools/tools/vt/keymaps/KBDFILES.mapMon Aug 18 09:40:19 2014 (r270131) +++ stable/10/tools/tools/vt/keymaps/KBDFILES.map Thu Aug 21 21:53:43 2014(r270308) @@ -1,28 +1,36 @@ # $FreeBSD$ - -ISO8859-15 be.iso.kbd be.kbd -ISO8859-15 be.iso.acc.kbd be.acc.kbd +# +# The Files are converted by "convert-keymaps.pl" from the given encoding to UCS. +# +# An additional "+EURO" causes the translation of the generic currency symbol to +# an Euro symbol, even if the source locale does not support an Euro symbol. +# This conversion is only performed for the "E" key (not e.g. on Shift-4, which +# still generates the currency symbol). +# +# Encoding syscons file name newcons (vt) file name +ISO8859-1+EURO be.iso.kbd be.kbd +ISO8859-1+EURO be.iso.acc.kbd be.acc.kbd ISO8859-5 bg.bds.ctrlcaps.kbd bg.bds.kbd -ISO8859-5 bg.phonetic.ctrlcaps.kbdbg.bds.ctrlcaps.kbd +ISO8859-5 bg.phonetic.ctrlcaps.kbdbg.phonetic.kbd -ISO8859-1 br275.iso.kbd br.kbd -ISO8859-1 br275.iso.acc.kbd br.acc.kbd -CP850 br275.cp850.kbd br.kbd.from-cp850 +#ISO8859-1 br275.iso.kbd br.kbd.from-iso1(only AltGr-Shift-6 differs from CP850) +ISO8859-1 br275.iso.acc.kbd br.kbd +CP850 br275.cp850.kbd br.noacc.kbd -CP1131 by.cp1131.kbd by.kbd.from-cp1131 -CP1251 by.cp1251.kbd by.kbd.from-cp1251 -ISO8859-5 by.iso5.kbd by.kbd.from-iso5 +#CP1131by.cp1131.kbd by.kbd.from-cp1131 (Shift-3 not OK) +#CP1251by.cp1251.kbd by.kbd.from-cp1251 (result identical to CP1251) +ISO8859-5 by.iso5.kbd by.kbd -ISO8859-2 ce.iso2.kbd centraleuropean.kbd +ISO8859-2 ce.iso2.kbd centraleuropean.qwerty.kbd -ISO8859-1 colemak.iso15.acc.kbd colemak.kbd +ISO8859-1 colemak.iso15.acc.kbd colemak.acc.kbd ISO8859-2 cs.latin2.qwertz.kbdcz.kbd -ISO8859-2 cz.iso2.kbd cz.kbd.from-ce +ISO8859-2 cz.iso2.kbd cz.qwerty.kbd.from-ce -ISO8859-15 danish.iso.kbd dk.kbd -ISO8859-15 danish.iso.acc.kbd dk.acc.kbd +ISO8859-1+EURO danish.iso.kbd dk.kbd +ISO8859-1+EURO danish.iso.acc.kbd dk.acc.kbd CP865 danish.cp865.kbddk.kbd.from-cp865 ISO8859-1 danish.iso.macbook.kbd dk.macbook.kbd @@ -36,19 +44,19 @@ ISO8859-1 estonian.iso.kbdee.kbd.from- ISO8859-15 estonian.iso15.kbd ee.kbd CP850 estonian.cp850.kbd ee.kbd.from-cp850 -ISO8859-15 finnish.iso.kbd fi.kbd +ISO8859-1+EURO finnish.iso.kbd fi.kbd CP850 finnish.cp850.kbd fi.kbd.from-cp850 -ISO8859-15 fr.iso.kbd fr.kbd -ISO8859-15 fr.iso.acc.kbd fr.acc.kbd -ISO8859-15 fr.macbook.acc.kbd fr.macbook.kbd -ISO8859-1 fr.dvorak.kbd fr.dvorak.kbd -ISO8859-15 fr.dvorak.acc.kbd fr.dvorak.acc.kbd +ISO8859-1+EURO fr.iso.kbd fr.kbd +ISO8859-1+EURO fr.iso.acc.kbd fr.acc.kbd +ISO8859-1+EURO fr.macbook.acc.kbd fr.macbook.kbd +ISO8859-1+EURO fr.dvorak.kbd fr.dvorak.kbd +ISO8859-1 fr.dvorak.acc.kbd fr.dvorak.acc.kbd -ISO8859-15 fr_CA.iso.acc.kbd ca-fr.kbd +ISO8859-1+EURO fr_CA.iso.acc.kbd ca-fr.kbd -ISO8859-15 german.iso.kbd de.kbd -ISO8859-15 german.iso.acc.kbd de.acc.kbd +ISO8859-1+EURO german.iso.kbd de.noacc.kbd +ISO8859-1+EURO german.iso.acc.kbd de.acc.kbd CP850 german.cp850.kbdde.kbd.from-cp850 ISO8859-7 gr.elot.acc.
svn commit: r270307 - stable/10/share/syscons/keymaps
Author: se Date: Thu Aug 21 21:48:33 2014 New Revision: 270307 URL: http://svnweb.freebsd.org/changeset/base/270307 Log: MFC 270153, 270098: Apply a fixes to problems found while converting to NEWCONS. Modified: stable/10/share/syscons/keymaps/INDEX.keymaps stable/10/share/syscons/keymaps/be.iso.acc.kbd stable/10/share/syscons/keymaps/cs.latin2.qwertz.kbd stable/10/share/syscons/keymaps/uk.iso-ctrl.kbd stable/10/share/syscons/keymaps/uk.iso.kbd Modified: stable/10/share/syscons/keymaps/INDEX.keymaps == --- stable/10/share/syscons/keymaps/INDEX.keymaps Thu Aug 21 21:36:06 2014(r270306) +++ stable/10/share/syscons/keymaps/INDEX.keymaps Thu Aug 21 21:48:33 2014(r270307) @@ -4,7 +4,7 @@ # # Format :: # -# lang: ar bg cs da de el en es fi fr hr hu hy is it iw ja kk ko nl no pl +# lang: ar bg cs da de el en es fi fr he hr hu hy is it ja kk ko nl no pl # pt ro ru sh sk sl sv tr uk zh # lang: lang,lang # @@ -27,7 +27,7 @@ MENU:fr:Choisissez la nationalit� de vot MENU:pl:Wybierz uk�ad klawiatury MENU:pt:Escolha o layout do teclado MENU:es:Seleccione el idioma de su teclado -MENU:iw:��� �� ��� �� ��� +MENU:he:��� �� ��� �� ��� MENU:uk:B���Ҧ�� � ���צ� MENU:el: �� ��� MENU:hy:�� ݳ߳�� ��� @@ -36,7 +36,7 @@ FONT:en:cp437-8x16.fnt FONT:de,fr,da,no,sv,pt,es:iso-8x16.fnt FONT:ru:koi8-r-8x16.fnt FONT:pl:iso02-8x16.fnt -FONT:iw:iso08-8x16.fnt +FONT:he:iso08-8x16.fnt FONT:uk:koi8-u-8x16.fnt FONT:el:iso07-8x16.fnt FONT:hy:haik8-8x16.fnt @@ -52,8 +52,10 @@ be.iso.acc.kbd:fr:Belge ISO-8859-1 (avec be.iso.acc.kbd:pt:Belga ISO-8859-1 (com acentos) be.iso.acc.kbd:es:Belga ISO-8859-1 (con acentos) -bg.bds.ctrlcaps.kbd:bg:Bulgarian BDS -bg.phonetic.ctrlcaps.kbd:bg:Bulgarian Phonetic +bg.bds.ctrlcaps.kbd:en:Bulgarian (BDS) +bg.bds.ctrlcaps.kbd:de:Bulgarisch (BDS) +bg.phonetic.ctrlcaps.kbd:en:Bulgarian (Phonetic) +bg.phonetic.ctrlcaps.kbd:de:Bulgarisch (phonetisch) br275.iso.kbd:en:Brazilian 275 ISO-8859-1 br275.iso.kbd:de:Brasilianisch 275 ISO-8859-1 @@ -74,10 +76,13 @@ br275.cp850.kbd:pt:Brasileiro 275 Codepa br275.cp850.kbd:es:Brasile�o 275 Codepage 850 by.cp1131.kbd:en:Belarusian Codepage 1131 +by.cp1131.kbd:de:Wei�russisch Code page 1131 by.cp1131.kbd:fr:Bi�lorusse Code page 1131 +by.cp1251.kbd:de:Wei�russisch Codepage 1251 by.cp1251.kbd:en:Belarusian Codepage 1251 by.cp1251.kbd:fr:Bi�lorusse Code page 1251 by.iso5.kbd:en:Belarusian ISO-8859-5 +by.iso5.kbd:de:Wei�russisch ISO-8859-5 by.iso5.kbd:fr:Bi�lorusse ISO-8859-5 ce.iso2.kbd:en:Central European ISO-8859-2 @@ -88,6 +93,7 @@ ce.iso2.kbd:es:Centroeuropeo ISO-8859-2 colemak.iso15.acc.kbd:en:Colemak ergonomic alternative cs.latin2.qwertz.kbd:en:Czech ISO-8859-2 (QWERTZ, accent keys) +cs.latin2.qwertz.kbd:de:Tschechisch ISO-8859-2 (QWERTZ, mit Akzenten) cs.latin2.qwertz.kbd:fr:Tch�que ISO-8859-2 (QWERTZ, avec accents) cs.latin2.qwertz.kbd:es:Checo ISO-8859-2 (QWERTZ, con acentos) @@ -118,8 +124,14 @@ danish.cp865.kbd:pt:Dinamarqu�s Codepage danish.cp865.kbd:es:Dan�s Codepage 865 danish.iso.macbook.kbd:da:Danish ISO-8859-1 (macbook) +danish.iso.macbook.kbd:da:Dansk ISO-8859-1 (macbook) +danish.iso.macbook.kbd:de:D�nisch ISO-8859-1 (Macbook) +danish.iso.macbook.kbd:fr:Danois ISO-8859-1 (macbook) +danish.iso.macbook.kbd:pt:Dinamarqu�s ISO-8859-1 (macbook) +danish.iso.macbook.kbd:es:Dan�s ISO-8859-1 (macbook) dutch.iso.acc.kbd:en:Dutch ISO keymap (accent keys) +dutch.iso.acc.kbd:de:Holl�ndisch (mit Akzenten) eee_nordic.kbd:en:Nordic layout on Asus eeePC eee_nordic.kbd:fr:Norv�gien phon�tique sur Asus eeePC @@ -193,19 +205,19 @@ fr_CA.iso.acc.kbd:fr:Fran�ais Canadien I fr_CA.iso.acc.kbd:es:Francocanadiense ISO-8859-1 (con acentos) fr_CA.iso.acc.kbd:uk:��-� ISO-8859-1 (accent keys) -german.iso.kbd:en:German ISO-8859-1 -german.iso.kbd:de:Deutsch ISO-8859-1 -german.iso.kbd:fr:Allemand ISO-8859-1 -german.iso.kbd:pt:Alem�o ISO-8859-1 -german.iso.kbd:es:Alem�n ISO-8859-1 -german.iso.kbd:uk: ISO-8859-1 - -german.iso.acc.kbd:en:German ISO-8859-1 (accent keys) -german.iso.acc.kbd:de:Deutsch ISO-8859-1 (mit Akzenten) -german.iso.acc.kbd:fr:Allemand ISO-8859-1 (avec accents) -german.iso.acc.kbd:pt:Alem�o ISO-8859-1 (com acentos) -german.iso.acc.kbd:es:Alem�n ISO-8859-1 (con acentos) -german.iso.acc.kbd:uk: ISO-8859-1 (accent keys) +german.iso.kbd:en:German ISO-8859-15 +german.iso.kbd:de:Deutsch ISO-8859-15 +german.iso.kbd:fr:Allemand ISO-8859-15 +german.iso.kbd:pt:Alem�o ISO-8859-15 +german.iso.kbd:es:Alem�n ISO-8859-15 +german.iso.kbd:uk: ISO-8859-15 + +german.iso.acc.kbd:en:German ISO-8859-15 (accent keys) +german.iso.acc.kbd:de:Deutsch ISO-8859-15 (mit Akzenten) +german.iso.acc.kbd:fr:Allemand ISO-8859-15 (avec accents) +german.iso.acc.kbd:pt:Alem�o ISO-8859-15 (com acentos) +german.iso.acc
svn commit: r270306 - stable/10/sys/modules/aic7xxx/ahc/ahc_eisa
Author: ian
Date: Thu Aug 21 21:36:06 2014
New Revision: 270306
URL: http://svnweb.freebsd.org/changeset/base/270306
Log:
This module requires pci_if.h, add it to the SRCS list.
We haven't noticed that it was missing because eisa has been disabled for
a while in -current, but it became apparent when some parallel-build stuff
was MFC'd to 10-stable and this module failed to build there.
Modified:
stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
Modified: stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
==
--- stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile Thu Aug 21 21:05:58
2014(r270305)
+++ stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile Thu Aug 21 21:36:06
2014(r270306)
@@ -5,7 +5,7 @@
KMOD= ahc_eisa
SRCS= ahc_eisa.c
-SRCS+= device_if.h bus_if.h eisa_if.h
+SRCS+= device_if.h bus_if.h eisa_if.h pci_if.h
SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h
CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I..
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270305 - in head/sys/cam: ata scsi
Author: sbruno
Date: Thu Aug 21 21:05:58 2014
New Revision: 270305
URL: http://svnweb.freebsd.org/changeset/base/270305
Log:
Add the Samsung 843T as a 4k enabled drive
Submitted by: Jason Wolfe
MFC after:2 weeks
Sponsored by: Limelight Networks
Modified:
head/sys/cam/ata/ata_da.c
head/sys/cam/scsi/scsi_da.c
Modified: head/sys/cam/ata/ata_da.c
==
--- head/sys/cam/ata/ata_da.c Thu Aug 21 20:58:43 2014(r270304)
+++ head/sys/cam/ata/ata_da.c Thu Aug 21 21:05:58 2014(r270305)
@@ -451,6 +451,14 @@ static struct ada_quirk_entry ada_quirk_
},
{
/*
+* Samsung 843T Series SSDs
+* 4k optimised
+*/
+ { T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7WD*", "*" },
+ /*quirks*/ADA_Q_4K
+ },
+ {
+ /*
* SuperTalent TeraDrive CT SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
*/
Modified: head/sys/cam/scsi/scsi_da.c
==
--- head/sys/cam/scsi/scsi_da.c Thu Aug 21 20:58:43 2014(r270304)
+++ head/sys/cam/scsi/scsi_da.c Thu Aug 21 21:05:58 2014(r270305)
@@ -1119,6 +1119,14 @@ static struct da_quirk_entry da_quirk_ta
},
{
/*
+* Samsung 843T Series SSDs
+* 4k optimised
+*/
+ { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "SAMSUNG MZ7WD*", "*" },
+ /*quirks*/DA_Q_4K
+ },
+ {
+ /*
* SuperTalent TeraDrive CT SSDs
* 4k optimised & trim only works in 4k requests + 4k aligned
*/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270304 - head/usr.bin/elfdump
Author: emaste Date: Thu Aug 21 20:58:43 2014 New Revision: 270304 URL: http://svnweb.freebsd.org/changeset/base/270304 Log: elfdump: Remove extraneous _SUNW_ in reported DT_ names Sponsored by: The FreeBSD Foundation Modified: head/usr.bin/elfdump/elfdump.c Modified: head/usr.bin/elfdump/elfdump.c == --- head/usr.bin/elfdump/elfdump.c Thu Aug 21 20:55:10 2014 (r270303) +++ head/usr.bin/elfdump/elfdump.c Thu Aug 21 20:58:43 2014 (r270304) @@ -221,11 +221,11 @@ d_tags(u_int64_t tag) case DT_GNU_HASH: return "DT_GNU_HASH"; case 0x6ef8:return "DT_GNU_CONFLICT"; case 0x6ef9:return "DT_GNU_LIBLIST"; - case 0x6efa:return "DT_SUNW_CONFIG"; - case 0x6efb:return "DT_SUNW_DEPAUDIT"; - case 0x6efc:return "DT_SUNW_AUDIT"; - case 0x6efd:return "DT_SUNW_PLTPAD"; - case 0x6efe:return "DT_SUNW_MOVETAB"; + case DT_CONFIG: return "DT_CONFIG"; + case DT_DEPAUDIT: return "DT_DEPAUDIT"; + case DT_AUDIT: return "DT_AUDIT"; + case DT_PLTPAD: return "DT_PLTPAD"; + case DT_MOVETAB:return "DT_MOVETAB"; case DT_SYMINFO : return "DT_SYMINFO (DT_ADDRRNGHI)"; case DT_RELACOUNT: return "DT_RELACOUNT"; case DT_RELCOUNT: return "DT_RELCOUNT"; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270303 - in head: sys/sys usr.bin/elfdump
Author: emaste
Date: Thu Aug 21 20:55:10 2014
New Revision: 270303
URL: http://svnweb.freebsd.org/changeset/base/270303
Log:
Rename DT_FEATURE_1 to DT_FEATURE
This provides a minor cleanup in elfdump; there are otherwise no
consumers in the tree. Old SUN documentation can be found for either
variant, but GNU binutils switched to DT_FEATURE around 2000.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/sys/elf_common.h
head/usr.bin/elfdump/elfdump.c
Modified: head/sys/sys/elf_common.h
==
--- head/sys/sys/elf_common.h Thu Aug 21 20:36:22 2014(r270302)
+++ head/sys/sys/elf_common.h Thu Aug 21 20:55:10 2014(r270303)
@@ -426,7 +426,7 @@ typedef struct {
#defineDT_PLTPADSZ 0x6df9 /* pltpadding size */
#defineDT_MOVEENT 0x6dfa /* move table entry size */
#defineDT_MOVESZ 0x6dfb /* move table size */
-#defineDT_FEATURE_10x6dfc /* feature holder */
+#defineDT_FEATURE 0x6dfc /* feature holder */
#defineDT_POSFLAG_10x6dfd /* flags for DT_* entries,
effecting */
/* the following DT_* entry. */
/* See DF_P1_* definitions */
Modified: head/usr.bin/elfdump/elfdump.c
==
--- head/usr.bin/elfdump/elfdump.c Thu Aug 21 20:36:22 2014
(r270302)
+++ head/usr.bin/elfdump/elfdump.c Thu Aug 21 20:55:10 2014
(r270303)
@@ -213,7 +213,7 @@ d_tags(u_int64_t tag)
case DT_PLTPADSZ: return "DT_PLTPADSZ";
case DT_MOVEENT:return "DT_MOVEENT";
case DT_MOVESZ: return "DT_MOVESZ";
- case 0x6dfc:return "DT_FEATURE";
+ case DT_FEATURE:return "DT_FEATURE";
case DT_POSFLAG_1: return "DT_POSFLAG_1";
case DT_SYMINSZ:return "DT_SYMINSZ";
case DT_SYMINENT : return "DT_SYMINENT (DT_VALRNGHI)";
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270301 - head/tools/tools/vt/keymaps
Author: se Date: Thu Aug 21 20:35:39 2014 New Revision: 270301 URL: http://svnweb.freebsd.org/changeset/base/270301 Log: Modify a few output file names as used with vt. MFC after:3 days Modified: head/tools/tools/vt/keymaps/KBDFILES.map Modified: head/tools/tools/vt/keymaps/KBDFILES.map == --- head/tools/tools/vt/keymaps/KBDFILES.mapThu Aug 21 20:33:09 2014 (r270300) +++ head/tools/tools/vt/keymaps/KBDFILES.mapThu Aug 21 20:35:39 2014 (r270301) @@ -12,7 +12,7 @@ ISO8859-1+EURObe.iso.kbd be.kbd ISO8859-1+EURO be.iso.acc.kbd be.acc.kbd ISO8859-5 bg.bds.ctrlcaps.kbd bg.bds.kbd -ISO8859-5 bg.phonetic.ctrlcaps.kbdbg.bds.ctrlcaps.kbd +ISO8859-5 bg.phonetic.ctrlcaps.kbdbg.phonetic.kbd #ISO8859-1 br275.iso.kbd br.kbd.from-iso1(only AltGr-Shift-6 differs from CP850) ISO8859-1 br275.iso.acc.kbd br.kbd @@ -24,7 +24,7 @@ ISO8859-5 by.iso5.kbd by.kbd ISO8859-2 ce.iso2.kbd centraleuropean.qwerty.kbd -ISO8859-1 colemak.iso15.acc.kbd colemak.kbd +ISO8859-1 colemak.iso15.acc.kbd colemak.acc.kbd ISO8859-2 cs.latin2.qwertz.kbdcz.kbd ISO8859-2 cz.iso2.kbd cz.qwerty.kbd.from-ce ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270300 - head/share/vt/keymaps
Author: se
Date: Thu Aug 21 20:33:09 2014
New Revision: 270300
URL: http://svnweb.freebsd.org/changeset/base/270300
Log:
Next round of fixes.
MFC after:3 days
Added:
head/share/vt/keymaps/bg.phonetic.kbd
- copied unchanged from r270290, head/share/vt/keymaps/bg.bds.ctrlcaps.kbd
head/share/vt/keymaps/colemak.acc.kbd
- copied unchanged from r270290, head/share/vt/keymaps/colemak.kbd
Deleted:
head/share/vt/keymaps/bg.bds.ctrlcaps.kbd
head/share/vt/keymaps/colemak.kbd
Modified:
head/share/vt/keymaps/INDEX.keymaps
head/share/vt/keymaps/Makefile
head/share/vt/keymaps/ca-fr.kbd
head/share/vt/keymaps/ca.kbd
head/share/vt/keymaps/jp.pc98.kbd
Modified: head/share/vt/keymaps/INDEX.keymaps
==
--- head/share/vt/keymaps/INDEX.keymaps Thu Aug 21 20:10:05 2014
(r270299)
+++ head/share/vt/keymaps/INDEX.keymaps Thu Aug 21 20:33:09 2014
(r270300)
@@ -53,8 +53,9 @@ be.acc.kbd:es:Belga (con acentos)
bg.bds.kbd:en:Bulgarian (BDS)
bg.bds.kbd:de:Bulgarisch (BDS)
-bg.bds.ctrlcaps.kbd:en:Bulgarian (Phonetic)
-bg.bds.ctrlcaps.kbd:de:Bulgarisch (phonetisch)
+
+bg.phonetic.kbd:en:Bulgarian (Phonetic)
+bg.phonetic.kbd:de:Bulgarisch (phonetisch)
br.kbd:en:Brazilian (accent keys)
br.kbd:de:Brasilianisch (mit Akzenten)
@@ -82,7 +83,7 @@ centraleuropean.qwerty.kbd:de:Zentral Eu
centraleuropean.qwerty.kbd:fr:Centre européen (QWERTY)
centraleuropean.qwerty.kbd:es:Centroeuropeo (QWERTY)
-colemak.kbd:en:Colemak ergonomic alternative
+colemak.acc.kbd:en:Colemak ergonomic alternative
cz.kbd:en:Czech (QWERTZ, accent keys)
cz.kbd:de:Tschechisch (QWERTZ, mit Akzenten)
Modified: head/share/vt/keymaps/Makefile
==
--- head/share/vt/keymaps/Makefile Thu Aug 21 20:10:05 2014
(r270299)
+++ head/share/vt/keymaps/Makefile Thu Aug 21 20:33:09 2014
(r270300)
@@ -2,9 +2,13 @@
FILES= INDEX.keymaps \
am.kbd \
- bg.bds.ctrlcaps.kbd \
+ be.acc.kbd \
+ be.kbd \
bg.bds.kbd \
+ bg.phonetic.kbd \
br.kbd \
+ br.noacc.kbd \
+ by.kbd \
ca.kbd \
ca-fr.kbd \
centraleuropean.kbd \
@@ -14,9 +18,10 @@ FILES= INDEX.keymaps \
ch.acc.kbd \
ch.kbd \
ch.macbook.acc.kbd \
- colemak.kbd \
+ colemak.acc.kbd \
cz.kbd \
de.acc.kbd \
+ de.noacc.kbd \
de.kbd \
dk.acc.kbd \
dk.kbd \
@@ -26,6 +31,9 @@ FILES=INDEX.keymaps \
es.dvorak.kbd \
es.kbd \
fi.kbd \
+ fr.dvorak.acc.kbd \
+ fr.dvorak.kbd \
+ fr.macbook.kbd \
gr.101.acc.kbd \
gr.elot.acc.kbd \
gr.kbd \
Copied: head/share/vt/keymaps/bg.phonetic.kbd (from r270290,
head/share/vt/keymaps/bg.bds.ctrlcaps.kbd)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/vt/keymaps/bg.phonetic.kbd Thu Aug 21 20:33:09 2014
(r270300, copy of r270290, head/share/vt/keymaps/bg.bds.ctrlcaps.kbd)
@@ -0,0 +1,260 @@
+# $FreeBSD$
+# alt
+# scan cntrl altalt cntrl lock
+# code base shift cntrl shift altshift cntrl shift state
+# --
+ 000 nopnopnopnopnopnopnopnop O
+ 001 escescescescescescdebug esc O
+ 002 '1''!'nopnop'1''!'nopnop O
+ 003 '2''@'nulnul'2''@'nulnul O
+ 004 '3''#'nopnop'3''#'nopnop O
+ 005 '4''$'nopnop'4''$'nopnop O
+ 006 '5''%'nopnop'5''%'nopnop O
+ 007 '6''^'rs rs '6''^'rs rs O
+ 008 '7''&'nopnop'7''&'nopnop O
+ 009 '8''*'nopnop'8''*'nopnop O
+ 010 '9''('nopnop'9''('nopnop O
+ 011 '0'')'nopnop'0'')'nopnop O
+ 012 '-''_'us us '-''_'us us O
+ 013 '=''+'nopnop'=''+'nopnop O
+ 014 bs bs deldelbs bs deldel O
+ 015 ht btab nopnopht btab nopnop O
+ 016 'q''Q'dc1dc1'q''Q'dc1dc1 C
+ 017 'w''W'etbetb'w''W'etbetb C
+ 018 'e''E'enqenq'e''E'enqenq C
+ 019 'r''R'dc2dc2'r''R'dc2dc2 C
+ 020 't''T'dc4dc4't''T'dc4dc4 C
+ 021 'y''Y'em em 'y''
svn commit: r270299 - head/sys/dev/vt/hw/vga
Author: dumbbell
Date: Thu Aug 21 20:10:05 2014
New Revision: 270299
URL: http://svnweb.freebsd.org/changeset/base/270299
Log:
vt_vga: When clearing video memory, don't read from it
The goal is to clear the video memory, in case an application drew to
it. So the content shouldn't be loaded in the latches, it can't be
trusted anyway.
This improves a bit the window switch speed.
MFC after:1 week
Modified:
head/sys/dev/vt/hw/vga/vt_vga.c
Modified: head/sys/dev/vt/hw/vga/vt_vga.c
==
--- head/sys/dev/vt/hw/vga/vt_vga.c Thu Aug 21 19:58:46 2014
(r270298)
+++ head/sys/dev/vt/hw/vga/vt_vga.c Thu Aug 21 20:10:05 2014
(r270299)
@@ -604,7 +604,6 @@ vga_initialize(struct vt_device *vd, int
* planes.
*/
for (ofs = 0; ofs < VT_VGA_MEMSIZE; ofs++) {
- MEM_READ1(sc, ofs);
MEM_WRITE1(sc, ofs, 0);
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270298 - stable/10/sys/dev/netmap
Author: np Date: Thu Aug 21 19:58:46 2014 New Revision: 270298 URL: http://svnweb.freebsd.org/changeset/base/270298 Log: MFC r270253: Change netmap's global lock to sx instead of a mutex. Modified: stable/10/sys/dev/netmap/netmap_kern.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/netmap/netmap_kern.h == --- stable/10/sys/dev/netmap/netmap_kern.h Thu Aug 21 19:54:02 2014 (r270297) +++ stable/10/sys/dev/netmap/netmap_kern.h Thu Aug 21 19:58:46 2014 (r270298) @@ -44,13 +44,13 @@ #define unlikely(x)__builtin_expect((long)!!(x), 0L) #defineNM_LOCK_T struct mtx -#defineNMG_LOCK_T struct mtx -#define NMG_LOCK_INIT()mtx_init(&netmap_global_lock, \ - "netmap global lock", NULL, MTX_DEF) -#define NMG_LOCK_DESTROY() mtx_destroy(&netmap_global_lock) -#define NMG_LOCK() mtx_lock(&netmap_global_lock) -#define NMG_UNLOCK() mtx_unlock(&netmap_global_lock) -#define NMG_LOCK_ASSERT() mtx_assert(&netmap_global_lock, MA_OWNED) +#defineNMG_LOCK_T struct sx +#define NMG_LOCK_INIT()sx_init(&netmap_global_lock, \ + "netmap global lock") +#define NMG_LOCK_DESTROY() sx_destroy(&netmap_global_lock) +#define NMG_LOCK() sx_xlock(&netmap_global_lock) +#define NMG_UNLOCK() sx_xunlock(&netmap_global_lock) +#define NMG_LOCK_ASSERT() sx_assert(&netmap_global_lock, SA_XLOCKED) #defineNM_SELINFO_Tstruct selinfo #defineMBUF_LEN(m) ((m)->m_pkthdr.len) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270297 - in stable/10/sys: conf dev/cxgbe dev/cxgbe/common dev/cxgbe/tom modules/cxgbe modules/cxgbe/if_cxgbe modules/cxgbe/iw_cxgbe modules/cxgbe/t4_firmware modules/cxgbe/t5_firmware...
Author: np Date: Thu Aug 21 19:54:02 2014 New Revision: 270297 URL: http://svnweb.freebsd.org/changeset/base/270297 Log: MFC r266571, r266757, r268536, r269076, r269364, r269366, r269411, r269413, r269428, r269440, r269537, r269644, r269731, and the cxgbe portion of r270063. r266571: cxgbe(4): Remove stray if_up from the code that creates the tracing ifnet. r266757: cxgbe(4): netmap support for Terminator 5 (T5) based 10G/40G cards. Netmap gets its own hardware-assisted virtual interface and won't take over or disrupt the "normal" interface in any way. You can use both simultaneously. For kernels with DEV_NETMAP, cxgbe(4) carves out an ncxl interface (note the 'n' prefix) in the hardware to accompany each cxl interface. These two ifnet's per port share the same wire but really are separate interfaces in the hardware and software. Each gets its own L2 MAC addresses (unicast and multicast), MTU, checksum caps, etc. You should run netmap on the 'n' interfaces only, that's what they are for. With this, pkt-gen is able to transmit > 45Mpps out of a single 40G port of a T580 card. 2 port tx is at ~56Mpps total (28M + 28M) as of now. Single port receive is at 33Mpps but this is very much a work in progress. I expect it to be closer to 40Mpps once done. In any case the current effort can already saturate multiple 10G ports of a T5 card at the smallest legal packet size. T4 gear is totally untested. trantor:~# ./pkt-gen -i ncxl0 -f tx -D 00:07:43:ab:cd:ef 881.952141 main [1621] interface is ncxl0 881.952250 extract_ip_range [275] range is 10.0.0.1:0 to 10.0.0.1:0 881.952253 extract_ip_range [275] range is 10.1.0.1:0 to 10.1.0.1:0 881.962540 main [1804] mapped 334980KB at 0x801dff000 Sending on netmap:ncxl0: 4 queues, 1 threads and 1 cpus. 10.0.0.1 -> 10.1.0.1 (00:00:00:00:00:00 -> 00:07:43:ab:cd:ef) 881.962562 main [1882] Sending 512 packets every 0.0 s 881.962563 main [1884] Wait 2 secs for phy reset 884.088516 main [1886] Ready... 884.088535 nm_open [457] overriding ifname ncxl0 ringid 0x0 flags 0x1 884.088607 sender_body [996] start 884.093246 sender_body [1064] drop copy 885.090435 main_thread [1418] 45206353 pps (45289533 pkts in 1001840 usec) 886.091600 main_thread [1418] 45322792 pps (45375593 pkts in 1001165 usec) 887.092435 main_thread [1418] 45313992 pps (45351784 pkts in 1000834 usec) 888.094434 main_thread [1418] 45315765 pps (45406397 pkts in 1002000 usec) 889.095434 main_thread [1418] 45333218 pps (45378551 pkts in 1001000 usec) 890.097434 main_thread [1418] 45315247 pps (45405877 pkts in 1002000 usec) 891.099434 main_thread [1418] 45326515 pps (45417168 pkts in 1002000 usec) 892.101434 main_thread [1418] 45333039 pps (45423705 pkts in 1002000 usec) 893.103434 main_thread [1418] 45324105 pps (45414708 pkts in 1001999 usec) 894.105434 main_thread [1418] 45318042 pps (45408723 pkts in 1002001 usec) 895.106434 main_thread [1418] 45332430 pps (45377762 pkts in 1001000 usec) 896.107434 main_thread [1418] 45338072 pps (45383410 pkts in 1001000 usec) ... r268536: cxgbe(4): Add an iSCSI softc to the adapter structure. r269076: Some hooks in cxgbe(4) for the offloaded iSCSI driver. r269364: Improve compliance with style.Makefile(5). r269366: List one file per line in the Makefiles. This makes it easier to read diffs when a file is added or removed. r269411: cxgbe(4): minor optimizations in ingress queue processing. Reorganize struct sge_iq. Make the iq entry size a compile time constant. While here, eliminate RX_FL_ESIZE and use EQ_ESIZE directly. r269413: cxgbe(4): Fix an off by one error when looking for the BAR2 doorbell address of an egress queue. r269428: cxgbe(4): some optimizations in freelist handling. r269440: cxgbe(4): Remove an unused version of t4_enable_vi. r269537: cxgbe(4): Do not run any sleepable code in the SIOCSIFFLAGS handler when IFF_PROMISC or IFF_ALLMULTI is being flipped. bpf(4) holds its global mutex around ifpromisc in at least the bpf_dtor path. r269644: cxgbe(4): Let caller specify whether it's ok to sleep in t4_sched_config and t4_sched_params. r269731: cxgbe(4): Do not poke T4-only registers on a T5 (and vice versa). Relnotes: Yes (native netmap support for Chelsio T4/T5 cards) Added: stable/10/sys/dev/cxgbe/t4_netmap.c - copied, changed from r266757, head/sys/dev/cxgbe/t4_netmap.c Modified: stable/10/sys/conf/files stable/10/sys/dev/cxgbe/adapter.h stable/10/sys/dev/cxgbe/common/common.h stable/10/sys/dev/cxgbe/common/t4_hw.c stable/10/sys/dev/cxgbe/offload.h stable/10/sys/dev/cxgbe/t4_main.c stable/10/sys/dev/cxgbe/t4_sge.c stable/10/sys/dev/cxgbe/t4_tracer.c stable/10/sys/dev/cxgbe/tom/t4_cpl_io.c stable/10/sys/dev/cxgbe/tom/t4_ddp.c stable/10/sys/dev/cxgbe/tom/t4_tom.h stable/10/sys/modules/cxgbe/Makefile sta
svn commit: r270296 - in stable/10/sys: ia64/acpica ia64/ia64 ia64/include sys
Author: emaste
Date: Thu Aug 21 19:51:07 2014
New Revision: 270296
URL: http://svnweb.freebsd.org/changeset/base/270296
Log:
MFC r263815, r263872:
Move ia64 efi.h to sys in preparation for amd64 UEFI support
Prototypes specific to ia64 have been left in this file for now, under
__ia64__, rather than moving them to a new header under sys/ia64.
I anticipate that (some of) the corresponding functions will be shared
by the amd64, arm64, i386, and ia64 architectures, and we can adjust
this as EFI support on other than ia64 continues to develop.
Fix missed efi.h header change in r263815
Sponsored by: The FreeBSD Foundation
Added:
stable/10/sys/sys/efi.h
- copied unchanged from r263815, head/sys/sys/efi.h
Deleted:
stable/10/sys/ia64/include/efi.h
Modified:
stable/10/sys/ia64/acpica/OsdEnvironment.c
stable/10/sys/ia64/ia64/clock.c
stable/10/sys/ia64/ia64/dump_machdep.c
stable/10/sys/ia64/ia64/efi.c
stable/10/sys/ia64/ia64/iodev_machdep.c
stable/10/sys/ia64/ia64/machdep.c
stable/10/sys/ia64/ia64/mem.c
stable/10/sys/ia64/ia64/nexus.c
stable/10/sys/ia64/ia64/pmap.c
stable/10/sys/ia64/ia64/sal.c
stable/10/sys/ia64/ia64/trap.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/ia64/acpica/OsdEnvironment.c
==
--- stable/10/sys/ia64/acpica/OsdEnvironment.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/acpica/OsdEnvironment.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -29,8 +29,8 @@
__FBSDID("$FreeBSD$");
#include
+#include
#include
-#include
#include
Modified: stable/10/sys/ia64/ia64/clock.c
==
--- stable/10/sys/ia64/ia64/clock.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/clock.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
Modified: stable/10/sys/ia64/ia64/dump_machdep.c
==
--- stable/10/sys/ia64/ia64/dump_machdep.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/dump_machdep.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#ifdef SW_WATCHDOG
@@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
#include
Modified: stable/10/sys/ia64/ia64/efi.c
==
--- stable/10/sys/ia64/ia64/efi.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/efi.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -29,9 +29,9 @@
__FBSDID("$FreeBSD$");
#include
+#include
#include
#include
-#include
#include
#include
#include
Modified: stable/10/sys/ia64/ia64/iodev_machdep.c
==
--- stable/10/sys/ia64/ia64/iodev_machdep.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/iodev_machdep.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
@@ -37,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
static int iodev_efivar_getvar(struct iodev_efivar_req *req);
Modified: stable/10/sys/ia64/ia64/machdep.c
==
--- stable/10/sys/ia64/ia64/machdep.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/machdep.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
#include
@@ -83,7 +84,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
Modified: stable/10/sys/ia64/ia64/mem.c
==
--- stable/10/sys/ia64/ia64/mem.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/mem.c Thu Aug 21 19:51:07 2014
(r270296)
@@ -45,13 +45,13 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
Modified: stable/10/sys/ia64/ia64/nexus.c
==
--- stable/10/sys/ia64/ia64/nexus.c Thu Aug 21 19:45:54 2014
(r270295)
+++ stable/10/sys/ia64/ia64/nexus.c Thu Aug 21 19:51:07 2014
svn commit: r270295 - stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: markj Date: Thu Aug 21 19:45:54 2014 New Revision: 270295 URL: http://svnweb.freebsd.org/changeset/base/270295 Log: MFC r269525: Return 0 for the PPID of threads in process 0, as process 0 doesn't have a parent process. Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Directory Properties: stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c == --- stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cThu Aug 21 19:45:52 2014(r270294) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cThu Aug 21 19:45:54 2014(r270295) @@ -3107,7 +3107,10 @@ dtrace_dif_variable(dtrace_mstate_t *mst */ return ((uint64_t)curthread->t_procp->p_ppid); #else - return ((uint64_t)curproc->p_pptr->p_pid); + if (curproc->p_pid == proc0.p_pid) + return (curproc->p_pid); + else + return (curproc->p_pptr->p_pid); #endif case DIF_VAR_TID: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270294 - stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: markj Date: Thu Aug 21 19:45:52 2014 New Revision: 270294 URL: http://svnweb.freebsd.org/changeset/base/270294 Log: MFC r269525: Return 0 for the PPID of threads in process 0, as process 0 doesn't have a parent process. Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c == --- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu Aug 21 19:42:24 2014(r270293) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Thu Aug 21 19:45:52 2014(r270294) @@ -3415,7 +3415,10 @@ dtrace_dif_variable(dtrace_mstate_t *mst */ return ((uint64_t)curthread->t_procp->p_ppid); #else - return ((uint64_t)curproc->p_pptr->p_pid); + if (curproc->p_pid == proc0.p_pid) + return (curproc->p_pid); + else + return (curproc->p_pptr->p_pid); #endif case DIF_VAR_TID: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270293 - in head/sys/dev/vt: . font
Author: dumbbell
Date: Thu Aug 21 19:42:24 2014
New Revision: 270293
URL: http://svnweb.freebsd.org/changeset/base/270293
Log:
vt(4): Rename the "mouse_cursor" structure to "vt_mouse_cursor"
At the same time, "w" and "h" members are now called "width" and
"height". The goal is to have a more "public" structure, because it will
soon be passed as argument to a new callback, replacing vd_bitbltchr_t.
MFC after:1 week
Modified:
head/sys/dev/vt/font/vt_mouse_cursor.c
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/font/vt_mouse_cursor.c
==
--- head/sys/dev/vt/font/vt_mouse_cursor.c Thu Aug 21 19:42:03 2014
(r270292)
+++ head/sys/dev/vt/font/vt_mouse_cursor.c Thu Aug 21 19:42:24 2014
(r270293)
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
#include
#ifndef SC_NO_CUTPASTE
-struct mouse_cursor vt_default_mouse_pointer = {
+struct vt_mouse_cursor vt_default_mouse_pointer = {
.map = {
0x00, /* "__ " */
0x40, /* "_*_ " */
@@ -64,7 +64,7 @@ struct mouse_cursor vt_default_mouse_poi
0x0f, /* "" */
0x0f, /* "" */
},
- .w = 8,
- .h = 13,
+ .width = 8,
+ .height = 13,
};
#endif
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hThu Aug 21 19:42:03 2014(r270292)
+++ head/sys/dev/vt/vt.hThu Aug 21 19:42:24 2014(r270293)
@@ -284,6 +284,15 @@ struct vt_window {
* (VDF_TEXTMODE).
*/
+#ifndef SC_NO_CUTPASTE
+struct vt_mouse_cursor {
+ uint8_t map[64 * 64 / 8];
+ uint8_t mask[64 * 64 / 8];
+ uint8_t width;
+ uint8_t height;
+};
+#endif
+
typedef int vd_init_t(struct vt_device *vd);
typedef int vd_probe_t(struct vt_device *vd);
typedef void vd_postswitch_t(struct vt_device *vd);
@@ -377,15 +386,6 @@ struct vt_font {
unsigned int vf_refcount;
};
-#ifndef SC_NO_CUTPASTE
-struct mouse_cursor {
- uint8_t map[64 * 64 / 8];
- uint8_t mask[64 * 64 / 8];
- uint8_t w;
- uint8_t h;
-};
-#endif
-
const uint8_t *vtfont_lookup(const struct vt_font *vf, term_char_t c);
struct vt_font *vtfont_ref(struct vt_font *vf);
voidvtfont_unref(struct vt_font *vf);
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 19:42:03 2014(r270292)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 19:42:24 2014(r270293)
@@ -134,7 +134,7 @@ extern unsigned char vt_logo_image[];
/* Font. */
extern struct vt_font vt_font_default;
#ifndef SC_NO_CUTPASTE
-extern struct mouse_cursor vt_default_mouse_pointer;
+extern struct vt_mouse_cursor vt_default_mouse_pointer;
#endif
static int signal_vt_rel(struct vt_window *);
@@ -853,7 +853,7 @@ vt_flush(struct vt_device *vd)
term_pos_t size;
term_char_t *r;
#ifndef SC_NO_CUTPASTE
- struct mouse_cursor *cursor;
+ struct vt_mouse_cursor *cursor;
int bpl, h, w;
#endif
@@ -940,13 +940,15 @@ vt_flush(struct vt_device *vd)
#ifndef SC_NO_CUTPASTE
if (cursor != NULL) {
- bpl = (cursor->w + 7) >> 3; /* Bytes per source line. */
- w = cursor->w;
- h = cursor->h;
+ bpl = (cursor->width + 7) >> 3; /* Bytes per source line. */
+ w = cursor->width;
+ h = cursor->height;
- if ((vd->vd_mx + cursor->w) > (size.tp_col * vf->vf_width))
+ if ((vd->vd_mx + cursor->width) >
+ (size.tp_col * vf->vf_width))
w = (size.tp_col * vf->vf_width) - vd->vd_mx - 1;
- if ((vd->vd_my + cursor->h) > (size.tp_row * vf->vf_height))
+ if ((vd->vd_my + cursor->height) >
+ (size.tp_row * vf->vf_height))
h = (size.tp_row * vf->vf_height) - vd->vd_my - 1;
vd->vd_driver->vd_bitbltchr(vd, cursor->map, cursor->mask, bpl,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270292 - stable/10/sys/net
Author: np
Date: Thu Aug 21 19:42:03 2014
New Revision: 270292
URL: http://svnweb.freebsd.org/changeset/base/270292
Log:
Update a couple of header files that were missed in r270252. This is a
direct commit to stable/10.
Submitted by: luigi
Modified:
stable/10/sys/net/netmap.h
stable/10/sys/net/netmap_user.h
Modified: stable/10/sys/net/netmap.h
==
--- stable/10/sys/net/netmap.h Thu Aug 21 19:32:54 2014(r270291)
+++ stable/10/sys/net/netmap.h Thu Aug 21 19:42:03 2014(r270292)
@@ -445,6 +445,13 @@ struct netmap_if {
* Set the virtio-net header length used by the client
* of a VALE switch port.
*
+ * NETMAP_BDG_NEWIF
+ * create a persistent VALE port with name nr_name.
+ * Used by vale-ctl -n ...
+ *
+ * NETMAP_BDG_DELIF
+ * delete a persistent VALE port. Used by vale-ctl -d ...
+ *
* nr_arg1, nr_arg2, nr_arg3 (in/out) command specific
*
*
@@ -478,11 +485,12 @@ struct nmreq {
uint16_tnr_cmd;
#define NETMAP_BDG_ATTACH 1 /* attach the NIC */
#define NETMAP_BDG_DETACH 2 /* detach the NIC */
-#define NETMAP_BDG_LOOKUP_REG 3 /* register lookup function */
+#define NETMAP_BDG_REGOPS 3 /* register bridge callbacks */
#define NETMAP_BDG_LIST4 /* get bridge's info */
#define NETMAP_BDG_VNET_HDR 5 /* set the port virtio-net-hdr length
*/
#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 */
uint16_tnr_arg1;/* reserve extra rings in NIOCREGIF */
#define NETMAP_BDG_HOST1 /* attach the host stack on
ATTACH */
@@ -517,6 +525,7 @@ enum { NR_REG_DEFAULT = 0,/* backward c
#define NIOCREGIF _IOWR('i', 146, struct nmreq) /* interface register */
#define NIOCTXSYNC _IO('i', 148) /* sync tx queues */
#define NIOCRXSYNC _IO('i', 149) /* sync rx queues */
+#define NIOCCONFIG _IOWR('i',150, struct nm_ifreq) /* for ext. modules */
#endif /* !NIOCREGIF */
@@ -533,4 +542,15 @@ nm_ring_empty(struct netmap_ring *ring)
return (ring->cur == ring->tail);
}
+/*
+ * Opaque structure that is passed to an external kernel
+ * module via ioctl(fd, NIOCCONFIG, req) for a user-owned
+ * bridge port (at this point ephemeral VALE interface).
+ */
+#define NM_IFRDATA_LEN 256
+struct nm_ifreq {
+ char nifr_name[IFNAMSIZ];
+ char data[NM_IFRDATA_LEN];
+};
+
#endif /* _NET_NETMAP_H_ */
Modified: stable/10/sys/net/netmap_user.h
==
--- stable/10/sys/net/netmap_user.h Thu Aug 21 19:32:54 2014
(r270291)
+++ stable/10/sys/net/netmap_user.h Thu Aug 21 19:42:03 2014
(r270292)
@@ -149,21 +149,21 @@ nm_ring_space(struct netmap_ring *ring)
#define ND(_fmt, ...) do {} while(0)
#define D(_fmt, ...) \
do {\
- struct timeval t0; \
- gettimeofday(&t0, NULL);\
+ struct timeval _t0; \
+ gettimeofday(&_t0, NULL); \
fprintf(stderr, "%03d.%06d %s [%d] " _fmt "\n", \
- (int)(t0.tv_sec % 1000), (int)t0.tv_usec, \
+ (int)(_t0.tv_sec % 1000), (int)_t0.tv_usec, \
__FUNCTION__, __LINE__, ##__VA_ARGS__); \
} while (0)
/* Rate limited version of "D", lps indicates how many per second */
#define RD(lps, format, ...)\
do {\
-static int t0, __cnt; \
+static int __t0, __cnt; \
struct timeval __xxts; \
gettimeofday(&__xxts, NULL);\
-if (t0 != __xxts.tv_sec) { \
-t0 = __xxts.tv_sec; \
+if (__t0 != __xxts.tv_sec) {\
+__t0 = __xxts.tv_sec; \
__cnt = 0; \
} \
if (__cnt++ < lps) {\
@@ -495,23 +495,23 @@ nm_open(const char *ifname, const struct
(char *)d->mem + d->memsize;
}
- if (nr_flags == NR_REG_SW) { /* host stack */
+ if (d->req.nr_flags == NR_REG_SW) { /* host stack */
svn commit: r270291 - stable/10/share/mk
Author: emaste
Date: Thu Aug 21 19:32:54 2014
New Revision: 270291
URL: http://svnweb.freebsd.org/changeset/base/270291
Log:
MFC r264927 by imp:
NO_DEBUG_FILES -> MK_DEBUG_FILES=no in last remaining place.
Modified:
stable/10/share/mk/bsd.crunchgen.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/mk/bsd.crunchgen.mk
==
--- stable/10/share/mk/bsd.crunchgen.mk Thu Aug 21 19:15:22 2014
(r270290)
+++ stable/10/share/mk/bsd.crunchgen.mk Thu Aug 21 19:32:54 2014
(r270291)
@@ -48,7 +48,7 @@ CRUNCH_GENERATE_LINKS?= yes
CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h
# Don't try to extract debug info from ${PROG}.
-NO_DEBUG_FILES=
+MK_DEBUG_FILES=no
# Program names and their aliases contribute hardlinks to 'rescue' executable,
# except for those that get suppressed.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270290 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 19:15:22 2014
New Revision: 270290
URL: http://svnweb.freebsd.org/changeset/base/270290
Log:
vt(4): Test if the cursor is shown only once
Later, we just see if the "struct mouse_cursor" pointer is set. This
avoids the need to mess with all the conditions several times; this has
been error prone.
While here, rename the variable "m" to a more meaningful "cursor", like
it's done elsewhere in the code.
MFC after:1 week
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 19:04:15 2014(r270289)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 19:15:22 2014(r270290)
@@ -853,7 +853,7 @@ vt_flush(struct vt_device *vd)
term_pos_t size;
term_char_t *r;
#ifndef SC_NO_CUTPASTE
- struct mouse_cursor *m;
+ struct mouse_cursor *cursor;
int bpl, h, w;
#endif
@@ -868,6 +868,7 @@ vt_flush(struct vt_device *vd)
return;
#ifndef SC_NO_CUTPASTE
+ cursor = NULL;
if ((vd->vd_flags & VDF_MOUSECURSOR) && /* Mouse support enabled. */
!(vw->vw_flags & VWF_MOUSE_HIDE)) { /* Cursor displayed. */
if (vd->vd_moldx != vd->vd_mx ||
@@ -903,6 +904,11 @@ vt_flush(struct vt_device *vd)
vd->vd_moldx = vd->vd_mx;
vd->vd_moldy = vd->vd_my;
}
+
+ if (!kdb_active && panicstr == NULL) {
+ /* Mouse enabled, and DDB isn't active. */
+ cursor = &vt_default_mouse_pointer;
+ }
}
#endif
@@ -933,27 +939,17 @@ vt_flush(struct vt_device *vd)
}
#ifndef SC_NO_CUTPASTE
- /* Mouse disabled. */
- if (vw->vw_flags & VWF_MOUSE_HIDE)
- return;
-
- /* No mouse for DDB. */
- if (kdb_active || panicstr != NULL)
- return;
-
- if ((vd->vd_flags & (VDF_MOUSECURSOR|VDF_TEXTMODE)) ==
- VDF_MOUSECURSOR) {
- m = &vt_default_mouse_pointer;
- bpl = (m->w + 7) >> 3; /* Bytes per source line. */
- w = m->w;
- h = m->h;
+ if (cursor != NULL) {
+ bpl = (cursor->w + 7) >> 3; /* Bytes per source line. */
+ w = cursor->w;
+ h = cursor->h;
- if ((vd->vd_mx + m->w) > (size.tp_col * vf->vf_width))
+ if ((vd->vd_mx + cursor->w) > (size.tp_col * vf->vf_width))
w = (size.tp_col * vf->vf_width) - vd->vd_mx - 1;
- if ((vd->vd_my + m->h) > (size.tp_row * vf->vf_height))
+ if ((vd->vd_my + cursor->h) > (size.tp_row * vf->vf_height))
h = (size.tp_row * vf->vf_height) - vd->vd_my - 1;
- vd->vd_driver->vd_bitbltchr(vd, m->map, m->mask, bpl,
+ vd->vd_driver->vd_bitbltchr(vd, cursor->map, cursor->mask, bpl,
vd->vd_offset.tp_row + vd->vd_my,
vd->vd_offset.tp_col + vd->vd_mx,
w, h, TC_WHITE, TC_BLACK);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270289 - in head: sbin/mksnap_ffs sbin/shutdown usr.sbin/ppp
Author: neel
Date: Thu Aug 21 19:04:15 2014
New Revision: 270289
URL: http://svnweb.freebsd.org/changeset/base/270289
Log:
Change file permissions for some setuid executables so they are "o+r".
The executable itself doesn't contain any privileged information.
An example of where this is useful is when makefs(8) is creating an image
that includes /sbin/shutdown. This can now be done without root privileges.
Reviewed by: delphij
Discussed with: delphij, des
CR: https://reviews.freebsd.org/D662
Modified:
head/sbin/mksnap_ffs/Makefile
head/sbin/shutdown/Makefile
head/usr.sbin/ppp/Makefile
Modified: head/sbin/mksnap_ffs/Makefile
==
--- head/sbin/mksnap_ffs/Makefile Thu Aug 21 18:26:32 2014
(r270288)
+++ head/sbin/mksnap_ffs/Makefile Thu Aug 21 19:04:15 2014
(r270289)
@@ -10,9 +10,9 @@ WARNS?= 2
CFLAGS+=-I${.CURDIR}/../mount
.if defined(NOSUID)
-BINMODE=550
+BINMODE=554
.else
-BINMODE=4550
+BINMODE=4554
BINOWN=root
.endif
BINGRP=operator
Modified: head/sbin/shutdown/Makefile
==
--- head/sbin/shutdown/Makefile Thu Aug 21 18:26:32 2014(r270288)
+++ head/sbin/shutdown/Makefile Thu Aug 21 19:04:15 2014(r270289)
@@ -8,6 +8,6 @@ MLINKS= shutdown.8 poweroff.8
BINOWN=root
BINGRP=operator
-BINMODE=4550
+BINMODE=4554
.include
Modified: head/usr.sbin/ppp/Makefile
==
--- head/usr.sbin/ppp/Makefile Thu Aug 21 18:26:32 2014(r270288)
+++ head/usr.sbin/ppp/Makefile Thu Aug 21 19:04:15 2014(r270289)
@@ -33,9 +33,9 @@ PPP_NO_PAM=
.endif
.if defined(PPP_NO_SUID)
-BINMODE=550
+BINMODE=554
.else
-BINMODE=4550
+BINMODE=4554
BINOWN=root
.endif
BINGRP=network
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270258 - in stable/10: sbin/umount usr.bin/showmount
On Wed, Aug 20, 2014 at 9:31 PM, Peter Wemm wrote: > Author: peter > Date: Thu Aug 21 04:31:48 2014 > New Revision: 270258 > URL: http://svnweb.freebsd.org/changeset/base/270258 > > Log: > MFC r270062: switch rpc mount protocol for showmount and umount from > mountv1 to mountv3 - it breaks by default on the new netapp release with > the legacy protocols removed. Next time when doing this type of commit, please set Relnotes: yes in the commit message. This type of commit is "Release Notes" worthy, and it makes writing release notes a bit easier for re@. -- Craig ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270288 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 18:26:32 2014
New Revision: 270288
URL: http://svnweb.freebsd.org/changeset/base/270288
Log:
vt(4): Constify vt_buf argument of vtbuf_iscursor()
MFC after:1 week
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_buf.c
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hThu Aug 21 17:54:42 2014(r270287)
+++ head/sys/dev/vt/vt.hThu Aug 21 18:26:32 2014(r270288)
@@ -197,7 +197,7 @@ void vtbuf_cursor_position(struct vt_buf
void vtbuf_scroll_mode(struct vt_buf *vb, int yes);
void vtbuf_undirty(struct vt_buf *, term_rect_t *, struct vt_bufmask *);
void vtbuf_sethistory_size(struct vt_buf *, int);
-int vtbuf_iscursor(struct vt_buf *vb, int row, int col);
+int vtbuf_iscursor(const struct vt_buf *vb, int row, int col);
void vtbuf_cursor_visibility(struct vt_buf *, int);
#ifndef SC_NO_CUTPASTE
void vtbuf_mouse_cursor_position(struct vt_buf *vb, int col, int row);
Modified: head/sys/dev/vt/vt_buf.c
==
--- head/sys/dev/vt/vt_buf.cThu Aug 21 17:54:42 2014(r270287)
+++ head/sys/dev/vt/vt_buf.cThu Aug 21 18:26:32 2014(r270288)
@@ -148,7 +148,7 @@ vtbuf_wth(struct vt_buf *vb, int row)
/* Translate history row to current view row number. */
static int
-vtbuf_htw(struct vt_buf *vb, int row)
+vtbuf_htw(const struct vt_buf *vb, int row)
{
/*
@@ -162,7 +162,7 @@ vtbuf_htw(struct vt_buf *vb, int row)
}
int
-vtbuf_iscursor(struct vt_buf *vb, int row, int col)
+vtbuf_iscursor(const struct vt_buf *vb, int row, int col)
{
int sc, sr, ec, er, tmp;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270287 - in head: sbin/ifconfig sys/net
Author: melifaro
Date: Thu Aug 21 17:54:42 2014
New Revision: 270287
URL: http://svnweb.freebsd.org/changeset/base/270287
Log:
* Add new net/sff8436.h containing constants used to access
QSFP+ data via i2c inteface. These constants has been taken
from SFF-8436 "QSFP+ 10 Gbs 4X PLUGGABLE TRANSCEIVER" standard
rev 4.8.
* Add support for printing QSFP+ information from 40G NICs
such as Chelsio T5.
This commit does not contain ioctl changes necessary for this
functionality work, there will be another commit soon.
Example:
cxl1: flags=8843 metric 0 mtu 1500
options=ec07bb
ether 00:07:43:28:ad:08
nd6 options=29
media: Ethernet 40Gbase-LR4
status: active
plugged: QSFP+ 40GBASE-LR4 (MPO Parallel Optic)
vendor: OEM PN: OP-QSFP-40G-LR4 SN: 20140318001 DATE: 2014-03-18
module temperature: 64.06 C voltage: 3.26 Volts
lane 1: RX: 0.47 mW (-3.21 dBm) TX: 2.78 mW (4.46 dBm)
lane 2: RX: 0.20 mW (-6.94 dBm) TX: 2.80 mW (4.47 dBm)
lane 3: RX: 0.18 mW (-7.38 dBm) TX: 2.79 mW (4.47 dBm)
lane 4: RX: 0.90 mW (-0.45 dBm) TX: 2.80 mW (4.48 dBm)
Tested on:Chelsio T5
Tested on:Mellanox/Huawei passive/active cables/transceivers.
MFC after:2 weeks
Sponsored by: Yandex LLC
Added:
head/sys/net/sff8436.h (contents, props changed)
Modified:
head/sbin/ifconfig/sfp.c
head/sys/net/sff8472.h
Modified: head/sbin/ifconfig/sfp.c
==
--- head/sbin/ifconfig/sfp.cThu Aug 21 17:36:42 2014(r270286)
+++ head/sbin/ifconfig/sfp.cThu Aug 21 17:54:42 2014(r270287)
@@ -34,11 +34,13 @@ static const char rcsid[] =
#include
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -53,11 +55,16 @@ typedef int (read_i2c)(struct i2c_info *
struct i2c_info {
int s;
int error;
+ int bshift;
+ int qsfp;
+ int do_diag;
struct ifreq *ifr;
read_i2c *f;
- uint8_t diag_type;
char *textbuf;
size_t bufsize;
+ int cfd;
+ int port_id;
+ int chip_id;
};
struct _nv {
@@ -86,11 +93,12 @@ static struct _nv conn[] = {
{ 0x20, "HSSDC II" },
{ 0x21, "Copper pigtail" },
{ 0x22, "RJ45" },
+ { 0x23, "No separate connector" }, /* SFF-8436 */
{ 0, NULL }
};
/* SFF-8472 Rev. 11.4 table 3.5: Transceiver codes */
-/* 10G Ethernet compliance codes, byte 3 */
+/* 10G Ethernet/IB compliance codes, byte 3 */
static struct _nv eth_10g[] = {
{ 0x80, "10G Base-ER" },
{ 0x40, "10G Base-LRM" },
@@ -165,6 +173,21 @@ static struct _nv fc_speed[] = {
{ 0, NULL }
};
+/* SFF-8436 Rev. 4.8 table 33: Specification compliance */
+
+/* 10/40G Ethernet compliance codes, byte 128 + 3 */
+static struct _nv eth_1040g[] = {
+ { 0x80, "Reserved" },
+ { 0x40, "10GBASE-LRM" },
+ { 0x20, "10GBASE-LR" },
+ { 0x10, "10GBASE-SR" },
+ { 0x08, "40GBASE-CR4" },
+ { 0x04, "40GBASE-SR4" },
+ { 0x02, "40GBASE-LR4" },
+ { 0x01, "40G Active Cable" },
+ { 0, NULL }
+};
+
const char *
find_value(struct _nv *x, int value)
{
@@ -194,18 +217,15 @@ find_zero_bit(struct _nv *x, int value,
}
static void
-get_sfp_identifier(struct i2c_info *ii, char *buf, size_t size)
+convert_sff_identifier(char *buf, size_t size, uint8_t value)
{
const char *x;
- uint8_t data;
-
- ii->f(ii, SFF_8472_BASE, SFF_8472_ID, 1, (caddr_t)&data);
x = NULL;
- if (data <= SFF_8472_ID_LAST)
- x = sff_8472_id[data];
+ if (value <= SFF_8024_ID_LAST)
+ x = sff_8024_id[value];
else {
- if (data > 0x80)
+ if (value > 0x80)
x = "Vendor specific";
else
x = "Reserved";
@@ -215,17 +235,14 @@ get_sfp_identifier(struct i2c_info *ii,
}
static void
-get_sfp_connector(struct i2c_info *ii, char *buf, size_t size)
+convert_sff_connector(char *buf, size_t size, uint8_t value)
{
const char *x;
- uint8_t data;
- ii->f(ii, SFF_8472_BASE, SFF_8472_CONNECTOR, 1, (caddr_t)&data);
-
- if ((x = find_value(conn, data)) == NULL) {
- if (data >= 0x0D && data <= 0x1F)
+ if ((x = find_value(conn, value)) == NULL) {
+ if (value >= 0x0D && value <= 0x1F)
x = "Unallocated";
- else if (data >= 0x23 && data <= 0x7F)
+ else if (value >= 0x24 && value <= 0x7F)
x = "Unallocated";
else
x = "Vendor specific";
@@ -235,6 +252,42 @@ get_sfp_connector(struct i2c_info *ii, c
}
static void
+get_sfp_identifier(struct i2c_info *ii, char *buf, size_t size)
+{
+ uint8_t data;
+
+
Re: svn commit: r269603 - in head: etc/mtree lib/libnv lib/libnv/tests tools/regression/lib/libnv
On 8/21/2014 12:42 PM, yaneurab...@gmail.com wrote: > On Aug 5, 2014, at 3:06 PM, Garrett Cooper wrote: > >> On Aug 5, 2014, at 11:41 AM, Garrett Cooper wrote: >> >>> Author: ngie >>> Date: Tue Aug 5 18:41:27 2014 >>> New Revision: 269603 >>> URL: http://svnweb.freebsd.org/changeset/base/269603 >>> >>> Log: >>> Integrate lib/libnv into the build/kyua >>> >>> Rename all of the TAP test applications from to _test >>> to match the convention described in the TestSuite wiki page >>> >>> Phabric: D538 >>> Approved by: jmmv (mentor) >>> Sponsored by: EMC / Isilon Storage Division >> >> I forgot to mention… >> >> MFC after: 2 weeks > > Didn’t realize that lib/libnv hasn’t been MFCed to stable/10, so this > note’s kind of moot right now :). > Thanks! > -Garrett > If I remember right, pjd@ did tell me he planned to MFC it to 10.1. Not sure if he still will. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
Re: svn commit: r269603 - in head: etc/mtree lib/libnv lib/libnv/tests tools/regression/lib/libnv
On Aug 5, 2014, at 3:06 PM, Garrett Cooper wrote: > On Aug 5, 2014, at 11:41 AM, Garrett Cooper wrote: > >> Author: ngie >> Date: Tue Aug 5 18:41:27 2014 >> New Revision: 269603 >> URL: http://svnweb.freebsd.org/changeset/base/269603 >> >> Log: >> Integrate lib/libnv into the build/kyua >> >> Rename all of the TAP test applications from to _test >> to match the convention described in the TestSuite wiki page >> >> Phabric: D538 >> Approved by: jmmv (mentor) >> Sponsored by: EMC / Isilon Storage Division > > I forgot to mention… > > MFC after: 2 weeks Didn’t realize that lib/libnv hasn’t been MFCed to stable/10, so this note’s kind of moot right now :). Thanks! -Garrett signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r270283 - head/usr.sbin/bsdconfig/share/packages
On 8/21/2014 12:23 PM, dte...@freebsd.org wrote: > > >> -Original Message- >> From: owner-src-committ...@freebsd.org [mailto:owner-src- >> committ...@freebsd.org] On Behalf Of Bryan Drewery >> Sent: Thursday, August 21, 2014 10:17 AM >> To: Devin Teske; src-committ...@freebsd.org; svn-src-all@freebsd.org; svn- >> src-h...@freebsd.org >> Subject: Re: svn commit: r270283 - head/usr.sbin/bsdconfig/share/packages >> >> On 8/21/2014 12:15 PM, Devin Teske wrote: >>> Author: dteske >>> Date: Thu Aug 21 17:15:09 2014 >>> New Revision: 270283 >>> URL: http://svnweb.freebsd.org/changeset/base/270283 >>> >>> Log: >>> Add `-A' flag to pkg-install(8) invocation when installing dependencies. >> >> Thank you!! >> > > To my recollection, nobody brought this to my attention before yesterday. > That's fine. I'm hoping we can communicate on mutual needs more going forward. I admit I have not used bsdinstall/bsdconfig much yet as my own systems are either HEAD or upgraded from a src tree. I haven't yet had a need to use the installer. So I am not familiar with all of the details. I'll have to trust your judgement on it, but keep in mind I may not understand what you're referring to or where you're coming from on it. I don't want to speak for bapt but he may be in the same position. Thinking outloud... I would love to see the installer allow the user select which repository they want to use. Consider this in a general sense as I still am considering building a WITHOUT_X11 repository for server uses. If that works out (some people think it will have too many problems) then it would be cool if the installer allowed picking between desktop/server repository. A stable repository (like debian does) bound to a release would be great too, but won't be happening soon. More support and planning needs to happen first. As for pkg pulling in the latest, we could probably put a question in the bootstrap to ask the user which repository they would like to use. That would cover other cases as well, and give a way for the installer to skip the question if it already has an answer from the GUI. As for the server selection (I haven't used it), if it's a sub-menu (and not forced part of the installation) then it seems fine to me. If the user is just selecting which server to use pkg.FreeBSD.org vs my.internalhost. My concern was if it was forcing the user to select which *mirror* to use, which we should let the geodns handle in most cases. Again, if it's an optional sub-menu for that then it is probably fine so long as it has a warning that it is less supported than using the main hostname of pkg.FreeBSD.org. Having said all of that, I did just go look in bsdconfig and it seems perfectly fine how it is now. Allowing to pick the default or select your own is perfect. So I misunderstood what you were talking about with selecting a server. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
svn commit: r270286 - stable/10/lib/atf/libatf-c++
Author: ngie
Date: Thu Aug 21 17:36:42 2014
New Revision: 270286
URL: http://svnweb.freebsd.org/changeset/base/270286
Log:
MFC r270116:
Fix typo in lib/atf/libatfc++/Makefile
LIBATFC should be LIBATF_C; this was missed in the initial import
(r241823)
PR: 192731
MFC after: 3 days
Phabric: D619
Approved by: rpaulo (mentor)
Modified:
stable/10/lib/atf/libatf-c++/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/atf/libatf-c++/Makefile
==
--- stable/10/lib/atf/libatf-c++/Makefile Thu Aug 21 17:32:38 2014
(r270285)
+++ stable/10/lib/atf/libatf-c++/Makefile Thu Aug 21 17:36:42 2014
(r270286)
@@ -31,7 +31,7 @@ LIB= atf-c++
SHLIB_MAJOR= 2
# libatf-c++ depends on the C version of the ATF library to build.
-DPADD= ${LIBATFC}
+DPADD= ${LIBATF_C}
LDADD= -latf-c
LDFLAGS+= -L${.OBJDIR}/../libatf-c
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270285 - in stable/10: etc/mtree lib/libmp lib/libmp/tests tools/regression/lib/libmp
Author: ngie
Date: Thu Aug 21 17:32:38 2014
New Revision: 270285
URL: http://svnweb.freebsd.org/changeset/base/270285
Log:
MFC r269534:
Integrate lib/libmp into the build/kyua
- Remove the .t wrapper
- Fix -Wreturn-type warnings with clang
This change has been tested on amd64/i386
Phabric: D530
Reviewed by: jmmv
Approved by: jmmv (co--mentor)
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
MFC note: src.opts.mk in the original commit was changed to
bsd.own.mk.
Added:
stable/10/lib/libmp/tests/
- copied from r269534, head/lib/libmp/tests/
Deleted:
stable/10/tools/regression/lib/libmp/
Modified:
stable/10/etc/mtree/BSD.tests.dist
stable/10/lib/libmp/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/mtree/BSD.tests.dist
==
--- stable/10/etc/mtree/BSD.tests.dist Thu Aug 21 17:18:21 2014
(r270284)
+++ stable/10/etc/mtree/BSD.tests.dist Thu Aug 21 17:32:38 2014
(r270285)
@@ -85,6 +85,8 @@
..
libcrypt
..
+libmp
+..
..
libexec
atf
Modified: stable/10/lib/libmp/Makefile
==
--- stable/10/lib/libmp/MakefileThu Aug 21 17:18:21 2014
(r270284)
+++ stable/10/lib/libmp/MakefileThu Aug 21 17:32:38 2014
(r270285)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include
+
LIB= mp
SHLIB_MAJOR= 7
DPADD= ${LIBCRYPTO}
@@ -13,4 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../crypto
VERSION_DEF= ${.CURDIR}/../libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
RE: svn commit: r270283 - head/usr.sbin/bsdconfig/share/packages
> -Original Message- > From: owner-src-committ...@freebsd.org [mailto:owner-src- > committ...@freebsd.org] On Behalf Of Bryan Drewery > Sent: Thursday, August 21, 2014 10:17 AM > To: Devin Teske; src-committ...@freebsd.org; svn-src-all@freebsd.org; svn- > src-h...@freebsd.org > Subject: Re: svn commit: r270283 - head/usr.sbin/bsdconfig/share/packages > > On 8/21/2014 12:15 PM, Devin Teske wrote: > > Author: dteske > > Date: Thu Aug 21 17:15:09 2014 > > New Revision: 270283 > > URL: http://svnweb.freebsd.org/changeset/base/270283 > > > > Log: > > Add `-A' flag to pkg-install(8) invocation when installing dependencies. > > Thank you!! > To my recollection, nobody brought this to my attention before yesterday. -- Devin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270284 - in stable/10: . sys/conf sys/dev/aic7xxx sys/modules/aic7xxx sys/modules/aic7xxx/ahc sys/modules/aic7xxx/ahc/ahc_eisa sys/modules/aic7xxx/ahc/ahc_isa sys/modules/aic7xxx/ahc/a...
Author: ian
Date: Thu Aug 21 17:18:21 2014
New Revision: 270284
URL: http://svnweb.freebsd.org/changeset/base/270284
Log:
MFC r260401
Remove aicasm as a build dependency. It made sense when the ahc and ahd
drivers and their firmware were under active development, but those days
have passed. The firmware now exists in pre-compiled form, no longer
dependent on it's sources or on aicasm. If you wish to rebuild the
firmware from source, the glue still exists under the 'make firmware'
target in sys/modules/aic7xxx.
This also fixes the problem introduced with r25 et al with building
kernels the old fashioned way in sys/$arch/compile/$CONFIG when the
ahc/ahd drivers were included.
Added:
stable/10/sys/dev/aic7xxx/aic79xx_reg.h
- copied unchanged from r260401, head/sys/dev/aic7xxx/aic79xx_reg.h
stable/10/sys/dev/aic7xxx/aic79xx_reg_print.c
- copied unchanged from r260401, head/sys/dev/aic7xxx/aic79xx_reg_print.c
stable/10/sys/dev/aic7xxx/aic79xx_seq.h
- copied unchanged from r260401, head/sys/dev/aic7xxx/aic79xx_seq.h
stable/10/sys/dev/aic7xxx/aic7xxx_reg.h
- copied unchanged from r260401, head/sys/dev/aic7xxx/aic7xxx_reg.h
stable/10/sys/dev/aic7xxx/aic7xxx_reg_print.c
- copied unchanged from r260401, head/sys/dev/aic7xxx/aic7xxx_reg_print.c
stable/10/sys/dev/aic7xxx/aic7xxx_seq.h
- copied unchanged from r260401, head/sys/dev/aic7xxx/aic7xxx_seq.h
Modified:
stable/10/Makefile.inc1
stable/10/sys/conf/files
stable/10/sys/modules/aic7xxx/Makefile
stable/10/sys/modules/aic7xxx/ahc/Makefile
stable/10/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
stable/10/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
stable/10/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
stable/10/sys/modules/aic7xxx/ahd/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==
--- stable/10/Makefile.inc1 Thu Aug 21 17:15:09 2014(r270283)
+++ stable/10/Makefile.inc1 Thu Aug 21 17:18:21 2014(r270284)
@@ -1383,15 +1383,6 @@ kernel-tools: .MAKE
mkdir -p ${MAKEOBJDIRPREFIX}/usr
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-p ${MAKEOBJDIRPREFIX}/usr >/dev/null
-.for _tool in \
-sys/dev/aic7xxx/aicasm
- ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
- cd ${.CURDIR}/${_tool} && \
- ${MAKE} DIRPRFX=${_tool}/ obj && \
- ${MAKE} DIRPRFX=${_tool}/ depend && \
- ${MAKE} DIRPRFX=${_tool}/ all && \
- ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
-.endfor
#
# cross-tools: Build cross-building tools
Modified: stable/10/sys/conf/files
==
--- stable/10/sys/conf/filesThu Aug 21 17:15:09 2014(r270283)
+++ stable/10/sys/conf/filesThu Aug 21 17:18:21 2014(r270284)
@@ -9,42 +9,6 @@ acpi_quirks.h optional acpi
\
compile-with"${AWK} -f $S/tools/acpi_quirks2h.awk
$S/dev/acpica/acpi_quirks" \
no-obj no-implicit-rule before-depend \
clean "acpi_quirks.h"
-aic7xxx_seq.h optional ahc \
- compile-with"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o
aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i
$S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \
- no-obj no-implicit-rule before-depend local\
- clean "aic7xxx_seq.h"\
- dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq}
$S/cam/scsi/scsi_message.h"
-aic7xxx_reg.h optional ahc \
- compile-with"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o
aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i
$S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \
- no-obj no-implicit-rule before-depend local\
- clean "aic7xxx_reg.h"\
- dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq}
$S/cam/scsi/scsi_message.h"
-aic7xxx_reg_print.coptional ahc \
- compile-with"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o
aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i
$S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \
- no-obj no-implicit-rule local \
- clean "aic7xxx_reg_print.c" \
- dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq}
$S/cam/scsi/scsi_message.h"
-aic7xxx_reg_print.ooptional ahc ahc_reg_pretty_print \
- compile-with"${NORMAL_C}"
Re: svn commit: r270283 - head/usr.sbin/bsdconfig/share/packages
On 8/21/2014 12:15 PM, Devin Teske wrote:
> Author: dteske
> Date: Thu Aug 21 17:15:09 2014
> New Revision: 270283
> URL: http://svnweb.freebsd.org/changeset/base/270283
>
> Log:
> Add `-A' flag to pkg-install(8) invocation when installing dependencies.
Thank you!!
>
> MFC after: 3 days
> X-MFC-to: stable/10, stable/9
> Reported by:gjb
> Discussed with: jelischer, gjb, bdrewery
>
> Modified:
> head/usr.sbin/bsdconfig/share/packages/packages.subr
>
> Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
> ==
> --- head/usr.sbin/bsdconfig/share/packages/packages.subr Thu Aug 21
> 16:08:17 2014(r270282)
> +++ head/usr.sbin/bsdconfig/share/packages/packages.subr Thu Aug 21
> 17:15:09 2014(r270283)
> @@ -1029,9 +1029,11 @@ f_package_extract()
>
> # Request the package be added via pkg-install(8)
> if f_debugging; then
> - f_eval_catch $funcname pkg 'pkg -d install -y "%s"' "$name"
> + f_eval_catch $funcname pkg \
> + 'pkg -d install -${depended:+A}y "%s"' "$name"
> else
> - f_eval_catch $funcname pkg 'pkg install -y "%s"' "$name"
> + f_eval_catch $funcname pkg \
> + 'pkg install -${depended:+A}y "%s"' "$name"
> fi
> if [ $? -ne $SUCCESS ]; then
> $alert "$msg_pkg_install_apparently_did_not_like_the_package" \
>
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
svn commit: r270283 - head/usr.sbin/bsdconfig/share/packages
Author: dteske
Date: Thu Aug 21 17:15:09 2014
New Revision: 270283
URL: http://svnweb.freebsd.org/changeset/base/270283
Log:
Add `-A' flag to pkg-install(8) invocation when installing dependencies.
MFC after:3 days
X-MFC-to: stable/10, stable/9
Reported by: gjb
Discussed with: jelischer, gjb, bdrewery
Modified:
head/usr.sbin/bsdconfig/share/packages/packages.subr
Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==
--- head/usr.sbin/bsdconfig/share/packages/packages.subrThu Aug 21
16:08:17 2014(r270282)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subrThu Aug 21
17:15:09 2014(r270283)
@@ -1029,9 +1029,11 @@ f_package_extract()
# Request the package be added via pkg-install(8)
if f_debugging; then
- f_eval_catch $funcname pkg 'pkg -d install -y "%s"' "$name"
+ f_eval_catch $funcname pkg \
+ 'pkg -d install -${depended:+A}y "%s"' "$name"
else
- f_eval_catch $funcname pkg 'pkg install -y "%s"' "$name"
+ f_eval_catch $funcname pkg \
+ 'pkg install -${depended:+A}y "%s"' "$name"
fi
if [ $? -ne $SUCCESS ]; then
$alert "$msg_pkg_install_apparently_did_not_like_the_package" \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270268 - head/share/man/man4
On Thu, Aug 21, 2014 at 8:50 AM, Bjoern A. Zeeb wrote: > Author: bz > Date: Thu Aug 21 12:50:11 2014 > New Revision: 270268 > URL: http://svnweb.freebsd.org/changeset/base/270268 > > Log: > Document MAC address selection and setting for atse(4). > > Submitted by: brooks > MFC after:3 days > Sponsored by: DARPA/AFRL > > Modified: > head/share/man/man4/altera_atse.4 > > Modified: head/share/man/man4/altera_atse.4 > > == > --- head/share/man/man4/altera_atse.4 Thu Aug 21 12:30:01 2014 > (r270267) > +++ head/share/man/man4/altera_atse.4 Thu Aug 21 12:50:11 2014 > (r270268) > +If the stored address is invalid, for example all zero's, multicast, or > the > +default address shipped on all DE4 boards (00:07:ed:ff:ed:15) then a > random > +address is generated when the device is attached. > I think that "all zeros" does not take an apostrophe. Also, the use of commas is slightly unclear, since "for example all zeros" is really a parenthetical, not a member of the comma-separated list. -Ben ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270282 - in head/sys: cam/ctl dev/iscsi
Author: trasz
Date: Thu Aug 21 16:08:17 2014
New Revision: 270282
URL: http://svnweb.freebsd.org/changeset/base/270282
Log:
Use proper include paths in kernel iSCSI code.
MFC after:2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/dev/iscsi/icl.c
head/sys/dev/iscsi/icl_proxy.c
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==
--- head/sys/cam/ctl/ctl_frontend_iscsi.c Thu Aug 21 15:59:25 2014
(r270281)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c Thu Aug 21 16:08:17 2014
(r270282)
@@ -67,9 +67,9 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "../../dev/iscsi/icl.h"
-#include "../../dev/iscsi/iscsi_proto.h"
-#include "ctl_frontend_iscsi.h"
+#include
+#include
+#include
#ifdef ICL_KERNEL_PROXY
#include
Modified: head/sys/dev/iscsi/icl.c
==
--- head/sys/dev/iscsi/icl.cThu Aug 21 15:59:25 2014(r270281)
+++ head/sys/dev/iscsi/icl.cThu Aug 21 16:08:17 2014(r270282)
@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "icl.h"
-#include "iscsi_proto.h"
+#include
+#include
SYSCTL_NODE(_kern, OID_AUTO, icl, CTLFLAG_RD, 0, "iSCSI Common Layer");
static int debug = 1;
Modified: head/sys/dev/iscsi/icl_proxy.c
==
--- head/sys/dev/iscsi/icl_proxy.c Thu Aug 21 15:59:25 2014
(r270281)
+++ head/sys/dev/iscsi/icl_proxy.c Thu Aug 21 16:08:17 2014
(r270282)
@@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "icl.h"
+#include
static int debug = 1;
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Thu Aug 21 15:59:25 2014(r270281)
+++ head/sys/dev/iscsi/iscsi.c Thu Aug 21 16:08:17 2014(r270282)
@@ -59,10 +59,10 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "iscsi_ioctl.h"
-#include "iscsi.h"
-#include "icl.h"
-#include "iscsi_proto.h"
+#include
+#include
+#include
+#include
#ifdef ICL_KERNEL_PROXY
#include
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270281 - head/sys/fs/autofs
Author: trasz
Date: Thu Aug 21 15:59:25 2014
New Revision: 270281
URL: http://svnweb.freebsd.org/changeset/base/270281
Log:
Fix includes.
Suggested by: pluknet@
MFC after:2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/fs/autofs/autofs.c
head/sys/fs/autofs/autofs_vfsops.c
head/sys/fs/autofs/autofs_vnops.c
Modified: head/sys/fs/autofs/autofs.c
==
--- head/sys/fs/autofs/autofs.c Thu Aug 21 15:55:18 2014(r270280)
+++ head/sys/fs/autofs/autofs.c Thu Aug 21 15:59:25 2014(r270281)
@@ -80,8 +80,8 @@
#include
#include
-#include "autofs.h"
-#include "autofs_ioctl.h"
+#include
+#include
MALLOC_DEFINE(M_AUTOFS, "autofs", "Automounter filesystem");
Modified: head/sys/fs/autofs/autofs_vfsops.c
==
--- head/sys/fs/autofs/autofs_vfsops.c Thu Aug 21 15:55:18 2014
(r270280)
+++ head/sys/fs/autofs/autofs_vfsops.c Thu Aug 21 15:59:25 2014
(r270281)
@@ -42,7 +42,7 @@
#include
#include
-#include "autofs.h"
+#include
static const char *autofs_opts[] = {
"from", "master_options", "master_prefix", NULL
Modified: head/sys/fs/autofs/autofs_vnops.c
==
--- head/sys/fs/autofs/autofs_vnops.c Thu Aug 21 15:55:18 2014
(r270280)
+++ head/sys/fs/autofs/autofs_vnops.c Thu Aug 21 15:59:25 2014
(r270281)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "autofs.h"
+#include
static int autofs_trigger_vn(struct vnode *vp, const char *path,
int pathlen, struct vnode **newvp);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270280 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 15:55:18 2014
New Revision: 270280
URL: http://svnweb.freebsd.org/changeset/base/270280
Log:
vt(4): Pause the flush timer while swithing window
This fixes bad looking refresh when switching window: squares instead
of text, flashing screen, and so on. In the worst case, vt_flush() came
at a very inappropriate timing and the screen was not refreshed at all
(leaving squares all over the place).
This doesn't fix the flickering of the screen with vt_vga, because the
sync signal is temporarily stopped and the video memory is cleared.
MFC after:1 week
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hThu Aug 21 15:32:38 2014(r270279)
+++ head/sys/dev/vt/vt.hThu Aug 21 15:55:18 2014(r270280)
@@ -133,6 +133,7 @@ struct vt_device {
struct mtx vd_lock; /* Per-device lock. */
struct cvvd_winswitch; /* (d) Window switch notify. */
struct callout vd_timer; /* (d) Display timer. */
+ volatile unsigned intvd_timer_armed;/* (?) Display timer started.*/
int vd_flags; /* (d) Device flags. */
#defineVDF_TEXTMODE0x01/* Do text mode rendering. */
#defineVDF_SPLASH 0x02/* Splash screen active. */
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 15:32:38 2014(r270279)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 15:55:18 2014(r270280)
@@ -228,6 +228,37 @@ vt_update_static(void *dummy)
}
static void
+vt_schedule_flush(struct vt_device *vd, int ms)
+{
+
+ if (ms <= 0)
+ /* Default to initial value. */
+ ms = 1000 / VT_TIMERFREQ;
+
+ callout_schedule(&vd->vd_timer, hz / (1000 / ms));
+}
+
+static void
+vt_resume_flush_timer(struct vt_device *vd, int ms)
+{
+
+ if (!atomic_cmpset_int(&vd->vd_timer_armed, 0, 1))
+ return;
+
+ vt_schedule_flush(vd, ms);
+}
+
+static void
+vt_suspend_flush_timer(struct vt_device *vd)
+{
+
+ if (!atomic_cmpset_int(&vd->vd_timer_armed, 1, 0))
+ return;
+
+ callout_drain(&vd->vd_timer);
+}
+
+static void
vt_switch_timer(void *arg)
{
@@ -330,6 +361,8 @@ vt_window_switch(struct vt_window *vw)
return (EINVAL);
}
+ vt_suspend_flush_timer(vd);
+
vd->vd_curwindow = vw;
vd->vd_flags |= VDF_INVALID;
cv_broadcast(&vd->vd_winswitch);
@@ -338,6 +371,8 @@ vt_window_switch(struct vt_window *vw)
if (vd->vd_driver->vd_postswitch)
vd->vd_driver->vd_postswitch(vd);
+ vt_resume_flush_timer(vd, 0);
+
/* Restore per-window keyboard mode. */
mtx_lock(&Giant);
kbd = kbd_get_keyboard(vd->vd_keyboard);
@@ -936,7 +971,7 @@ vt_timer(void *arg)
vt_flush(vd);
/* Schedule for next update. */
- callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);
+ vt_schedule_flush(vd, 0);
}
static void
@@ -2091,6 +2126,7 @@ vt_upgrade(struct vt_device *vd)
/* Start timer when everything ready. */
vd->vd_flags |= VDF_ASYNC;
callout_reset(&vd->vd_timer, hz / VT_TIMERFREQ, vt_timer, vd);
+ vd->vd_timer_armed = 1;
}
VT_UNLOCK(vd);
@@ -2150,7 +2186,7 @@ vt_allocate(struct vt_driver *drv, void
if (vd->vd_flags & VDF_ASYNC) {
/* Stop vt_flush periodic task. */
- callout_drain(&vd->vd_timer);
+ vt_suspend_flush_timer(vd);
/*
* Mute current terminal until we done. vt_change_font (called
* from vt_resize) will unmute it.
@@ -2181,7 +2217,7 @@ vt_allocate(struct vt_driver *drv, void
/* Allow to put chars now. */
terminal_mute(vd->vd_curwindow->vw_terminal, 0);
/* Rerun timer for screen updates. */
- callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);
+ vt_resume_flush_timer(vd, 0);
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270159 - in stable/10: lib/libvmmapi sys/amd64/amd64 sys/amd64/include sys/amd64/vmm sys/amd64/vmm/intel sys/amd64/vmm/io sys/x86/include usr.sbin/bhyve usr.sbin/bhyvectl usr.sbin/bhy
Hi Garrett, Funny as it sounds, this breaks gcc with “warning: ‘inline’ is not at beginning of declaration” :/. I’ve opened this bug to track the issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192880 . Thanks: I'll fix this today. later, Peter. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270279 - in head: sys/dev/iscsi usr.bin/iscsictl usr.sbin/ctld usr.sbin/iscsid
Author: trasz
Date: Thu Aug 21 15:32:38 2014
New Revision: 270279
URL: http://svnweb.freebsd.org/changeset/base/270279
Log:
Make the iSCSI stack use __FBSDID() properly.
MFC after:2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/iscsi/icl.c
head/sys/dev/iscsi/icl_proxy.c
head/sys/dev/iscsi/iscsi.c
head/usr.bin/iscsictl/iscsictl.c
head/usr.sbin/ctld/ctld.c
head/usr.sbin/ctld/discovery.c
head/usr.sbin/ctld/kernel.c
head/usr.sbin/ctld/keys.c
head/usr.sbin/ctld/log.c
head/usr.sbin/ctld/login.c
head/usr.sbin/ctld/pdu.c
head/usr.sbin/iscsid/discovery.c
head/usr.sbin/iscsid/iscsid.c
head/usr.sbin/iscsid/keys.c
head/usr.sbin/iscsid/log.c
head/usr.sbin/iscsid/login.c
head/usr.sbin/iscsid/pdu.c
Modified: head/sys/dev/iscsi/icl.c
==
--- head/sys/dev/iscsi/icl.cThu Aug 21 15:14:54 2014(r270278)
+++ head/sys/dev/iscsi/icl.cThu Aug 21 15:32:38 2014(r270279)
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
/*
@@ -34,6 +33,9 @@
* and receive iSCSI PDUs.
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/sys/dev/iscsi/icl_proxy.c
==
--- head/sys/dev/iscsi/icl_proxy.c Thu Aug 21 15:14:54 2014
(r270278)
+++ head/sys/dev/iscsi/icl_proxy.c Thu Aug 21 15:32:38 2014
(r270279)
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
/*-
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -68,6 +67,9 @@
#ifdef ICL_KERNEL_PROXY
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Thu Aug 21 15:14:54 2014(r270278)
+++ head/sys/dev/iscsi/iscsi.c Thu Aug 21 15:32:38 2014(r270279)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.bin/iscsictl/iscsictl.c
==
--- head/usr.bin/iscsictl/iscsictl.cThu Aug 21 15:14:54 2014
(r270278)
+++ head/usr.bin/iscsictl/iscsictl.cThu Aug 21 15:32:38 2014
(r270279)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/ctld/ctld.c
==
--- head/usr.sbin/ctld/ctld.c Thu Aug 21 15:14:54 2014(r270278)
+++ head/usr.sbin/ctld/ctld.c Thu Aug 21 15:32:38 2014(r270279)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/ctld/discovery.c
==
--- head/usr.sbin/ctld/discovery.c Thu Aug 21 15:14:54 2014
(r270278)
+++ head/usr.sbin/ctld/discovery.c Thu Aug 21 15:32:38 2014
(r270279)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/ctld/kernel.c
==
--- head/usr.sbin/ctld/kernel.c Thu Aug 21 15:14:54 2014(r270278)
+++ head/usr.sbin/ctld/kernel.c Thu Aug 21 15:32:38 2014(r270279)
@@ -32,9 +32,11 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/ctld/keys.c
==
--- head/usr.sbin/ctld/keys.c Thu Aug 21 15:14:54 2014(r270278)
+++ head/usr.sbin/ctld/keys.c Thu Aug 21 15:32:38 2014(r270279)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/ctld/log.c
==
--- head/usr.sbin/ctld/log.cThu Aug 21 15:14:54 2014(r270278)
+++ head/usr.sbin/ctld/log.cThu Aug 21 15:32:38
svn commit: r270278 - head/sys/dev/vt
Author: dumbbell Date: Thu Aug 21 15:14:54 2014 New Revision: 270278 URL: http://svnweb.freebsd.org/changeset/base/270278 Log: vt(4): Mark cursor position as dirty when we enable/disable it MFC after:1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c == --- head/sys/dev/vt/vt_core.c Thu Aug 21 15:10:10 2014(r270277) +++ head/sys/dev/vt/vt_core.c Thu Aug 21 15:14:54 2014(r270278) @@ -1559,6 +1559,15 @@ vt_mouse_state(int show) vw->vw_flags &= ~VWF_MOUSE_HIDE; break; } + + /* +* Mark mouse position as dirty. +* +* FIXME: See comments in vt_flush(). +*/ + vtbuf_mouse_cursor_position(&vw->vw_buf, + vd->vd_mx / vw->vw_font->vf_width, + vd->vd_my / vw->vw_font->vf_height); } #endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270277 - head/include
Author: kan Date: Thu Aug 21 15:10:10 2014 New Revision: 270277 URL: http://svnweb.freebsd.org/changeset/base/270277 Log: Add guards to ptrdiff_t definition in include/stddef.h Back in 2011 obrien has added the #define macro in sys/sys/stddef.h to guard ptrdiff_t. Add similar protection to the identical code in include/stddef.h. Submitted by: Mariusz Zaborski MFC after: 1 week Modified: head/include/stddef.h Modified: head/include/stddef.h == --- head/include/stddef.h Thu Aug 21 15:07:25 2014(r270276) +++ head/include/stddef.h Thu Aug 21 15:10:10 2014(r270277) @@ -38,7 +38,10 @@ #include #include +#ifndef _PTRDIFF_T_DECLARED typedef__ptrdiff_t ptrdiff_t; +#define_PTRDIFF_T_DECLARED +#endif #if __BSD_VISIBLE #ifndef _RUNE_T_DECLARED ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270276 - in head: sys/fs/autofs usr.sbin/autofs
Author: trasz
Date: Thu Aug 21 15:07:25 2014
New Revision: 270276
URL: http://svnweb.freebsd.org/changeset/base/270276
Log:
Use __FBSDID() properly.
Suggested by: pluknet@
MFC after:2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/fs/autofs/autofs.c
head/sys/fs/autofs/autofs.h
head/sys/fs/autofs/autofs_vfsops.c
head/sys/fs/autofs/autofs_vnops.c
head/usr.sbin/autofs/automount.c
head/usr.sbin/autofs/automountd.c
head/usr.sbin/autofs/autounmountd.c
head/usr.sbin/autofs/common.c
head/usr.sbin/autofs/defined.c
head/usr.sbin/autofs/log.c
head/usr.sbin/autofs/popen.c
Modified: head/sys/fs/autofs/autofs.c
==
--- head/sys/fs/autofs/autofs.c Thu Aug 21 15:00:21 2014(r270275)
+++ head/sys/fs/autofs/autofs.c Thu Aug 21 15:07:25 2014(r270276)
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
/*-
* Copyright (c) 1989, 1991, 1993, 1995
@@ -61,6 +60,9 @@
*
*/
+#include
+ __FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/sys/fs/autofs/autofs.h
==
--- head/sys/fs/autofs/autofs.h Thu Aug 21 15:00:21 2014(r270275)
+++ head/sys/fs/autofs/autofs.h Thu Aug 21 15:07:25 2014(r270276)
@@ -32,9 +32,6 @@
#ifndef AUTOFS_H
#defineAUTOFS_H
-#include
-__FBSDID("$FreeBSD$");
-
#define VFSTOAUTOFS(mp)((struct autofs_mount *)((mp)->mnt_data))
MALLOC_DECLARE(M_AUTOFS);
Modified: head/sys/fs/autofs/autofs_vfsops.c
==
--- head/sys/fs/autofs/autofs_vfsops.c Thu Aug 21 15:00:21 2014
(r270275)
+++ head/sys/fs/autofs/autofs_vfsops.c Thu Aug 21 15:07:25 2014
(r270276)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+ __FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/sys/fs/autofs/autofs_vnops.c
==
--- head/sys/fs/autofs/autofs_vnops.c Thu Aug 21 15:00:21 2014
(r270275)
+++ head/sys/fs/autofs/autofs_vnops.c Thu Aug 21 15:07:25 2014
(r270276)
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
#include
Modified: head/usr.sbin/autofs/automount.c
==
--- head/usr.sbin/autofs/automount.cThu Aug 21 15:00:21 2014
(r270275)
+++ head/usr.sbin/autofs/automount.cThu Aug 21 15:07:25 2014
(r270276)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/autofs/automountd.c
==
--- head/usr.sbin/autofs/automountd.c Thu Aug 21 15:00:21 2014
(r270275)
+++ head/usr.sbin/autofs/automountd.c Thu Aug 21 15:07:25 2014
(r270276)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/autofs/autounmountd.c
==
--- head/usr.sbin/autofs/autounmountd.c Thu Aug 21 15:00:21 2014
(r270275)
+++ head/usr.sbin/autofs/autounmountd.c Thu Aug 21 15:07:25 2014
(r270276)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/autofs/common.c
==
--- head/usr.sbin/autofs/common.c Thu Aug 21 15:00:21 2014
(r270275)
+++ head/usr.sbin/autofs/common.c Thu Aug 21 15:07:25 2014
(r270276)
@@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
+#include
+__FBSDID("$FreeBSD$");
+
#include
#include
#include
Modified: head/usr.sbin/autofs/defined.c
==
--- head/usr.sbin/autofs/defined.c Thu Aug 21 15:00:21 2014
(r270275)
+++ head/usr.sbin/autofs/defined.c Thu Aug 21 15:07:25 2014
(r270276)
@@ -26,7 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
*/
/*
@@ -34,6 +33,9 @@
* such
svn commit: r270275 - head/sys/dev/vt
Author: dumbbell Date: Thu Aug 21 15:00:21 2014 New Revision: 270275 URL: http://svnweb.freebsd.org/changeset/base/270275 Log: vt(4): Mark the current cursor position as dirty Like r270273, this has no effect for now, because the cursor is always drawn. This is in preparation of future changes to vd_bitbltchr_t API. MFC after:1 week Modified: head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/vt_core.c == --- head/sys/dev/vt/vt_core.c Thu Aug 21 14:56:57 2014(r270274) +++ head/sys/dev/vt/vt_core.c Thu Aug 21 15:00:21 2014(r270275) @@ -850,10 +850,16 @@ vt_flush(struct vt_device *vd) * to font size possibly inconsistent across * windows, this may not be sufficient. This * causes part of the cursor to not be erased. +* +* FIXME: The vt_buf lock is acquired twice in a +* row. */ vtbuf_mouse_cursor_position(&vw->vw_buf, vd->vd_moldx / vf->vf_width, vd->vd_moldy / vf->vf_height); + vtbuf_mouse_cursor_position(&vw->vw_buf, + vd->vd_mx / vf->vf_width, + vd->vd_my / vf->vf_height); /* * Save point of last mouse cursor to erase it ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270274 - in stable/10: . sys/conf sys/dev/aic7xxx/aicasm sys/modules/aic7xxx sys/modules/aic7xxx/ahc sys/modules/aic7xxx/ahd
Author: ian
Date: Thu Aug 21 14:56:57 2014
New Revision: 270274
URL: http://svnweb.freebsd.org/changeset/base/270274
Log:
MFC r257637, r257730, r257734, r25, r257825, r257838, r257873:
Changes to how the aicasm tool is built. This series of changes results
in the aicasm tool being built as part of the tools stages of world and
kernel builds.
Most of these changes will ultimately be undone when r260401 is MFC'd,
but it will leave in place the new kernel-build-tool machinery (KTMAKE
stuff) in case a new special kernel tool ever comes along.
Modified:
stable/10/Makefile.inc1
stable/10/sys/conf/files
stable/10/sys/dev/aic7xxx/aicasm/Makefile
stable/10/sys/modules/aic7xxx/Makefile
stable/10/sys/modules/aic7xxx/ahc/Makefile
stable/10/sys/modules/aic7xxx/ahd/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==
--- stable/10/Makefile.inc1 Thu Aug 21 14:54:37 2014(r270273)
+++ stable/10/Makefile.inc1 Thu Aug 21 14:56:57 2014(r270274)
@@ -264,6 +264,21 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-DWITHOUT_GDB -DNO_TESTS
+# kernel-tools stage
+KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
+ PATH=${BPATH}:${PATH} \
+ WORLDTMP=${WORLDTMP} \
+ VERSION="${VERSION}" \
+ COMPILER_TYPE=${COMPILER_TYPE}
+KTMAKE=TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+ ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+ DESTDIR= \
+ BOOTSTRAPPING=${OSRELDATE} \
+ SSP_CFLAGS= \
+ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+ -DNO_PIC -DNO_PROFILE -DNO_SHARED \
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
# world stage
WMAKEENV= ${CROSSENV} \
_SHLIBDIRPREFIX=${WORLDTMP} \
@@ -543,6 +558,7 @@ _cross-tools:
@echo ">>> stage 3: cross tools"
@echo "--"
${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
+ ${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
_includes:
@echo
@echo "--"
@@ -1032,21 +1048,7 @@ buildkernel:
@echo "--"
@echo ">>> stage 2.3: build tools"
@echo "--"
- cd ${KRNLOBJDIR}/${_kernel}; \
- PATH=${BPATH}:${PATH} \
- MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
- ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
- -DEARLY_BUILD -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
-# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) &&
exists(${KERNSRCDIR}/modules)
-.for target in obj depend all
- cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
- PATH=${BPATH}:${PATH} \
- MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
- ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
- -DEARLY_BUILD ${target}
-.endfor
-.endif
+ ${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
.if !defined(NO_KERNELDEPEND)
@echo
@echo "--"
@@ -1334,10 +1336,6 @@ bootstrap-tools: .MAKE
#
# build-tools: Build special purpose build tools
#
-.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
-_aicasm= sys/modules/aic7xxx/aicasm
-.endif
-
.if !defined(NO_SHARE)
_share=share/syscons/scrnmaps
.endif
@@ -1359,7 +1357,6 @@ build-tools: .MAKE
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
${_share} \
-${_aicasm} \
usr.bin/awk \
lib/libmagic \
usr.bin/mkesdb_static \
@@ -1380,6 +1377,23 @@ build-tools: .MAKE
.endfor
#
+# kernel-tools: Build kernel-building tools
+#
+kernel-tools: .MAKE
+ mkdir -p ${MAKEOBJDIRPREFIX}/usr
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+.for _tool in \
+sys/dev/aic7xxx/aicasm
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+ cd ${.CURDIR}/${_tool} && \
+ ${MAKE} DIRPRFX=${_tool}/ obj && \
+ ${MAKE} DIRPRFX=${_tool}/ depend && \
+ ${MAKE} DIRPRFX=${_tool}/ all && \
+ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
+.endfor
+
+#
# cross-tools: Build cross-building tools
#
.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
Modified: stable/10/sys/conf/files
==
--- stable/10/sys
svn commit: r270273 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 14:54:37 2014
New Revision: 270273
URL: http://svnweb.freebsd.org/changeset/base/270273
Log:
vt(4): If the cursor didn't move, don't mark its position as dirty
Currently, this has no effect, because the cursor is always redrawn
anyway. But this will be useful after improvements to the vd_bitbltchr_t
callback API.
The vt_device structure members used to store the position of the cursor
as of the last redraw are renamed from vd_mdirty{x,y} to vd_mold{x,y}.
The associated comment is fixed too. Also, their value is now expressed
in pixels, not in character columns/row.
MFC after:1 week
Modified:
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hThu Aug 21 14:12:11 2014(r270272)
+++ head/sys/dev/vt/vt.hThu Aug 21 14:54:37 2014(r270273)
@@ -122,10 +122,10 @@ struct vt_device {
struct vt_window*vd_markedwin; /* (?) Copy/paste buf owner. */
const struct vt_driver *vd_driver; /* (c) Graphics driver. */
void*vd_softc; /* (u) Driver data. */
- uint16_t vd_mx; /* (?) Mouse X. */
- uint16_t vd_my; /* (?) Mouse Y. */
- vt_axis_tvd_mdirtyx;/* (?) Screen width. */
- vt_axis_tvd_mdirtyy;/* (?) Screen height. */
+ uint16_t vd_mx; /* (?) Current mouse X. */
+ uint16_t vd_my; /* (?) current mouse Y. */
+ vt_axis_tvd_moldx; /* (?) Mouse X as of last
redraw. */
+ vt_axis_tvd_moldy; /* (?) Mouse Y as of last
redraw. */
uint32_t vd_mstate; /* (?) Mouse state. */
term_pos_t vd_offset; /* (?) Pixel offset. */
vt_axis_tvd_width; /* (?) Screen width. */
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 14:12:11 2014(r270272)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 14:54:37 2014(r270273)
@@ -835,9 +835,33 @@ vt_flush(struct vt_device *vd)
#ifndef SC_NO_CUTPASTE
if ((vd->vd_flags & VDF_MOUSECURSOR) && /* Mouse support enabled. */
!(vw->vw_flags & VWF_MOUSE_HIDE)) { /* Cursor displayed. */
- /* Mark last mouse position as dirty to erase. */
- vtbuf_mouse_cursor_position(&vw->vw_buf, vd->vd_mdirtyx,
- vd->vd_mdirtyy);
+ if (vd->vd_moldx != vd->vd_mx ||
+ vd->vd_moldy != vd->vd_my) {
+ /*
+* Mark last mouse position as dirty to erase.
+*
+* FIXME: The font size could be different among
+* all windows, so the column/row calculation
+* below isn't correct for all windows.
+*
+* FIXME: The cursor can span more than one
+* character cell. vtbuf_mouse_cursor_position
+* marks surrounding cells as dirty. But due
+* to font size possibly inconsistent across
+* windows, this may not be sufficient. This
+* causes part of the cursor to not be erased.
+*/
+ vtbuf_mouse_cursor_position(&vw->vw_buf,
+ vd->vd_moldx / vf->vf_width,
+ vd->vd_moldy / vf->vf_height);
+
+ /*
+* Save point of last mouse cursor to erase it
+* later.
+*/
+ vd->vd_moldx = vd->vd_mx;
+ vd->vd_moldy = vd->vd_my;
+ }
}
#endif
@@ -892,9 +916,6 @@ vt_flush(struct vt_device *vd)
vd->vd_offset.tp_row + vd->vd_my,
vd->vd_offset.tp_col + vd->vd_mx,
w, h, TC_WHITE, TC_BLACK);
- /* Save point of last mouse cursor to erase it later. */
- vd->vd_mdirtyx = vd->vd_mx / vf->vf_width;
- vd->vd_mdirtyy = vd->vd_my / vf->vf_height;
}
#endif
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270272 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 14:12:11 2014
New Revision: 270272
URL: http://svnweb.freebsd.org/changeset/base/270272
Log:
vt(4): If the cursor is globally disabled, don't mark its position as dirty
This avoids unnecessary redraw. In particular, during boot, where the
cursor is disabled and its fake position is [0;0], this triggered a
refresh of the whole screen each time vt_flush() is called.
MFC after:1 week
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 13:28:48 2014(r270271)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 14:12:11 2014(r270272)
@@ -833,7 +833,8 @@ vt_flush(struct vt_device *vd)
return;
#ifndef SC_NO_CUTPASTE
- if ((vw->vw_flags & VWF_MOUSE_HIDE) == 0) {
+ if ((vd->vd_flags & VDF_MOUSECURSOR) && /* Mouse support enabled. */
+ !(vw->vw_flags & VWF_MOUSE_HIDE)) { /* Cursor displayed. */
/* Mark last mouse position as dirty to erase. */
vtbuf_mouse_cursor_position(&vw->vw_buf, vd->vd_mdirtyx,
vd->vd_mdirtyy);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270271 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 13:28:48 2014
New Revision: 270271
URL: http://svnweb.freebsd.org/changeset/base/270271
Log:
vt(4): Mark cursor old position as dirty before reading the dirty area
Otherwise, the redraw is done during the next vt_flush run.
MFC after:1 week
Modified:
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 13:27:05 2014(r270270)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 13:28:48 2014(r270271)
@@ -832,6 +832,14 @@ vt_flush(struct vt_device *vd)
if (vd->vd_flags & VDF_SPLASH || vw->vw_flags & VWF_BUSY)
return;
+#ifndef SC_NO_CUTPASTE
+ if ((vw->vw_flags & VWF_MOUSE_HIDE) == 0) {
+ /* Mark last mouse position as dirty to erase. */
+ vtbuf_mouse_cursor_position(&vw->vw_buf, vd->vd_mdirtyx,
+ vd->vd_mdirtyy);
+ }
+#endif
+
vtbuf_undirty(&vw->vw_buf, &tarea, &tmask);
vt_termsize(vd, vf, &size);
@@ -844,14 +852,6 @@ vt_flush(struct vt_device *vd)
vd->vd_flags &= ~VDF_INVALID;
}
-#ifndef SC_NO_CUTPASTE
- if ((vw->vw_flags & VWF_MOUSE_HIDE) == 0) {
- /* Mark last mouse position as dirty to erase. */
- vtbuf_mouse_cursor_position(&vw->vw_buf, vd->vd_mdirtyx,
- vd->vd_mdirtyy);
- }
-#endif
-
for (row = tarea.tr_begin.tp_row; row < tarea.tr_end.tp_row; row++) {
if (!VTBUF_DIRTYROW(&tmask, row))
continue;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270270 - stable/10/sys/dev/virtio
Author: bryanv
Date: Thu Aug 21 13:27:05 2014
New Revision: 270270
URL: http://svnweb.freebsd.org/changeset/base/270270
Log:
MFC r268480:
Add accessor to get the number of free descriptors in the virtqueue
Modified:
stable/10/sys/dev/virtio/virtqueue.c
stable/10/sys/dev/virtio/virtqueue.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/virtio/virtqueue.c
==
--- stable/10/sys/dev/virtio/virtqueue.cThu Aug 21 13:04:34 2014
(r270269)
+++ stable/10/sys/dev/virtio/virtqueue.cThu Aug 21 13:27:05 2014
(r270270)
@@ -375,6 +375,13 @@ virtqueue_size(struct virtqueue *vq)
}
int
+virtqueue_nfree(struct virtqueue *vq)
+{
+
+ return (vq->vq_free_cnt);
+}
+
+int
virtqueue_empty(struct virtqueue *vq)
{
Modified: stable/10/sys/dev/virtio/virtqueue.h
==
--- stable/10/sys/dev/virtio/virtqueue.hThu Aug 21 13:04:34 2014
(r270269)
+++ stable/10/sys/dev/virtio/virtqueue.hThu Aug 21 13:27:05 2014
(r270270)
@@ -86,6 +86,7 @@ vm_paddr_t virtqueue_paddr(struct virtqu
int virtqueue_full(struct virtqueue *vq);
int virtqueue_empty(struct virtqueue *vq);
int virtqueue_size(struct virtqueue *vq);
+int virtqueue_nfree(struct virtqueue *vq);
int virtqueue_nused(struct virtqueue *vq);
voidvirtqueue_notify(struct virtqueue *vq);
voidvirtqueue_dump(struct virtqueue *vq);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270269 - head/sys/dev/vt
Author: dumbbell
Date: Thu Aug 21 13:04:34 2014
New Revision: 270269
URL: http://svnweb.freebsd.org/changeset/base/270269
Log:
vt(4): Handle global and per-window mouse cursor toggle in one place
Before the global flag was set/unset using the CONS_MOUSECTL ioctl, and
the per-window flag through the MOUSE_SETLEVEL or MOUSE_SETMODE ioctls.
Also, if the cursor is already enabled/disabled, return immediatly. This
avoids to reset the cursor's position to the center of the screen.
This matches syscons' behavior.
While here, remove a trailing space and a redundant variable
declaration.
Modified:
head/sys/dev/vt/vt_core.c
head/sys/dev/vt/vt_sysmouse.c
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Thu Aug 21 12:50:11 2014(r270268)
+++ head/sys/dev/vt/vt_core.c Thu Aug 21 13:04:34 2014(r270269)
@@ -1703,7 +1703,7 @@ skip_thunk:
/* XXX: other fields! */
return (0);
}
- case CONS_GETVERS:
+ case CONS_GETVERS:
*(int *)data = 0x200;
return (0);
case CONS_MODEINFO:
@@ -1713,20 +1713,28 @@ skip_thunk:
mouse_info_t *mouse = (mouse_info_t*)data;
/*
-* This has no effect on vt(4). We don't draw any mouse
-* cursor. Just ignore MOUSE_HIDE and MOUSE_SHOW to
-* prevent excessive errors. All the other commands
+* All the commands except MOUSE_SHOW nd MOUSE_HIDE
* should not be applied to individual TTYs, but only to
* consolectl.
*/
switch (mouse->operation) {
case MOUSE_HIDE:
- vd->vd_flags &= ~VDF_MOUSECURSOR;
+ if (vd->vd_flags & VDF_MOUSECURSOR) {
+ vd->vd_flags &= ~VDF_MOUSECURSOR;
+#ifndef SC_NO_CUTPASTE
+ vt_mouse_state(VT_MOUSE_HIDE);
+#endif
+ }
return (0);
case MOUSE_SHOW:
- vd->vd_mx = vd->vd_width / 2;
- vd->vd_my = vd->vd_height / 2;
- vd->vd_flags |= VDF_MOUSECURSOR;
+ if (!(vd->vd_flags & VDF_MOUSECURSOR)) {
+ vd->vd_flags |= VDF_MOUSECURSOR;
+ vd->vd_mx = vd->vd_width / 2;
+ vd->vd_my = vd->vd_height / 2;
+#ifndef SC_NO_CUTPASTE
+ vt_mouse_state(VT_MOUSE_SHOW);
+#endif
+ }
return (0);
default:
return (EINVAL);
@@ -1749,7 +1757,6 @@ skip_thunk:
}
case GIO_SCRNMAP: {
scrmap_t *sm = (scrmap_t *)data;
- int i;
/* We don't have screen maps, so return a handcrafted one. */
for (i = 0; i < 256; i++)
Modified: head/sys/dev/vt/vt_sysmouse.c
==
--- head/sys/dev/vt/vt_sysmouse.c Thu Aug 21 12:50:11 2014
(r270268)
+++ head/sys/dev/vt/vt_sysmouse.c Thu Aug 21 13:04:34 2014
(r270269)
@@ -347,9 +347,6 @@ sysmouse_ioctl(struct cdev *dev, u_long
return (EINVAL);
sysmouse_level = level;
-#ifndef SC_NO_CUTPASTE
- vt_mouse_state((level == 0)?VT_MOUSE_SHOW:VT_MOUSE_HIDE);
-#endif
return (0);
}
case MOUSE_SETMODE: {
@@ -362,10 +359,6 @@ sysmouse_ioctl(struct cdev *dev, u_long
case 0:
case 1:
sysmouse_level = mode->level;
-#ifndef SC_NO_CUTPASTE
- vt_mouse_state((mode->level == 0)?VT_MOUSE_SHOW:
- VT_MOUSE_HIDE);
-#endif
break;
default:
return (EINVAL);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270268 - head/share/man/man4
Author: bz Date: Thu Aug 21 12:50:11 2014 New Revision: 270268 URL: http://svnweb.freebsd.org/changeset/base/270268 Log: Document MAC address selection and setting for atse(4). Submitted by: brooks MFC after:3 days Sponsored by: DARPA/AFRL Modified: head/share/man/man4/altera_atse.4 Modified: head/share/man/man4/altera_atse.4 == --- head/share/man/man4/altera_atse.4 Thu Aug 21 12:30:01 2014 (r270267) +++ head/share/man/man4/altera_atse.4 Thu Aug 21 12:50:11 2014 (r270268) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2013 SRI International +.\" Copyright (c) 2013-2014 SRI International .\" All rights reserved. .\" .\" This software was developed by SRI International and the University of @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 18, 2013 +.Dd May 21, 2014 .Dt ALTERA_ATSE 4 .Os .Sh NAME @@ -66,6 +66,25 @@ The current version of the .Nm driver supports the Ethernet MegaCore as described in version 11.1 of Altera's documentation when the device is configured with internal FIFOs. +.Sh MAC SELECTION +The default MAC address for each +.Nm +interface is derived from a value stored in +.Xr cfi 4 +flash. +The value is managed by the +.Xr atsectl 8 +utility. +.Pp +Only a single MAC address may be stored in flash. +If the address begins with the Altera prefix 00:07:ed and ends in 00 then +up to 16 addresses will be derived from it by adding the unit number of +the interface to the stored address. +For other prefixes, the address will be assigned to atse0 and random +addresses will be used for other interfaces. +If the stored address is invalid, for example all zero's, multicast, or the +default address shipped on all DE4 boards (00:07:ed:ff:ed:15) then a random +address is generated when the device is attached. .Sh SEE ALSO .Xr miibus 4 , .Xr netintro 4 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265003 - head/secure/usr.sbin/sshd
On Thu, Aug 21, 2014 at 01:12:46PM +0200, Roger Pau Monn? wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> On 21/08/14 10:05, Konstantin Belousov wrote:
> > On Wed, Aug 20, 2014 at 05:34:58PM +0200, Roger Pau Monn? wrote:
> >> On 20/08/14 17:28, Bryan Drewery wrote:
> >>> On 8/20/2014 10:19 AM, Roger Pau Monn? wrote:
> On 20/08/14 17:13, Konstantin Belousov wrote:
> > On Wed, Aug 20, 2014 at 04:41:05PM +0200, Roger Pau Monn??
> > wrote:
> >> On 27/04/14 07:28, Konstantin Belousov wrote:
> >>> Author: kib Date: Sun Apr 27 05:28:14 2014 New
> >>> Revision: 265003 URL:
> >>> http://svnweb.freebsd.org/changeset/base/265003
> >>>
> >>> Log: Fix order of libthr and libc in the global dso
> >>> list for sshd, by explicitely linking main binary with
> >>> -lpthread. Before, libthr appeared in the list due to
> >>> dependency of one of the kerberos libs. Due to the
> >>> change in ld(1) behaviour of not copying NEEDED entries
> >>> from direct dependencies into the link results, the
> >>> order becomes reversed.
> >>>
> >>> The libthr must appear before libc to properly
> >>> interpose libc symbols and provide working rtld locks
> >>> implementation. The symptom was sshd hanging on rtld
> >>> bind lock during nested symbol binding from a signal
> >>> handler.
> >>>
> >>> Approved by: des (openssh maintainer) Sponsored by:
> >>> The FreeBSD Foundation MFC after: 1 week
> >>>
> >>> Modified: head/secure/usr.sbin/sshd/Makefile
> >>>
> >>> Modified: head/secure/usr.sbin/sshd/Makefile
> >>> ==
> >>>
> >>>
> >>>
> >>>
> >>>
> - --- head/secure/usr.sbin/sshd/Makefile Sun Apr 27 05:19:01 2014
> (r265002)
> >>> +++ head/secure/usr.sbin/sshd/MakefileSun Apr 27
> >>> 05:28:14 2014 (r265003) @@ -57,6 +57,16 @@ CFLAGS+=
> >>> -DNONE_CIPHER_ENABLED DPADD+= ${LIBCRYPT} ${LIBCRYPTO}
> >>> ${LIBZ} LDADD+= -lcrypt -lcrypto -lz
> >>>
> >>> +# Fix the order of NEEDED entries for libthr and
> >>> libc. The libthr +# needs to interpose libc symbols,
> >>> leaving the libthr loading as +# dependency of krb
> >>> causes reversed order and broken interposing. Put +#
> >>> the threading library last on the linker command line,
> >>> just before +# the -lc added by a compiler driver.
> >>> +.if ${MK_KERBEROS_SUPPORT} != "no" +DPADD+=
> >>> ${LIBPTHREAD} +LDADD+= -lpthread +.endif + .if
> >>> defined(LOCALBASE) CFLAGS+=
> >>> -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif
> >>
> >> Hello,
> >>
> >> This change makes the following simple test program fail
> >> on the second assert. The problem is that sa_handler ==
> >> SIG_DFL, and sa_flags == SA_SIGINFO, which according to
> >> the sigaction(9) man page is not possible. With this
> >> change reverted the test is successful.
> > I do not quite follow.
> >
> > What are the relations between sshd and your test program ?
> > Should the test be run somehow specially ?
>
> No, and frankly that's what I don't understand. I compile
> this simple test with `cc -o test test.c`. It fails with
> this commit applied, and succeeds without it.
>
> Roger.
>
> >>>
> >>> Does it fail if you do not connect with ssh?
> >>
> >> Right, it works fine from the serial console, fails when
> >> executed from ssh.
> >
> > I cannot reproduce it locally with your scenario, but the attached
> > program demonstrates the issue without relying on inheritance and
> > libthr.
> >
> > I think you mis-interpret the man page statement, it only says that
> > SA_SIGINFO should not be set in new->sa_flags IMO. But I do not see
> > much sense in the requirement. Note that we do not test flags for
> > correctness at all. SUSv4 is also silent on the issue.
> >
> > If this is important for your case, the following patch prevents
> > leaking of the flags for ignored of default/action signals. Could
> > you, please, describe why do you consider this a bug ?
>
> IMO, it is an inconsistency to return an invalid old sigaction, I
> assume that what is returned as the old sigaction should also be valid
> according to the man page.
>
> I realize SUSv4 don't specify such requirement, but it would still be
> wrong to use SIG_DFL with SA_SIGINFO, since SA_SIGINFO expect the
> handler to be of the type:
>
> void func(int signo, siginfo_t *info, void *context);
>
> While SIG_DLF is of type:
>
> void func(int signo);
>
> There's software out there that (wrongly?) relies on sa_action ==
> SIG_DFL and (sa_flags & SA_SIGINFO) == 0:
>
> http://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=tools/libxl/libxl_fork.c;h=fa150959adcfa6618342ba1eb0085cbba5f75d0a;hb=HEAD#l338
>
> The sa_flags check done here seems too strong
svn commit: r270267 - stable/10/sys/kern
Author: kib Date: Thu Aug 21 12:30:01 2014 New Revision: 270267 URL: http://svnweb.freebsd.org/changeset/base/270267 Log: Commit forgotten chunk of r270264. Modified: stable/10/sys/kern/kern_fork.c Modified: stable/10/sys/kern/kern_fork.c == --- stable/10/sys/kern/kern_fork.c Thu Aug 21 11:48:37 2014 (r270266) +++ stable/10/sys/kern/kern_fork.c Thu Aug 21 12:30:01 2014 (r270267) @@ -404,6 +404,7 @@ do_fork(struct thread *td, int flags, st bzero(&p2->p_startzero, __rangeof(struct proc, p_startzero, p_endzero)); + p2->p_treeflag = 0; p2->p_ucred = crhold(td->td_ucred); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270266 - stable/10/share/misc
Author: marck (doc committer) Date: Thu Aug 21 11:48:37 2014 New Revision: 270266 URL: http://svnweb.freebsd.org/changeset/base/270266 Log: MFC: Make BSD tree more contemporary-looking. This is actually batch of MFCs from the beginning of stable/10 branch. Modified: stable/10/share/misc/bsd-family-tree Directory Properties: stable/10/ (props changed) Modified: stable/10/share/misc/bsd-family-tree == --- stable/10/share/misc/bsd-family-treeThu Aug 21 10:54:39 2014 (r270265) +++ stable/10/share/misc/bsd-family-treeThu Aug 21 11:48:37 2014 (r270266) @@ -110,9 +110,11 @@ FreeBSD 2.1 | | | | | | | | NetBSD 1.3.2| | | FreeBSD 2.2.7 | | ||| | | | | | ||| BSD/OS 4.0 - | v | | ||| | | FreeBSD 2.2.8 | | ||| | - | | | ||OpenBSD 2.4 | + | | | | ||| | + | v | | ||OpenBSD 2.4 | + | FreeBSD 2.2.9 | | ||| | + | | | ||| | FreeBSD 3.0 <* | |v| | | | | NetBSD 1.3.3| | *---FreeBSD 3.1 | | | | @@ -276,18 +278,43 @@ FreeBSD 5.2 | | | | | | | | | OpenBSD 5.3 DragonFly 3.4.1 | | | | | | NetBSD | | | | | | | |6.0.3 | | + | | | | | | || | + | | | | | | NetBSD | | + | | | | | |6.0.4 | | + | | | | | | || | + | | | | | | NetBSD | | + | | | | | |6.0.5 | | | | | | | | | | | | | | | |`-NetBSD 6.1 | | | |FreeBSD | | | | | | | 8.4 | |NetBSD 6.1.1 | | | | | | | | | | FreeBSD | |NetBSD 6.1.2 | | - |9.2 | | | | + |9.2 Mac OS X | | | | + | | 10.9| |OpenBSD 5.4 | + | `-.| | | | DragonFly 3.6.0 + |\ | | | | | + *--FreeBSD| | |NetBSD 6.1.3 | | + | 10.0 | | | | | | + | | | | | | DragonFly 3.6.1 + | | | | | | | + | | | | | | | + | | | | | | DragonFly 3.6.2 + | | | |NetBSD 6.1.4 | | + | | | | | | + | | | |OpenBSD 5.5 | + | | | | | DragonFly 3.8.0 + | FreeBSD | | | | + |9.3 | | | | + || | | | + || | | | + || | | | + || | | | || | | | || | | | || | | | || | | | -FreeBSD 10 -current | NetBSD -current OpenBSD -current | +FreeBSD 11 -current | NetBSD -current OpenBSD -current DragonFly -current || | | | vv v v v @@ -531,6 +558,7 @@ FreeBSD 6.0 2005-11-01 [FBD] Ne
Re: svn commit: r265003 - head/secure/usr.sbin/sshd
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 21/08/14 10:05, Konstantin Belousov wrote:
> On Wed, Aug 20, 2014 at 05:34:58PM +0200, Roger Pau Monn? wrote:
>> On 20/08/14 17:28, Bryan Drewery wrote:
>>> On 8/20/2014 10:19 AM, Roger Pau Monn? wrote:
On 20/08/14 17:13, Konstantin Belousov wrote:
> On Wed, Aug 20, 2014 at 04:41:05PM +0200, Roger Pau Monn??
> wrote:
>> On 27/04/14 07:28, Konstantin Belousov wrote:
>>> Author: kib Date: Sun Apr 27 05:28:14 2014 New
>>> Revision: 265003 URL:
>>> http://svnweb.freebsd.org/changeset/base/265003
>>>
>>> Log: Fix order of libthr and libc in the global dso
>>> list for sshd, by explicitely linking main binary with
>>> -lpthread. Before, libthr appeared in the list due to
>>> dependency of one of the kerberos libs. Due to the
>>> change in ld(1) behaviour of not copying NEEDED entries
>>> from direct dependencies into the link results, the
>>> order becomes reversed.
>>>
>>> The libthr must appear before libc to properly
>>> interpose libc symbols and provide working rtld locks
>>> implementation. The symptom was sshd hanging on rtld
>>> bind lock during nested symbol binding from a signal
>>> handler.
>>>
>>> Approved by:des (openssh maintainer) Sponsored by:
>>> The FreeBSD Foundation MFC after: 1 week
>>>
>>> Modified: head/secure/usr.sbin/sshd/Makefile
>>>
>>> Modified: head/secure/usr.sbin/sshd/Makefile
>>> ==
>>>
>>>
>>>
>>>
>>>
- --- head/secure/usr.sbin/sshd/MakefileSun Apr 27 05:19:01 2014
(r265002)
>>> +++ head/secure/usr.sbin/sshd/Makefile Sun Apr 27
>>> 05:28:14 2014 (r265003) @@ -57,6 +57,16 @@ CFLAGS+=
>>> -DNONE_CIPHER_ENABLED DPADD+= ${LIBCRYPT} ${LIBCRYPTO}
>>> ${LIBZ} LDADD+= -lcrypt -lcrypto -lz
>>>
>>> +# Fix the order of NEEDED entries for libthr and
>>> libc. The libthr +# needs to interpose libc symbols,
>>> leaving the libthr loading as +# dependency of krb
>>> causes reversed order and broken interposing. Put +#
>>> the threading library last on the linker command line,
>>> just before +# the -lc added by a compiler driver.
>>> +.if ${MK_KERBEROS_SUPPORT} != "no" +DPADD+=
>>> ${LIBPTHREAD} +LDADD+= -lpthread +.endif + .if
>>> defined(LOCALBASE) CFLAGS+=
>>> -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif
>>
>> Hello,
>>
>> This change makes the following simple test program fail
>> on the second assert. The problem is that sa_handler ==
>> SIG_DFL, and sa_flags == SA_SIGINFO, which according to
>> the sigaction(9) man page is not possible. With this
>> change reverted the test is successful.
> I do not quite follow.
>
> What are the relations between sshd and your test program ?
> Should the test be run somehow specially ?
No, and frankly that's what I don't understand. I compile
this simple test with `cc -o test test.c`. It fails with
this commit applied, and succeeds without it.
Roger.
>>>
>>> Does it fail if you do not connect with ssh?
>>
>> Right, it works fine from the serial console, fails when
>> executed from ssh.
>
> I cannot reproduce it locally with your scenario, but the attached
> program demonstrates the issue without relying on inheritance and
> libthr.
>
> I think you mis-interpret the man page statement, it only says that
> SA_SIGINFO should not be set in new->sa_flags IMO. But I do not see
> much sense in the requirement. Note that we do not test flags for
> correctness at all. SUSv4 is also silent on the issue.
>
> If this is important for your case, the following patch prevents
> leaking of the flags for ignored of default/action signals. Could
> you, please, describe why do you consider this a bug ?
IMO, it is an inconsistency to return an invalid old sigaction, I
assume that what is returned as the old sigaction should also be valid
according to the man page.
I realize SUSv4 don't specify such requirement, but it would still be
wrong to use SIG_DFL with SA_SIGINFO, since SA_SIGINFO expect the
handler to be of the type:
void func(int signo, siginfo_t *info, void *context);
While SIG_DLF is of type:
void func(int signo);
There's software out there that (wrongly?) relies on sa_action ==
SIG_DFL and (sa_flags & SA_SIGINFO) == 0:
http://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=tools/libxl/libxl_fork.c;h=fa150959adcfa6618342ba1eb0085cbba5f75d0a;hb=HEAD#l338
The sa_flags check done here seems too strong in my opinion, but I
still think it's right according to the man page.
Roger.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (Darwin)
iQEcBAEBAgAGBQJT9dQpAAoJEKXZdqUyumTAgsIH/2xAfa0FjWpCpkvDoNXGVs4K
tRDurCFTsaCJZ1xt3aQyPvPALm+qOpBX+i3nTiX4Bg86jbrZRGTag4OeAE6uX3KR
TCKaUB6jNUjuNsj5djURIQk
svn commit: r270265 - head/sys/dev/vt/font
Author: dumbbell Date: Thu Aug 21 10:54:39 2014 New Revision: 270265 URL: http://svnweb.freebsd.org/changeset/base/270265 Log: vt(4): Fix an inconsistency between the mouse cursor bitmap and its mask MFC after:1 week Modified: head/sys/dev/vt/font/vt_mouse_cursor.c Modified: head/sys/dev/vt/font/vt_mouse_cursor.c == --- head/sys/dev/vt/font/vt_mouse_cursor.c Thu Aug 21 10:46:19 2014 (r270264) +++ head/sys/dev/vt/font/vt_mouse_cursor.c Thu Aug 21 10:54:39 2014 (r270265) @@ -43,7 +43,7 @@ struct mouse_cursor vt_default_mouse_poi 0x7c, /* "_*_ " */ 0x7e, /* "_**_" */ 0x68, /* "_**_" */ - 0x4c, /* "_*__**__" */ + 0x4c, /* "_*__**_ " */ 0x0c, /* " _ _**_ " */ 0x06, /* "_**_" */ 0x06, /* "_**_" */ @@ -58,8 +58,8 @@ struct mouse_cursor vt_default_mouse_poi 0xfe, /* "___ " */ 0xff, /* "" */ 0xff, /* "" */ - 0xff, /* "" */ - 0x1e, /* " " */ + 0xfe, /* "___ " */ + 0x5e, /* " _ " */ 0x0f, /* "" */ 0x0f, /* "" */ 0x0f, /* "" */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270264 - in stable/10: bin/ps sys/kern sys/sys
Author: kib
Date: Thu Aug 21 10:46:19 2014
New Revision: 270264
URL: http://svnweb.freebsd.org/changeset/base/270264
Log:
MFC r269656:
Implement and use proc_realparent(9).
MFC r270024 (by markj):
Correct the order of arguments passed to LIST_INSERT_AFTER().
For merge, the p_treeflag member of struct proc was moved to the end
of the structure, to keep KBI intact.
Modified:
stable/10/bin/ps/ps.1
stable/10/sys/kern/kern_exit.c
stable/10/sys/kern/kern_proc.c
stable/10/sys/kern/sys_process.c
stable/10/sys/sys/proc.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/bin/ps/ps.1
==
--- stable/10/bin/ps/ps.1 Thu Aug 21 10:25:35 2014(r270263)
+++ stable/10/bin/ps/ps.1 Thu Aug 21 10:46:19 2014(r270264)
@@ -29,7 +29,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd June 6, 2014
+.Dd August 7, 2014
.Dt PS 1
.Os
.Sh NAME
@@ -332,7 +332,6 @@ the include file
.It Dv "P_SINGLE_BOUNDARY" Ta No "0x40" Ta "Threads should suspend at user
boundary"
.It Dv "P_HWPMC" Ta No "0x80" Ta "Process is using HWPMCs"
.It Dv "P_JAILED" Ta No "0x100" Ta "Process is in jail"
-.It Dv "P_ORPHAN" Ta No "0x200" Ta "Orphaned by original parent,
reparented to debugger"
.It Dv "P_INEXEC" Ta No "0x400" Ta "Process is in execve()"
.It Dv "P_STATCHILD" Ta No "0x800" Ta "Child process stopped or exited"
.It Dv "P_INMEM" Ta No "0x1000" Ta "Loaded into memory"
Modified: stable/10/sys/kern/kern_exit.c
==
--- stable/10/sys/kern/kern_exit.c Thu Aug 21 10:25:35 2014
(r270263)
+++ stable/10/sys/kern/kern_exit.c Thu Aug 21 10:46:19 2014
(r270264)
@@ -99,16 +99,44 @@ SDT_PROBE_DEFINE1(proc, kernel, , exit,
/* Hook for NFS teardown procedure. */
void (*nlminfo_release_p)(struct proc *p);
+struct proc *
+proc_realparent(struct proc *child)
+{
+ struct proc *p, *parent;
+
+ sx_assert(&proctree_lock, SX_LOCKED);
+ if ((child->p_treeflag & P_TREE_ORPHANED) == 0) {
+ return (child->p_pptr->p_pid == child->p_oppid ?
+ child->p_pptr : initproc);
+ }
+ for (p = child; (p->p_treeflag & P_TREE_FIRST_ORPHAN) == 0;) {
+ /* Cannot use LIST_PREV(), since the list head is not known. */
+ p = __containerof(p->p_orphan.le_prev, struct proc,
+ p_orphan.le_next);
+ KASSERT((p->p_treeflag & P_TREE_ORPHANED) != 0,
+ ("missing P_ORPHAN %p", p));
+ }
+ parent = __containerof(p->p_orphan.le_prev, struct proc,
+ p_orphans.lh_first);
+ return (parent);
+}
+
static void
clear_orphan(struct proc *p)
{
+ struct proc *p1;
- PROC_LOCK_ASSERT(p, MA_OWNED);
-
- if (p->p_flag & P_ORPHAN) {
- LIST_REMOVE(p, p_orphan);
- p->p_flag &= ~P_ORPHAN;
+ sx_assert(&proctree_lock, SA_XLOCKED);
+ if ((p->p_treeflag & P_TREE_ORPHANED) == 0)
+ return;
+ if ((p->p_treeflag & P_TREE_FIRST_ORPHAN) != 0) {
+ p1 = LIST_NEXT(p, p_orphan);
+ if (p1 != NULL)
+ p1->p_treeflag |= P_TREE_FIRST_ORPHAN;
+ p->p_treeflag &= ~P_TREE_FIRST_ORPHAN;
}
+ LIST_REMOVE(p, p_orphan);
+ p->p_treeflag &= ~P_TREE_ORPHANED;
}
/*
@@ -778,7 +806,9 @@ proc_reap(struct thread *td, struct proc
* If we got the child via a ptrace 'attach', we need to give it back
* to the old parent.
*/
- if (p->p_oppid && (t = pfind(p->p_oppid)) != NULL) {
+ if (p->p_oppid != 0) {
+ t = proc_realparent(p);
+ PROC_LOCK(t);
PROC_LOCK(p);
proc_reparent(p, t);
p->p_oppid = 0;
@@ -1251,8 +1281,15 @@ proc_reparent(struct proc *child, struct
clear_orphan(child);
if (child->p_flag & P_TRACED) {
- LIST_INSERT_HEAD(&child->p_pptr->p_orphans, child, p_orphan);
- child->p_flag |= P_ORPHAN;
+ if (LIST_EMPTY(&child->p_pptr->p_orphans)) {
+ child->p_treeflag |= P_TREE_FIRST_ORPHAN;
+ LIST_INSERT_HEAD(&child->p_pptr->p_orphans, child,
+ p_orphan);
+ } else {
+ LIST_INSERT_AFTER(LIST_FIRST(&child->p_pptr->p_orphans),
+ child, p_orphan);
+ }
+ child->p_treeflag |= P_TREE_ORPHANED;
}
child->p_pptr = parent;
Modified: stable/10/sys/kern/kern_proc.c
==
--- stable/10/sys/kern/kern_proc.c Thu Aug 21 10:25:35 2014
(r270263)
+++ stable/10/sys/kern/kern_proc.c Thu Aug 21 10:46:19 2014
svn commit: r270263 - in stable/9/sys/dev/vt: colors hw/fb hw/ofwfb
Author: dumbbell
Date: Thu Aug 21 10:25:35 2014
New Revision: 270263
URL: http://svnweb.freebsd.org/changeset/base/270263
Log:
vt(4): Colors are indexed against a console palette, not a VGA palette
Rename vt_generate_vga_palette() to vt_generate_cons_palette() and
change it to build a palette where the color index is the same than in
terminal escape codes, not the VGA index. That's what TCHAR_CREATE()
uses and passes to vt(4).
The main differences between both orders are:
o Blue and red are swapped (1 <-> 4)
o Yellow and cyan are swapped (3 <-> 6)
The problem remained unnoticed, because the RGB bit indexes passed to
vt_generate_vga_palette() were reversed. This inversion was cancelled
by the colors inversions in the generated palette. For instance, red
(0xff) and blue (0xff) have bytes in opposite order, but were
swapped in the palette. But after changing the value of blue (see last
paragraph), the modified color was in fact the red one.
While here, tune the palette to better match console colors and improve
the readability (especially the dark blue).
This is an MFC of r269783 and r269791.
Modified:
stable/9/sys/dev/vt/colors/vt_termcolors.c
stable/9/sys/dev/vt/colors/vt_termcolors.h
stable/9/sys/dev/vt/hw/fb/vt_early_fb.c
stable/9/sys/dev/vt/hw/fb/vt_fb.c
stable/9/sys/dev/vt/hw/ofwfb/ofwfb.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/vt/colors/vt_termcolors.c
==
--- stable/9/sys/dev/vt/colors/vt_termcolors.c Thu Aug 21 10:18:42 2014
(r270262)
+++ stable/9/sys/dev/vt/colors/vt_termcolors.c Thu Aug 21 10:25:35 2014
(r270263)
@@ -39,25 +39,36 @@ static struct {
unsigned char b;/* Blue percentage value. */
} color_def[16] = {
{0, 0, 0}, /* black */
- {0, 0, 50},/* dark blue */
- {0, 50, 0}, /* dark green */
- {0, 50, 50},/* dark cyan */
{50,0, 0}, /* dark red */
+ {0, 50, 0}, /* dark green */
+ {77,63, 0}, /* dark yellow */
+ {20,40, 64},/* dark blue */
{50,0, 50},/* dark magenta */
- {50,50, 0}, /* brown */
+ {0, 50, 50},/* dark cyan */
{75,75, 75},/* light gray */
- {50,50, 50},/* dark gray */
- {0, 0, 100}, /* light blue */
- {0, 100,0}, /* light green */
- {0, 100,100}, /* light cyan */
+
+ {18,20, 21},/* dark gray */
{100, 0, 0}, /* light red */
+ {0, 100,0}, /* light green */
+ {100, 100,0}, /* light yellow */
+ {45,62, 81},/* light blue */
{100, 0, 100}, /* light magenta */
- {100, 100,0}, /* yellow */
+ {0, 100,100}, /* light cyan */
{100, 100,100}, /* white */
};
+/*
+ * Between console's palette and VGA's one:
+ * - blue and red are swapped (1 <-> 4)
+ * - yellow ad cyan are swapped (3 <-> 6)
+ */
+static const int cons_to_vga_colors[16] = {
+ 0, 4, 2, 6, 1, 5, 3, 7,
+ 0, 4, 2, 6, 1, 5, 3, 7
+};
+
int
-vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, int
roffset,
+vt_generate_cons_palette(uint32_t *palette, int format, uint32_t rmax, int
roffset,
uint32_t gmax, int goffset, uint32_t bmax, int boffset)
{
int i;
@@ -66,7 +77,7 @@ vt_generate_vga_palette(uint32_t *palett
for (i = 0; i < 16; i++) {
switch (format) {
case COLOR_FORMAT_VGA:
- palette[i] = i;
+ palette[i] = cons_to_vga_colors[i];
break;
case COLOR_FORMAT_RGB:
palette[i] = CF(r, i) | CF(g, i) | CF(b, i);
Modified: stable/9/sys/dev/vt/colors/vt_termcolors.h
==
--- stable/9/sys/dev/vt/colors/vt_termcolors.h Thu Aug 21 10:18:42 2014
(r270262)
+++ stable/9/sys/dev/vt/colors/vt_termcolors.h Thu Aug 21 10:25:35 2014
(r270263)
@@ -45,6 +45,6 @@ enum vt_color_format {
};
/* Helper to fill color map used by driver */
-int vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax,
+int vt_generate_cons_palette(uint32_t *palette, int format, uint32_t rmax,
int roffset, uint32_t gmax, int goffset, uint32_t bmax, int boffset);
Modified: stable/9/sys/dev/vt/hw/fb/vt_early_fb.c
==
--- stable/9/sys/dev/vt/hw/fb/vt_early_fb.c Thu Aug 21 10:18:42 2014
(r270262)
+++ stable/9/sys/dev/vt/hw/fb/vt_early_fb.c Thu Aug 21 10:25:35 2014
(r270263
svn commit: r270262 - in stable/10/sys: arm/freescale/imx dev/vt/colors dev/vt/hw/efifb dev/vt/hw/fb dev/vt/hw/ofwfb
Author: dumbbell
Date: Thu Aug 21 10:18:42 2014
New Revision: 270262
URL: http://svnweb.freebsd.org/changeset/base/270262
Log:
vt(4): Colors are indexed against a console palette, not a VGA palette
Rename vt_generate_vga_palette() to vt_generate_cons_palette() and
change it to build a palette where the color index is the same than in
terminal escape codes, not the VGA index. That's what TCHAR_CREATE()
uses and passes to vt(4).
The main differences between both orders are:
o Blue and red are swapped (1 <-> 4)
o Yellow and cyan are swapped (3 <-> 6)
The problem remained unnoticed, because the RGB bit indexes passed to
vt_generate_vga_palette() were reversed. This inversion was cancelled
by the colors inversions in the generated palette. For instance, red
(0xff) and blue (0xff) have bytes in opposite order, but were
swapped in the palette. But after changing the value of blue (see last
paragraph), the modified color was in fact the red one.
While here, tune the palette to better match console colors and improve
the readability (especially the dark blue).
This is an MFC of r269783 and r269791.
Modified:
stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
stable/10/sys/dev/vt/colors/vt_termcolors.c
stable/10/sys/dev/vt/colors/vt_termcolors.h
stable/10/sys/dev/vt/hw/efifb/efifb.c
stable/10/sys/dev/vt/hw/fb/vt_early_fb.c
stable/10/sys/dev/vt/hw/fb/vt_fb.c
stable/10/sys/dev/vt/hw/ofwfb/ofwfb.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
==
--- stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Thu Aug 21 09:01:42
2014(r270261)
+++ stable/10/sys/arm/freescale/imx/imx51_ipuv3_fbd.c Thu Aug 21 10:18:42
2014(r270262)
@@ -163,18 +163,18 @@ ipu3_fb_init_cmap(uint32_t *cmap, int by
switch (bytespp) {
case 8:
- return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+ return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
0x7, 5, 0x7, 2, 0x3, 0));
case 15:
- return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+ return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
0x1f, 10, 0x1f, 5, 0x1f, 0));
case 16:
- return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+ return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
0x1f, 11, 0x3f, 5, 0x1f, 0));
case 24:
case 32: /* Ignore alpha. */
- return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
- 0xff, 16, 0xff, 8, 0xff, 0));
+ return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
+ 0xff, 0, 0xff, 8, 0xff, 16));
default:
return (1);
}
Modified: stable/10/sys/dev/vt/colors/vt_termcolors.c
==
--- stable/10/sys/dev/vt/colors/vt_termcolors.c Thu Aug 21 09:01:42 2014
(r270261)
+++ stable/10/sys/dev/vt/colors/vt_termcolors.c Thu Aug 21 10:18:42 2014
(r270262)
@@ -39,25 +39,36 @@ static struct {
unsigned char b;/* Blue percentage value. */
} color_def[16] = {
{0, 0, 0}, /* black */
- {0, 0, 50},/* dark blue */
- {0, 50, 0}, /* dark green */
- {0, 50, 50},/* dark cyan */
{50,0, 0}, /* dark red */
+ {0, 50, 0}, /* dark green */
+ {77,63, 0}, /* dark yellow */
+ {20,40, 64},/* dark blue */
{50,0, 50},/* dark magenta */
- {50,50, 0}, /* brown */
+ {0, 50, 50},/* dark cyan */
{75,75, 75},/* light gray */
- {50,50, 50},/* dark gray */
- {0, 0, 100}, /* light blue */
- {0, 100,0}, /* light green */
- {0, 100,100}, /* light cyan */
+
+ {18,20, 21},/* dark gray */
{100, 0, 0}, /* light red */
+ {0, 100,0}, /* light green */
+ {100, 100,0}, /* light yellow */
+ {45,62, 81},/* light blue */
{100, 0, 100}, /* light magenta */
- {100, 100,0}, /* yellow */
+ {0, 100,100}, /* light cyan */
{100, 100,100}, /* white */
};
+/*
+ * Between console's palette and VGA's one:
+ * - blue and red are swapped (1 <-> 4)
+ * - yellow ad cyan are swapped (3 <-> 6)
+ */
+static const int cons_to_vga_colors[16] = {
+ 0, 4, 2, 6, 1, 5, 3, 7,
+ 0, 4, 2, 6, 1, 5, 3, 7
+};
+
int
-vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, int
roffset,
+vt_generate_cons_palette(uint32_t *palette, i
svn commit: r270261 - head/sys/sys
Author: davide Date: Thu Aug 21 09:01:42 2014 New Revision: 270261 URL: http://svnweb.freebsd.org/changeset/base/270261 Log: Revert r270227. GCC doesn't like the lack of LL suffix, so this makes powerpc build failing. Modified: head/sys/sys/time.h Modified: head/sys/sys/time.h == --- head/sys/sys/time.h Thu Aug 21 08:25:46 2014(r270260) +++ head/sys/sys/time.h Thu Aug 21 09:01:42 2014(r270261) @@ -129,7 +129,7 @@ bintime_shift(struct bintime *_bt, int _ #defineSBT_1MS (SBT_1S / 1000) #defineSBT_1US (SBT_1S / 100) #defineSBT_1NS (SBT_1S / 10) -#defineSBT_MAX 0x7fff +#defineSBT_MAX 0x7fffLL static __inline int sbintime_getsec(sbintime_t _sbt) @@ -184,7 +184,7 @@ timespec2bintime(const struct timespec * _bt->sec = _ts->tv_sec; /* 18446744073 = int(2^64 / 10) */ - _bt->frac = _ts->tv_nsec * (uint64_t)18446744073; + _bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL; } static __inline void @@ -201,7 +201,7 @@ timeval2bintime(const struct timeval *_t _bt->sec = _tv->tv_sec; /* 18446744073709 = int(2^64 / 100) */ - _bt->frac = _tv->tv_usec * (uint64_t)18446744073709; + _bt->frac = _tv->tv_usec * (uint64_t)18446744073709LL; } static __inline struct timespec ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r270260 - head/sys/cddl/compat/opensolaris/sys
Author: delphij
Date: Thu Aug 21 08:25:46 2014
New Revision: 270260
URL: http://svnweb.freebsd.org/changeset/base/270260
Log:
Provide compatibility shim for atomic_dec_64_nv.
X-MFC-with: r270247
MFC after:13 days
Modified:
head/sys/cddl/compat/opensolaris/sys/atomic.h
Modified: head/sys/cddl/compat/opensolaris/sys/atomic.h
==
--- head/sys/cddl/compat/opensolaris/sys/atomic.h Thu Aug 21 07:52:51
2014(r270259)
+++ head/sys/cddl/compat/opensolaris/sys/atomic.h Thu Aug 21 08:25:46
2014(r270260)
@@ -117,6 +117,12 @@ atomic_inc_64_nv(volatile uint64_t *targ
return (atomic_add_64_nv(target, 1));
}
+static __inline uint64_t
+atomic_dec_64_nv(volatile uint64_t *target)
+{
+ return (atomic_add_64_nv(target, -1));
+}
+
#if !defined(COMPAT_32BIT) && defined(__LP64__)
static __inline void *
atomic_cas_ptr(volatile void *target, void *cmp, void *newval)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r265003 - head/secure/usr.sbin/sshd
On Wed, Aug 20, 2014 at 05:34:58PM +0200, Roger Pau Monn? wrote:
> On 20/08/14 17:28, Bryan Drewery wrote:
> > On 8/20/2014 10:19 AM, Roger Pau Monn? wrote:
> >> On 20/08/14 17:13, Konstantin Belousov wrote:
> >>> On Wed, Aug 20, 2014 at 04:41:05PM +0200, Roger Pau Monn?? wrote:
> On 27/04/14 07:28, Konstantin Belousov wrote:
> > Author: kib
> > Date: Sun Apr 27 05:28:14 2014
> > New Revision: 265003
> > URL: http://svnweb.freebsd.org/changeset/base/265003
> >
> > Log:
> > Fix order of libthr and libc in the global dso list for sshd, by
> > explicitely linking main binary with -lpthread. Before, libthr
> > appeared in the list due to dependency of one of the kerberos libs.
> > Due to the change in ld(1) behaviour of not copying NEEDED entries
> > from direct dependencies into the link results, the order becomes
> > reversed.
> >
> > The libthr must appear before libc to properly interpose libc symbols
> > and provide working rtld locks implementation. The symptom was sshd
> > hanging on rtld bind lock during nested symbol binding from a signal
> > handler.
> >
> > Approved by: des (openssh maintainer)
> > Sponsored by: The FreeBSD Foundation
> > MFC after:1 week
> >
> > Modified:
> > head/secure/usr.sbin/sshd/Makefile
> >
> > Modified: head/secure/usr.sbin/sshd/Makefile
> > ==
> > --- head/secure/usr.sbin/sshd/Makefile Sun Apr 27 05:19:01 2014
> > (r265002)
> > +++ head/secure/usr.sbin/sshd/Makefile Sun Apr 27 05:28:14 2014
> > (r265003)
> > @@ -57,6 +57,16 @@ CFLAGS+= -DNONE_CIPHER_ENABLED
> > DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
> > LDADD+= -lcrypt -lcrypto -lz
> >
> > +# Fix the order of NEEDED entries for libthr and libc. The libthr
> > +# needs to interpose libc symbols, leaving the libthr loading as
> > +# dependency of krb causes reversed order and broken interposing. Put
> > +# the threading library last on the linker command line, just before
> > +# the -lc added by a compiler driver.
> > +.if ${MK_KERBEROS_SUPPORT} != "no"
> > +DPADD+= ${LIBPTHREAD}
> > +LDADD+= -lpthread
> > +.endif
> > +
> > .if defined(LOCALBASE)
> > CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"
> > .endif
>
> Hello,
>
> This change makes the following simple test program fail on the second
> assert. The problem is that sa_handler == SIG_DFL, and sa_flags ==
> SA_SIGINFO, which according to the sigaction(9) man page is not
> possible. With this change reverted the test is successful.
> >>> I do not quite follow.
> >>>
> >>> What are the relations between sshd and your test program ?
> >>> Should the test be run somehow specially ?
> >>
> >> No, and frankly that's what I don't understand. I compile this simple
> >> test with `cc -o test test.c`. It fails with this commit applied, and
> >> succeeds without it.
> >>
> >> Roger.
> >>
> >
> > Does it fail if you do not connect with ssh?
>
> Right, it works fine from the serial console, fails when executed from ssh.
I cannot reproduce it locally with your scenario, but the attached program
demonstrates the issue without relying on inheritance and libthr.
I think you mis-interpret the man page statement, it only says that
SA_SIGINFO should not be set in new->sa_flags IMO. But I do not see much
sense in the requirement. Note that we do not test flags for correctness
at all. SUSv4 is also silent on the issue.
If this is important for your case, the following patch prevents leaking
of the flags for ignored of default/action signals. Could you, please,
describe why do you consider this a bug ?
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 561ea0a..3409875 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -621,6 +621,15 @@ sig_ffs(sigset_t *set)
return (0);
}
+static bool
+sigact_flag_test(struct sigaction *act, int flag)
+{
+
+ return ((act->sa_flags & flag) != 0 &&
+ (__sighandler_t *)act->sa_sigaction != SIG_IGN &&
+ (__sighandler_t *)act->sa_sigaction != SIG_DFL);
+}
+
/*
* kern_sigaction
* sigaction
@@ -679,7 +688,7 @@ kern_sigaction(td, sig, act, oact, flags)
ps->ps_catchmask[_SIG_IDX(sig)] = act->sa_mask;
SIG_CANTMASK(ps->ps_catchmask[_SIG_IDX(sig)]);
- if (act->sa_flags & SA_SIGINFO) {
+ if (sigact_flag_test(act, SA_SIGINFO)) {
ps->ps_sigact[_SIG_IDX(sig)] =
(__sighandler_t *)act->sa_sigaction;
SIGADDSET(ps->ps_siginfo, sig);
@@ -687,19 +696,19 @@ kern_sigaction(td, sig, act, oact, flags)
ps->ps_sigact[_SIG_IDX(sig)] = act->sa_handler;
SIGDELSET(p
svn commit: r270259 - head/sys/sys
Author: gavin Date: Thu Aug 21 07:52:51 2014 New Revision: 270259 URL: http://svnweb.freebsd.org/changeset/base/270259 Log: Add a missing brace to callout_init_rm() to fix syntax. MFC after:1 week Modified: head/sys/sys/callout.h Modified: head/sys/sys/callout.h == --- head/sys/sys/callout.h Thu Aug 21 04:31:48 2014(r270258) +++ head/sys/sys/callout.h Thu Aug 21 07:52:51 2014(r270259) @@ -72,7 +72,7 @@ void _callout_init_lock(struct callout * _callout_init_lock((c), ((mtx) != NULL) ? &(mtx)->lock_object : \ NULL, (flags)) #definecallout_init_rm(c, rm, flags) \ - _callout_init_lock((c), ((rm != NULL) ? &(rm)->lock_object :\ + _callout_init_lock((c), ((rm) != NULL) ? &(rm)->lock_object : \ NULL, (flags)) #definecallout_init_rw(c, rw, flags) \ _callout_init_lock((c), ((rw) != NULL) ? &(rw)->lock_object : \ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r270159 - in stable/10: lib/libvmmapi sys/amd64/amd64 sys/amd64/include sys/amd64/vmm sys/amd64/vmm/intel sys/amd64/vmm/io sys/x86/include usr.sbin/bhyve usr.sbin/bhyvectl usr.sbin/bhy
Hi Peter! On Aug 18, 2014, at 6:20 PM, Peter Grehan wrote: > Author: grehan > Date: Tue Aug 19 01:20:24 2014 > New Revision: 270159 > URL: http://svnweb.freebsd.org/changeset/base/270159 > > Log: > MFC r267921, r267934, r267949, r267959, r267966, r268202, r268276, > r268427, r268428, r268521, r268638, r268639, r268701, r268777, > r268889, r268922, r269008, r269042, r269043, r269080, r269094, > r269108, r269109, r269281, r269317, r269700, r269896, r269962, > r269989. > > Catch bhyve up to CURRENT. > > Lightly tested with FreeBSD i386/amd64, Linux i386/amd64, and > OpenBSD/amd64. Still resolving anissue with OpenBSD/i386. > > Many thanks to jhb@ for all the hard work on the prior MFCs ! ... > +#ifdef _SYS_PROC_H_ > +static int __inline Funny as it sounds, this breaks gcc with “warning: ‘inline’ is not at beginning of declaration” :/. I’ve opened this bug to track the issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192880 . Thanks! -Garrett signature.asc Description: Message signed with OpenPGP using GPGMail
