From nobody Fri Feb 17 17:08:17 2023 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 4PJJDL0fJyz3r9gK; Fri, 17 Feb 2023 17:08:18 +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 4PJJDK6qGfz3lv4; Fri, 17 Feb 2023 17:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676653698; 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=MXfg7E/e8jx9M+WSZqRff1hEac1QihxxCQIlJw/WXXQ=; b=miBfvivi9B3IrCH2v4SmrVAYtb5xiLj2Zxnuh3vm4eZK7P7F5Ett3PyfUgcews1S2FLGEv EIegP/OQn1xrMmp6Xl6+q7Trxs04qeyFoJQ2Oi6IYOPCuay84OLZN7azgWFQi9dOf/EIx2 A18blXgzMJReFmOtRxDAJuwkmS0eRC+O7+tW0rDb0qwf3XsT70IvUKmepHiXetjirvWzci R3BCXsdF/j1yMVTlkoAqtRqMTGG/4vlLUUclJv18MEiQznhNhQc7bLoB4SHPXF4bj9ykQV aVLftPyEq6YsFkHGbtJ7f0/N1u3hsBuQAFIMHTW70UknLkdOIBI//j8RQKS6lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676653698; 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=MXfg7E/e8jx9M+WSZqRff1hEac1QihxxCQIlJw/WXXQ=; b=tPimqfCtCFBxyv6vV33PtZZ4WdLZHhXpHl+KW7/zYp+t6nIac0DSmbmvZCAGbnE3+c6PQZ mEWtZM0tqBpMG77Rsr4kxOEkk6K2UkJSjfa9jpzMLZZReF4c3wHhGuCBKc826BHvgxGyf8 dyeM8C+nodjTZNa7klnKTDV+HKBJXY9omWFZdjvs4bjmTPdUj1cWToEDb4oP4rKO4Gdxn6 f2TKcCsCIPKa0HPS/zDAFPZFhT4fG+V007Ckyax2PFwxrRBhTxGE9MANU8ejutO8hjLf3j muM+4/XPS8+iXmUzpGFeLuT5tHZ1KSrapDOyAb85iaSGmR1Lh6iKIdxlOMQ/Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676653698; a=rsa-sha256; cv=none; b=sJ5EO8Ipt1U+OwawpMYoYY4W8lufap7IHQUO35+KN0KLdBM9Goa/Drj3D50CHyD7pMOJO+ v5Zf/dLPDqilCaOnGLrfYts5PAQdDQrVKccyqlN+rlaPeGBiR4OP4m2aP5QaKnTC+JkFUr 5E1zVXNBWyXDmdydFHM5tOOLSTAzxpERUx9M3U4cBREvlOZvG2PWVwjtdakpGhJgOhPUAq dqwr/IPY/MCU8UVZbJU35mn9pERvvuhpVVbNBm9errIXlC/GyghcQZ+c79LRLJDISWlCtI xneuu4HY2ubHHu0gWxv8WRm4W5Q5lE7ffejpuel0UV6vqC/mKPyXix1mbcc7xA== 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 4PJJDK5tx2zr7m; Fri, 17 Feb 2023 17:08:17 +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 31HH8Hlm054956; Fri, 17 Feb 2023 17:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HH8H9I054955; Fri, 17 Feb 2023 17:08:17 GMT (envelope-from git) Date: Fri, 17 Feb 2023 17:08:17 GMT Message-Id: <202302171708.31HH8H9I054955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b919bf05966c - main - cxgbe: Move helper functions for mbuf metadata to adapter.h. 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b919bf05966c34cef8e02451ff1dfe9eec0f9cbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b919bf05966c34cef8e02451ff1dfe9eec0f9cbd commit b919bf05966c34cef8e02451ff1dfe9eec0f9cbd Author: John Baldwin AuthorDate: 2023-02-17 17:06:12 +0000 Commit: John Baldwin CommitDate: 2023-02-17 17:06:12 +0000 cxgbe: Move helper functions for mbuf metadata to adapter.h. Previously private to t4_sge.c, this allows other parts of the driver (such as NIC TLS) to use these helpers directly. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D38578 --- sys/dev/cxgbe/adapter.h | 58 +++++++++++++++++++++++++++++++++++++++++++++ sys/dev/cxgbe/t4_sge.c | 63 ------------------------------------------------- 2 files changed, 58 insertions(+), 63 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index b470d1a6461c..7076b1cf781a 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -1118,6 +1118,64 @@ hw_off_limits(struct adapter *sc) return (__predict_false(off_limits != 0)); } +static inline int +mbuf_nsegs(struct mbuf *m) +{ + M_ASSERTPKTHDR(m); + KASSERT(m->m_pkthdr.inner_l5hlen > 0, + ("%s: mbuf %p missing information on # of segments.", __func__, m)); + + return (m->m_pkthdr.inner_l5hlen); +} + +static inline void +set_mbuf_nsegs(struct mbuf *m, uint8_t nsegs) +{ + M_ASSERTPKTHDR(m); + m->m_pkthdr.inner_l5hlen = nsegs; +} + +/* Internal mbuf flags stored in PH_loc.eight[1]. */ +#define MC_NOMAP 0x01 +#define MC_RAW_WR 0x02 +#define MC_TLS 0x04 + +static inline int +mbuf_cflags(struct mbuf *m) +{ + M_ASSERTPKTHDR(m); + return (m->m_pkthdr.PH_loc.eight[4]); +} + +static inline void +set_mbuf_cflags(struct mbuf *m, uint8_t flags) +{ + M_ASSERTPKTHDR(m); + m->m_pkthdr.PH_loc.eight[4] = flags; +} + +static inline int +mbuf_len16(struct mbuf *m) +{ + int n; + + M_ASSERTPKTHDR(m); + n = m->m_pkthdr.PH_loc.eight[0]; + if (!(mbuf_cflags(m) & MC_TLS)) + MPASS(n > 0 && n <= SGE_MAX_WR_LEN / 16); + + return (n); +} + +static inline void +set_mbuf_len16(struct mbuf *m, uint8_t len16) +{ + M_ASSERTPKTHDR(m); + if (!(mbuf_cflags(m) & MC_TLS)) + MPASS(len16 > 0 && len16 <= SGE_MAX_WR_LEN / 16); + m->m_pkthdr.PH_loc.eight[0] = len16; +} + static inline uint32_t t4_read_reg(struct adapter *sc, uint32_t reg) { diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index ad3cb63dade4..94fc705bd1d4 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -87,11 +87,6 @@ __FBSDID("$FreeBSD$"); #define RX_COPY_THRESHOLD MINCLSIZE #endif -/* Internal mbuf flags stored in PH_loc.eight[1]. */ -#define MC_NOMAP 0x01 -#define MC_RAW_WR 0x02 -#define MC_TLS 0x04 - /* * Ethernet frames are DMA'd at this byte offset into the freelist buffer. * 0-7 are valid values. @@ -2284,64 +2279,6 @@ t4_update_fl_bufsize(struct ifnet *ifp) #endif } -static inline int -mbuf_nsegs(struct mbuf *m) -{ - - M_ASSERTPKTHDR(m); - KASSERT(m->m_pkthdr.inner_l5hlen > 0, - ("%s: mbuf %p missing information on # of segments.", __func__, m)); - - return (m->m_pkthdr.inner_l5hlen); -} - -static inline void -set_mbuf_nsegs(struct mbuf *m, uint8_t nsegs) -{ - - M_ASSERTPKTHDR(m); - m->m_pkthdr.inner_l5hlen = nsegs; -} - -static inline int -mbuf_cflags(struct mbuf *m) -{ - - M_ASSERTPKTHDR(m); - return (m->m_pkthdr.PH_loc.eight[4]); -} - -static inline void -set_mbuf_cflags(struct mbuf *m, uint8_t flags) -{ - - M_ASSERTPKTHDR(m); - m->m_pkthdr.PH_loc.eight[4] = flags; -} - -static inline int -mbuf_len16(struct mbuf *m) -{ - int n; - - M_ASSERTPKTHDR(m); - n = m->m_pkthdr.PH_loc.eight[0]; - if (!(mbuf_cflags(m) & MC_TLS)) - MPASS(n > 0 && n <= SGE_MAX_WR_LEN / 16); - - return (n); -} - -static inline void -set_mbuf_len16(struct mbuf *m, uint8_t len16) -{ - - M_ASSERTPKTHDR(m); - if (!(mbuf_cflags(m) & MC_TLS)) - MPASS(len16 > 0 && len16 <= SGE_MAX_WR_LEN / 16); - m->m_pkthdr.PH_loc.eight[0] = len16; -} - #ifdef RATELIMIT static inline int mbuf_eo_nsegs(struct mbuf *m)