From nobody Wed Jan 05 21:07:28 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A4A1119216B2 for ; Wed, 5 Jan 2022 21:07:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa2d.google.com (mail-vk1-xa2d.google.com [IPv6:2607:f8b0:4864:20::a2d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JThrr3Fhcz51q5 for ; Wed, 5 Jan 2022 21:07:40 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa2d.google.com with SMTP id h5so440538vkp.5 for ; Wed, 05 Jan 2022 13:07:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ffui18ocuZobhBC3HBY0MPl6MZMj/4l24WPvKcamb68=; b=epdlFZ9w7tuN3Tf6PR1nalfdSFTJe9SnAlg6vdxKIff8mkzT0tLk76j5VSu87erLD2 CSRjqsfi8RDXeXpamRWWjg0XXREtNKISyNvPzhHbxSx4nspYXAzen7aIEke5Hbzy57Te Ee4AbmDb2siiXNqeT3+NWf+mJ8GtNur0rptyvLEI+h71eVUiOFaXzumzpCZYH6TyrQ+C R0C1l5Wka7JsLB38UqmwWvPsq6uyJhG4ctWESDYLQhOiKaT8UvIrXpRpe5vpDN8HSFcQ IrQLMsAhXu5IzJ9bueo96XLboOtZPeJmTsvREiuSfGYVoAjBVSDVBJmGmcgnkd8VuIRZ wxmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ffui18ocuZobhBC3HBY0MPl6MZMj/4l24WPvKcamb68=; b=0Zc0Uc3slsWc56U4REj3Qs5o42HnZzB0SJka0n7J4M4xI9NSnVPw7HBzaZPPNj6CC9 r//808oHAaXVFz/NoZcOSxxhYTsRy+q5ZXyvtCO4pZemdKCDooEv2eD6Q8om2w+d9Kl5 vbGx0TByaArVs1c1QiJZGOF44Z5+CInJerbsUYQciEMmE+GA53NwwsTb/hbXzOOs45Yq 0JPMi+3mUDuCl2vGquCxJ+hkB4TedqfxpFt2WLd339K+uVzDDDXoHlbmcFJhrvyhP24K pzhT3wMP5RY/QV8k11wfpWo3/Y/o+RNGAD1qKyenw1YW2jX8hfD0R+7akVytpjIJXN3x D8bw== X-Gm-Message-State: AOAM531b76VNYbKsZjN1lXS5IDhNEsH75Ia1KMWWcS2UIZGN1V60wpe8 67/NeMFY0MLALKgk8QnqB6+yRNXqEcHqb4WC5DuYkw== X-Google-Smtp-Source: ABdhPJzdCPFwKBwp5rN0v13XXappnu6vwbRES2LFnWSzqRLCmO40/WP4tROfmhAQU4KGKplpj2qpoI64DpX76GzzlDw= X-Received: by 2002:a05:6122:da0:: with SMTP id bc32mr7961869vkb.26.1641416859771; Wed, 05 Jan 2022 13:07:39 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202112312157.1BVLvLhd040939@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 5 Jan 2022 14:07:28 -0700 Message-ID: Subject: Re: git: 5a73a6c178f6 - main - Add lio back to NOTES To: Mateusz Guzik Cc: Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000dafc8d05d4dc24d6" X-Rspamd-Queue-Id: 4JThrr3Fhcz51q5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --000000000000dafc8d05d4dc24d6 Content-Type: text/plain; charset="UTF-8" On Wed, Jan 5, 2022 at 1:53 PM Mateusz Guzik wrote: > On 1/5/22, Warner Losh wrote: > > On Wed, Jan 5, 2022, 1:26 PM Mateusz Guzik wrote: > > > >> On 12/31/21, Warner Losh wrote: > >> > The branch main has been updated by imp: > >> > > >> > URL: > >> > > >> > https://cgit.FreeBSD.org/src/commit/?id=5a73a6c178f65b91fe60e52e476a88137e40f0e4 > >> > > >> > commit 5a73a6c178f65b91fe60e52e476a88137e40f0e4 > >> > Author: Warner Losh > >> > AuthorDate: 2021-12-31 21:56:16 +0000 > >> > Commit: Warner Losh > >> > CommitDate: 2021-12-31 21:56:16 +0000 > >> > > >> > Add lio back to NOTES > >> > > >> > lio appears to be partially removed from this file. It's a modern > >> > enough > >> > card, so add it back. It builds everywhere. > >> > > >> > >> This breaks NOIP kernels: > >> > > > > NOIP kernels were already broken when I made this commit. I'll take a > look > > now that emaste committed fixes for those... > > > > It builds fine without the change. > Only because of a6668e31aa3cc855bfb37d6edc05122514592a47 Warner > > Warner > > > > ld: error: undefined symbol: tcp_lro_flush_all > >> >>> referenced by lio_droq.c > >> >>> lio_droq.o:(lio_droq_process_packets) > >> > >> ld: error: undefined symbol: tcp_lro_rx > >> >>> referenced by lio_core.c > >> >>> lio_core.o:(lio_push_packet) > >> > >> ld: error: undefined symbol: tcp_lro_init > >> >>> referenced by lio_main.c > >> >>> lio_main.o:(lio_attach) > >> > >> ld: error: undefined symbol: tcp_lro_free > >> >>> referenced by lio_main.c > >> >>> lio_main.o:(lio_attach) > >> >>> referenced by lio_main.c > >> >>> lio_main.o:(lio_destroy_nic_device) > >> > >> > Sponsored by: Netflix > >> > --- > >> > sys/conf/NOTES | 1 + > >> > 1 file changed, 1 insertion(+) > >> > > >> > diff --git a/sys/conf/NOTES b/sys/conf/NOTES > >> > index 65e088cfe7c9..eded586b4491 100644 > >> > --- a/sys/conf/NOTES > >> > +++ b/sys/conf/NOTES > >> > @@ -1931,6 +1931,7 @@ envvar hint.fxp.0.prefer_iomap="0" > >> > device gem # Apple GMAC/Sun ERI/Sun GEM > >> > device jme # JMicron JMC250 Gigabit/JMC260 > >> Fast Ethernet > >> > device lge # Level 1 LXT1001 gigabit > >> > Ethernet > >> > +device lio # Support for Cavium 23XX > >> > Ethernet > >> adapters > >> > device mlxfw # Mellanox firmware update > module > >> > device mlx5 # Shared code module between IB > >> and Ethernet > >> > device mlx5en # Mellanox ConnectX-4 and > >> ConnectX-4 LX > >> > > >> > >> > >> -- > >> Mateusz Guzik > >> > > > > > -- > Mateusz Guzik > --000000000000dafc8d05d4dc24d6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Jan 5, 2022 at 1:53 PM Mateus= z Guzik <mjguzik@gmail.com> = wrote:
On 1/5/22= , Warner Losh <imp@b= sdimp.com> wrote:
> On Wed, Jan 5, 2022, 1:26 PM Mateusz Guzik <mjguzik@gmail.com> wrote:
>
>> On 12/31/21, Warner Losh <imp@freebsd.org> wrote:
>> > The branch main has been updated by imp:
>> >
>> > URL:
>> >
>> https://c= git.FreeBSD.org/src/commit/?id=3D5a73a6c178f65b91fe60e52e476a88137e40f0e4
>> >
>> > commit 5a73a6c178f65b91fe60e52e476a88137e40f0e4
>> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > AuthorDate: 2021-12-31 21:56:16 +0000
>> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > CommitDate: 2021-12-31 21:56:16 +0000
>> >
>> >=C2=A0 =C2=A0 =C2=A0Add lio back to NOTES
>> >
>> >=C2=A0 =C2=A0 =C2=A0lio appears to be partially removed from t= his file. It's a modern
>> > enough
>> >=C2=A0 =C2=A0 =C2=A0card, so add it back. It builds everywhere= .
>> >
>>
>> This breaks NOIP kernels:
>>
>
> NOIP kernels were already broken when I made this commit. I'll tak= e a look
> now that emaste committed fixes for those...
>

It builds fine without the change.


Warner
=C2=A0
> Warner
>
> ld: error: undefined symbol: tcp_lro_flush_all
>> >>> referenced by lio_droq.c
>> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0lio_droq.o:(lio_droq_process_packets)
>>
>> ld: error: undefined symbol: tcp_lro_rx
>> >>> referenced by lio_core.c
>> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0lio_core.o:(lio_push_packet)
>>
>> ld: error: undefined symbol: tcp_lro_init
>> >>> referenced by lio_main.c
>> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0lio_main.o:(lio_attach)
>>
>> ld: error: undefined symbol: tcp_lro_free
>> >>> referenced by lio_main.c
>> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0lio_main.o:(lio_attach)
>> >>> referenced by lio_main.c
>> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0lio_main.o:(lio_destroy_nic_device)
>>
>> >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0Netflix
>> > ---
>> >=C2=A0 sys/conf/NOTES | 1 +
>> >=C2=A0 1 file changed, 1 insertion(+)
>> >
>> > diff --git a/sys/conf/NOTES b/sys/conf/NOTES
>> > index 65e088cfe7c9..eded586b4491 100644
>> > --- a/sys/conf/NOTES
>> > +++ b/sys/conf/NOTES
>> > @@ -1931,6 +1931,7 @@ envvar=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 hint.fxp.0.prefer_iomap=3D"0"
>> >=C2=A0 device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0gem=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Apple GMAC/Sun E= RI/Sun GEM
>> >=C2=A0 device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0jme=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# JMicron JMC250 G= igabit/JMC260
>> Fast Ethernet
>> >=C2=A0 device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0lge=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Level 1 LXT1001 = gigabit
>> > Ethernet
>> > +device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0lio=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Support for Cavium = 23XX
>> > Ethernet
>> adapters
>> >=C2=A0 device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlxfw=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# Mellanox firmware upd= ate module
>> >=C2=A0 device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlx5=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Shared code module be= tween IB
>> and Ethernet
>> >=C2=A0 device=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0mlx5en=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Mellanox ConnectX-4 and >> ConnectX-4 LX
>> >
>>
>>
>> --
>> Mateusz Guzik <mjguzik gmail.com>
>>
>


--
Mateusz Guzik <mjguzik gmail.com>
--000000000000dafc8d05d4dc24d6--