svn commit: r255134 - in user/syuu/mq_bpf: sbin/ifconfig share/man/man4 share/man/man9 sys/dev/e1000 sys/dev/ixgbe sys/dev/mxge sys/net
Takuya ASADA
syuu at FreeBSD.org
Sun Sep 1 22:16:22 UTC 2013
Author: syuu
Date: Sun Sep 1 22:16:19 2013
New Revision: 255134
URL: http://svnweb.freebsd.org/changeset/base/255134
Log:
rename rxqueue_len/txqueue_len
Modified:
user/syuu/mq_bpf/sbin/ifconfig/ifconfig.c
user/syuu/mq_bpf/share/man/man4/netintro.4
user/syuu/mq_bpf/share/man/man9/ifnet.9
user/syuu/mq_bpf/sys/dev/e1000/if_igb.c
user/syuu/mq_bpf/sys/dev/ixgbe/ixgbe.c
user/syuu/mq_bpf/sys/dev/mxge/if_mxge.c
user/syuu/mq_bpf/sys/net/bpf.c
user/syuu/mq_bpf/sys/net/if.c
user/syuu/mq_bpf/sys/net/if.h
user/syuu/mq_bpf/sys/net/if_var.h
Modified: user/syuu/mq_bpf/sbin/ifconfig/ifconfig.c
==============================================================================
--- user/syuu/mq_bpf/sbin/ifconfig/ifconfig.c Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sbin/ifconfig/ifconfig.c Sun Sep 1 22:16:19 2013 (r255134)
@@ -985,16 +985,16 @@ status(const struct afswtch *afp, const
}
if ((ifr.ifr_reqcap & IFCAP_MULTIQUEUE)) {
- int i, rxqlen = 0, txqlen = 0;
+ int i, numrxq = 0, numtxq = 0;
if (ioctl(s, SIOCGIFQLEN, &ifr) == 0) {
- rxqlen = ifr.ifr_rxqueue_len;
- txqlen = ifr.ifr_txqueue_len;
+ numrxq = ifr.ifr_num_rxqueue;
+ numtxq = ifr.ifr_num_txqueue;
}else
perror("ioctl");
- printf("\trxqueue len=%d affinity=[", rxqlen);
- for (i = 0; i < rxqlen; i++) {
+ printf("\tnumber of rxqueues=%d affinity=[", numrxq);
+ for (i = 0; i < numrxq; i++) {
ifr.ifr_queue_affinity_index = i;
if (ioctl(s, SIOCGIFRXQAFFINITY, &ifr) == 0)
printf(" %d:%d", ifr.ifr_queue_affinity_index,
@@ -1004,8 +1004,8 @@ status(const struct afswtch *afp, const
}
printf(" ]\n");
- printf("\ttxqueue len=%d affinity=[", txqlen);
- for (i = 0; i < txqlen; i++) {
+ printf("\tnumber of txqueues=%d affinity=[", numtxq);
+ for (i = 0; i < numtxq; i++) {
ifr.ifr_queue_affinity_index = i;
if (ioctl(s, SIOCGIFTXQAFFINITY, &ifr) == 0)
printf(" %d:%d", ifr.ifr_queue_affinity_index,
Modified: user/syuu/mq_bpf/share/man/man4/netintro.4
==============================================================================
--- user/syuu/mq_bpf/share/man/man4/netintro.4 Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/share/man/man4/netintro.4 Sun Sep 1 22:16:19 2013 (r255134)
@@ -213,7 +213,7 @@ struct ifreq {
int ifru_media;
caddr_t ifru_data;
int ifru_cap[2];
- int ifru_queue_len[2];
+ int ifru_num_queue[2];
int ifru_queue_affinity[2];
} ifr_ifru;
#define ifr_addr ifr_ifru.ifru_addr /* address */
@@ -230,8 +230,8 @@ struct ifreq {
#define ifr_reqcap ifr_ifru.ifru_cap[0] /* requested capabilities */
#define ifr_curcap ifr_ifru.ifru_cap[1] /* current capabilities */
#define ifr_index ifr_ifru.ifru_index /* interface index */
-#define ifr_rxqueue_len ifr_ifru.ifru_queue_len[0] /* rxqueue len */
-#define ifr_txqueue_len ifr_ifru.ifru_queue_len[1] /* txqueue len */
+#define ifr_num_rxqueue ifr_ifru.ifru_num_queue[0] /* rxqueue len */
+#define ifr_num_txqueue ifr_ifru.ifru_num_queue[1] /* txqueue len */
#define ifr_queue_affinity_index ifr_ifru.ifru_queue_affinity[0] /* queue id */
#define ifr_queue_affinity_cpu ifr_ifru.ifru_queue_affinity[1] /* cpu id */
};
Modified: user/syuu/mq_bpf/share/man/man9/ifnet.9
==============================================================================
--- user/syuu/mq_bpf/share/man/man9/ifnet.9 Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/share/man/man9/ifnet.9 Sun Sep 1 22:16:19 2013 (r255134)
@@ -120,9 +120,9 @@
.Fa "struct ifnet *ifp" "struct sockaddr **retsa" "struct sockaddr *addr"
.Fc
.Ft int
-.Fn \*(lp*if_get_rxqueue_len\*(rp "struct ifnet *ifp"
+.Fn \*(lp*if_get_num_rxqueue\*(rp "struct ifnet *ifp"
.Ft int
-.Fn \*(lp*if_get_txqueue_len\*(rp "struct ifnet *ifp"
+.Fn \*(lp*if_get_num_txqueue\*(rp "struct ifnet *ifp"
.Ft int
.Fn \*(lp*if_get_rxqueue_affinity\*(rp "struct ifnet *ifp" "int queid"
.Ft int
@@ -545,9 +545,9 @@ for validity, and if necessary compute a
corresponds to that address which is returned in
.Fa *retsa .
Returns zero on success, or an error code on failure.
-.It Fn if_get_rxqueue_len
+.It Fn if_get_num_rxqueue
Get RX queue length, only required for multiqueue supported interfaces.
-.It Fn if_get_txqueue_len
+.It Fn if_get_num_txqueue
Get TX queue length, only required for multiqueue supported interfaces.
.It Fn if_get_rxqueue_affinity
Get RX queue affinity, only required for multiqueue supported interfaces.
Modified: user/syuu/mq_bpf/sys/dev/e1000/if_igb.c
==============================================================================
--- user/syuu/mq_bpf/sys/dev/e1000/if_igb.c Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/dev/e1000/if_igb.c Sun Sep 1 22:16:19 2013 (r255134)
@@ -278,8 +278,8 @@ static int igb_set_flowcntl(SYSCTL_HANDL
static int igb_sysctl_dmac(SYSCTL_HANDLER_ARGS);
static int igb_sysctl_eee(SYSCTL_HANDLER_ARGS);
-static int igb_get_rxqueue_len(struct ifnet *);
-static int igb_get_txqueue_len(struct ifnet *);
+static int igb_get_num_rxqueue(struct ifnet *);
+static int igb_get_num_txqueue(struct ifnet *);
static int igb_get_rxqueue_affinity(struct ifnet *, int);
static int igb_get_txqueue_affinity(struct ifnet *, int);
@@ -3122,8 +3122,8 @@ igb_setup_interface(device_t dev, struct
ifp->if_softc = adapter;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = igb_ioctl;
- ifp->if_get_rxqueue_len = igb_get_rxqueue_len;
- ifp->if_get_txqueue_len = igb_get_txqueue_len;
+ ifp->if_get_num_rxqueue = igb_get_num_rxqueue;
+ ifp->if_get_num_txqueue = igb_get_num_txqueue;
ifp->if_get_rxqueue_affinity = igb_get_rxqueue_affinity;
ifp->if_get_txqueue_affinity = igb_get_txqueue_affinity;
#ifndef IGB_LEGACY_TX
@@ -6067,14 +6067,14 @@ igb_sysctl_eee(SYSCTL_HANDLER_ARGS)
}
static int
-igb_get_rxqueue_len(struct ifnet *ifp)
+igb_get_num_rxqueue(struct ifnet *ifp)
{
struct adapter *adapter = ifp->if_softc;
return (adapter->num_queues);
}
static int
-igb_get_txqueue_len(struct ifnet *ifp)
+igb_get_num_txqueue(struct ifnet *ifp)
{
struct adapter *adapter = ifp->if_softc;
return (adapter->num_queues);
Modified: user/syuu/mq_bpf/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- user/syuu/mq_bpf/sys/dev/ixgbe/ixgbe.c Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/dev/ixgbe/ixgbe.c Sun Sep 1 22:16:19 2013 (r255134)
@@ -210,8 +210,8 @@ static void ixgbe_reinit_fdir(void *, in
/* Missing shared code prototype */
extern void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw);
-static int ixgbe_get_rxqueue_len(struct ifnet *);
-static int ixgbe_get_txqueue_len(struct ifnet *);
+static int ixgbe_get_num_rxqueue(struct ifnet *);
+static int ixgbe_get_num_txqueue(struct ifnet *);
static int ixgbe_get_rxqueue_affinity(struct ifnet *, int);
static int ixgbe_get_txqueue_affinity(struct ifnet *, int);
@@ -2632,8 +2632,8 @@ ixgbe_setup_interface(device_t dev, stru
ifp->if_softc = adapter;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = ixgbe_ioctl;
- ifp->if_get_rxqueue_len = ixgbe_get_rxqueue_len;
- ifp->if_get_txqueue_len = ixgbe_get_txqueue_len;
+ ifp->if_get_num_rxqueue = ixgbe_get_num_rxqueue;
+ ifp->if_get_num_txqueue = ixgbe_get_num_txqueue;
ifp->if_get_rxqueue_affinity = ixgbe_get_rxqueue_affinity;
ifp->if_get_txqueue_affinity = ixgbe_get_txqueue_affinity;
#ifndef IXGBE_LEGACY_TX
@@ -5765,14 +5765,14 @@ ixgbe_set_advertise(SYSCTL_HANDLER_ARGS)
}
static int
-ixgbe_get_rxqueue_len(struct ifnet *ifp)
+ixgbe_get_num_rxqueue(struct ifnet *ifp)
{
struct adapter *adapter = ifp->if_softc;
return (adapter->num_queues);
}
static int
-ixgbe_get_txqueue_len(struct ifnet *ifp)
+ixgbe_get_num_txqueue(struct ifnet *ifp)
{
struct adapter *adapter = ifp->if_softc;
return (adapter->num_queues);
Modified: user/syuu/mq_bpf/sys/dev/mxge/if_mxge.c
==============================================================================
--- user/syuu/mq_bpf/sys/dev/mxge/if_mxge.c Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/dev/mxge/if_mxge.c Sun Sep 1 22:16:19 2013 (r255134)
@@ -120,8 +120,8 @@ static int mxge_detach(device_t dev);
static int mxge_shutdown(device_t dev);
static void mxge_intr(void *arg);
-static int mxge_get_rxqueue_len(struct ifnet *);
-static int mxge_get_txqueue_len(struct ifnet *);
+static int mxge_get_num_rxqueue(struct ifnet *);
+static int mxge_get_num_txqueue(struct ifnet *);
static int mxge_get_rxqueue_affinity(struct ifnet *, int);
static int mxge_get_txqueue_affinity(struct ifnet *, int);
@@ -4943,8 +4943,8 @@ mxge_attach(device_t dev)
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = mxge_ioctl;
ifp->if_start = mxge_start;
- ifp->if_get_rxqueue_len = mxge_get_rxqueue_len;
- ifp->if_get_txqueue_len = mxge_get_txqueue_len;
+ ifp->if_get_num_rxqueue = mxge_get_num_rxqueue;
+ ifp->if_get_num_txqueue = mxge_get_num_txqueue;
ifp->if_get_rxqueue_affinity = mxge_get_rxqueue_affinity;
ifp->if_get_txqueue_affinity = mxge_get_txqueue_affinity;
@@ -5046,14 +5046,14 @@ mxge_shutdown(device_t dev)
static int
-mxge_get_rxqueue_len(struct ifnet *ifp)
+mxge_get_num_rxqueue(struct ifnet *ifp)
{
mxge_softc_t *sc = ifp->if_softc;
return (sc->num_slices);
}
static int
-mxge_get_txqueue_len(struct ifnet *ifp)
+mxge_get_num_txqueue(struct ifnet *ifp)
{
mxge_softc_t *sc = ifp->if_softc;
return (sc->num_slices);
Modified: user/syuu/mq_bpf/sys/net/bpf.c
==============================================================================
--- user/syuu/mq_bpf/sys/net/bpf.c Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/net/bpf.c Sun Sep 1 22:16:19 2013 (r255134)
@@ -1727,14 +1727,14 @@ bpfioctl(struct cdev *dev, u_long cmd, c
error = EINVAL;
break;
}
- KASSERT(ifp->if_get_rxqueue_len, ("ifp->if_get_rxqueue_len not set\n"));
- KASSERT(ifp->if_get_txqueue_len, ("ifp->if_get_rxqueue_len not set\n"));
+ KASSERT(ifp->if_get_num_rxqueue, ("ifp->if_get_num_rxqueue not set\n"));
+ KASSERT(ifp->if_get_num_txqueue, ("ifp->if_get_num_rxqueue not set\n"));
d->bd_qmask.qm_enabled = TRUE;
d->bd_qmask.qm_rxq_mask =
- malloc(ifp->if_get_rxqueue_len(ifp) * sizeof(boolean_t), M_BPF,
+ malloc(ifp->if_get_num_rxqueue(ifp) * sizeof(boolean_t), M_BPF,
M_WAITOK | M_ZERO);
d->bd_qmask.qm_txq_mask =
- malloc(ifp->if_get_txqueue_len(ifp) * sizeof(boolean_t), M_BPF,
+ malloc(ifp->if_get_num_txqueue(ifp) * sizeof(boolean_t), M_BPF,
M_WAITOK | M_ZERO);
d->bd_qmask.qm_other_mask = FALSE;
BPFQ_WUNLOCK(&d->bd_qmask);
@@ -1784,7 +1784,7 @@ bpfioctl(struct cdev *dev, u_long cmd, c
}
ifp = d->bd_bif->bif_ifp;
index = *(uint32_t *)addr;
- if (index > ifp->if_get_rxqueue_len(ifp)) {
+ if (index > ifp->if_get_num_rxqueue(ifp)) {
BPFQ_WUNLOCK(&d->bd_qmask);
error = EINVAL;
break;
@@ -1814,7 +1814,7 @@ bpfioctl(struct cdev *dev, u_long cmd, c
}
ifp = d->bd_bif->bif_ifp;
index = *(uint32_t *)addr;
- if (index > ifp->if_get_rxqueue_len(ifp)) {
+ if (index > ifp->if_get_num_rxqueue(ifp)) {
BPFQ_WUNLOCK(&d->bd_qmask);
error = EINVAL;
break;
@@ -1844,7 +1844,7 @@ bpfioctl(struct cdev *dev, u_long cmd, c
}
ifp = d->bd_bif->bif_ifp;
index = *(uint32_t *)addr;
- if (index > ifp->if_get_rxqueue_len(ifp)) {
+ if (index > ifp->if_get_num_rxqueue(ifp)) {
BPFQ_WUNLOCK(&d->bd_qmask);
error = EINVAL;
break;
@@ -1875,7 +1875,7 @@ bpfioctl(struct cdev *dev, u_long cmd, c
ifp = d->bd_bif->bif_ifp;
index = *(uint32_t *)addr;
- if (index > ifp->if_get_txqueue_len(ifp)) {
+ if (index > ifp->if_get_num_txqueue(ifp)) {
BPFQ_WUNLOCK(&d->bd_qmask);
error = EINVAL;
break;
@@ -1906,7 +1906,7 @@ bpfioctl(struct cdev *dev, u_long cmd, c
ifp = d->bd_bif->bif_ifp;
index = *(uint32_t *)addr;
- if (index > ifp->if_get_txqueue_len(ifp)) {
+ if (index > ifp->if_get_num_txqueue(ifp)) {
BPFQ_WUNLOCK(&d->bd_qmask);
error = EINVAL;
break;
@@ -1936,7 +1936,7 @@ bpfioctl(struct cdev *dev, u_long cmd, c
}
ifp = d->bd_bif->bif_ifp;
index = *(uint32_t *)addr;
- if (index > ifp->if_get_txqueue_len(ifp)) {
+ if (index > ifp->if_get_num_txqueue(ifp)) {
BPFQ_WUNLOCK(&d->bd_qmask);
error = EINVAL;
break;
@@ -2402,7 +2402,7 @@ bpf_mtap(struct bpf_if *bp, struct mbuf
} else {
struct ifnet *ifp = bp->bif_ifp;
if (m->m_pkthdr.rxqueue != (uint32_t)-1) {
- if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
+ if (m->m_pkthdr.rxqueue >= ifp->if_get_num_rxqueue(ifp)) {
BPFQ_RUNLOCK(&d->bd_qmask);
BPFIF_RUNLOCK(bp);
return;
@@ -2413,7 +2413,7 @@ bpf_mtap(struct bpf_if *bp, struct mbuf
}
}
if (m->m_pkthdr.txqueue != (uint32_t)-1) {
- if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
+ if (m->m_pkthdr.txqueue >= ifp->if_get_num_txqueue(ifp)) {
BPFQ_RUNLOCK(&d->bd_qmask);
BPFIF_RUNLOCK(bp);
return;
@@ -2501,7 +2501,7 @@ bpf_mtap2(struct bpf_if *bp, void *data,
} else {
struct ifnet *ifp = bp->bif_ifp;
if (m->m_pkthdr.rxqueue != (uint32_t)-1) {
- if (m->m_pkthdr.rxqueue >= ifp->if_get_rxqueue_len(ifp)) {
+ if (m->m_pkthdr.rxqueue >= ifp->if_get_num_rxqueue(ifp)) {
BPFQ_RUNLOCK(&d->bd_qmask);
BPFIF_RUNLOCK(bp);
return;
@@ -2512,7 +2512,7 @@ bpf_mtap2(struct bpf_if *bp, void *data,
}
}
if (m->m_pkthdr.txqueue != (uint32_t)-1) {
- if (m->m_pkthdr.txqueue >= ifp->if_get_txqueue_len(ifp)) {
+ if (m->m_pkthdr.txqueue >= ifp->if_get_num_txqueue(ifp)) {
BPFQ_RUNLOCK(&d->bd_qmask);
BPFIF_RUNLOCK(bp);
return;
Modified: user/syuu/mq_bpf/sys/net/if.c
==============================================================================
--- user/syuu/mq_bpf/sys/net/if.c Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/net/if.c Sun Sep 1 22:16:19 2013 (r255134)
@@ -2431,10 +2431,10 @@ ifhwioctl(u_long cmd, struct ifnet *ifp,
case SIOCGIFQLEN:
if (!(ifp->if_capabilities & IFCAP_MULTIQUEUE))
return (EOPNOTSUPP);
- KASSERT(ifp->if_get_rxqueue_len, ("if_get_rxqueue_len not set"));
- KASSERT(ifp->if_get_txqueue_len, ("if_get_txqueue_len not set"));
- ifr->ifr_rxqueue_len = ifp->if_get_rxqueue_len(ifp);
- ifr->ifr_txqueue_len = ifp->if_get_txqueue_len(ifp);
+ KASSERT(ifp->if_get_num_rxqueue, ("if_get_num_rxqueue not set"));
+ KASSERT(ifp->if_get_num_txqueue, ("if_get_num_txqueue not set"));
+ ifr->ifr_num_rxqueue = ifp->if_get_num_rxqueue(ifp);
+ ifr->ifr_num_txqueue = ifp->if_get_num_txqueue(ifp);
break;
case SIOCGIFRXQAFFINITY:
Modified: user/syuu/mq_bpf/sys/net/if.h
==============================================================================
--- user/syuu/mq_bpf/sys/net/if.h Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/net/if.h Sun Sep 1 22:16:19 2013 (r255134)
@@ -386,7 +386,7 @@ struct ifreq {
caddr_t ifru_data;
int ifru_cap[2];
u_int ifru_fib;
- int ifru_queue_len[2];
+ int ifru_num_queue[2];
int ifru_queue_affinity[2];
} ifr_ifru;
#define ifr_addr ifr_ifru.ifru_addr /* address */
@@ -405,8 +405,8 @@ struct ifreq {
#define ifr_curcap ifr_ifru.ifru_cap[1] /* current capabilities */
#define ifr_index ifr_ifru.ifru_index /* interface index */
#define ifr_fib ifr_ifru.ifru_fib /* interface fib */
-#define ifr_rxqueue_len ifr_ifru.ifru_queue_len[0] /* rxqueue len */
-#define ifr_txqueue_len ifr_ifru.ifru_queue_len[1] /* txqueue len */
+#define ifr_num_rxqueue ifr_ifru.ifru_num_queue[0] /* rxqueue len */
+#define ifr_num_txqueue ifr_ifru.ifru_num_queue[1] /* txqueue len */
#define ifr_queue_affinity_index ifr_ifru.ifru_queue_affinity[0] /* queue id */
#define ifr_queue_affinity_cpu ifr_ifru.ifru_queue_affinity[1] /* cpu id */
Modified: user/syuu/mq_bpf/sys/net/if_var.h
==============================================================================
--- user/syuu/mq_bpf/sys/net/if_var.h Sun Sep 1 21:44:43 2013 (r255133)
+++ user/syuu/mq_bpf/sys/net/if_var.h Sun Sep 1 22:16:19 2013 (r255134)
@@ -176,9 +176,9 @@ struct ifnet {
(struct ifnet *, struct mbuf *);
void (*if_reassign) /* reassign to vnet routine */
(struct ifnet *, struct vnet *, char *);
- int (*if_get_rxqueue_len)
+ int (*if_get_num_rxqueue)
(struct ifnet *);
- int (*if_get_txqueue_len)
+ int (*if_get_num_txqueue)
(struct ifnet *);
int (*if_get_rxqueue_affinity)
(struct ifnet *, int);
More information about the svn-src-user
mailing list