Page MenuHomeFreeBSD
Files F143996099

D54133.id168782.diff
No OneTemporary
Actions

D54133.id168782.diff
View Options

diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 26, 2025
+.Dd December 29, 2025
.Dt BHYVE 8
.Os
.Sh NAME
@@ -542,6 +542,8 @@
.Cm slirp
.Op Cm \&,open
.Op Cm \&,hostfwd= Ar proto : Ar hostaddr : Ar hostport - Ar guestaddr : Ar guestport
+.Op Cm \&,mac= Ar xx:xx:xx:xx:xx:xx
+.Op Cm \&,mtu= Ar N
.Xc
.El
.Sm on
diff --git a/usr.sbin/bhyve/net_backend_slirp.c b/usr.sbin/bhyve/net_backend_slirp.c
--- a/usr.sbin/bhyve/net_backend_slirp.c
+++ b/usr.sbin/bhyve/net_backend_slirp.c
@@ -62,6 +62,7 @@
#include "config.h"
#include "debug.h"
#include "mevent.h"
+#include "net_utils.h"
#include "net_backends.h"
#include "net_backends_priv.h"
@@ -71,6 +72,8 @@
int s;
pid_t helper;
struct mevent *mevp;
+ unsigned long mtu;
+ uint8_t *buf;
};
extern char **environ;
@@ -86,6 +89,8 @@
const char **argv;
char sockname[32];
int error, s[2];
+ const char *mtu_value;
+ unsigned long mtu = SLIRP_MTU;
if (socketpair(PF_LOCAL, SOCK_SEQPACKET | SOCK_NONBLOCK, 0, s) != 0) {
EPRINTLN("socketpair");
@@ -124,6 +129,15 @@
EPRINTLN("nvlist_clone");
goto err;
}
+
+ mtu_value = get_config_value_node(nvl, "mtu");
+ if (mtu_value != NULL) {
+ if (net_parsemtu(mtu_value, &mtu)) {
+ EPRINTLN("Could not parse MTU");
+ goto err;
+ }
+ }
+
nvlist_add_string(config, "vmname", get_config_value("name"));
error = nvlist_send(s[0], config);
nvlist_destroy(config);
@@ -141,6 +155,12 @@
priv->helper = child;
priv->s = s[0];
+ priv->mtu = mtu;
+ priv->buf = malloc(mtu);
+ if (priv->buf == NULL) {
+ EPRINTLN("Could not allocate buffer");
+ goto err;
+ }
(void)close(s[1]);
return (0);
@@ -168,6 +188,8 @@
{
struct slirp_priv *priv = NET_BE_PRIV(be);
+ free(priv->buf);
+
if (priv->helper > 0) {
int status;
@@ -184,17 +206,15 @@
slirp_peek_recvlen(struct net_backend *be)
{
struct slirp_priv *priv = NET_BE_PRIV(be);
- uint8_t buf[SLIRP_MTU];
ssize_t n;
/*
* Copying into the buffer is totally unnecessary, but we don't
* implement MSG_TRUNC for SEQPACKET sockets.
*/
- n = recv(priv->s, buf, sizeof(buf), MSG_PEEK | MSG_DONTWAIT);
+ n = recv(priv->s, priv->buf, priv->mtu, MSG_PEEK | MSG_DONTWAIT);
if (n < 0)
return (errno == EWOULDBLOCK ? 0 : -1);
- assert((size_t)n <= SLIRP_MTU);
return (n);
}
@@ -218,7 +238,7 @@
return (0);
return (-1);
}
- assert(n <= SLIRP_MTU);
+ assert((size_t)n <= priv->mtu);
return (n);
}
diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c
--- a/usr.sbin/bhyve/slirp/slirp-helper.c
+++ b/usr.sbin/bhyve/slirp/slirp-helper.c
@@ -47,6 +47,8 @@
struct pollfd *pollfds;
size_t npollfds;
size_t lastpollfd;
+ unsigned long mtu;
+ uint8_t *buf;
};
typedef int (*slirp_add_hostxfwd_p_t)(Slirp *,
@@ -104,7 +106,7 @@
priv = param;
- assert(len <= SLIRP_MTU);
+ assert(len <= priv->mtu);
n = send(priv->sock, buf, len, MSG_EOR);
if (n < 0) {
warn("slirp_cb_send_packet: send");
@@ -289,16 +291,14 @@
ssize_t n;
do {
- uint8_t buf[SLIRP_MTU];
-
- n = recv(priv->sock, buf, sizeof(buf),
+ n = recv(priv->sock, priv->buf, priv->mtu,
MSG_DONTWAIT);
if (n < 0) {
if (errno == EWOULDBLOCK)
break;
err(1, "recv");
}
- slirp_input_p(priv->slirp, buf, (int)n);
+ slirp_input_p(priv->slirp, priv->buf, (int)n);
} while (n >= 0);
}
}
@@ -461,9 +461,10 @@
SlirpConfig slirpconfig;
Slirp *slirp;
nvlist_t *config;
- const char *hostfwd, *vmname;
+ const char *hostfwd, *vmname, *mtu_value;
int ch, fd, sd;
bool restricted;
+ size_t mtu = SLIRP_MTU;
sd = -1;
while ((ch = getopt(argc, argv, "S:")) != -1) {
@@ -514,6 +515,16 @@
config = nvlist_recv(sd, 0);
if (config == NULL)
err(1, "nvlist_recv");
+
+ mtu_value = get_config_value_node(config, "mtu");
+ if (mtu_value != NULL)
+ mtu = (size_t)strtoul(mtu_value, NULL, 10);
+
+ priv.mtu = mtu;
+ priv.buf = malloc(mtu);
+ if (priv.buf == NULL)
+ err(1, "malloc");
+
vmname = get_config_value_node(config, "vmname");
if (vmname != NULL)
setproctitle("%s", vmname);
@@ -521,7 +532,7 @@
slirpconfig = (SlirpConfig){
.version = 4,
- .if_mtu = SLIRP_MTU,
+ .if_mtu = mtu,
.restricted = restricted,
.in_enabled = true,
.vnetwork.s_addr = htonl(0x0a000200), /* 10.0.2.0/24 */

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 4, 3:17 AM (7 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28429941
Default Alt Text
D54133.id168782.diff (4 KB)

Event Timeline