Module Name: src
Committed By: christos
Date: Fri Nov 6 14:50:13 UTC 2020
Modified Files:
src/sys/kern: uipc_domain.c uipc_usrreq.c
src/sys/rump/librump/rumpnet: net_stub.c
src/sys/sys: un.h
Log Message:
PR/55777: Ruslan Nikolaev: Move the unp_sysctl_create to uipc_usrreq.c to
facilitate splitting rump modules and does not require a dummy function.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/kern/uipc_domain.c
cvs rdiff -u -r1.199 -r1.200 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.40 -r1.41 src/sys/rump/librump/rumpnet/net_stub.c
cvs rdiff -u -r1.58 -r1.59 src/sys/sys/un.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_domain.c
diff -u src/sys/kern/uipc_domain.c:1.107 src/sys/kern/uipc_domain.c:1.108
--- src/sys/kern/uipc_domain.c:1.107 Sat Oct 17 05:45:20 2020
+++ src/sys/kern/uipc_domain.c Fri Nov 6 09:50:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_domain.c,v 1.107 2020/10/17 09:45:20 mlelstv Exp $ */
+/* $NetBSD: uipc_domain.c,v 1.108 2020/11/06 14:50:13 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.107 2020/10/17 09:45:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.108 2020/11/06 14:50:13 christos Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -692,7 +692,6 @@ sysctl_net_setup(void)
SYSCTL_DESCR("SOCK_DGRAM protocol control block list"),
sysctl_unpcblist, 0, NULL, 0,
CTL_NET, PF_LOCAL, SOCK_DGRAM, CTL_CREATE, CTL_EOL);
- unp_sysctl_create(&domain_sysctllog);
}
void
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.199 src/sys/kern/uipc_usrreq.c:1.200
--- src/sys/kern/uipc_usrreq.c:1.199 Wed Aug 26 18:54:30 2020
+++ src/sys/kern/uipc_usrreq.c Fri Nov 6 09:50:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.199 2020/08/26 22:54:30 christos Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.200 2020/11/06 14:50:13 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.199 2020/08/26 22:54:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.200 2020/11/06 14:50:13 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -196,6 +196,8 @@ static kcondvar_t unp_thread_cv;
static lwp_t *unp_thread_lwp;
static SLIST_HEAD(,file) unp_thread_discard;
static int unp_defer;
+static struct sysctllog *usrreq_sysctllog;
+static void unp_sysctl_create(void);
/* Compat interface */
@@ -219,6 +221,8 @@ uipc_init(void)
{
int error;
+ unp_sysctl_create();
+
uipc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
cv_init(&unp_thread_cv, "unpgc");
@@ -1988,40 +1992,42 @@ unp_discard_later(file_t *fp)
mutex_exit(&filelist_lock);
}
-void
-unp_sysctl_create(struct sysctllog **clog)
+static void
+unp_sysctl_create(void)
{
- sysctl_createv(clog, 0, NULL, NULL,
+
+ KASSERT(usrreq_sysctllog == NULL);
+ sysctl_createv(&usrreq_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_LONG, "sendspace",
SYSCTL_DESCR("Default stream send space"),
NULL, 0, &unpst_sendspace, 0,
CTL_NET, PF_LOCAL, SOCK_STREAM, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(&usrreq_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_LONG, "recvspace",
SYSCTL_DESCR("Default stream recv space"),
NULL, 0, &unpst_recvspace, 0,
CTL_NET, PF_LOCAL, SOCK_STREAM, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(&usrreq_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_LONG, "sendspace",
SYSCTL_DESCR("Default datagram send space"),
NULL, 0, &unpdg_sendspace, 0,
CTL_NET, PF_LOCAL, SOCK_DGRAM, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(&usrreq_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_LONG, "recvspace",
SYSCTL_DESCR("Default datagram recv space"),
NULL, 0, &unpdg_recvspace, 0,
CTL_NET, PF_LOCAL, SOCK_DGRAM, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(&usrreq_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CTLTYPE_INT, "inflight",
SYSCTL_DESCR("File descriptors in flight"),
NULL, 0, &unp_rights, 0,
CTL_NET, PF_LOCAL, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(&usrreq_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CTLTYPE_INT, "deferred",
SYSCTL_DESCR("File descriptors deferred for close"),
Index: src/sys/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.40 src/sys/rump/librump/rumpnet/net_stub.c:1.41
--- src/sys/rump/librump/rumpnet/net_stub.c:1.40 Sat Sep 26 20:34:44 2020
+++ src/sys/rump/librump/rumpnet/net_stub.c Fri Nov 6 09:50:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.40 2020/09/27 00:34:44 roy Exp $ */
+/* $NetBSD: net_stub.c,v 1.41 2020/11/06 14:50:13 christos Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.40 2020/09/27 00:34:44 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.41 2020/11/06 14:50:13 christos Exp $");
#include <sys/mutex.h>
#include <sys/param.h>
@@ -34,8 +34,6 @@ __KERNEL_RCSID(0, "$NetBSD: net_stub.c,v
#include <sys/socketvar.h>
#include <sys/pslist.h>
#include <sys/psref.h>
-#include <sys/sysctl.h>
-#include <sys/un.h>
#include <net/if.h>
#include <net/route.h>
@@ -88,12 +86,6 @@ int ipsec_used;
percpu_t *ipsecstat_percpu;
u_int ipsec_spdgen;
-/* sysctl */
-void
-unp_sysctl_create(struct sysctllog **clog)
-{
-}
-
__weak_alias(ah4_ctlinput,rumpnet_stub);
__weak_alias(ah6_ctlinput,rumpnet_stub);
__weak_alias(esp4_ctlinput,rumpnet_stub);
Index: src/sys/sys/un.h
diff -u src/sys/sys/un.h:1.58 src/sys/sys/un.h:1.59
--- src/sys/sys/un.h:1.58 Sat May 5 15:58:08 2018
+++ src/sys/sys/un.h Fri Nov 6 09:50:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: un.h,v 1.58 2018/05/05 19:58:08 christos Exp $ */
+/* $NetBSD: un.h,v 1.59 2020/11/06 14:50:13 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -90,7 +90,6 @@ int unp_connect(struct socket *, struct
int unp_connect2(struct socket *, struct socket *);
void unp_dispose(struct mbuf *);
int unp_externalize(struct mbuf *, struct lwp *, int);
-void unp_sysctl_create(struct sysctllog **);
#else /* !_KERNEL */
