svn commit: r334447 - in head/sys: conf dev/cxgbe modules/cxgbe/if_cxgbe

Navdeep Parhar np at FreeBSD.org
Thu May 31 21:31:11 UTC 2018


Author: np
Date: Thu May 31 21:31:08 2018
New Revision: 334447
URL: https://svnweb.freebsd.org/changeset/base/334447

Log:
  cxgbe(4): Add code to deal with the chip's source MAC table (aka SMT).
  
  Submitted by:	Krishnamraju Eraparaju @ Chelsio
  Sponsored by:	Chelsio Communications

Added:
  head/sys/dev/cxgbe/t4_smt.c   (contents, props changed)
  head/sys/dev/cxgbe/t4_smt.h   (contents, props changed)
Modified:
  head/sys/conf/files
  head/sys/dev/cxgbe/adapter.h
  head/sys/dev/cxgbe/t4_main.c
  head/sys/modules/cxgbe/if_cxgbe/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu May 31 21:22:09 2018	(r334446)
+++ head/sys/conf/files	Thu May 31 21:31:08 2018	(r334447)
@@ -1409,6 +1409,8 @@ dev/cxgbe/t4_sched.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_sge.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
+dev/cxgbe/t4_smt.c		optional cxgbe pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_l2t.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_tracer.c		optional cxgbe pci \

Modified: head/sys/dev/cxgbe/adapter.h
==============================================================================
--- head/sys/dev/cxgbe/adapter.h	Thu May 31 21:22:09 2018	(r334446)
+++ head/sys/dev/cxgbe/adapter.h	Thu May 31 21:31:08 2018	(r334447)
@@ -824,6 +824,7 @@ struct adapter {
 	void *iscsi_ulp_softc;	/* (struct cxgbei_data *) */
 	void *ccr_softc;	/* (struct ccr_softc *) */
 	struct l2t_data *l2t;	/* L2 table */
+	struct smt_data *smt;	/* Source MAC Table */
 	struct tid_info tids;
 
 	uint8_t doorbells;

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Thu May 31 21:22:09 2018	(r334446)
+++ head/sys/dev/cxgbe/t4_main.c	Thu May 31 21:31:08 2018	(r334447)
@@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
 #include "t4_l2t.h"
 #include "t4_mp_ring.h"
 #include "t4_if.h"
+#include "t4_smt.h"
 
 /* T4 bus driver interface */
 static int t4_probe(device_t);
@@ -1105,6 +1106,7 @@ t4_attach(device_t dev)
 	    M_ZERO | M_WAITOK);
 
 	t4_init_l2t(sc, M_WAITOK);
+	t4_init_smt(sc, M_WAITOK);
 	t4_init_tx_sched(sc);
 #ifdef RATELIMIT
 	t4_init_etid_table(sc);
@@ -1379,6 +1381,8 @@ t4_detach_common(device_t dev)
 
 	if (sc->l2t)
 		t4_free_l2t(sc->l2t);
+	if (sc->smt)
+		t4_free_smt(sc->smt);
 #ifdef RATELIMIT
 	t4_free_etid_table(sc);
 #endif
@@ -5680,6 +5684,10 @@ t4_sysctls(struct adapter *sc)
 	    CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
 	    sysctl_l2t, "A", "hardware L2 table");
 
+	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "smt",
+	    CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
+	    sysctl_smt, "A", "hardware source MAC table");
+
 	SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "lb_stats",
 	    CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
 	    sysctl_lb_stats, "A", "loopback statistics");
@@ -10173,6 +10181,8 @@ mod_event(module_t mod, int cmd, void *arg)
 			    t4_del_hashfilter_rpl, CPL_COOKIE_HASHFILTER);
 			t4_register_cpl_handler(CPL_TRACE_PKT, t4_trace_pkt);
 			t4_register_cpl_handler(CPL_T5_TRACE_PKT, t5_trace_pkt);
+			t4_register_cpl_handler(CPL_SMT_WRITE_RPL,
+			    do_smt_write_rpl);
 			sx_init(&t4_list_lock, "T4/T5 adapters");
 			SLIST_INIT(&t4_list);
 #ifdef TCP_OFFLOAD

