Page MenuHomeFreeBSD
Differential D47031

bhyvectl: Convert to use vm_openf()
ClosedPublic
Actions

Authored by markj on Oct 9 2024, 9:20 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Aug 25, 1:44 AM
Unknown Object (File)
Fri, Aug 22, 3:04 PM
Unknown Object (File)
Fri, Aug 15, 5:30 PM
Unknown Object (File)
Thu, Aug 14, 11:35 PM
Unknown Object (File)
Tue, Aug 12, 6:10 PM
Unknown Object (File)
Fri, Aug 8, 8:36 PM
Unknown Object (File)
Fri, Aug 8, 7:24 PM
Unknown Object (File)
Fri, Aug 8, 6:58 PM
View All 61 Files
Subscribers
bcran
imp
rgrimes

Details

Reviewers
jhb
Group Reviewers
bhyve
Commits
rGc2b34d060705: bhyvectl: Convert to use vm_openf()
Summary

This is not really necessary, but it simplifies the code a bit.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 59877
Build 56762: arc lint + arc unit

Revision Contents
Changeset List

PathSize
usr.sbin/
bhyvectl/
21 lines

Diff 144548

View Options

usr.sbin/bhyvectl/bhyvectl.c

Show All 36 Lines
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/pcpu.h> #include <sys/pcpu.h>
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h> #include <sys/socketvar.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/tcp.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <rpc/rpc_com.h> #include <rpc/rpc_com.h>
#include <rpc/krpc.h> #include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h> #include <rpc/rpcsec_tls.h>
static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *, static enum clnt_stat clnt_reconnect_call(CLIENT *, struct rpc_callextra *,
rpcproc_t, struct mbuf *, struct mbuf **, struct timeval); rpcproc_t, struct mbuf *, struct mbuf **, struct timeval);
static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *); static void clnt_reconnect_geterr(CLIENT *, struct rpc_err *);
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Linesclnt_reconnect_create(
rc->rc_retries = INT_MAX; rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE; rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv"; rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0; rc->rc_intr = 0;
rc->rc_connecting = FALSE; rc->rc_connecting = FALSE;
rc->rc_closed = FALSE; rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred); rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL; rc->rc_client = NULL;
rc->rc_ddp = false;
rc->rc_tls = false; rc->rc_tls = false;
rc->rc_tlscertname = NULL; rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL; rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL; rc->rc_reconarg = NULL;
cl->cl_refs = 1; cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops; cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc; cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0; rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient); CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient); CLNT_RELEASE(newclient);
newclient = NULL; newclient = NULL;
td->td_ucred = oldcred; td->td_ucred = oldcred;
goto out; goto out;
} }
} }
if (rc->rc_ddp && newclient != NULL) {
int optval = 1;
(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
&optval, sizeof(optval));
}
rmacklemUnsubmitted
Not Done
Inline Actions

Normally the clnt_rc.c (reconnect layer) would
do a CLSET_TCP_DDP and the so_setsockopt()
would be done for CLSET_TCP_DDP in clnt_vc.c
and ignored in clnt_dg.c.

I've never been much of an object oriented guy,
but the Sun folk loved these layers.

rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL) if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg, (*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred); rc->rc_ucred);
} }
td->td_ucred = oldcred; td->td_ucred = oldcred;
if (!newclient) { if (!newclient) {
soclose(so); soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen); rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen); strlcpy(rc->rc_tlscertname, info, slen);
break; break;
case CLSET_RECONUPCALL: case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info; upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call; rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg; rc->rc_reconarg = upcp->arg;
break;
case CLSET_DDP:
rc->rc_ddp = true;
break; break;
default: default:
return (FALSE); return (FALSE);
} }
return (TRUE); return (TRUE);
} }
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines