From nobody Sat Nov 22 15:14:38 2025 X-Original-To: dev-commits-src-main@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 4dDFxs5Bqqz6HJ5K for ; Sat, 22 Nov 2025 15:14:57 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDFxr5wrbz3DNN for ; Sat, 22 Nov 2025 15:14:56 +0000 (UTC) (envelope-from gkontos.mail@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="S/JI9aE3"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of gkontos.mail@gmail.com designates 2a00:1450:4864:20::433 as permitted sender) smtp.mailfrom=gkontos.mail@gmail.com Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-42b3c965df5so1521871f8f.1 for ; Sat, 22 Nov 2025 07:14:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763824490; x=1764429290; darn=freebsd.org; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=cnVcD8AwfoPjxoU5m5CYsEGVzMD9yAlWl++zx7QxUF4=; b=S/JI9aE3HPbacRUhUacXrLnQij8mz25E/sO6VDreJEcstpyBLCg71MdWQ5Ft9AfgQD QZMPLGe8z4Dh9PO3p13FkiqWA7gJMVkmWpuoVBkK+7Zs/HVzd5eUAg3TLFrhtthN1TEI CxcsDovIQut1/epFfwUup/kT0vYzRTUHjHr8ESkITZX9EEf3MZkWiBPf5/dbHWTgHVJw shysjjD8TTeuxh6Bdu7vRHPoa9DTjmVC5Zg/lhD4R3c7zgsgj6IUO8c6ZHzyLBYdU5nt jXBTndtz9iKKm7O5VidoLtpC3Ez5Yh6FjWXccw3c8tv719gFCqiE77WGmg5esF9xW9e7 Brng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763824490; x=1764429290; h=message-id:in-reply-to:to:references:date:subject:mime-version :content-transfer-encoding:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cnVcD8AwfoPjxoU5m5CYsEGVzMD9yAlWl++zx7QxUF4=; b=PDUpHYMfUYdOgRyZiL69TjswA6T48bLdl6WeLo4e7UuVplx1Yto6CLmUUPd7IQsPVm 5sycBjqdws4YdoSd+g3VM7VGPR85m4EdCtXdexyPSxIsmTw3WTBWr1flkbMa8t8C2u0c ImdflwG2aYif0RzXbgKP6WxQGyb/iroaZaQGjXevj9iHLAa6GyUG6lJlG6yg+pm2gpnu VUEvB5EyegTuti9sRFKS27m8uFAOp0aI9CZ+iHQs8eFRFdzPRxvfrOdOXRLCG+xXTQQB gPGtnr1iiwwMz1QvrgJEViDb5FlmTgyQ8lqlXlKp0labqQeIKqiyN+0IT7GZ+hVdxYSQ xlzA== X-Forwarded-Encrypted: i=1; AJvYcCWzLG+0m5U6Z2SZkUuSo5HvxkK+GpfbrQSbUWyEBYNTXzGE6s3HOW199wY9mZx2iIW400XPSQcSzDgAUsFPGq6ZJgveKg==@freebsd.org X-Gm-Message-State: AOJu0YxsZxHwJx1bbFXcg9sUN2w7n2EU08LH9snC2kDWsMjnYSB1Ii6v f/g8ZhxQY12SREg+8Fw2oPk5RtAjoIDLQkAwd0q8gdGo5VcM/B9igiOXI6XTiw== X-Gm-Gg: ASbGncuXrWto0mKQCDIUxPILagoln2cnGnFGTu+/WqVFHQn1Qs/hsco0P0ppgd9rS7o /9FF3ifsngzFj4JZ0uCQrYLZdis8ahXdR7XmKFDYRYb6DKhi+3cGQUxD1igY9kwjXzKSotU2h/b V8mHklow8wzs6210Hhwg96bzVUfRd0Aw/4fvQWfASVfXEUAd9ruc6+TZVhKQDNCoAx4WcO1Qmd3 9Z0yzar7dY0XVx/ycPXStjugiLT+Sl0BLP0I9NwAeTwQpwS9g/bbUPROao7HnHQhe24dAY/q0EM ACP8DpDT78CZ8TdEIe4VFcFoRso2HIQ3OVWqV3Lr5+nGhLP5uTGTcl33qSMBA57Hw/N7T4/lSan Os3vfDgJkj5XKkFHyIb3jJbXMtmJ4k0atRgsx/P03o2Ka5Dl6fSvndsXrz/Z4bqDTRCl8xegrXb Poh0SS/Hug/p0XCZE40AWqlPM7RA2GOiY= X-Google-Smtp-Source: AGHT+IHJX2odMOkxqjC9kygJ8geeW4YGATXYE5Q0Vn4m1xBdMtAvAWd76YQYT6Iqm9V/V9OuYWpD9A== X-Received: by 2002:a05:6000:1447:b0:3ec:dd12:54d3 with SMTP id ffacd0b85a97d-42cc1d0c37dmr5866655f8f.35.1763824490087; Sat, 22 Nov 2025 07:14:50 -0800 (PST) Received: from smtpclient.apple ([62.74.10.0]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7f363b0sm17585722f8f.13.2025.11.22.07.14.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Nov 2025 07:14:49 -0800 (PST) From: George Kontostanos Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Subject: Re: git: 5a94c2e89f6a - main - lio: use newly exposed RSS hash key API rather than ad-hoc hashing Date: Sat, 22 Nov 2025 17:14:38 +0200 References: <6921c926.2f362.6af0f437@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-main@freebsd.org" , "dev-commits-src-all@freebsd.org" In-Reply-To: <6921c926.2f362.6af0f437@gitrepo.freebsd.org> Message-Id: <66177B99-8140-4233-A4C1-C79EF3BC9541@gmail.com> X-Mailer: Apple Mail (2.3864.200.81.1.6) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; TO_DN_EQ_ADDR_ALL(0.00)[]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[gmail.com:+]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::433:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4dDFxr5wrbz3DNN unsubscribe > On 22 Nov 2025, at 4:31=E2=80=AFPM, Andrew Gallatin = wrote: >=20 > The branch main has been updated by gallatin: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5a94c2e89f6a4fbdea49d6c3a51b5fe0= 154d2495 >=20 > commit 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 > Author: Andrew Gallatin > AuthorDate: 2025-11-22 14:29:34 +0000 > Commit: Andrew Gallatin > CommitDate: 2025-11-22 14:29:34 +0000 >=20 > lio: use newly exposed RSS hash key API rather than ad-hoc hashing >=20 > Differential Revision: https://reviews.freebsd.org/D53101 > Reviewed by: zlei > Sponsored by: Netflix > --- > sys/dev/liquidio/lio_main.c | 5 ----- > sys/dev/liquidio/lio_network.h | 2 -- > sys/dev/liquidio/lio_rss.c | 8 ++++---- > sys/dev/liquidio/lio_rss.h | 4 ---- > 4 files changed, 4 insertions(+), 15 deletions(-) >=20 > diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c > index 3c73a6b10eed..7b6eeb460095 100644 > --- a/sys/dev/liquidio/lio_main.c > +++ b/sys/dev/liquidio/lio_main.c > @@ -64,10 +64,8 @@ static int num_queues_per_pf1; > TUNABLE_INT("hw.lio.num_queues_per_pf0", &num_queues_per_pf0); > TUNABLE_INT("hw.lio.num_queues_per_pf1", &num_queues_per_pf1); >=20 > -#ifdef RSS > static int lio_rss =3D 1; > TUNABLE_INT("hw.lio.rss", &lio_rss); > -#endif /* RSS */ >=20 > /* Hardware LRO */ > unsigned int lio_hwlro =3D 0; > @@ -1437,13 +1435,10 @@ lio_setup_nic_devices(struct octeon_device = *octeon_dev) > lio_set_feature(ifp, LIO_CMD_TNL_TX_CSUM_CTL, > LIO_CMD_TXCSUM_ENABLE); >=20 > -#ifdef RSS > if (lio_rss) { > if (lio_send_rss_param(lio)) > goto setup_nic_dev_fail; > } else > -#endif /* RSS */ > - > lio_set_feature(ifp, LIO_CMD_SET_FNV, > LIO_CMD_FNV_ENABLE); >=20 > diff --git a/sys/dev/liquidio/lio_network.h = b/sys/dev/liquidio/lio_network.h > index 856cc8f7ab09..65896bf8cfa9 100644 > --- a/sys/dev/liquidio/lio_network.h > +++ b/sys/dev/liquidio/lio_network.h > @@ -125,9 +125,7 @@ struct lio { > /* VLAN Filtering related */ > eventhandler_tag vlan_attach; > eventhandler_tag vlan_detach; > -#ifdef RSS > struct lio_rss_params_set rss_set; > -#endif /* RSS */ > }; >=20 > #define LIO_MAX_CORES 12 > diff --git a/sys/dev/liquidio/lio_rss.c b/sys/dev/liquidio/lio_rss.c > index df10cbbe3a05..da1e18142e81 100644 > --- a/sys/dev/liquidio/lio_rss.c > +++ b/sys/dev/liquidio/lio_rss.c > @@ -31,8 +31,6 @@ > * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH = DAMAGE. > */ >=20 > -#ifdef RSS > - > #include "lio_bsd.h" > #include "lio_common.h" > #include "lio_droq.h" > @@ -69,7 +67,11 @@ lio_set_rss_info(struct lio *lio) > uint8_t queue_id; >=20 > for (i =3D 0; i < LIO_RSS_TABLE_SZ; i++) { > +#ifdef RSS > queue_id =3D rss_get_indirection_to_bucket(i); > +#else > + queue_id =3D i; > +#endif > queue_id =3D queue_id % oct->num_oqs; > rss_set->fw_itable[i] =3D queue_id; > } > @@ -168,5 +170,3 @@ lio_send_rss_param(struct lio *lio) >=20 > return (0); > } > - > -#endif /* RSS */ > diff --git a/sys/dev/liquidio/lio_rss.h b/sys/dev/liquidio/lio_rss.h > index 8a5020d47f7e..727f08b5fb0d 100644 > --- a/sys/dev/liquidio/lio_rss.h > +++ b/sys/dev/liquidio/lio_rss.h > @@ -34,8 +34,6 @@ > #ifndef __LIO_RSS_H__ > #define __LIO_RSS_H__ >=20 > -#ifdef RSS > - > #include > #include >=20 > @@ -76,8 +74,6 @@ struct lio_rss_params_set { >=20 > }; >=20 > -#endif /* RSS */ > - > #define LIO_RSS_HASH_IPV4 0x100 > #define LIO_RSS_HASH_TCP_IPV4 0x200 > #define LIO_RSS_HASH_IPV6 0x400 >=20