From owner-svn-src-head@freebsd.org Wed May 8 03:46:01 2019 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 ED5A7159C771; Wed, 8 May 2019 03:46:00 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 81752899DA; Wed, 8 May 2019 03:46:00 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id u2so12545495ioc.4; Tue, 07 May 2019 20:46:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=5bqf4D8rAkq5qw9Mt1nNdVrw//QS+95fvCHkuz1vaug=; b=tJW/aYYOFjuzlOWdSUTU5F4GRXwJiMaM9GvW78o4bXsVn7rC6/lp2Z1e8h7yEf16Q0 I3iJpLIuUc16oB5DgK5sts9jLkWPPR3djfCI+LGKNz2Eflh/uwQGhwxmHIPYhNyj7GGS 5mokQKJ15QbSgX54R0oSWMdpUTjoKzfBBanwyjOyAVwZ+uvXZ1P+ubZzDuJwgqmr056a YKm6FyNpyTUmgJMj34yQfmHur7/TFbs9ubkpHIFKefDr45rfSO84xWH52usVHLnoNRrw RFSLzpHGw+KsMDNurdv0btt+8swQx/dGWSvxmUvUDQ4oQqWrt89SgEOkX+WcQi5/T8XW D4Gg== X-Gm-Message-State: APjAAAXlUlpH3kjyr/CMso8dNpLIABUCZP2RSjbTdLt8xaf993GbTo24 fy8YrLbxF/hwFB4cqYMsBQ2LRG20 X-Google-Smtp-Source: APXvYqyFRHMEc1ZfYCHEZWryZrF3Tv5hdjVydpu4bOFuKUwAhkwQGKSEZzhmhutP8aFEKN3D4fRqkQ== X-Received: by 2002:a6b:ef07:: with SMTP id k7mr12841225ioh.276.1557286748533; Tue, 07 May 2019 20:39:08 -0700 (PDT) Received: from mail-it1-f172.google.com (mail-it1-f172.google.com. [209.85.166.172]) by smtp.gmail.com with ESMTPSA id g4sm5634116ioa.21.2019.05.07.20.39.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 May 2019 20:39:08 -0700 (PDT) Received: by mail-it1-f172.google.com with SMTP id p18so1197064itm.1; Tue, 07 May 2019 20:39:08 -0700 (PDT) X-Received: by 2002:a24:65cf:: with SMTP id u198mr1710644itb.32.1557286748223; Tue, 07 May 2019 20:39:08 -0700 (PDT) MIME-Version: 1.0 References: <201905070828.x478SZ3t019398@repo.freebsd.org> In-Reply-To: <201905070828.x478SZ3t019398@repo.freebsd.org> Reply-To: cem@freebsd.org From: Conrad Meyer Date: Tue, 7 May 2019 20:38:57 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r347221 - head/sys/net To: Marius Strobl Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 81752899DA X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; TAGGED_FROM(0.00)[] 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: Wed, 08 May 2019 03:46:01 -0000 Hi Marius, This change seems to break LINT-NOIP tinderbox builds; one reference to tcp_lro_free() is covered by #if defined(INET) || defined(INET6), but the one added in iflib_rx_structures_free() is not. On Tue, May 7, 2019 at 1:28 AM Marius Strobl wrote: > > Author: marius > Date: Tue May 7 08:28:35 2019 > New Revision: 347221 > URL: https://svnweb.freebsd.org/changeset/base/347221 > ... > Modified: head/sys/net/iflib.c > ============================================================================== > --- head/sys/net/iflib.c Tue May 7 08:14:30 2019 (r347220) > +++ head/sys/net/iflib.c Tue May 7 08:28:35 2019 (r347221) > ... The one below is protected by INET or INET6 define: > @@ -5627,14 +5668,14 @@ iflib_rx_structures_setup(if_ctx_t ctx) > #if defined(INET6) || defined(INET) <<<< > fail: > /* > - * Free RX software descriptors allocated so far, we will only handle > + * Free LRO resources allocated so far, we will only handle > * the rings that completed, the failing case will have > - * cleaned up for itself. 'q' failed, so its the terminus. > + * cleaned up for itself. 'q' failed, so its the terminus. > */ > rxq = ctx->ifc_rxqs; > for (i = 0; i < q; ++i, rxq++) { > - iflib_rx_sds_free(rxq); > - rxq->ifr_cq_cidx = 0; > + if (if_getcapabilities(ctx->ifc_ifp) & IFCAP_LRO) > + tcp_lro_free(&rxq->ifr_lc); <<< > } > return (err); > #endif <<< But the following one is not: > @@ -5649,9 +5690,12 @@ static void > iflib_rx_structures_free(if_ctx_t ctx) > { > iflib_rxq_t rxq = ctx->ifc_rxqs; > + int i; > > - for (int i = 0; i < ctx->ifc_softc_ctx.isc_nrxqsets; i++, rxq++) { > + for (i = 0; i < ctx->ifc_softc_ctx.isc_nrxqsets; i++, rxq++) { > iflib_rx_sds_free(rxq); > + if (if_getcapabilities(ctx->ifc_ifp) & IFCAP_LRO) > + tcp_lro_free(&rxq->ifr_lc); ^^^^^^^ > } > free(ctx->ifc_rxqs, M_IFLIB); > ctx->ifc_rxqs = NULL; This fails to compile on kernels without INET and INET6 (which is something we still support, for reasons I cannot fathom) because netinet/tcp_lro.c is conditional on option inet | inet6 in sys/conf/files. Best, Conrad