Date: Mon, 6 Jun 2016 09:08:16 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301494 - head/sys/dev/sfxge Message-ID: <201606060908.u5698GMe047012@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Mon Jun 6 09:08:16 2016 New Revision: 301494 URL: https://svnweb.freebsd.org/changeset/base/301494 Log: sfxge(4): pick an RSS bucket for the packet enqueued and select TXQ accordingly Submitted by: Ivan Malov <Ivan.Malov at oktetlabs.ru> Reviewed by: gnn Sponsored by: Solarflare Communications, Inc. Differential Revision: https://reviews.freebsd.org/D6723 Modified: head/sys/dev/sfxge/sfxge_tx.c Modified: head/sys/dev/sfxge/sfxge_tx.c ============================================================================== --- head/sys/dev/sfxge/sfxge_tx.c Mon Jun 6 09:07:26 2016 (r301493) +++ head/sys/dev/sfxge/sfxge_tx.c Mon Jun 6 09:08:16 2016 (r301494) @@ -49,6 +49,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_rss.h" + #include <sys/param.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -68,6 +70,10 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip6.h> #include <netinet/tcp.h> +#ifdef RSS +#include <net/rss_config.h> +#endif + #include "common/efx.h" #include "sfxge.h" @@ -818,12 +824,24 @@ sfxge_if_transmit(struct ifnet *ifp, str (CSUM_DELAY_DATA | CSUM_TCP_IPV6 | CSUM_UDP_IPV6 | CSUM_TSO)) { int index = 0; +#ifdef RSS + uint32_t bucket_id; + + /* + * Select a TX queue which matches the corresponding + * RX queue for the hash in order to assign both + * TX and RX parts of the flow to the same CPU + */ + if (rss_m2bucket(m, &bucket_id) == 0) + index = bucket_id % (sc->txq_count - (SFXGE_TXQ_NTYPES - 1)); +#else /* check if flowid is set */ if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { uint32_t hash = m->m_pkthdr.flowid; index = sc->rx_indir_table[hash % SFXGE_RX_SCALE_MAX]; } +#endif #if SFXGE_TX_PARSE_EARLY if (m->m_pkthdr.csum_flags & CSUM_TSO) sfxge_parse_tx_packet(m);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606060908.u5698GMe047012>