Date: Sat, 20 Aug 2016 10:18:14 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Gleb Smirnoff <glebius@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r304244 - head/sys/kern Message-ID: <529d7219-4dc9-eb06-2a5d-682c725855f6@FreeBSD.org> In-Reply-To: <201608162155.u7GLtYp4091232@repo.freebsd.org> References: <201608162155.u7GLtYp4091232@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wHtvbNoT5HReuwovSiwOqFQdfUfw5jNmc Content-Type: multipart/mixed; boundary="je8VnCsmxL1ejnTS2WSvjbIdtebWlkmSf" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Gleb Smirnoff <glebius@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <529d7219-4dc9-eb06-2a5d-682c725855f6@FreeBSD.org> Subject: Re: svn commit: r304244 - head/sys/kern References: <201608162155.u7GLtYp4091232@repo.freebsd.org> In-Reply-To: <201608162155.u7GLtYp4091232@repo.freebsd.org> --je8VnCsmxL1ejnTS2WSvjbIdtebWlkmSf Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/16/2016 2:55 PM, Gleb Smirnoff wrote: > Author: glebius > Date: Tue Aug 16 21:55:34 2016 > New Revision: 304244 > URL: https://svnweb.freebsd.org/changeset/base/304244 >=20 > Log: > We should not be allowing a timeout to reset when a drain is in progr= ess on > it (either async or sync drain). > =20 > At this moment the only user of drain is TCP, but TCP wouldn't resche= dule a > callout after it has drained it, since it drains only when a tcpcb is= closed. > This for now the problem isn't observed. > =20 > Submitted by: rrs Should this be MFC'd into 11.0? >=20 > Modified: > head/sys/kern/kern_timeout.c >=20 > Modified: head/sys/kern/kern_timeout.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_timeout.c Tue Aug 16 21:32:05 2016 (r304243) > +++ head/sys/kern/kern_timeout.c Tue Aug 16 21:55:34 2016 (r304244) > @@ -1061,7 +1061,7 @@ callout_reset_sbt_on(struct callout *c,=20 > */ > if (c->c_lock !=3D NULL && !cc_exec_cancel(cc, direct)) > cancelled =3D cc_exec_cancel(cc, direct) =3D true; > - if (cc_exec_waiting(cc, direct)) { > + if (cc_exec_waiting(cc, direct) || cc_exec_drain(cc, dir)) { > /* > * Someone has called callout_drain to kill this > * callout. Don't reschedule. >=20 --=20 Regards, Bryan Drewery --je8VnCsmxL1ejnTS2WSvjbIdtebWlkmSf-- --wHtvbNoT5HReuwovSiwOqFQdfUfw5jNmc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJXuJDWAAoJEDXXcbtuRpfP2MYH/2GQ3qnxniBeflXbty2Eml/g Paz2/gYCydCRtTKbflW9ZT1szB913ju0T6IswdBjXjsUm4bls6sME5/37D0bqBj1 3ril9Vz7uC1T5HEQ65giK0l/r6ROsL7IOJ9befUjOQo5OTe6XqPf878xk3pxmjhM XtrmBy6wW4nvRgZJRxY2nFbP7efH/14ugexeksf4NA3n6aoY+kG5SHHpVLSzUDdi 3v2YOulmnPVGkTSt5Kd9J0VMdtTkBnvRfXhR1PwCByfAPHf0MYsfAmhF9B0H32GJ AuKV3Bny5KEahQjW3G7VBBfd0+cD25kKfxzrZgyJZS/o+Fz/+5m1AbLX73MfKRg= =u2W6 -----END PGP SIGNATURE----- --wHtvbNoT5HReuwovSiwOqFQdfUfw5jNmc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?529d7219-4dc9-eb06-2a5d-682c725855f6>