From owner-freebsd-current@freebsd.org Wed Feb 12 08:57:39 2020 Return-Path: Delivered-To: freebsd-current@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 D0CDB231758 for ; Wed, 12 Feb 2020 08:57:39 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (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 48HYSM0CbMz45hG for ; Wed, 12 Feb 2020 08:57:38 +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 57C452602AB; Wed, 12 Feb 2020 09:57:30 +0100 (CET) Subject: Re: panic: Assertion in_epoch(net_epoch_preempt) failed, r357793 To: yp@mm.st, FreeBSD Current References: <1123c163-846f-7264-febd-3027e1b17369@mm.st> <9c3d101f-d2f9-2d7d-b48d-9bbee6e8dd8d@mm.st> From: Hans Petter Selasky Message-ID: Date: Wed, 12 Feb 2020 09:57:19 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: <9c3d101f-d2f9-2d7d-b48d-9bbee6e8dd8d@mm.st> Content-Type: multipart/mixed; boundary="------------A650E9E27FF7BCCCDA5C4AE9" Content-Language: en-US X-Rspamd-Queue-Id: 48HYSM0CbMz45hG X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 2a01:4f8:c17:6c4b::2 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-4.96 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; HAS_ATTACHMENT(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; DMARC_NA(0.00)[selasky.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; IP_SCORE(-2.66)[ip: (-9.21), ipnet: 2a01:4f8::/29(-2.52), asn: 24940(-1.56), country: DE(-0.02)]; FREEMAIL_TO(0.00)[mm.st]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Feb 2020 08:57:39 -0000 This is a multi-part message in MIME format. --------------A650E9E27FF7BCCCDA5C4AE9 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Does the attached patch fix the issue? --HPS --------------A650E9E27FF7BCCCDA5C4AE9 Content-Type: text/x-patch; charset=UTF-8; name="epoch.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="epoch.diff" Index: sys/net/iflib.c =================================================================== --- sys/net/iflib.c (revision 357799) +++ sys/net/iflib.c (working copy) @@ -6060,6 +6060,7 @@ gtask = &ctx->ifc_txqs[qid].ift_task; tqg = qgroup_if_io_tqg; fn = _task_fn_tx; + GROUPTASK_INIT(gtask, 0, fn, q); break; case IFLIB_INTR_RX: q = &ctx->ifc_rxqs[qid]; @@ -6066,6 +6067,7 @@ gtask = &ctx->ifc_rxqs[qid].ifr_task; tqg = qgroup_if_io_tqg; fn = _task_fn_rx; + NET_GROUPTASK_INIT(gtask, 0, fn, q); break; case IFLIB_INTR_IOV: q = ctx; @@ -6072,11 +6074,11 @@ gtask = &ctx->ifc_vflr_task; tqg = qgroup_if_config_tqg; fn = _task_fn_iov; + GROUPTASK_INIT(gtask, 0, fn, q); break; default: panic("unknown net intr type"); } - GROUPTASK_INIT(gtask, 0, fn, q); if (irq != NULL) { err = iflib_irq_set_affinity(ctx, irq, type, qid, gtask, tqg, q, name); @@ -6136,7 +6138,7 @@ iflib_fast_intr_rxtx, NULL, info, name); if (err != 0) return (err); - GROUPTASK_INIT(gtask, 0, fn, q); + NET_GROUPTASK_INIT(gtask, 0, fn, q); res = irq->ii_res; taskqgroup_attach(tqg, gtask, q, dev, res, name); --------------A650E9E27FF7BCCCDA5C4AE9--