Added: head/sys/dev/cxgbe/t4_smt.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/cxgbe/t4_smt.c	Thu May 31 21:31:08 2018	(r334447)
@@ -0,0 +1,346 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2018 Chelsio Communications, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+#include "opt_inet6.h"
+
+#include <sys/param.h>
+#include <sys/eventhandler.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/rwlock.h>
+#include <sys/socket.h>
+#include <sys/sbuf.h>
+#include <netinet/in.h>
+
+#include "common/common.h"
+#include "common/t4_msg.h"
+#include "t4_smt.h"
+
+/*
+ * Module locking notes:  There is a RW lock protecting the SMAC table as a
+ * whole plus a spinlock per SMT entry.  Entry lookups and allocations happen
+ * under the protection of the table lock, individual entry changes happen
+ * while holding that entry's spinlock.  The table lock nests outside the
+ * entry locks.  Allocations of new entries take the table lock as writers so
+ * no other lookups can happen while allocating new entries.  Entry updates
+ * take the table lock as readers so multiple entries can be updated in
+ * parallel.  An SMT entry can be dropped by decrementing its reference count
+ * and therefore can happen in parallel with entry allocation but no entry
+ * can change state or increment its ref count during allocation as both of
+ * these perform lookups.
+ *
+ * Note: We do not take references to ifnets in this module because both
+ * the TOE and the sockets already hold references to the interfaces and the
+ * lifetime of an SMT entry is fully contained in the lifetime of the TOE.
+ */
+
+/*
+ * Allocate a free SMT entry.  Must be called with smt_data.lock held.
+ */
+struct smt_entry *
+t4_find_or_alloc_sme(struct smt_data *s, uint8_t *smac)
+{
+	struct smt_entry *end, *e;
+	struct smt_entry *first_free = NULL;
+
+	rw_assert(&s->lock, RA_WLOCKED);
+	for (e = &s->smtab[0], end = &s->smtab[s->smt_size]; e != end; ++e) {
+		if (atomic_load_acq_int(&e->refcnt) == 0) {
+			if (!first_free)
+				first_free = e;
+		} else {
+			if (e->state == SMT_STATE_SWITCHING) {
+				/*
+				 * This entry is actually in use. See if we can
+				 * re-use it?
+				 */
+				if (memcmp(e->smac, smac, ETHER_ADDR_LEN) == 0)
+					goto found_reuse;
+			}
+		}
+	}
+	if (first_free) {
+		e = first_free;
+		goto found;
+	}
+	return NULL;
+
+found:
+	e->state = SMT_STATE_UNUSED;
+found_reuse:
+	atomic_add_int(&e->refcnt, 1);
+	return e;
+}
+
+/*
+ * Write an SMT entry.  Must be called with the entry locked.
+ */
+int
+t4_write_sme(struct smt_entry *e)
+{
+	struct smt_data *s;
+	struct sge_wrq *wrq;
+	struct adapter *sc;
+	struct wrq_cookie cookie;
+	struct cpl_smt_write_req *req;
+	struct cpl_t6_smt_write_req *t6req;
+	u8 row;
+
+	mtx_assert(&e->lock, MA_OWNED);
+
+	MPASS(e->wrq != NULL);
+	wrq = e->wrq;
+	sc = wrq->adapter;
+	MPASS(wrq->adapter != NULL);
+	s = sc->smt;
+
+
+	if (chip_id(sc) <= CHELSIO_T5) {
+		/* Source MAC Table (SMT) contains 256 SMAC entries
+		 * organized in 128 rows of 2 entries each.
+		 */
+		req = start_wrq_wr(wrq, howmany(sizeof(*req), 16), &cookie);
+		if (req == NULL)
+			return (ENOMEM);
+		INIT_TP_WR(req, 0);
+		/* Each row contains an SMAC pair.
+		 * LSB selects the SMAC entry within a row
+		 */
+		row = (e->idx >> 1);
+		if (e->idx & 1) {
+			req->pfvf1 = 0x0;
+			memcpy(req->src_mac1, e->smac, ETHER_ADDR_LEN);
+			/* fill pfvf0/src_mac0 with entry
+			 * at prev index from smt-tab.
+			 */
+			req->pfvf0 = 0x0;
+			memcpy(req->src_mac0, s->smtab[e->idx - 1].smac,
+					ETHER_ADDR_LEN);
+		} else {
+			req->pfvf0 = 0x0;
+			memcpy(req->src_mac0, e->smac, ETHER_ADDR_LEN);
+			/* fill pfvf1/src_mac1 with entry
+			 * at next index from smt-tab
+			 */
+			req->pfvf1 = 0x0;
+			memcpy(req->src_mac1, s->smtab[e->idx + 1].smac,
+					ETHER_ADDR_LEN);
+		}
+	} else {
+		/* Source MAC Table (SMT) contains 256 SMAC entries */
+		t6req = start_wrq_wr(wrq, howmany(sizeof(*t6req), 16), &cookie);
+		if (t6req == NULL)
+			return (ENOMEM);
+		INIT_TP_WR(t6req, 0);
+		req = (struct cpl_smt_write_req *)t6req;
+
+		/* fill pfvf0/src_mac0 from smt-tab */
+		req->pfvf0 = 0x0;
+		memcpy(req->src_mac0, s->smtab[e->idx].smac, ETHER_ADDR_LEN);
+		row = e->idx;
+	}
+	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SMT_WRITE_REQ, e->idx |
+					V_TID_QID(e->iqid)));
+	req->params = htonl(V_SMTW_NORPL(0) |
+			V_SMTW_IDX(row) |
+			V_SMTW_OVLAN_IDX(0));
+
+	commit_wrq_wr(wrq, req, &cookie);
+
+	return (0);
+}
+
+/*
+ * Allocate an SMT entry for use by a switching rule.
+ */
+struct smt_entry *
+t4_smt_alloc_switching(struct smt_data *s, uint8_t *smac)
+{
+	struct smt_entry *e;
+
+	MPASS(s != NULL);
+	rw_wlock(&s->lock);
+	e = t4_find_or_alloc_sme(s, smac);
+	rw_wunlock(&s->lock);
+	return e;
+}
+
+/*
+ * Sets/updates the contents of a switching SMT entry that has been allocated
+ * with an earlier call to @t4_smt_alloc_switching.
+ */
+int
+t4_smt_set_switching(struct adapter *sc, struct smt_entry *e, uint16_t pfvf,
+								uint8_t *smac)
+{
+	int rc = 0;
+
+	if (atomic_load_acq_int(&e->refcnt) == 1) {
+		/* Setup the entry for the first time */
+		mtx_lock(&e->lock);
+		e->wrq = &sc->sge.mgmtq;
+		e->iqid = sc->sge.fwq.abs_id;
+		e->pfvf =  pfvf;
+		e->state = SMT_STATE_SWITCHING;
+		memcpy(e->smac, smac, ETHER_ADDR_LEN);
+		rc = t4_write_sme(e);
+		mtx_unlock(&e->lock);
+	}
+
+	return (rc);
+}
+
+int
+t4_init_smt(struct adapter *sc, int flags)
+{
+	int i, smt_size;
+	struct smt_data *s;
+
+	smt_size = SMT_SIZE;
+	s = malloc(sizeof(*s) + smt_size * sizeof (struct smt_entry), M_CXGBE,
+	    M_ZERO | flags);
+	if (!s)
+		return (ENOMEM);
+
+	s->smt_size = smt_size;
+	rw_init(&s->lock, "SMT");
+
+	for (i = 0; i < smt_size; i++) {
+		struct smt_entry *e = &s->smtab[i];
+
+		e->idx = i;
+		e->state = SMT_STATE_UNUSED;
+		mtx_init(&e->lock, "SMT_E", NULL, MTX_DEF);
+		atomic_store_rel_int(&e->refcnt, 0);
+	}
+
+	sc->smt = s;
+
+	return (0);
+}
+
+int
+t4_free_smt(struct smt_data *s)
+{
+	int i;
+
+	for (i = 0; i < s->smt_size; i++)
+		mtx_destroy(&s->smtab[i].lock);
+	rw_destroy(&s->lock);
+	free(s, M_CXGBE);
+
+	return (0);
+}
+
+int
+do_smt_write_rpl(struct sge_iq *iq, const struct rss_header *rss,
+		struct mbuf *m)
+{
+	struct adapter *sc = iq->adapter;
+	const struct cpl_smt_write_rpl *rpl = (const void *)(rss + 1);
+	unsigned int tid = GET_TID(rpl);
+	unsigned int smtidx = G_TID_TID(tid);
+
+	if (__predict_false(rpl->status != CPL_ERR_NONE)) {
+		struct smt_entry *e = &sc->smt->smtab[smtidx];
+		log(LOG_ERR,
+		    "Unexpected SMT_WRITE_RPL (%u) for entry at hw_idx %u\n",
+		    rpl->status, smtidx);
+		mtx_lock(&e->lock);
+		e->state = SMT_STATE_ERROR;
+		mtx_unlock(&e->lock);
+		return (EINVAL);
+	}
+
+	return (0);
+}
+
+#ifdef SBUF_DRAIN
+static char
+smt_state(const struct smt_entry *e)
+{
+	switch (e->state) {
+	case SMT_STATE_SWITCHING: return 'X';
+	case SMT_STATE_ERROR: return 'E';
+	default: return 'U';
+	}
+}
+
+int
+sysctl_smt(SYSCTL_HANDLER_ARGS)
+{
+	struct adapter *sc = arg1;
+	struct smt_data *smt = sc->smt;
+	struct smt_entry *e;
+	struct sbuf *sb;
+	int rc, i, header = 0;
+
+	if (smt == NULL)
+		return (ENXIO);
+
+	rc = sysctl_wire_old_buffer(req, 0);
+	if (rc != 0)
+		return (rc);
+
+	sb = sbuf_new_for_sysctl(NULL, NULL, SMT_SIZE, req);
+	if (sb == NULL)
+		return (ENOMEM);
+
+	e = &smt->smtab[0];
+	for (i = 0; i < smt->smt_size; i++, e++) {
+		mtx_lock(&e->lock);
+		if (e->state == SMT_STATE_UNUSED)
+			goto skip;
+
+		if (header == 0) {
+			sbuf_printf(sb, " Idx "
+			    "Ethernet address  State Users");
+			header = 1;
+		}
+		sbuf_printf(sb, "\n%4u %02x:%02x:%02x:%02x:%02x:%02x "
+			   "%c   %5u",
+			   e->idx, e->smac[0], e->smac[1], e->smac[2],
+			   e->smac[3], e->smac[4], e->smac[5],
+			   smt_state(e), atomic_load_acq_int(&e->refcnt));
+skip:
+		mtx_unlock(&e->lock);
+	}
+
+	rc = sbuf_finish(sb);
+	sbuf_delete(sb);
+
+	return (rc);
+}
+#endif

