From owner-svn-src-stable-7@FreeBSD.ORG Sun Feb 7 16:55:45 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D03C6106566C; Sun, 7 Feb 2010 16:55:45 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C068B8FC08; Sun, 7 Feb 2010 16:55:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o17GtjWW078414; Sun, 7 Feb 2010 16:55:45 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o17GtjWr078412; Sun, 7 Feb 2010 16:55:45 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <201002071655.o17GtjWr078412@svn.freebsd.org> From: Ruslan Ermilov Date: Sun, 7 Feb 2010 16:55:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203612 - stable/7/sbin/ifconfig X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2010 16:55:45 -0000 Author: ru Date: Sun Feb 7 16:55:45 2010 New Revision: 203612 URL: http://svn.freebsd.org/changeset/base/203612 Log: MFC: r203486: Shortening a passphrase caused wrong authentication key to be used. Approved by: re (kib) Modified: stable/7/sbin/ifconfig/ifcarp.c Directory Properties: stable/7/sbin/ifconfig/ (props changed) Modified: stable/7/sbin/ifconfig/ifcarp.c ============================================================================== --- stable/7/sbin/ifconfig/ifcarp.c Sun Feb 7 15:42:15 2010 (r203611) +++ stable/7/sbin/ifconfig/ifcarp.c Sun Feb 7 16:55:45 2010 (r203612) @@ -96,6 +96,7 @@ setcarp_passwd(const char *val, int d, i if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1) err(1, "SIOCGVH"); + memset(carpr.carpr_key, 0, sizeof(carpr.carpr_key)); /* XXX Should hash the password into the key here, perhaps? */ strlcpy(carpr.carpr_key, val, CARP_KEY_LEN); From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 9 01:19:10 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5F9B106566B; Tue, 9 Feb 2010 01:19:10 +0000 (UTC) (envelope-from davidxu@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C54CC8FC1B; Tue, 9 Feb 2010 01:19:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o191JADa013462; Tue, 9 Feb 2010 01:19:10 GMT (envelope-from davidxu@svn.freebsd.org) Received: (from davidxu@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o191JAj4013460; Tue, 9 Feb 2010 01:19:10 GMT (envelope-from davidxu@svn.freebsd.org) Message-Id: <201002090119.o191JAj4013460@svn.freebsd.org> From: David Xu Date: Tue, 9 Feb 2010 01:19:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203694 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 01:19:10 -0000 Author: davidxu Date: Tue Feb 9 01:19:10 2010 New Revision: 203694 URL: http://svn.freebsd.org/changeset/base/203694 Log: MFC r203414: After busied the lock, re-read state word before checking waiters flag, otherwise, the waiters bit may not be set and a wakeup is lost. Approved by: re (kib) Modified: stable/7/sys/kern/kern_umtx.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/kern_umtx.c ============================================================================== --- stable/7/sys/kern/kern_umtx.c Tue Feb 9 00:38:40 2010 (r203693) +++ stable/7/sys/kern/kern_umtx.c Tue Feb 9 01:19:10 2010 (r203694) @@ -2463,6 +2463,12 @@ do_rw_rdlock(struct thread *td, struct u umtxq_busy(&uq->uq_key); umtxq_unlock(&uq->uq_key); + /* + * re-read the state, in case it changed between the try-lock above + * and the check below + */ + state = fuword32(__DEVOLATILE(int32_t *, &rwlock->rw_state)); + /* set read contention bit */ while ((state & wrflags) && !(state & URWLOCK_READ_WAITERS)) { oldstate = casuword32(&rwlock->rw_state, state, state | URWLOCK_READ_WAITERS); @@ -2595,6 +2601,12 @@ do_rw_wrlock(struct thread *td, struct u umtxq_busy(&uq->uq_key); umtxq_unlock(&uq->uq_key); + /* + * re-read the state, in case it changed between the try-lock above + * and the check below + */ + state = fuword32(__DEVOLATILE(int32_t *, &rwlock->rw_state)); + while (((state & URWLOCK_WRITE_OWNER) || URWLOCK_READER_COUNT(state) != 0) && (state & URWLOCK_WRITE_WAITERS) == 0) { oldstate = casuword32(&rwlock->rw_state, state, state | URWLOCK_WRITE_WAITERS); From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 9 14:56:10 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE080106568B; Tue, 9 Feb 2010 14:56:10 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C9158FC1D; Tue, 9 Feb 2010 14:56:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o19EuAek099392; Tue, 9 Feb 2010 14:56:10 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o19EuA4w099388; Tue, 9 Feb 2010 14:56:10 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201002091456.o19EuA4w099388@svn.freebsd.org> From: Attilio Rao Date: Tue, 9 Feb 2010 14:56:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203704 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 14:56:10 -0000 Author: attilio Date: Tue Feb 9 14:56:10 2010 New Revision: 203704 URL: http://svn.freebsd.org/changeset/base/203704 Log: MFC r202889, r202940: - Fix a race in sched_switch() of sched_4bsd. Block the td_lock when acquiring explicitly sched_lock in order to prevent races with other td_lock contenders. - Merge the ULE's internal function thread_block_switch() into the global thread_lock_block() and make the former semantic as the default for thread_lock_block(). - Split out an invariant in order to have better checks. Tested by: Giovanni Trematerra Approved by: re (kib) Modified: stable/7/sys/kern/kern_mutex.c stable/7/sys/kern/sched_4bsd.c stable/7/sys/kern/sched_ule.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/kern_mutex.c ============================================================================== --- stable/7/sys/kern/kern_mutex.c Tue Feb 9 14:51:39 2010 (r203703) +++ stable/7/sys/kern/kern_mutex.c Tue Feb 9 14:56:10 2010 (r203704) @@ -557,7 +557,6 @@ thread_lock_block(struct thread *td) { struct mtx *lock; - spinlock_enter(); THREAD_LOCK_ASSERT(td, MA_OWNED); lock = td->td_lock; td->td_lock = &blocked_lock; @@ -572,7 +571,6 @@ thread_lock_unblock(struct thread *td, s mtx_assert(new, MA_OWNED); MPASS(td->td_lock == &blocked_lock); atomic_store_rel_ptr((volatile void *)&td->td_lock, (uintptr_t)new); - spinlock_exit(); } void Modified: stable/7/sys/kern/sched_4bsd.c ============================================================================== --- stable/7/sys/kern/sched_4bsd.c Tue Feb 9 14:51:39 2010 (r203703) +++ stable/7/sys/kern/sched_4bsd.c Tue Feb 9 14:56:10 2010 (r203704) @@ -824,9 +824,11 @@ sched_sleep(struct thread *td) void sched_switch(struct thread *td, struct thread *newtd, int flags) { + struct mtx *tmtx; struct td_sched *ts; struct proc *p; + tmtx = NULL; ts = td->td_sched; p = td->td_proc; @@ -835,17 +837,20 @@ sched_switch(struct thread *td, struct t /* * Switch to the sched lock to fix things up and pick * a new thread. + * Block the td_lock in order to avoid breaking the critical path. */ if (td->td_lock != &sched_lock) { mtx_lock_spin(&sched_lock); - thread_unlock(td); + tmtx = thread_lock_block(td); } if ((p->p_flag & P_NOLOAD) == 0) sched_load_rem(); - if (newtd) + if (newtd) { + MPASS(newtd->td_lock == &sched_lock); newtd->td_flags |= (td->td_flags & TDF_NEEDRESCHED); + } td->td_lastcpu = td->td_oncpu; td->td_flags &= ~TDF_NEEDRESCHED; @@ -888,8 +893,8 @@ sched_switch(struct thread *td, struct t sched_load_add(); } else { newtd = choosethread(); + MPASS(newtd->td_lock == &sched_lock); } - MPASS(newtd->td_lock == &sched_lock); if (td != newtd) { #ifdef HWPMC_HOOKS @@ -907,7 +912,7 @@ sched_switch(struct thread *td, struct t (*dtrace_vtime_switch_func)(newtd); #endif /* I feel sleepy */ - cpu_switch(td, newtd, td->td_lock); + cpu_switch(td, newtd, tmtx != NULL ? tmtx : td->td_lock); /* * Where am I? What year is it? * We are in the same thread that went to sleep above, Modified: stable/7/sys/kern/sched_ule.c ============================================================================== --- stable/7/sys/kern/sched_ule.c Tue Feb 9 14:51:39 2010 (r203703) +++ stable/7/sys/kern/sched_ule.c Tue Feb 9 14:56:10 2010 (r203704) @@ -318,7 +318,6 @@ static void sched_balance_groups(void); static void sched_balance_group(struct tdq_group *); static void sched_balance_pair(struct tdq *, struct tdq *); static inline struct tdq *sched_setcpu(struct td_sched *, int, int); -static inline struct mtx *thread_block_switch(struct thread *); static inline void thread_unblock_switch(struct thread *, struct mtx *); static struct mtx *sched_switch_migrate(struct tdq *, struct thread *, int); #endif @@ -989,9 +988,11 @@ sched_setcpu(struct td_sched *ts, int cp * The hard case, migration, we need to block the thread first to * prevent order reversals with other cpus locks. */ + spinlock_enter(); thread_lock_block(td); TDQ_LOCK(tdq); thread_lock_unblock(td, TDQ_LOCKPTR(tdq)); + spinlock_exit(); return (tdq); } @@ -1789,23 +1790,6 @@ sched_switchin(struct tdq *tdq, struct t } /* - * Block a thread for switching. Similar to thread_block() but does not - * bump the spin count. - */ -static inline struct mtx * -thread_block_switch(struct thread *td) -{ - struct mtx *lock; - - THREAD_LOCK_ASSERT(td, MA_OWNED); - lock = td->td_lock; - td->td_lock = &blocked_lock; - mtx_unlock_spin(lock); - - return (lock); -} - -/* * Handle migration from sched_switch(). This happens only for * cpu binding. */ @@ -1822,7 +1806,7 @@ sched_switch_migrate(struct tdq *tdq, st * not holding either run-queue lock. */ spinlock_enter(); - thread_block_switch(td); /* This releases the lock on tdq. */ + thread_lock_block(td); /* This releases the lock on tdq. */ /* * Acquire both run-queue locks before placing the thread on the new @@ -1848,7 +1832,8 @@ sched_switch_migrate(struct tdq *tdq, st } /* - * Release a thread that was blocked with thread_block_switch(). + * Variadic version of thread_lock_unblock() that does not assume td_lock + * is blocked. */ static inline void thread_unblock_switch(struct thread *td, struct mtx *mtx) @@ -1907,7 +1892,7 @@ sched_switch(struct thread *td, struct t } else { /* This thread must be going to sleep. */ TDQ_LOCK(tdq); - mtx = thread_block_switch(td); + mtx = thread_lock_block(td); tdq_load_rem(tdq, ts); } /* From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 9 16:18:44 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9059106566B; Tue, 9 Feb 2010 16:18:44 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C85B18FC1A; Tue, 9 Feb 2010 16:18:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o19GIi0n017626; Tue, 9 Feb 2010 16:18:44 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o19GIi1V017624; Tue, 9 Feb 2010 16:18:44 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <201002091618.o19GIi1V017624@svn.freebsd.org> From: Ruslan Ermilov Date: Tue, 9 Feb 2010 16:18:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203706 - stable/7/sbin/dumpfs X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 16:18:45 -0000 Author: ru Date: Tue Feb 9 16:18:44 2010 New Revision: 203706 URL: http://svn.freebsd.org/changeset/base/203706 Log: MFC: r198231: Properly re-create "-s size" argument to newfs(8). Approved by: re (kib) Modified: stable/7/sbin/dumpfs/dumpfs.c Directory Properties: stable/7/sbin/dumpfs/ (props changed) Modified: stable/7/sbin/dumpfs/dumpfs.c ============================================================================== --- stable/7/sbin/dumpfs/dumpfs.c Tue Feb 9 15:23:15 2010 (r203705) +++ stable/7/sbin/dumpfs/dumpfs.c Tue Feb 9 16:18:44 2010 (r203706) @@ -413,7 +413,7 @@ marshal(const char *name) break; } /* -p..r unimplemented */ - printf("-s %jd ", (intmax_t)fs->fs_size); + printf("-s %jd ", (intmax_t)fsbtodb(fs, fs->fs_size)); printf("%s ", disk.d_name); printf("\n"); From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 9 17:55:57 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 257B9106566B; Tue, 9 Feb 2010 17:55:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id EAC3D8FC1E; Tue, 9 Feb 2010 17:55:56 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 84D6446B49; Tue, 9 Feb 2010 12:55:56 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id E103F8A01F; Tue, 9 Feb 2010 12:55:55 -0500 (EST) From: John Baldwin To: Attilio Rao Date: Tue, 9 Feb 2010 12:54:09 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20100120; KDE/4.3.1; amd64; ; ) References: <201002091456.o19EuA4w099388@svn.freebsd.org> In-Reply-To: <201002091456.o19EuA4w099388@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201002091254.09935.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 09 Feb 2010 12:55:55 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r203704 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 17:55:57 -0000 On Tuesday 09 February 2010 9:56:10 am Attilio Rao wrote: > Author: attilio > Date: Tue Feb 9 14:56:10 2010 > New Revision: 203704 > URL: http://svn.freebsd.org/changeset/base/203704 > > Log: > MFC r202889, r202940: > - Fix a race in sched_switch() of sched_4bsd. > Block the td_lock when acquiring explicitly sched_lock in order to prevent > races with other td_lock contenders. > - Merge the ULE's internal function thread_block_switch() into the global > thread_lock_block() and make the former semantic as the default for > thread_lock_block(). > - Split out an invariant in order to have better checks. Does this require an MFC of a change to cpu_switch() for sparc64? -- John Baldwin From owner-svn-src-stable-7@FreeBSD.ORG Tue Feb 9 18:30:11 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F9B91065695 for ; Tue, 9 Feb 2010 18:30:11 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-iw0-f172.google.com (mail-iw0-f172.google.com [209.85.223.172]) by mx1.freebsd.org (Postfix) with ESMTP id 2EF698FC18 for ; Tue, 9 Feb 2010 18:30:10 +0000 (UTC) Received: by iwn2 with SMTP id 2so123095iwn.8 for ; Tue, 09 Feb 2010 10:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=MAUIWO7CjyuOOyoXCbc6XtcbnIiSqU15muK4QkOA+3c=; b=b/0n1PLCyvz6oS6YbJdHAozjVXUd/5aejuZRT9ElJC1ph4fwI2E0uuGIcdwSlS2naS 8Bi8cBxl/qjRKI5hniH2G6mBMN9vxmqBlWByt0VA+82vPTze9nqHXrQ8BrD2MILB2rur 1aEud9AVnlY53SmxC+a25l6mN9gTI31TbJ2Zo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=m56SUzGiaK85r9eZ70RiBmUFRlSo53MXcI98iTwjOclio/HpcR7V2KSSFUSQLml1Ax 1YFUx7YMP4WsIqjKAJmDW0yQmlQRAKzqOzfzU8jOUfChV2EG8b+sCUL0j/a4FdmbZpQV AgZLD1d8pQ8mc+3U1s3SCpOo3+Um0LVDMRv3g= MIME-Version: 1.0 Sender: asmrookie@gmail.com Received: by 10.231.168.136 with SMTP id u8mr748040iby.56.1265738336256; Tue, 09 Feb 2010 09:58:56 -0800 (PST) In-Reply-To: <201002091254.09935.jhb@freebsd.org> References: <201002091456.o19EuA4w099388@svn.freebsd.org> <201002091254.09935.jhb@freebsd.org> Date: Tue, 9 Feb 2010 18:58:56 +0100 X-Google-Sender-Auth: a5629e27620976ce Message-ID: <3bbf2fe11002090958i850d50bt404998c3aefc5bfb@mail.gmail.com> From: Attilio Rao To: John Baldwin Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r203704 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 18:30:11 -0000 2010/2/9 John Baldwin : > On Tuesday 09 February 2010 9:56:10 am Attilio Rao wrote: >> Author: attilio >> Date: Tue Feb =C2=A09 14:56:10 2010 >> New Revision: 203704 >> URL: http://svn.freebsd.org/changeset/base/203704 >> >> Log: >> =C2=A0 MFC r202889, r202940: >> =C2=A0 - Fix a race in sched_switch() of sched_4bsd. >> =C2=A0 =C2=A0 Block the td_lock when acquiring explicitly sched_lock in = order to prevent >> =C2=A0 =C2=A0 races with other td_lock contenders. >> =C2=A0 - Merge the ULE's internal function thread_block_switch() into th= e global >> =C2=A0 =C2=A0 thread_lock_block() and make the former semantic as the de= fault for >> =C2=A0 =C2=A0 thread_lock_block(). >> =C2=A0 - Split out an invariant in order to have better checks. > > Does this require an MFC of a change to cpu_switch() for sparc64? It is already done by marius. (I waited for his work before to let this go in). Attilio --=20 Peace can only be achieved by understanding - A. Einstein From owner-svn-src-stable-7@FreeBSD.ORG Wed Feb 10 04:12:55 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD8261065670; Wed, 10 Feb 2010 04:12:55 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CB7978FC16; Wed, 10 Feb 2010 04:12:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1A4CtGL076841; Wed, 10 Feb 2010 04:12:55 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1A4CtV9076839; Wed, 10 Feb 2010 04:12:55 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201002100412.o1A4CtV9076839@svn.freebsd.org> From: Ken Smith Date: Wed, 10 Feb 2010 04:12:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203742 - stable/7/sys/sys X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2010 04:12:56 -0000 Author: kensmith Date: Wed Feb 10 04:12:55 2010 New Revision: 203742 URL: http://svn.freebsd.org/changeset/base/203742 Log: Bump __FreeBSD_version to reflect that releng/7.3 has been branched. Approved by: re (implicit) Modified: stable/7/sys/sys/param.h Modified: stable/7/sys/sys/param.h ============================================================================== --- stable/7/sys/sys/param.h Wed Feb 10 04:10:36 2010 (r203741) +++ stable/7/sys/sys/param.h Wed Feb 10 04:12:55 2010 (r203742) @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 702106 /* Master, propagated to newvers */ +#define __FreeBSD_version 703100 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-svn-src-stable-7@FreeBSD.ORG Sat Feb 13 10:42:29 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC9941065670; Sat, 13 Feb 2010 10:42:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D8C428FC12; Sat, 13 Feb 2010 10:42:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1DAgTu4060952; Sat, 13 Feb 2010 10:42:29 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1DAgTos060950; Sat, 13 Feb 2010 10:42:29 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201002131042.o1DAgTos060950@svn.freebsd.org> From: Konstantin Belousov Date: Sat, 13 Feb 2010 10:42:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203819 - stable/7/sys/vm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2010 10:42:30 -0000 Author: kib Date: Sat Feb 13 10:42:29 2010 New Revision: 203819 URL: http://svn.freebsd.org/changeset/base/203819 Log: MFC r195635: Properly set MAP_ENTRY_WIRE_SKIPPED when aborting the loop. PR: kern/143717 (for RELENG_7) Approved by: re (bz) Modified: stable/7/sys/vm/vm_map.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/vm/vm_map.c ============================================================================== --- stable/7/sys/vm/vm_map.c Sat Feb 13 10:34:50 2010 (r203818) +++ stable/7/sys/vm/vm_map.c Sat Feb 13 10:42:29 2010 (r203819) @@ -2060,12 +2060,12 @@ vm_map_wire(vm_map_t map, vm_offset_t st if (entry->wired_count == 0) { if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE)) == 0) { + entry->eflags |= MAP_ENTRY_WIRE_SKIPPED; if ((flags & VM_MAP_WIRE_HOLESOK) == 0) { end = entry->end; rv = KERN_INVALID_ADDRESS; goto done; } - entry->eflags |= MAP_ENTRY_WIRE_SKIPPED; goto next_entry; } entry->wired_count++;