The branch stable/12 has been updated by vmaffione:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e817c8f77fe8196fcfdcc823b3a2c04b761e68c6
commit e817c8f77fe8196fcfdcc823b3a2c04b761e68c6
Author: Vincenzo Maffione <vmaffi...@freebsd.org>
AuthorDate: 2021-01-24 21:59:02 +0000
Commit: Vincenzo Maffione <vmaffi...@freebsd.org>
CommitDate: 2021-01-31 08:52:11 +0000
netmap: simplify parameter passing
Changes imported from the netmap github.
(cherry picked from commit ee0005f11f2b38a714bc66b7d79832108f6fee77)
---
sys/dev/netmap/netmap.c | 78 ++++++++++++++++++++++-------------------
sys/dev/netmap/netmap_bdg.c | 3 +-
sys/dev/netmap/netmap_kern.h | 5 ++-
sys/dev/netmap/netmap_monitor.c | 3 +-
4 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index f75567565bf1..ca5af6ab5217 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -1833,13 +1833,15 @@ netmap_ring_reinit(struct netmap_kring *kring)
*
*/
int
-netmap_interp_ringid(struct netmap_priv_d *priv, uint32_t nr_mode,
- uint16_t nr_ringid, uint64_t nr_flags)
+netmap_interp_ringid(struct netmap_priv_d *priv, struct nmreq_header *hdr)
{
struct netmap_adapter *na = priv->np_na;
+ struct nmreq_register *reg = (struct nmreq_register *)hdr->nr_body;
int excluded_direction[] = { NR_TX_RINGS_ONLY, NR_RX_RINGS_ONLY };
enum txrx t;
u_int j;
+ u_int nr_flags = reg->nr_flags, nr_mode = reg->nr_mode,
+ nr_ringid = reg->nr_ringid;
for_rx_tx(t) {
if (nr_flags & excluded_direction[t]) {
@@ -1933,19 +1935,19 @@ netmap_interp_ringid(struct netmap_priv_d *priv,
uint32_t nr_mode,
* for all rings is the same as a single ring.
*/
static int
-netmap_set_ringid(struct netmap_priv_d *priv, uint32_t nr_mode,
- uint16_t nr_ringid, uint64_t nr_flags)
+netmap_set_ringid(struct netmap_priv_d *priv, struct nmreq_header *hdr)
{
struct netmap_adapter *na = priv->np_na;
+ struct nmreq_register *reg = (struct nmreq_register *)hdr->nr_body;
int error;
enum txrx t;
- error = netmap_interp_ringid(priv, nr_mode, nr_ringid, nr_flags);
+ error = netmap_interp_ringid(priv, hdr);
if (error) {
return error;
}
- priv->np_txpoll = (nr_flags & NR_NO_TX_POLL) ? 0 : 1;
+ priv->np_txpoll = (reg->nr_flags & NR_NO_TX_POLL) ? 0 : 1;
/* optimization: count the users registered for more than
* one ring, which are the ones sleeping on the global queue.
@@ -1975,6 +1977,19 @@ netmap_unset_ringid(struct netmap_priv_d *priv)
priv->np_kloop_state = 0;
}
+#define within_sel(p_, t_, i_) \
+ ((i_) < (p_)->np_qlast[(t_)])
+#define nonempty_sel(p_, t_) \
+ (within_sel((p_), (t_), (p_)->np_qfirst[(t_)]))
+#define foreach_selected_ring(p_, t_, i_, kring_) \
+ for ((t_) = nonempty_sel((p_), NR_RX) ? NR_RX : NR_TX, \
+ (i_) = (p_)->np_qfirst[(t_)]; \
+ (t_ == NR_RX || \
+ (t == NR_TX && within_sel((p_), (t_), (i_)))) && \
+ ((kring_) = NMR((p_)->np_na, (t_))[(i_)]); \
+ (i_) = within_sel((p_), (t_), (i_) + 1) ? (i_) + 1 : \
+ (++(t_) < NR_TXRX ? (p_)->np_qfirst[(t_)] : (i_)))
+
/* Set the nr_pending_mode for the requested rings.
* If requested, also try to get exclusive access to the rings, provided
@@ -2001,29 +2016,23 @@ netmap_krings_get(struct netmap_priv_d *priv)
* are neither alread exclusively owned, nor we
* want exclusive ownership when they are already in use
*/
- for_rx_tx(t) {
- for (i = priv->np_qfirst[t]; i < priv->np_qlast[t]; i++) {
- kring = NMR(na, t)[i];
- if ((kring->nr_kflags & NKR_EXCLUSIVE) ||
- (kring->users && excl))
- {
- nm_prdis("ring %s busy", kring->name);
- return EBUSY;
- }
+ foreach_selected_ring(priv, t, i, kring) {
+ if ((kring->nr_kflags & NKR_EXCLUSIVE) ||
+ (kring->users && excl))
+ {
+ nm_prdis("ring %s busy", kring->name);
+ return EBUSY;
}
}
/* second round: increment usage count (possibly marking them
* as exclusive) and set the nr_pending_mode
*/
- for_rx_tx(t) {
- for (i = priv->np_qfirst[t]; i < priv->np_qlast[t]; i++) {
- kring = NMR(na, t)[i];
- kring->users++;
- if (excl)
- kring->nr_kflags |= NKR_EXCLUSIVE;
- kring->nr_pending_mode = NKR_NETMAP_ON;
- }
+ foreach_selected_ring(priv, t, i, kring) {
+ kring->users++;
+ if (excl)
+ kring->nr_kflags |= NKR_EXCLUSIVE;
+ kring->nr_pending_mode = NKR_NETMAP_ON;
}
return 0;
@@ -2036,7 +2045,6 @@ netmap_krings_get(struct netmap_priv_d *priv)
static void
netmap_krings_put(struct netmap_priv_d *priv)
{
- struct netmap_adapter *na = priv->np_na;
u_int i;
struct netmap_kring *kring;
int excl = (priv->np_flags & NR_EXCLUSIVE);
@@ -2049,15 +2057,12 @@ netmap_krings_put(struct netmap_priv_d *priv)
priv->np_qfirst[NR_RX],
priv->np_qlast[MR_RX]);
- for_rx_tx(t) {
- for (i = priv->np_qfirst[t]; i < priv->np_qlast[t]; i++) {
- kring = NMR(na, t)[i];
- if (excl)
- kring->nr_kflags &= ~NKR_EXCLUSIVE;
- kring->users--;
- if (kring->users == 0)
- kring->nr_pending_mode = NKR_NETMAP_OFF;
- }
+ foreach_selected_ring(priv, t, i, kring) {
+ if (excl)
+ kring->nr_kflags &= ~NKR_EXCLUSIVE;
+ kring->users--;
+ if (kring->users == 0)
+ kring->nr_pending_mode = NKR_NETMAP_OFF;
}
}
@@ -2290,7 +2295,7 @@ netmap_buf_size_validate(const struct netmap_adapter *na,
unsigned mtu) {
*/
int
netmap_do_regif(struct netmap_priv_d *priv, struct netmap_adapter *na,
- uint32_t nr_mode, uint16_t nr_ringid, uint64_t nr_flags)
+ struct nmreq_header *hdr)
{
struct netmap_if *nifp = NULL;
int error;
@@ -2315,7 +2320,7 @@ netmap_do_regif(struct netmap_priv_d *priv, struct
netmap_adapter *na,
}
/* compute the range of tx and rx rings to monitor */
- error = netmap_set_ringid(priv, nr_mode, nr_ringid, nr_flags);
+ error = netmap_set_ringid(priv, hdr);
if (error)
goto err_put_lut;
@@ -2556,8 +2561,7 @@ netmap_ioctl(struct netmap_priv_d *priv, u_long cmd,
caddr_t data,
break;
}
- error = netmap_do_regif(priv, na, req->nr_mode,
- req->nr_ringid,
req->nr_flags);
+ error = netmap_do_regif(priv, na, hdr);
if (error) { /* reg. failed, release priv
and ref */
break;
}
diff --git a/sys/dev/netmap/netmap_bdg.c b/sys/dev/netmap/netmap_bdg.c
index 96d6deedb768..4d18859e2091 100644
--- a/sys/dev/netmap/netmap_bdg.c
+++ b/sys/dev/netmap/netmap_bdg.c
@@ -1477,8 +1477,7 @@ netmap_bwrap_bdg_ctl(struct nmreq_header *hdr, struct
netmap_adapter *na)
if (npriv == NULL)
return ENOMEM;
npriv->np_ifp = na->ifp; /* let the priv destructor release the
ref */
- error = netmap_do_regif(npriv, na, req->reg.nr_mode,
- req->reg.nr_ringid, req->reg.nr_flags);
+ error = netmap_do_regif(npriv, na, hdr);
if (error) {
netmap_priv_delete(npriv);
return error;
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index 3786826d8e38..fd9db5842df3 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -1449,8 +1449,7 @@ int netmap_attach_common(struct netmap_adapter *);
/* fill priv->np_[tr]xq{first,last} using the ringid and flags information
* coming from a struct nmreq_register
*/
-int netmap_interp_ringid(struct netmap_priv_d *priv, uint32_t nr_mode,
- uint16_t nr_ringid, uint64_t nr_flags);
+int netmap_interp_ringid(struct netmap_priv_d *priv, struct nmreq_header *hdr);
/* update the ring parameters (number and size of tx and rx rings).
* It calls the nm_config callback, if available.
*/
@@ -1485,7 +1484,7 @@ void netmap_enable_all_rings(struct ifnet *);
int netmap_buf_size_validate(const struct netmap_adapter *na, unsigned mtu);
int netmap_do_regif(struct netmap_priv_d *priv, struct netmap_adapter *na,
- uint32_t nr_mode, uint16_t nr_ringid, uint64_t nr_flags);
+ struct nmreq_header *);
void netmap_do_unregif(struct netmap_priv_d *priv);
u_int nm_bound_var(u_int *v, u_int dflt, u_int lo, u_int hi, const char *msg);
diff --git a/sys/dev/netmap/netmap_monitor.c b/sys/dev/netmap/netmap_monitor.c
index f30abcc4b39a..1f5ff65b3b81 100644
--- a/sys/dev/netmap/netmap_monitor.c
+++ b/sys/dev/netmap/netmap_monitor.c
@@ -950,8 +950,7 @@ netmap_get_monitor_na(struct nmreq_header *hdr, struct
netmap_adapter **na,
mna->priv.np_na = pna;
/* grab all the rings we need in the parent */
- error = netmap_interp_ringid(&mna->priv, req->nr_mode, req->nr_ringid,
- req->nr_flags);
+ error = netmap_interp_ringid(&mna->priv, hdr);
if (error) {
nm_prerr("ringid error");
goto free_out;
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