Added: head/sys/dev/cxgbe/t4_smt.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/cxgbe/t4_smt.h	Thu May 31 21:31:08 2018	(r334447)
@@ -0,0 +1,92 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2018 Chelsio Communications, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef __T4_SMT_H
+#define __T4_SMT_H
+
+/* identifies sync vs async SMT_WRITE_REQs */
+#define S_SYNC_WR    12
+#define V_SYNC_WR(x) ((x) << S_SYNC_WR)
+#define F_SYNC_WR    V_SYNC_WR(1)
+
+enum { SMT_SIZE = 256 };     /* # of SMT entries */
+
+enum {
+	SMT_STATE_SWITCHING,	/* entry is being used by a switching filter */
+	SMT_STATE_UNUSED,	/* entry not in use */
+	SMT_STATE_ERROR		/* entry is in error state */
+};
+
+struct smt_entry {
+	uint16_t state;			/* entry state */
+	uint16_t idx;			/* entry index */
+	uint32_t iqid;                  /* iqid for reply to write_sme */
+	struct sge_wrq *wrq;            /* queue to use for write_sme */
+	uint16_t pfvf;			/* pfvf number */
+	volatile int refcnt;		/* entry reference count */
+	uint8_t smac[ETHER_ADDR_LEN];	/* source MAC address */
+	struct mtx lock;
+};
+
+struct smt_data {
+	struct rwlock lock;
+	u_int smt_size;
+	struct smt_entry smtab[];
+};
+
+
+int t4_init_smt(struct adapter *, int);
+int t4_free_smt(struct smt_data *);
+struct smt_entry *t4_find_or_alloc_sme(struct smt_data *, uint8_t *);
+struct smt_entry *t4_smt_alloc_switching(struct smt_data *, uint8_t *);
+int t4_smt_set_switching(struct adapter *, struct smt_entry *,
+					uint16_t, uint8_t *);
+int t4_write_sme(struct smt_entry *);
+int do_smt_write_rpl(struct sge_iq *, const struct rss_header *, struct mbuf *);
+
+static inline void
+t4_smt_release(struct smt_entry *e)
+{
+	MPASS(e != NULL);
+	if (atomic_fetchadd_int(&e->refcnt, -1) == 1) {
+		mtx_lock(&e->lock);
+		e->state = SMT_STATE_UNUSED;
+		mtx_unlock(&e->lock);
+	}
+
+}
+
+
+#ifdef SBUF_DRAIN
+int sysctl_smt(SYSCTL_HANDLER_ARGS);
+#endif
+
+#endif  /* __T4_SMT_H */

Modified: head/sys/modules/cxgbe/if_cxgbe/Makefile
==============================================================================
--- head/sys/modules/cxgbe/if_cxgbe/Makefile	Thu May 31 21:22:09 2018	(r334446)
+++ head/sys/modules/cxgbe/if_cxgbe/Makefile	Thu May 31 21:31:08 2018	(r334447)
@@ -25,6 +25,7 @@ SRCS+=	t4_mp_ring.c
 SRCS+=	t4_netmap.c
 SRCS+=	t4_sched.c
 SRCS+=	t4_sge.c
+SRCS+=	t4_smt.c
 SRCS+=	t4_tracer.c
 SRCS+=  cudbg_common.c
 SRCS+=  cudbg_flash_utils.c


More information about the svn-src-all mailing list