From owner-svn-src-all@freebsd.org Thu Jan 23 08:36:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4C082324BE; Thu, 23 Jan 2020 08:36:58 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 483Fxk5Klyz4K9l; Thu, 23 Jan 2020 08:36:58 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [62.141.129.235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 1CDD9260497; Thu, 23 Jan 2020 09:36:55 +0100 (CET) Subject: Re: svn commit: r357004 - in head/sys: kern sys To: Gleb Smirnoff , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202001230124.00N1OlXi029506@repo.freebsd.org> From: Hans Petter Selasky Message-ID: Date: Thu, 23 Jan 2020 09:36:53 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <202001230124.00N1OlXi029506@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 483Fxk5Klyz4K9l X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_LONG(-0.99)[-0.994,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2020 08:36:59 -0000 On 2020-01-23 02:24, Gleb Smirnoff wrote: > Author: glebius > Date: Thu Jan 23 01:24:47 2020 > New Revision: 357004 > URL: https://svnweb.freebsd.org/changeset/base/357004 > > Log: > Enter the network epoch for interrupt handlers of INTR_TYPE_NET. > > Provide tunable to limit how many times handlers may be executed > without reentering epoch. > > Differential Revision: https://reviews.freebsd.org/D23242 > > Modified: > head/sys/kern/kern_intr.c > head/sys/sys/interrupt.h > > Modified: head/sys/kern/kern_intr.c > ============================================================================== > --- head/sys/kern/kern_intr.c Thu Jan 23 01:20:59 2020 (r357003) > +++ head/sys/kern/kern_intr.c Thu Jan 23 01:24:47 2020 (r357004) > @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -94,6 +95,9 @@ static int intr_storm_threshold = 0; > SYSCTL_INT(_hw, OID_AUTO, intr_storm_threshold, CTLFLAG_RWTUN, > &intr_storm_threshold, 0, > "Number of consecutive interrupts before storm protection is enabled"); > +static int intr_epoch_batch = 1000; > +SYSCTL_INT(_hw, OID_AUTO, intr_epoch_batch, CTLFLAG_RWTUN, &intr_epoch_batch, > + 0, "Maximum interrupt handler executions without re-entering epoch(9)"); > static TAILQ_HEAD(, intr_event) event_list = > TAILQ_HEAD_INITIALIZER(event_list); > static struct mtx event_lock; > @@ -587,6 +591,8 @@ intr_event_add_handler(struct intr_event *ie, const ch > ih->ih_flags |= IH_MPSAFE; > if (flags & INTR_ENTROPY) > ih->ih_flags |= IH_ENTROPY; > + if (flags & INTR_TYPE_NET) > + ih->ih_flags |= IH_NET; > > /* We can only have one exclusive handler in a event. */ > mtx_lock(&ie->ie_lock); > @@ -1196,11 +1202,12 @@ ithread_execute_handlers(struct proc *p, struct intr_e > static void > ithread_loop(void *arg) > { > + struct epoch_tracker et; > struct intr_thread *ithd; > struct intr_event *ie; > struct thread *td; > struct proc *p; > - int wake; > + int wake, epoch_count; > > td = curthread; > p = td->td_proc; > @@ -1235,8 +1242,21 @@ ithread_loop(void *arg) > * that the load of ih_need in ithread_execute_handlers() > * is ordered after the load of it_need here. > */ > - while (atomic_cmpset_acq_int(&ithd->it_need, 1, 0) != 0) > + if (ie->ie_hflags & IH_NET) { > + epoch_count = 0; > + NET_EPOCH_ENTER(et); > + } > + while (atomic_cmpset_acq_int(&ithd->it_need, 1, 0) != 0) { > ithread_execute_handlers(p, ie); > + if ((ie->ie_hflags & IH_NET) && > + ++epoch_count >= intr_epoch_batch) { > + NET_EPOCH_EXIT(et); > + epoch_count = 0; > + NET_EPOCH_ENTER(et); > + } > + } > + if (ie->ie_hflags & IH_NET) > + NET_EPOCH_EXIT(et); > WITNESS_WARN(WARN_PANIC, NULL, "suspending ithread"); > mtx_assert(&Giant, MA_NOTOWNED); > Beware that iflib uses GROUP TASKs to invoke the RX-path for packet processing and only register a fast IRQ handler. --HPS