From owner-freebsd-net@FreeBSD.ORG Thu May 23 21:28:21 2013 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 80B67E3F for ; Thu, 23 May 2013 21:28:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA74220 for ; Thu, 23 May 2013 21:28:21 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id A12A0B917; Thu, 23 May 2013 17:28:19 -0400 (EDT) From: John Baldwin To: Guy Helmer Subject: Re: bpf hold buffer in-use flag Date: Thu, 23 May 2013 17:28:05 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <9C928117-2230-4F01-9B95-B6D945AF4416@gmail.com> <201301091535.04904.jhb@freebsd.org> <4EA47178-7CE2-40CE-A767-2689FAF7BEBD@gmail.com> In-Reply-To: <4EA47178-7CE2-40CE-A767-2689FAF7BEBD@gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201305231728.05253.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 23 May 2013 17:28:19 -0400 (EDT) Cc: freebsd-net@freebsd.org X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 May 2013 21:28:21 -0000 On Thursday, May 23, 2013 5:05:39 pm Guy Helmer wrote: > > On Jan 9, 2013, at 2:35 PM, John Baldwin wrote: > > > On Tuesday, November 13, 2012 4:40:57 pm Guy Helmer wrote: > >> To try to completely resolve the race in bpfread(), I have put together > > these changes to add a flag to indicate when the hold buffer cannot be > > modified because it is in use. Since it's my first time using mtx_sleep() and > > wakeup(), I wanted to run these past the list to see if I can get any feedback > > on the approach. > >> > >> > >> Index: bpf.c > >> =================================================================== > >> --- bpf.c (revision 242997) > >> +++ bpf.c (working copy) > >> @@ -819,6 +819,7 @@ bpfopen(struct cdev *dev, int flags, int fmt, stru > >> * particular buffer method. > >> */ > >> bpf_buffer_init(d); > >> + d->bd_hbuf_in_use = 0; > >> d->bd_bufmode = BPF_BUFMODE_BUFFER; > >> d->bd_sig = SIGIO; > >> d->bd_direction = BPF_D_INOUT; > >> @@ -872,6 +873,9 @@ bpfread(struct cdev *dev, struct uio *uio, int iof > >> callout_stop(&d->bd_callout); > >> timed_out = (d->bd_state == BPF_TIMED_OUT); > >> d->bd_state = BPF_IDLE; > >> + while (d->bd_hbuf_in_use) > >> + mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock, > >> + PRINET|PCATCH, "bd_hbuf", 0); > > > > You need to check the return value here, otherwise the PCATCH is useless (you > > will just go back to sleep instead of failing with an error if this is > > interrupted by a signal). > > Thanks for the feedback (sorry it's taken so long to get to it). Would this > change correctly handle interruptions? Yes. > Index: bpf.c > =================================================================== > --- bpf.c (revision 250941) > +++ bpf.c (working copy) > @@ -856,9 +856,14 @@ > callout_stop(&d->bd_callout); > timed_out = (d->bd_state == BPF_TIMED_OUT); > d->bd_state = BPF_IDLE; > - while (d->bd_hbuf_in_use) > - mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock, > + while (d->bd_hbuf_in_use) { > + error = mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock, > PRINET|PCATCH, "bd_hbuf", 0); > + if (error == EINTR || error == ERESTART) { > + BPFD_UNLOCK(d); > + return (error); > + } > + } Maybe simplify the check to just 'if (error != 0)'? -- John Baldwin