From owner-svn-src-head@FreeBSD.ORG Thu May 21 13:26:49 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC9B3106566C; Thu, 21 May 2009 13:26:49 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.terabit.net.ua (mail.terabit.net.ua [195.137.202.147]) by mx1.freebsd.org (Postfix) with ESMTP id 6C1EA8FC13; Thu, 21 May 2009 13:26:49 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from skuns.zoral.com.ua ([91.193.166.194] helo=mail.zoral.com.ua) by mail.terabit.net.ua with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63 (FreeBSD)) (envelope-from ) id 1M78IH-000Olj-AB; Thu, 21 May 2009 16:26:46 +0300 Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id n4LDQgDm008515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 21 May 2009 16:26:42 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3) with ESMTP id n4LDQfQ4016766; Thu, 21 May 2009 16:26:41 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id n4LDQfv1016765; Thu, 21 May 2009 16:26:41 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 21 May 2009 16:26:41 +0300 From: Kostik Belousov To: Attilio Rao Message-ID: <20090521132641.GJ1927@deviant.kiev.zoral.com.ua> References: <200905211322.n4LDM73t067924@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="KiOS11rrlPLUJaFM" Content-Disposition: inline In-Reply-To: <200905211322.n4LDM73t067924@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.1 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua X-Virus-Scanned: mail.terabit.net.ua 1M78IH-000Olj-AB 16faef938e03532384d848c773c21f11 X-Terabit: YES Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r192535 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2009 13:26:50 -0000 --KiOS11rrlPLUJaFM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 21, 2009 at 01:22:07PM +0000, Attilio Rao wrote: > Author: attilio > Date: Thu May 21 13:22:07 2009 > New Revision: 192535 > URL: http://svn.freebsd.org/changeset/base/192535 >=20 > Log: > Move the M_WAITOK flag in notify() into an M_NOWAIT one in order to mat= ch > the behaviour alredy present with the further malloc() call in > devctl_notify(). > This fixes a bug in the CAM layer where the camisr handler finished to > call camperiphfree() (and subsequently destroy_dev() resulting in a new > dev notify) while the xpt lock is held. This is wrong. You cannot call destroy_dev() while holding any mutex. Taking this into account, it makes no sense to use M_NOWAIT in notify(). > =20 > PR: kern/130330 > Tested by: Riccardo Torrini >=20 > Modified: > head/sys/kern/kern_conf.c >=20 > Modified: head/sys/kern/kern_conf.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/kern_conf.c Thu May 21 12:36:40 2009 (r192534) > +++ head/sys/kern/kern_conf.c Thu May 21 13:22:07 2009 (r192535) > @@ -491,7 +491,9 @@ notify(struct cdev *dev, const char *ev) > if (cold) > return; > namelen =3D strlen(dev->si_name); > - data =3D malloc(namelen + sizeof(prefix), M_TEMP, M_WAITOK); > + data =3D malloc(namelen + sizeof(prefix), M_TEMP, M_NOWAIT); > + if (data =3D=3D NULL) > + return; > memcpy(data, prefix, sizeof(prefix) - 1); > memcpy(data + sizeof(prefix) - 1, dev->si_name, namelen + 1); > devctl_notify("DEVFS", "CDEV", ev, data); --KiOS11rrlPLUJaFM Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkoVVpEACgkQC3+MBN1Mb4glQQCdEM0ah4yu8InyG1m5bUD95rXO 97UAmwe15Zq8oxgGyo8a190TS0MprCeh =S2ta -----END PGP SIGNATURE----- --KiOS11rrlPLUJaFM--