From owner-svn-src-head@freebsd.org Thu Apr 12 04:03:19 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8249CF8B975; Thu, 12 Apr 2018 04:03:19 +0000 (UTC) (envelope-from kmacybsd@gmail.com) Received: from mail-ot0-x232.google.com (mail-ot0-x232.google.com [IPv6:2607:f8b0:4003:c0f::232]) (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 DA2997BDDE; Thu, 12 Apr 2018 04:03:18 +0000 (UTC) (envelope-from kmacybsd@gmail.com) Received: by mail-ot0-x232.google.com with SMTP id o9-v6so4502258otj.5; Wed, 11 Apr 2018 21:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=jEpsVBpjOeHmHwJ9YqQlRhnN0o+haB2L+pada8eVKcw=; b=qQiMnLWrYIWUEF1hcODM6ceSGvaIOEqtHW6X7tcANWfJfb70Bpp/R5UJpXlEd5bUh3 BUNHNyvFNoO+Z9ChWM7/gfpOWHmaMpqUZ9/bNBuWG17QFVdYDAij09QDlpYQ2NbzQ+Cz u2dmK4ZgwBBxYNkodT0SqGXBxNS4eUjJbz1CQJ95IZ06klIyEJ9PJk7jgVPjsoLCPpuD ZsE+zz7MzsyiKmvnOr+nTnt3qux3L3GyqAZNLRm5Kr82BccHxMmOFpbPjJuxXBS4nHqn aOrvJiU/KMbf0h1VwocCJ+h0RZ3KqHAMr0XwMo8gyaJq4Jlqf1Qmz8em9/Dhqz2utksp jFpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=jEpsVBpjOeHmHwJ9YqQlRhnN0o+haB2L+pada8eVKcw=; b=Bdh4+x24+hTrY42WcD1w9VVXPjKpeOalOMJOgsxv/ELjd5RGVGO8OBYrNQhVf2d+8Z cEe6SG2NUfSledhwgYy+ov3koEYmzHOE4Il3BB6xkyX3t8YTFzEUX5pRgElyNmYcHJTU +v0HfNmicB9/xdVZGn6wX4xfCbaGHHRgd7WhkyiFWO+QmVQ3kKxirpZHZ6TaOYBPoIhV a7K1Sz9eji0uJkZP9C6xl1hizjANHGYdKlAcbkSmMhFsMGb20iKtE4nnY8qe+Ydz88pe cegnlSay8nQILpI8y8jHYhXZ+tcwu4Zc59JzkDVv+WUpVAkYX4EoYNfPLVr3qf1fH3dj zs3Q== X-Gm-Message-State: ALQs6tCruOkhuOxOxZs5EVjN6TqNsTLDKxS4lY2DUCEKqcEXMqENjNXZ vbA4YhZRxtrhwW+AJ3+CbLD37PRG0d39FswZmuUChG8k X-Google-Smtp-Source: AIpwx4+ZAWUOUvCacRFisvtGJy5WsDAG2c+tx/AhM20HwPxM7663JKoyWu0UedCIoLD0KVFOi0/Ow6eeiVoOY+1JUJQ= X-Received: by 2002:a9d:4082:: with SMTP id n2-v6mr4643162ote.150.1523505798141; Wed, 11 Apr 2018 21:03:18 -0700 (PDT) MIME-Version: 1.0 Sender: kmacybsd@gmail.com Received: by 2002:a9d:4782:0:0:0:0:0 with HTTP; Wed, 11 Apr 2018 21:03:17 -0700 (PDT) In-Reply-To: <201804112141.w3BLfxho048321@repo.freebsd.org> References: <201804112141.w3BLfxho048321@repo.freebsd.org> From: "K. Macy" Date: Wed, 11 Apr 2018 21:03:17 -0700 X-Google-Sender-Auth: _ukj_4ZZudNujFDhCPFbCpb6MCc Message-ID: Subject: Re: svn commit: r332419 - head/sys/net To: Stephen Hurd Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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: Thu, 12 Apr 2018 04:03:19 -0000 There was a panic inducing merge error, please apply if you encounter problems: @ -2288,7 +2294,7 @@ iflib_stop(if_ctx_t ctx) for (i = 0; i < scctx->isc_nrxqsets; i++, rxq++) { /* make sure all transmitters have completed before proceeding XXX */ - for (j = 0, di = txq->ift_ifdi; j < rxq->ifr_nfl; j++, di++) + for (j = 0, di = rxq->ifr_ifdi; j < rxq->ifr_nfl; j++, di++) bzero((void *)di->idi_vaddr, di->idi_size); /* also resets the free lists pidx/cidx */ for (j = 0, fl = rxq->ifr_fl; j < rxq->ifr_nfl; j++, fl++) On Wed, Apr 11, 2018 at 2:41 PM, Stephen Hurd wrote: > Author: shurd > Date: Wed Apr 11 21:41:59 2018 > New Revision: 332419 > URL: https://svnweb.freebsd.org/changeset/base/332419 > > Log: > Properly initialize ifc_nhwtxqs. > > Also, since ifc_nhwrxqs is only used in one place, remove it from the struct. > This was preventing iflib_dma_free() from being called via > iflib_device_detach(). > > Submitted by: Matthew Macy > Reviewed by: shurd > Sponsored by: Limelight Networks > > Modified: > head/sys/net/iflib.c > > Modified: head/sys/net/iflib.c > ============================================================================== > --- head/sys/net/iflib.c Wed Apr 11 20:04:06 2018 (r332418) > +++ head/sys/net/iflib.c Wed Apr 11 21:41:59 2018 (r332419) > @@ -166,7 +166,6 @@ struct iflib_ctx { > struct mtx ifc_mtx; > > uint16_t ifc_nhwtxqs; > - uint16_t ifc_nhwrxqs; > > iflib_txq_t ifc_txqs; > iflib_rxq_t ifc_rxqs; > @@ -2289,7 +2288,7 @@ iflib_stop(if_ctx_t ctx) > for (i = 0; i < scctx->isc_nrxqsets; i++, rxq++) { > /* make sure all transmitters have completed before proceeding XXX */ > > - for (j = 0, di = txq->ift_ifdi; j < ctx->ifc_nhwrxqs; j++, di++) > + for (j = 0, di = txq->ift_ifdi; j < rxq->ifr_nfl; j++, di++) > bzero((void *)di->idi_vaddr, di->idi_size); > /* also resets the free lists pidx/cidx */ > for (j = 0, fl = rxq->ifr_fl; j < rxq->ifr_nfl; j++, fl++) > @@ -4198,6 +4197,7 @@ iflib_device_register(device_t dev, void *sc, if_share > > scctx = &ctx->ifc_softc_ctx; > ifp = ctx->ifc_ifp; > + ctx->ifc_nhwtxqs = sctx->isc_ntxqs; > > /* > * XXX sanity check that ntxd & nrxd are a power of 2 > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"