From nobody Tue Jan 03 09:58:47 2023 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 4NmSqW3jZJz2pKcl; Tue, 3 Jan 2023 09:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NmSqW3BfNz4Gvh; Tue, 3 Jan 2023 09:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672739927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YLucVHnCdQ5KSJPKlBsI9yPEIiX1I9+FR4FMKmG9flc=; b=qH0D3xtwIZ6DhI/RSdOHj+qunqX+v0jUbqNldoYgMJ2OPq2xftz0jkpyrBO7crf/1dxMbK QKqW+PeTC00G6ocroP725RmJFzDx1a/YmNGFUsmPkH2+Js5mcWBB0tTF7u+E3BkBY94FhE aBGjTcEZsz0NYIzCw+9ezEVZ//pas4+VEAv8TOpgFB44s4UscsPXDw3L3tmmmv8J1HAhMf ury9LdJbmmCSWAIaQXixdApqgjH1f735lAsy6bWMP06lV9I7xbm1jNDbs3g1KD8ZEfhYhL 9iDVuOlpp0ritQIYjQHgGPJ3iM+n3Cv/22CBplRAH9PpgxRWHIEON0TSp81DLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672739927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YLucVHnCdQ5KSJPKlBsI9yPEIiX1I9+FR4FMKmG9flc=; b=C9L3JmGTtSDlEOrf5FAPlkZD4VvQYSHYRroYqIf80GVEUTWr1E0JbmImP0A9y5WJ3/RFcD YE4nwReB+7pL8g1lG99Y3CWtWbjLBfCXBgUY0KBJNo2vEJcheO9Y07hjSQu9CPKksINHIz BuIc7AcsBN2bhiXDVR1KCggRldAz+jozN8oJwqB4I7oO4dceLVpdHRHn5/ig9mbWAv4pOb sA71sFx5RUXTFKzJ3KVBwSvcXp8uA8o1EeYKUj+EqN0bkx4pDZFgN8ySsDvV4B+smC8Ln5 FpU2TvS8giCXG8GKS/OUpqexgG6f1avH8zrJJQAn5GNHyhGzsdLI7ilfYyTd0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672739927; a=rsa-sha256; cv=none; b=E1Y1OOIFqw4ajiFY7XGf080WgD49huOx/3n1BhugTgX1YBtpkqLdYAK+KDNCNVexP8aDGd pxBwTj2yyHRkFfdGzTyHvCd1XxBbtAa0pAlOLvr2XevR94LQaQrh39OvaZfVMgv15wZIE4 y0qyAz29aiU2N9VhSqBpyE8qzPvNh2PPOjLESM+KpKrzjcRMh5ogAfd8Kvi7Xck7NoGDYD PSsDNoOs2cvqT8cOqT2iuxjLuytXlpNsshwYCmkt5gajYosW2VK/a/6loubd02+T39ni+I EimiQDbTGrVoMZZCjb+qcbwMy3g6ossMw5EwvFe5J8Zy/4ayqyELKLo7BZH0/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NmSqW2GW8zSC7; Tue, 3 Jan 2023 09:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3039wlp0031503; Tue, 3 Jan 2023 09:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3039wlwg031502; Tue, 3 Jan 2023 09:58:47 GMT (envelope-from git) Date: Tue, 3 Jan 2023 09:58:47 GMT Message-Id: <202301030958.3039wlwg031502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 01143ba1189b - main - ifcapnv: fix IFCAP2 usage 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01143ba1189b5a2cbbe58cd3eea4c2eb22e04e57 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=01143ba1189b5a2cbbe58cd3eea4c2eb22e04e57 commit 01143ba1189b5a2cbbe58cd3eea4c2eb22e04e57 Author: Konstantin Belousov AuthorDate: 2022-12-23 17:30:11 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-03 09:48:16 +0000 ifcapnv: fix IFCAP2 usage IFCAP2_XXX constants are integers, they do not need shift for the definition. But their usage as bitmask for if_capenable2 does require shift. Add convenience macro IFCAP2_BIT() for consumers. Fix the only existing consumer, mlx5(4) RXTLS enable bits. Reported by: jhb Reviewed by: jhb, jhibbits, hselasky Coverity CID: 1501659 Sponsored by: NVIDIA networking Differential revision: https://reviews.freebsd.org/D37862 --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 11 ++++++----- sys/net/if.h | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 47bf627ed7af..04e3c302005b 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3664,10 +3664,10 @@ siocsifcap_driver: } } mask = drv_ioctl_data->reqcap2 ^ ifp->if_capenable2; - if (mask & IFCAP2_RXTLS4) - ifp->if_capenable2 ^= IFCAP2_RXTLS4; - if (mask & IFCAP2_RXTLS6) - ifp->if_capenable2 ^= IFCAP2_RXTLS6; + if ((mask & IFCAP2_BIT(IFCAP2_RXTLS4)) != 0) + ifp->if_capenable2 ^= IFCAP2_BIT(IFCAP2_RXTLS4); + if ((mask & IFCAP2_BIT(IFCAP2_RXTLS6)) != 0) + ifp->if_capenable2 ^= IFCAP2_BIT(IFCAP2_RXTLS6); out: PRIV_UNLOCK(priv); break; @@ -4550,7 +4550,8 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) ifp->if_capabilities |= IFCAP_TXRTLMT | IFCAP_TXTLS_RTLMT; #endif ifp->if_capabilities |= IFCAP_VXLAN_HWCSUM | IFCAP_VXLAN_HWTSO; - ifp->if_capabilities2 |= IFCAP2_RXTLS4 | IFCAP2_RXTLS6; + ifp->if_capabilities2 |= IFCAP2_BIT(IFCAP2_RXTLS4) | + IFCAP2_BIT(IFCAP2_RXTLS6); ifp->if_snd_tag_alloc = mlx5e_snd_tag_alloc; #ifdef RATELIMIT ifp->if_ratelimit_query = mlx5e_ratelimit_query; diff --git a/sys/net/if.h b/sys/net/if.h index 0faf159ff1aa..b39eb933993c 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -255,8 +255,10 @@ struct if_data { #define IFCAP_TXTLS_RTLMT 0x80000000 /* can do TLS with rate limiting */ /* IFCAP2_* are integers, not bits. */ -#define IFCAP2_RXTLS4 (0x00001ULL << 32) -#define IFCAP2_RXTLS6 (0x00002ULL << 32) +#define IFCAP2_RXTLS4 0 +#define IFCAP2_RXTLS6 1 + +#define IFCAP2_BIT(x) (1UL << (x)) #define IFCAP_HWCSUM_IPV6 (IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM_IPV6) @@ -265,7 +267,6 @@ struct if_data { #define IFCAP_WOL (IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC) #define IFCAP_TOE (IFCAP_TOE4 | IFCAP_TOE6) #define IFCAP_TXTLS (IFCAP_TXTLS4 | IFCAP_TXTLS6) -#define IFCAP2_RXTLS (IFCAP2_RXTLS4 | IFCAP2_RXTLS6) #define IFCAP_CANTCHANGE (IFCAP_NETMAP | IFCAP_NV) #define IFCAP_ALLCAPS 0xffffffff