From owner-svn-src-head@freebsd.org Sat Jan 25 20:37:55 2020 Return-Path: Delivered-To: svn-src-head@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 E739B1FA4F5; Sat, 25 Jan 2020 20:37:55 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 484nrf5xZzz44Qv; Sat, 25 Jan 2020 20:37:54 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x730.google.com with SMTP id w25so84305qki.3; Sat, 25 Jan 2020 12:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=1VLRAZeOmtWLN/DxEY+ej59BQzW/UWq8r7sj3UDfTVc=; b=In/yZDj/Z5lmg6yf9NIxq+bxmRGLI1O+15SFi1aFC1BK4EVdFbQoiGW3qPSnd8Rf4p sCPLpLbhcq7XWB+rTpMwNX/HXO6jdIQOviCt0AwuX+tXBeWZo2MGwJGlf8lPo+s0qzck 7kjLVQ7cgPgnE6rpYyS3A3Y3BpifbTiGZa4FBbL1E/bOUA0FvZ4XH0o0EgW+aZWwZkBI 862//gfipD28NvBbB/QKMkQiS2I+ZZFcx8YmN4wP8+Z7iGUZcyRdfoIdQMq15bkXrXhg 7S7sOuMb5fNocH3ScqALFw2EbOhZpNmc7fSt0WuA2v0SetG4rioY9awNW5TfUSe7jHvk DTgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=1VLRAZeOmtWLN/DxEY+ej59BQzW/UWq8r7sj3UDfTVc=; b=pn8z0Q4qyn04dKX/woS/7Bw+HW8zfFeqxrvdlnW+licFeZJgE/UvSrLC97lKPt/Mkr a1EHK71w0BF0BhOULQOtX0PxHBTGgQrN5uZRB0MjYPSmtGCx4tDWd3WPtrP1hGaEp9eT D26o4BK0mne7qnmEstKXDduslZdlfcT0Umh92wxCs3z1rxqy7vBh2NI6d0lubajnNXie HYAihCKKj4hUXwBk23fKsADaGCWN/MKG5rdxPzrcjS0WRcpDsi0htOR2ZzNY1yqtj1tY roLkd1Po4QDCVVPj8acUrML18z3LxfIDbhHO0GvgihAKKUxPds1lgNImxBNQEERghBmj j6gA== X-Gm-Message-State: APjAAAXg8x648hVhIkCx/+1Q771QiBx33ADhv5oELv9gow5UTeQX3tqb uvQoqg56b02e60jIp1qkkIZnU1+q X-Google-Smtp-Source: APXvYqyyjIoPyI3OYkrp9HMYkc8dwO0RyfWPx54CAjZ0WYe72oTWDObpfhxhaKWmAlDo3aVnQcjnAA== X-Received: by 2002:a37:905:: with SMTP id 5mr8996677qkj.404.1579984673353; Sat, 25 Jan 2020 12:37:53 -0800 (PST) Received: from raichu (toroon0560w-lp130-05-69-158-183-252.dsl.bell.ca. [69.158.183.252]) by smtp.gmail.com with ESMTPSA id s20sm5715669qkg.131.2020.01.25.12.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2020 12:37:52 -0800 (PST) Sender: Mark Johnston Date: Sat, 25 Jan 2020 15:37:48 -0500 From: Mark Johnston To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r357090 - head/sys/dev/re Message-ID: <20200125203748.GA56065@raichu> References: <202001241724.00OHO3jn066308@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202001241724.00OHO3jn066308@repo.freebsd.org> X-Rspamd-Queue-Id: 484nrf5xZzz44Qv X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=In/yZDj/; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::730 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-4.33 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-2.63)[ip: (-9.24), ipnet: 2607:f8b0::/32(-2.05), asn: 15169(-1.79), country: US(-0.05)]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_IN_DNSWL_NONE(0.00)[0.3.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; MID_RHS_NOT_FQDN(0.50)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 25 Jan 2020 20:37:56 -0000 On Fri, Jan 24, 2020 at 05:24:03PM +0000, Gleb Smirnoff wrote: > Author: glebius > Date: Fri Jan 24 17:24:02 2020 > New Revision: 357090 > URL: https://svnweb.freebsd.org/changeset/base/357090 > > Log: > re(4) uses taskqueue to process input packets. Enter network epoch > in there. ena(4) and the virtio network driver are similarly broken. > Modified: > head/sys/dev/re/if_re.c > > Modified: head/sys/dev/re/if_re.c > ============================================================================== > --- head/sys/dev/re/if_re.c Fri Jan 24 17:15:31 2020 (r357089) > +++ head/sys/dev/re/if_re.c Fri Jan 24 17:24:02 2020 (r357090) > @@ -2576,6 +2576,7 @@ re_intr(void *arg) > static void > re_int_task(void *arg, int npending) > { > + struct epoch_tracker et; > struct rl_softc *sc; > struct ifnet *ifp; > u_int16_t status; > @@ -2602,8 +2603,11 @@ re_int_task(void *arg, int npending) > } > #endif > > - if (status & (RL_ISR_RX_OK|RL_ISR_RX_ERR|RL_ISR_FIFO_OFLOW)) > + if (status & (RL_ISR_RX_OK|RL_ISR_RX_ERR|RL_ISR_FIFO_OFLOW)) { > + NET_EPOCH_ENTER(et); > rval = re_rxeof(sc, NULL); > + NET_EPOCH_EXIT(et); > + } > > /* > * Some chips will ignore a second TX request issued