From owner-svn-src-head@freebsd.org Tue Aug 16 22:43:29 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6452BBBC18F; Tue, 16 Aug 2016 22:43:29 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0B6501F66; Tue, 16 Aug 2016 22:43:29 +0000 (UTC) (envelope-from gljennjohn@gmail.com) Received: by mail-wm0-x243.google.com with SMTP id i5so18934764wmg.2; Tue, 16 Aug 2016 15:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=lI0I1jHarMEp0rN9+RvuTZ2uhs6xkNeHvKVW2Zbo8/0=; b=dMXk2sMCJkjqFiXDshQIOpFASh9uSASY2OZEfVG/RTGv3pJYU/bzpK54cR4g4/iA3M tkxc/VpXfFEGcW2hbwKlhrNrllxYdzneJeFWxctYMFRxTobVXdAH2NOKn8eGzI8sOU0X Zj44UoKa7wJO2VdNOCSmtwFN4t4RFcmhlQdH7VIxp7sPM24UlqBFrYd5PotKhBjEBP3P BvayssdpCBlNBuMCWFlwDme/us1H/0PVij43M0tz4VpHMldoTVYkahxYBnyEQICuv9xd stQd8uQC4lhFtaGyx5s7/1tdYSTxPcEagYLSe4DQZ4pfM1df3jb3bP4IuemoLZ/P1Cae RKyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=lI0I1jHarMEp0rN9+RvuTZ2uhs6xkNeHvKVW2Zbo8/0=; b=euhCeXuEwdfxOzHMPNj73WG0lkEY1Re4WAoyeYDccFirnY84XvKeR+oGmPz1hpGaer QHw1m4Owpup+Ew120vW+c5WguPHZWzUlEf20ieqp5lJzPhDN4BEfY+E2AjCrqYvRERPK ucg4XUHmww3YhRNxfjAxWKC5nSAzeYBMh/YTaoe7TbCa67YCpM4XTzl+zqOrZbz6s9Ra s2r6LAeE476WETxcyemiCY3+jsSuXB81IC5VPaj2hRFaSRgzlyqCk3mzvNH/vjvyY5wq 38Cz0Au7U7J4m6oEG6UsBjRCADocSkst0+Oxgv0hMWb0kaWCbmS3YXj4ESKBAZ/sQ0Cn Y1kA== X-Gm-Message-State: AEkoout+Sk5xGbjTcE7c9bfGKp288eHPRlKKU8EzAd1ZIhDIaSOlY4980knqU6Iu2GHt3Q== X-Received: by 10.194.29.2 with SMTP id f2mr38633703wjh.161.1471387406323; Tue, 16 Aug 2016 15:43:26 -0700 (PDT) Received: from ernst.home (p578E3980.dip0.t-ipconnect.de. [87.142.57.128]) by smtp.gmail.com with ESMTPSA id i66sm23749285wmg.9.2016.08.16.15.43.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2016 15:43:25 -0700 (PDT) Date: Wed, 17 Aug 2016 00:43:23 +0200 From: Gary Jennejohn To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r304244 - head/sys/kern Message-ID: <20160817004323.5383bf7f@ernst.home> In-Reply-To: <201608162155.u7GLtYp4091232@repo.freebsd.org> References: <201608162155.u7GLtYp4091232@repo.freebsd.org> Reply-To: gljennjohn@gmail.com X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 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: Tue, 16 Aug 2016 22:43:29 -0000 On Tue, 16 Aug 2016 21:55:34 +0000 (UTC) Gleb Smirnoff wrote: > Author: glebius > Date: Tue Aug 16 21:55:34 2016 > New Revision: 304244 > URL: https://svnweb.freebsd.org/changeset/base/304244 > > Log: > We should not be allowing a timeout to reset when a drain is in progress on > it (either async or sync drain). > > At this moment the only user of drain is TCP, but TCP wouldn't reschedule a > callout after it has drained it, since it drains only when a tcpcb is closed. > This for now the problem isn't observed. > > Submitted by: rrs > > Modified: > head/sys/kern/kern_timeout.c > > Modified: head/sys/kern/kern_timeout.c > ============================================================================== > --- 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, > */ > if (c->c_lock != NULL && !cc_exec_cancel(cc, direct)) > cancelled = cc_exec_cancel(cc, direct) = true; > - if (cc_exec_waiting(cc, direct)) { > + if (cc_exec_waiting(cc, direct) || cc_exec_drain(cc, dir)) { <== dir in this line should really be direct. > /* > * Someone has called callout_drain to kill this > * callout. Don't reschedule. -- Gary Jennejohn