svn commit: r247910 - head/sys/dev/sound/pci/hda
Author: glebius
Date: Thu Mar 7 07:54:50 2013
New Revision: 247910
URL: http://svnweb.freebsd.org/changeset/base/247910
Log:
Plug a memory leak.
Reviewed by: mav
Sponsored by: Nginx, Inc.
Modified:
head/sys/dev/sound/pci/hda/hdacc.c
Modified: head/sys/dev/sound/pci/hda/hdacc.c
==
--- head/sys/dev/sound/pci/hda/hdacc.c Thu Mar 7 07:28:05 2013
(r247909)
+++ head/sys/dev/sound/pci/hda/hdacc.c Thu Mar 7 07:54:50 2013
(r247910)
@@ -460,8 +460,12 @@ hdacc_attach(device_t dev)
static int
hdacc_detach(device_t dev)
{
+ struct hdacc_softc *codec = device_get_softc(dev);
+ int error;
- return (device_delete_children(dev));
+ error = device_delete_children(dev);
+ free(codec->fgs, M_HDACC);
+ return (error);
}
static int
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247906 - head/sys/netinet
Author: lstewart
Date: Thu Mar 7 04:42:20 2013
New Revision: 247906
URL: http://svnweb.freebsd.org/changeset/base/247906
Log:
The hashmask returned by hashinit() is a valid index in the returned hash
array.
Fix a siftr(4) potential memory leak and INVARIANTS triggered kernel panic in
hashdestroy() by ensuring the last array index in the flow counter hash table
is
flushed of entries.
MFC after:3 days
Modified:
head/sys/netinet/siftr.c
Modified: head/sys/netinet/siftr.c
==
--- head/sys/netinet/siftr.cThu Mar 7 02:53:29 2013(r247905)
+++ head/sys/netinet/siftr.cThu Mar 7 04:42:20 2013(r247906)
@@ -1314,7 +1314,7 @@ siftr_manage_ops(uint8_t action)
* flow seen and freeing any malloc'd memory.
* The hash consists of an array of LISTs (man 3 queue).
*/
- for (i = 0; i < siftr_hashmask; i++) {
+ for (i = 0; i <= siftr_hashmask; i++) {
LIST_FOREACH_SAFE(counter, counter_hash + i, nodes,
tmp_counter) {
key = counter->key;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247905 - head/sys/kern
Author: ian
Date: Thu Mar 7 02:53:29 2013
New Revision: 247905
URL: http://svnweb.freebsd.org/changeset/base/247905
Log:
Call sched_prio() to immediately change the priority of the thread in
response to an rtprio_thread() call, when the priority is different
than the old priority, and either the old or the new priority class is
not RTP_PRIO_NORMAL (timeshare).
The reasoning for the second half of the test is that if it's a change in
timeshare priority, then the scheduler is going to adjust that priority
in a way that completely wipes out the requested change anyway, so
what's the point? (If that's not true, then allowing a thread to change
its own timeshare priority would subvert the scheduler's adjustments and
let a cpu-bound thread monopolize the cpu; if allowed at all, that
should require priveleges.)
On the other hand, if either the old or new priority class is not
timeshare, then the scheduler doesn't make automatic adjustments, so we
should honor the request and make the priority change right away. The
reason the old class gets caught up in this is the very reason for this
change: when thread A changes the priority of its child thread B from
idle back to timeshare, thread B never actually gets moved to a
timeshare-range run queue unless there are some idle cycles available
to allow it to first get scheduled again as an idle thread.
Reviewed by: jhb@
Modified:
head/sys/kern/kern_resource.c
Modified: head/sys/kern/kern_resource.c
==
--- head/sys/kern/kern_resource.c Wed Mar 6 23:22:40 2013
(r247904)
+++ head/sys/kern/kern_resource.c Thu Mar 7 02:53:29 2013
(r247905)
@@ -469,8 +469,7 @@ sys_rtprio(td, uap)
int
rtp_to_pri(struct rtprio *rtp, struct thread *td)
{
- u_char newpri;
- u_char oldpri;
+ u_char newpri, oldclass, oldpri;
switch (RTP_PRIO_BASE(rtp->type)) {
case RTP_PRIO_REALTIME:
@@ -493,11 +492,12 @@ rtp_to_pri(struct rtprio *rtp, struct th
}
thread_lock(td);
+ oldclass = td->td_pri_class;
sched_class(td, rtp->type); /* XXX fix */
oldpri = td->td_user_pri;
sched_user_prio(td, newpri);
- if (td->td_user_pri != oldpri && (td == curthread ||
- td->td_priority == oldpri || td->td_user_pri <= PRI_MAX_REALTIME))
+ if (td->td_user_pri != oldpri && (oldclass != RTP_PRIO_NORMAL ||
+ td->td_pri_class != RTP_PRIO_NORMAL))
sched_prio(td, td->td_user_pri);
if (TD_ON_UPILOCK(td) && oldpri != newpri) {
critical_enter();
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r247904 - head/crypto/openssh
On Wed, 2013-03-06 at 23:22 +, Dag-Erling Smørgrav wrote: > Author: des > Date: Wed Mar 6 23:22:40 2013 > New Revision: 247904 > URL: http://svnweb.freebsd.org/changeset/base/247904 > > Log: > Remove strnvis(), strvis(), strvisx(). I don't think that this is the "right" solution as it results in a "derped" version of ssh. I've been running *without* r247904 and the following patch all day long without issue: Index: crypto/openssh/config.h === --- crypto/openssh/config.h (revision 247893) +++ crypto/openssh/config.h (working copy) @@ -956,7 +956,7 @@ #define HAVE_STRNLEN 1 /* Define to 1 if you have the `strnvis' function. */ -#define HAVE_STRNVIS 1 +/* #undef HAVE_STRNVIS */ /* Define to 1 if you have the `strptime' function. */ #define HAVE_STRPTIME 1 Sean ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r247904 - head/crypto/openssh
On Wed, Mar 06, 2013 at 11:22:40PM +, Dag-Erling Smørgrav wrote: > Author: des > Date: Wed Mar 6 23:22:40 2013 > New Revision: 247904 > URL: http://svnweb.freebsd.org/changeset/base/247904 > > Log: > Remove strnvis(), strvis(), strvisx(). > > Modified: > head/crypto/openssh/ssh_namespace.h > This commit now causes ssh(1) to dump core. Glen pgpnQFdxHH8Tn.pgp Description: PGP signature
Re: svn commit: r247871 - head/usr.sbin/bhyve
>On 03/06/13 15:16, David Malone wrote: >>> + /* >>> +* We're just computing (a-b) in GF(216). >> >>> + ndesc = (unsigned)*hq->hq_avail_idx - (unsigned)hq->hq_cur_aidx; >> >> I think the comment here is wrong? Subtraction (and addition) in >> GF(2^16) is just xor of 16 bit numbers. You seem to actually be >> working in Z(2^16), where subtraction is normal subtraction mod >> 65536. > >Given that there's no such thing as GF(216) due to 216 = 2^3 * 3^3 not >being a prime power, the comment is definitely wrong. ;-) Any suggestions for better wording ? I submitted the comment block unchanged from the patch. later, Peter. later, Peter. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247904 - head/crypto/openssh
Author: des Date: Wed Mar 6 23:22:40 2013 New Revision: 247904 URL: http://svnweb.freebsd.org/changeset/base/247904 Log: Remove strnvis(), strvis(), strvisx(). Modified: head/crypto/openssh/ssh_namespace.h Modified: head/crypto/openssh/ssh_namespace.h == --- head/crypto/openssh/ssh_namespace.h Wed Mar 6 22:40:47 2013 (r247903) +++ head/crypto/openssh/ssh_namespace.h Wed Mar 6 23:22:40 2013 (r247904) @@ -451,9 +451,6 @@ #define start_progress_meter ssh_start_progress_meter #define stop_progress_meterssh_stop_progress_meter #define strdelim ssh_strdelim -#define strnvisssh_strnvis -#define strvis ssh_strvis -#define strvisxssh_strvisx #define sys_tun_open ssh_sys_tun_open #define temporarily_use_uidssh_temporarily_use_uid #define tilde_expand_filename ssh_tilde_expand_filename ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r247871 - head/usr.sbin/bhyve
On 03/06/13 15:16, David Malone wrote: >> +/* >> + * We're just computing (a-b) in GF(216). > >> +ndesc = (unsigned)*hq->hq_avail_idx - (unsigned)hq->hq_cur_aidx; > > I think the comment here is wrong? Subtraction (and addition) in > GF(2^16) is just xor of 16 bit numbers. You seem to actually be > working in Z(2^16), where subtraction is normal subtraction mod > 65536. Given that there's no such thing as GF(216) due to 216 = 2^3 * 3^3 not being a prime power, the comment is definitely wrong. ;-) -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r247871 - head/usr.sbin/bhyve
> + /* > + * We're just computing (a-b) in GF(216). > + ndesc = (unsigned)*hq->hq_avail_idx - (unsigned)hq->hq_cur_aidx; I think the comment here is wrong? Subtraction (and addition) in GF(2^16) is just xor of 16 bit numbers. You seem to actually be working in Z(2^16), where subtraction is normal subtraction mod 65536. David. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247903 - head/sys/kern
Author: mav
Date: Wed Mar 6 22:40:47 2013
New Revision: 247903
URL: http://svnweb.freebsd.org/changeset/base/247903
Log:
Reduce minimal time intervals of setitimer(2) from 1/HZ to 1/(16*HZ) by
using callout_reset_sbt() instead of callout_reset(). We can't remove
lower limit completely in this case because of significant processing
overhead, caused by unability to use direct callout execution due to using
process mutex in callout handler for sending SEGALRM signal. With support
of periodic events that would allow unprivileged user to abuse the system.
Reviewed by: davide
Modified:
head/sys/kern/kern_time.c
Modified: head/sys/kern/kern_time.c
==
--- head/sys/kern/kern_time.c Wed Mar 6 22:12:45 2013(r247902)
+++ head/sys/kern/kern_time.c Wed Mar 6 22:40:47 2013(r247903)
@@ -691,7 +691,7 @@ kern_getitimer(struct thread *td, u_int
*aitv = p->p_realtimer;
PROC_UNLOCK(p);
if (timevalisset(&aitv->it_value)) {
- getmicrouptime(&ctv);
+ microuptime(&ctv);
if (timevalcmp(&aitv->it_value, &ctv, <))
timevalclear(&aitv->it_value);
else
@@ -736,28 +736,33 @@ kern_setitimer(struct thread *td, u_int
{
struct proc *p = td->td_proc;
struct timeval ctv;
+ sbintime_t sbt, pr;
if (aitv == NULL)
return (kern_getitimer(td, which, oitv));
if (which > ITIMER_PROF)
return (EINVAL);
- if (itimerfix(&aitv->it_value))
+ if (itimerfix(&aitv->it_value) ||
+ aitv->it_value.tv_sec > INT32_MAX / 2)
return (EINVAL);
if (!timevalisset(&aitv->it_value))
timevalclear(&aitv->it_interval);
- else if (itimerfix(&aitv->it_interval))
+ else if (itimerfix(&aitv->it_interval) ||
+ aitv->it_interval.tv_sec > INT32_MAX / 2)
return (EINVAL);
if (which == ITIMER_REAL) {
PROC_LOCK(p);
if (timevalisset(&p->p_realtimer.it_value))
callout_stop(&p->p_itcallout);
- getmicrouptime(&ctv);
+ microuptime(&ctv);
if (timevalisset(&aitv->it_value)) {
- callout_reset(&p->p_itcallout, tvtohz(&aitv->it_value),
- realitexpire, p);
+ pr = tvtosbt(aitv->it_value) >> tc_precexp;
timevaladd(&aitv->it_value, &ctv);
+ sbt = tvtosbt(aitv->it_value);
+ callout_reset_sbt(&p->p_itcallout, sbt, pr,
+ realitexpire, p, C_ABSOLUTE);
}
*oitv = p->p_realtimer;
p->p_realtimer = *aitv;
@@ -793,7 +798,8 @@ void
realitexpire(void *arg)
{
struct proc *p;
- struct timeval ctv, ntv;
+ struct timeval ctv;
+ sbintime_t isbt;
p = (struct proc *)arg;
kern_psignal(p, SIGALRM);
@@ -803,19 +809,17 @@ realitexpire(void *arg)
wakeup(&p->p_itcallout);
return;
}
- for (;;) {
+ isbt = tvtosbt(p->p_realtimer.it_interval);
+ if (isbt >= sbt_timethreshold)
+ getmicrouptime(&ctv);
+ else
+ microuptime(&ctv);
+ do {
timevaladd(&p->p_realtimer.it_value,
&p->p_realtimer.it_interval);
- getmicrouptime(&ctv);
- if (timevalcmp(&p->p_realtimer.it_value, &ctv, >)) {
- ntv = p->p_realtimer.it_value;
- timevalsub(&ntv, &ctv);
- callout_reset(&p->p_itcallout, tvtohz(&ntv) - 1,
- realitexpire, p);
- return;
- }
- }
- /*NOTREACHED*/
+ } while (timevalcmp(&p->p_realtimer.it_value, &ctv, <=));
+ callout_reset_sbt(&p->p_itcallout, tvtosbt(p->p_realtimer.it_value),
+ isbt >> tc_precexp, realitexpire, p, C_ABSOLUTE);
}
/*
@@ -830,8 +834,9 @@ itimerfix(struct timeval *tv)
if (tv->tv_sec < 0 || tv->tv_usec < 0 || tv->tv_usec >= 100)
return (EINVAL);
- if (tv->tv_sec == 0 && tv->tv_usec != 0 && tv->tv_usec < tick)
- tv->tv_usec = tick;
+ if (tv->tv_sec == 0 && tv->tv_usec != 0 &&
+ tv->tv_usec < (u_int)tick / 16)
+ tv->tv_usec = (u_int)tick / 16;
return (0);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247899 - head/lib/libc/string
Author: zeising (doc,ports committer) Date: Wed Mar 6 19:59:42 2013 New Revision: 247899 URL: http://svnweb.freebsd.org/changeset/base/247899 Log: Create a symlink from strchrnul.3 to strchr.3. This was forgotten in the initial commit of strchrnul() Approved by: theraven Modified: head/lib/libc/string/Makefile.inc Modified: head/lib/libc/string/Makefile.inc == --- head/lib/libc/string/Makefile.inc Wed Mar 6 19:37:38 2013 (r247898) +++ head/lib/libc/string/Makefile.inc Wed Mar 6 19:59:42 2013 (r247899) @@ -46,7 +46,8 @@ MLINKS+=strcasecmp.3 strncasecmp.3 \ strcasecmp.3 strcasecmp_l.3 \ strcasecmp.3 strncasecmp_l.3 MLINKS+=strcat.3 strncat.3 -MLINKS+=strchr.3 strrchr.3 +MLINKS+=strchr.3 strrchr.3 \ + strchr.3 strchrnul.3 MLINKS+=strcmp.3 strncmp.3 MLINKS+=strcoll.3 strcoll_l.3 MLINKS+=strcpy.3 stpcpy.3 \ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247898 - head/sys/kern
Author: mav
Date: Wed Mar 6 19:37:38 2013
New Revision: 247898
URL: http://svnweb.freebsd.org/changeset/base/247898
Log:
Fix time math overflows and improve zero intervals handling in poll(),
select(), nanosleep() and kevent() functions after calloutng changes.
Reported by: bde
Modified:
head/sys/kern/kern_event.c
head/sys/kern/kern_time.c
head/sys/kern/sys_generic.c
Modified: head/sys/kern/kern_event.c
==
--- head/sys/kern/kern_event.c Wed Mar 6 18:45:11 2013(r247897)
+++ head/sys/kern/kern_event.c Wed Mar 6 19:37:38 2013(r247898)
@@ -1329,11 +1329,16 @@ kqueue_scan(struct kqueue *kq, int maxev
goto done_nl;
}
if (timespecisset(tsp)) {
- rsbt = tstosbt(*tsp);
- if (TIMESEL(&asbt, rsbt))
- asbt += tc_tick_sbt;
- asbt += rsbt;
- rsbt >>= tc_precexp;
+ if (tsp->tv_sec < INT32_MAX) {
+ rsbt = tstosbt(*tsp);
+ if (TIMESEL(&asbt, rsbt))
+ asbt += tc_tick_sbt;
+ asbt += rsbt;
+ if (asbt < rsbt)
+ asbt = 0;
+ rsbt >>= tc_precexp;
+ } else
+ asbt = 0;
} else
asbt = -1;
} else
Modified: head/sys/kern/kern_time.c
==
--- head/sys/kern/kern_time.c Wed Mar 6 18:45:11 2013(r247897)
+++ head/sys/kern/kern_time.c Wed Mar 6 19:37:38 2013(r247898)
@@ -484,13 +484,20 @@ kern_nanosleep(struct thread *td, struct
{
struct timespec ts;
sbintime_t sbt, sbtt, prec, tmp;
+ time_t over;
int error;
if (rqt->tv_nsec < 0 || rqt->tv_nsec >= 10)
return (EINVAL);
if (rqt->tv_sec < 0 || (rqt->tv_sec == 0 && rqt->tv_nsec == 0))
return (0);
- tmp = tstosbt(*rqt);
+ ts = *rqt;
+ if (ts.tv_sec > INT32_MAX / 2) {
+ over = ts.tv_sec - INT32_MAX / 2;
+ ts.tv_sec -= over;
+ } else
+ over = 0;
+ tmp = tstosbt(ts);
prec = tmp;
prec >>= tc_precexp;
if (TIMESEL(&sbt, tmp))
@@ -504,6 +511,7 @@ kern_nanosleep(struct thread *td, struct
TIMESEL(&sbtt, tmp);
if (rmt != NULL) {
ts = sbttots(sbt - sbtt);
+ ts.tv_sec += over;
if (ts.tv_sec < 0)
timespecclear(&ts);
*rmt = ts;
Modified: head/sys/kern/sys_generic.c
==
--- head/sys/kern/sys_generic.c Wed Mar 6 18:45:11 2013(r247897)
+++ head/sys/kern/sys_generic.c Wed Mar 6 19:37:38 2013(r247898)
@@ -1051,12 +1051,19 @@ kern_select(struct thread *td, int nd, f
error = EINVAL;
goto done;
}
- rsbt = tvtosbt(rtv);
- precision = rsbt;
- precision >>= tc_precexp;
- if (TIMESEL(&asbt, rsbt))
- asbt += tc_tick_sbt;
- asbt += rsbt;
+ if (rtv.tv_sec == 0 && rtv.tv_usec == 0)
+ asbt = 0;
+ else if (rtv.tv_sec < INT32_MAX) {
+ rsbt = tvtosbt(rtv);
+ precision = rsbt;
+ precision >>= tc_precexp;
+ if (TIMESEL(&asbt, rsbt))
+ asbt += tc_tick_sbt;
+ asbt += rsbt;
+ if (asbt < rsbt)
+ asbt = -1;
+ } else
+ asbt = -1;
} else
asbt = -1;
seltdinit(td);
@@ -1295,12 +1302,16 @@ sys_poll(td, uap)
error = EINVAL;
goto done;
}
- rsbt = SBT_1MS * uap->timeout;
- precision = rsbt;
- precision >>= tc_precexp;
- if (TIMESEL(&asbt, rsbt))
- asbt += tc_tick_sbt;
- asbt += rsbt;
+ if (uap->timeout == 0)
+ asbt = 0;
+ else {
+ rsbt = SBT_1MS * uap->timeout;
+ precision = rsbt;
+ precision >>= tc_precexp;
+ if (TIMESEL(&asbt, rsbt))
+ asbt += tc_tick_sbt;
+ asbt += rsbt;
+ }
Re: svn commit: r247892 - head/crypto/openssh
On Wed, Mar 6, 2013 at 10:47 AM, Peter Wemm wrote: > On Wed, Mar 6, 2013 at 5:46 AM, Dag-Erling Smørgrav wrote: > >> @@ -931,8 +952,11 @@ >> /* Define to 1 if you have the `strmode' function. */ >> #define HAVE_STRMODE 1 >> >> +/* Define to 1 if you have the `strnlen' function. */ >> +#define HAVE_STRNLEN 1 >> + >> /* Define to 1 if you have the `strnvis' function. */ >> -/* #undef HAVE_STRNVIS */ >> +#define HAVE_STRNVIS 1 > > > We may have a derp moment here: > ===> secure/libexec/sftp-server (all) > ... > /usr/obj/scratch/src/tmp/usr/lib/libssh.so: undefined reference to > `ssh_strnvis'^M > cc: error: linker command failed with exit code 1 (use -v to see invocation)^M > ... Probably need to remove: * $FreeBSD: head/crypto/openssh/ssh_namespace.h 240075 2012-09-03 16:51:41Z des $ ... #define strnvis ssh_strnvis ... if the compat stub is being disabled. -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV bitcoin:188ZjyYLFJiEheQZw4UtU27e2FMLmuRBUE ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r247892 - head/crypto/openssh
On Wed, Mar 6, 2013 at 5:46 AM, Dag-Erling Smørgrav wrote: > @@ -931,8 +952,11 @@ > /* Define to 1 if you have the `strmode' function. */ > #define HAVE_STRMODE 1 > > +/* Define to 1 if you have the `strnlen' function. */ > +#define HAVE_STRNLEN 1 > + > /* Define to 1 if you have the `strnvis' function. */ > -/* #undef HAVE_STRNVIS */ > +#define HAVE_STRNVIS 1 We may have a derp moment here: ===> secure/libexec/sftp-server (all) ... /usr/obj/scratch/src/tmp/usr/lib/libssh.so: undefined reference to `ssh_strnvis'^M cc: error: linker command failed with exit code 1 (use -v to see invocation)^M ... -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r246856 - head/etc
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2013-03-06 10:01:33 -0500, Gleb Smirnoff wrote: > Jung-uk, > > On Fri, Feb 15, 2013 at 10:58:44PM +, Jung-uk Kim wrote: J> > Author: jkim J> Date: Fri Feb 15 22:58:44 2013 J> New Revision: > 246856 J> URL: http://svnweb.freebsd.org/changeset/base/246856 J> > J> Log: J> Revert r227528 and r227787. This hack is no longer > necessary since r233580. > > I'm sorry, but it doesn't work. Mouse isn't working after resume > for me on r247873. > > Please return the code back, and I'd appreciate if next time you > back something out, you communicate with the person who added the > code to give him a chance to confirm or decline whether code is > still needed or not. > > Thanks. > > J> Modified: J> head/etc/rc.resume J> J> Modified: > head/etc/rc.resume J> > == > > J> --- head/etc/rc.resume Fri Feb 15 22:43:08 2013(r246855) > J> +++ head/etc/rc.resume Fri Feb 15 22:58:44 2013(r246856) J> @@ > -43,10 +43,6 @@ if [ -r /var/run/rc.suspend.pid ]; then J>echo > 'rc.resume: killed rc.suspend that was still around' J> fi J> J> > -if [ -r /var/run/moused.pid ]; then J> - pkill -HUP -F > /var/run/moused.pid J> -fi J> - J> # Turns on a power supply of a > card in the slot inactivated. J> # See also contrib/pccardq.c > (only for PAO users). J> # pccardq | awk -F '~' '$5 == "inactive" > \ > You know, I disagreed with the above change because this type of quirks can be easily handled by the driver. IMHO, /etc/rc.resume is the last place to put it. When I committed r233580 to fix resuming psm(4) and MFC'd it to stable/9 (r234713), we had an agreement to back it out if we hear no user complaints for enough time *without* merging your /etc/rc.resume changes. At least, that's what I remember. In fact, you never MFC'd your changes. So, I thought the agreement is still valid and it is safe to back out. I am sorry for not asking your confirmation, though. Now, please consider fixing psm. If you can't find a generic solution, it is okay to add your model-specific quirk in sys/dev/atkbdc/psm.c like this: http://svnweb.freebsd.org/base/head/sys/dev/atkbdc/psm.c?annotate=233580#l1441 Also, please mention it in the manual page, i.e., the CAVEATS section of psm(4). Thanks, Jung-uk Kim -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBAgAGBQJRN44uAAoJECXpabHZMqHO1loH/3/lBVpM/mo+VhOJmK3u2qqk /8o7Lxyv6sLZ0Og9hCoyi1EKVFUAxuPoVWeyeydPFSs2NcbJZvP9E80T4ompCGX9 m6wOs3SqI1LBNwIpWWa7O6M0rGhkP4Y0uFUe7MLN5/8FW1OEEChcboo11iq2Ftex mzaElMFjefXbw3DDyknqZNyBbEWkSsPyhuMN1TpLXR0VVSM8/dzUsxwbYk1rrWrf TY4U9wzvJz0rgMkjAhB8SPJl/JO7NLQGMlnhLNzIR7EMbtO2EZ5OLxNFJsqZ4pjf XbRDFrtGT3N90UIKhpivBSG9+929hAwS+y29wn3xn5B8aUdmfcgT5mHH8LXY7DI= =KcJ+ -END PGP SIGNATURE- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r246856 - head/etc
Jung-uk, On Fri, Feb 15, 2013 at 10:58:44PM +, Jung-uk Kim wrote: J> Author: jkim J> Date: Fri Feb 15 22:58:44 2013 J> New Revision: 246856 J> URL: http://svnweb.freebsd.org/changeset/base/246856 J> J> Log: J> Revert r227528 and r227787. This hack is no longer necessary since r233580. I'm sorry, but it doesn't work. Mouse isn't working after resume for me on r247873. Please return the code back, and I'd appreciate if next time you back something out, you communicate with the person who added the code to give him a chance to confirm or decline whether code is still needed or not. Thanks. J> Modified: J> head/etc/rc.resume J> J> Modified: head/etc/rc.resume J> == J> --- head/etc/rc.resume Fri Feb 15 22:43:08 2013(r246855) J> +++ head/etc/rc.resume Fri Feb 15 22:58:44 2013(r246856) J> @@ -43,10 +43,6 @@ if [ -r /var/run/rc.suspend.pid ]; then J> echo 'rc.resume: killed rc.suspend that was still around' J> fi J> J> -if [ -r /var/run/moused.pid ]; then J> -pkill -HUP -F /var/run/moused.pid J> -fi J> - J> # Turns on a power supply of a card in the slot inactivated. J> # See also contrib/pccardq.c (only for PAO users). J> # pccardq | awk -F '~' '$5 == "inactive" \ -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247893 - head/crypto/openssh
Author: des Date: Wed Mar 6 13:48:49 2013 New Revision: 247893 URL: http://svnweb.freebsd.org/changeset/base/247893 Log: Forced commit to note that this file had not been regenerated since 5.8 due to issues with the configure script incorrectly detecting utmp and lastlog despite the fact that FreeBSD 10 does not have them any more. Modified: head/crypto/openssh/config.h Modified: head/crypto/openssh/config.h == ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247892 - head/crypto/openssh
Author: des Date: Wed Mar 6 13:46:20 2013 New Revision: 247892 URL: http://svnweb.freebsd.org/changeset/base/247892 Log: Explicitly disable lastlog, utmp and wtmp. Modified: head/crypto/openssh/FREEBSD-upgrade head/crypto/openssh/config.h Modified: head/crypto/openssh/FREEBSD-upgrade == --- head/crypto/openssh/FREEBSD-upgrade Wed Mar 6 11:44:19 2013 (r247891) +++ head/crypto/openssh/FREEBSD-upgrade Wed Mar 6 13:46:20 2013 (r247892) @@ -43,6 +43,7 @@ 7) Run configure with the appropriate arguments: $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ + --disable-lastlog --disable-utmp --disable-wtmp \ --with-pam --with-tcp-wrappers --with-libedit \ --with-ssl-engine Modified: head/crypto/openssh/config.h == --- head/crypto/openssh/config.hWed Mar 6 11:44:19 2013 (r247891) +++ head/crypto/openssh/config.hWed Mar 6 13:46:20 2013 (r247892) @@ -17,6 +17,9 @@ /* Define if your resolver libs need this for getrrsetbyname */ /* #undef BIND_8_COMPAT */ +/* The system has incomplete BSM API */ +/* #undef BROKEN_BSM_API */ + /* Define if cmsg_type is not passed correctly */ /* #undef BROKEN_CMSG_TYPE */ @@ -97,7 +100,7 @@ /* #undef DISABLE_FD_PASSING */ /* Define if you don't want to use lastlog */ -/* #undef DISABLE_LASTLOG */ +#define DISABLE_LASTLOG 1 /* Define if you don't want to use your system's login() call */ /* #undef DISABLE_LOGIN */ @@ -307,7 +310,7 @@ #define HAVE_DECL__GETSHORT 0 /* Define if you have /dev/ptmx */ -#define HAVE_DEV_PTMX 1 +/* #undef HAVE_DEV_PTMX */ /* Define if you have /dev/ptc */ /* #undef HAVE_DEV_PTS_AND_PTC */ @@ -316,7 +319,7 @@ #define HAVE_DIRENT_H 1 /* Define to 1 if you have the `dirfd' function. */ -/* #undef HAVE_DIRFD */ +#define HAVE_DIRFD 1 /* Define to 1 if you have the `dirname' function. */ #define HAVE_DIRNAME 1 @@ -501,6 +504,9 @@ /* Define if HEADER.ad exists in arpa/nameser.h */ #define HAVE_HEADER_AD 1 +/* Define to 1 if you have the `HMAC_CTX_init' function. */ +#define HAVE_HMAC_CTX_INIT 1 + /* Define if you have ut_host in utmp.h */ /* #undef HAVE_HOST_IN_UTMP */ @@ -552,6 +558,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_LASTLOG_H */ +/* Define if you want ldns support */ +/* #undef HAVE_LDNS */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_LIBAUDIT_H */ @@ -594,10 +603,19 @@ /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_FILTER_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_LINUX_IF_TUN_H */ -/* Define if your libraries define login() */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_SECCOMP_H */ + +/* Define to 1 if you have the `login' function. */ /* #undef HAVE_LOGIN */ /* Define to 1 if you have the header file. */ @@ -805,6 +823,9 @@ /* Define to 1 if you have the `setgroups' function. */ #define HAVE_SETGROUPS 1 +/* Define to 1 if you have the `setlinebuf' function. */ +#define HAVE_SETLINEBUF 1 + /* Define to 1 if you have the `setlogin' function. */ #define HAVE_SETLOGIN 1 @@ -931,8 +952,11 @@ /* Define to 1 if you have the `strmode' function. */ #define HAVE_STRMODE 1 +/* Define to 1 if you have the `strnlen' function. */ +#define HAVE_STRNLEN 1 + /* Define to 1 if you have the `strnvis' function. */ -/* #undef HAVE_STRNVIS */ +#define HAVE_STRNVIS 1 /* Define to 1 if you have the `strptime' function. */ #define HAVE_STRPTIME 1 @@ -1351,15 +1375,21 @@ /* Sandbox using setrlimit(2) */ #define SANDBOX_RLIMIT 1 +/* Sandbox using seccomp filter */ +/* #undef SANDBOX_SECCOMP_FILTER */ + +/* setrlimit RLIMIT_FSIZE works */ +/* #undef SANDBOX_SKIP_RLIMIT_FSIZE */ + /* Sandbox using systrace(4) */ /* #undef SANDBOX_SYSTRACE */ +/* Specify the system call convention in use */ +/* #undef SECCOMP_AUDIT_ARCH */ + /* Define if your platform breaks doing a seteuid before a setuid */ /* #undef SETEUID_BREAKS_SETUID */ -/* The size of `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -1500,6 +1530,11 @@ /* Define if xauth is found in your path */ /* #undef XAUTH_PATH */ +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscrib
svn commit: r247891 - head/sys/modules/uart
Author: uqs
Date: Wed Mar 6 11:44:19 2013
New Revision: 247891
URL: http://svnweb.freebsd.org/changeset/base/247891
Log:
Fix 'make depend'
Modified:
head/sys/modules/uart/Makefile
Modified: head/sys/modules/uart/Makefile
==
--- head/sys/modules/uart/Makefile Wed Mar 6 11:33:25 2013
(r247890)
+++ head/sys/modules/uart/Makefile Wed Mar 6 11:44:19 2013
(r247891)
@@ -26,6 +26,7 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} u
SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
power_if.h pccarddevs.h serdev_if.h
+SRCS+= opt_platform.h
MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r247880 - head/sys/dev/oce
Author: delphij
Date: Wed Mar 6 09:53:38 2013
New Revision: 247880
URL: http://svnweb.freebsd.org/changeset/base/247880
Log:
Update driver to version 4.6.95.0.
Submitted by: "Duvvuru,Venkat Kumar"
MFC after:3 days
Modified:
head/sys/dev/oce/oce_hw.c
head/sys/dev/oce/oce_hw.h
head/sys/dev/oce/oce_if.c
head/sys/dev/oce/oce_if.h
head/sys/dev/oce/oce_mbox.c
head/sys/dev/oce/oce_queue.c
head/sys/dev/oce/oce_sysctl.c
head/sys/dev/oce/oce_util.c
Modified: head/sys/dev/oce/oce_hw.c
==
--- head/sys/dev/oce/oce_hw.c Wed Mar 6 09:33:16 2013(r247879)
+++ head/sys/dev/oce/oce_hw.c Wed Mar 6 09:53:38 2013(r247880)
@@ -405,11 +405,6 @@ oce_create_nw_interface(POCE_SOFTC sc)
sc->if_cap_flags = capab_en_flags;
- /* Enable VLAN Promisc on HW */
- rc = oce_config_vlan(sc, (uint8_t) sc->if_id, NULL, 0, 1, 1);
- if (rc)
- goto error;
-
/* set default flow control */
rc = oce_set_flow_control(sc, sc->flow_control);
if (rc)
@@ -477,12 +472,9 @@ oce_hw_start(POCE_SOFTC sc)
return 1;
if (link.logical_link_status == NTWK_LOGICAL_LINK_UP) {
- sc->ifp->if_drv_flags |= IFF_DRV_RUNNING;
sc->link_status = NTWK_LOGICAL_LINK_UP;
if_link_state_change(sc->ifp, LINK_STATE_UP);
} else {
- sc->ifp->if_drv_flags &=
- ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
sc->link_status = NTWK_LOGICAL_LINK_DOWN;
if_link_state_change(sc->ifp, LINK_STATE_DOWN);
}
Modified: head/sys/dev/oce/oce_hw.h
==
--- head/sys/dev/oce/oce_hw.h Wed Mar 6 09:33:16 2013(r247879)
+++ head/sys/dev/oce/oce_hw.h Wed Mar 6 09:53:38 2013(r247880)
@@ -38,6 +38,8 @@
/* $FreeBSD$ */
+/* $FreeBSD$ */
+
#include
#undef _BIG_ENDIAN /* TODO */
@@ -155,7 +157,10 @@
#defineASYNC_EVENT_LINK_UP 0x1
#defineASYNC_EVENT_LINK_DOWN 0x0
#define ASYNC_EVENT_GRP5 0x5
+#define ASYNC_EVENT_CODE_DEBUG 0x6
#define ASYNC_EVENT_PVID_STATE 0x3
+#define ASYNC_EVENT_DEBUG_QNQ 0x1
+#define ASYNC_EVENT_CODE_SLIPORT 0x11
#define VLAN_VID_MASK 0x0FFF
/* port link_status */
@@ -707,6 +712,17 @@ struct oce_async_event_grp5_pvid_state {
uint32_t code;
};
+/* async event indicating outer VLAN tag in QnQ */
+struct oce_async_event_qnq {
+uint8_t valid; /* Indicates if outer VLAN is valid */
+uint8_t rsvd0;
+uint16_t vlan_tag;
+uint32_t event_tag;
+uint8_t rsvd1[4];
+ uint32_t code;
+} ;
+
+
typedef union oce_mq_ext_ctx_u {
uint32_t dw[6];
struct {
@@ -750,6 +766,44 @@ typedef union oce_mq_ext_ctx_u {
/* dw5 */
uint32_t dw8rsvd1;
} v0;
+ struct {
+ #ifdef _BIG_ENDIAN
+/* dw0 */
+uint32_t cq_id:16;
+uint32_t num_pages:16;
+/* dw1 */
+uint32_t async_evt_bitmap;
+/* dw2 */
+uint32_t dw5rsvd2:12;
+uint32_t ring_size:4;
+uint32_t async_cq_id:16;
+/* dw3 */
+uint32_t valid:1;
+uint32_t dw6rsvd1:31;
+/* dw4 */
+ uint32_t dw7rsvd1:31;
+uint32_t async_cq_valid:1;
+#else
+/* dw0 */
+uint32_t num_pages:16;
+uint32_t cq_id:16;
+/* dw1 */
+uint32_t async_evt_bitmap;
+/* dw2 */
+uint32_t async_cq_id:16;
+uint32_t ring_size:4;
+uint32_t dw5rsvd2:12;
+/* dw3 */
+uint32_t dw6rsvd1:31;
+uint32_t valid:1;
+/* dw4 */
+uint32_t async_cq_valid:1;
+uint32_t dw7rsvd1:31;
+#endif
+/* dw5 */
+uint32_t dw8rsvd1;
+} v1;
+
} oce_mq_ext_ctx_t;
@@ -826,6 +880,7 @@ enum COMMON_SUBSYSTEM_OPCODES {
OPCODE_COMMON_SET_BEACON_CONFIG = 69,
OPCODE_COMMON_GET_BEACON_CONFIG = 70,
OPCODE_COMMON_GET_PHYSICAL_LINK_CONFIG = 71,
+ OPCODE_COMMON_READ_TRANSRECEIVER_DATA = 73,
OPCODE_COMMON_GET_OEM_ATTRIBUTES = 76,
OPCODE_COMMON_GET_PORT_NAME = 77,
OPCODE_COMMON_GET_CONFIG_SIGNATURE = 78,
@@ -1724,6 +1779,12 @@ struct mbx_set_common_iface_rx_filter {
} params;
};
+struct be_set_eqd {
+ uint32_t eq_id;
+ uint32_t phase;
+ uint32_t dm;
+};
+
/* [41] OPCODE_COMMON_MODIFY_EQ_DELAY */
struct mbx_modify_common_eq_delay {
struct mbx_hdr hdr;
@@ -1743,
