Module Name: src Committed By: pgoyette Date: Thu Sep 20 07:34:10 UTC 2018
Modified Files: src/sys/compat/common [pgoyette-compat]: uipc_syscalls_40.c uipc_syscalls_50.c src/sys/kern [pgoyette-compat]: compat_stub.c src/sys/net [pgoyette-compat]: if.c src/sys/sys [pgoyette-compat]: compat_stub.h Log Message: Use the MP-safe hooks mechanism for the uipc_syscalls_40 and _50 routines. To generate a diff of this commit: cvs rdiff -u -r1.15.2.9 -r1.15.2.10 src/sys/compat/common/uipc_syscalls_40.c cvs rdiff -u -r1.3.56.8 -r1.3.56.9 src/sys/compat/common/uipc_syscalls_50.c cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/sys/kern/compat_stub.c cvs rdiff -u -r1.419.2.10 -r1.419.2.11 src/sys/net/if.c cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/sys/sys/compat_stub.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/compat/common/uipc_syscalls_40.c diff -u src/sys/compat/common/uipc_syscalls_40.c:1.15.2.9 src/sys/compat/common/uipc_syscalls_40.c:1.15.2.10 --- src/sys/compat/common/uipc_syscalls_40.c:1.15.2.9 Mon Apr 16 03:41:34 2018 +++ src/sys/compat/common/uipc_syscalls_40.c Thu Sep 20 07:34:09 2018 @@ -1,9 +1,9 @@ -/* $NetBSD: uipc_syscalls_40.c,v 1.15.2.9 2018/04/16 03:41:34 pgoyette Exp $ */ +/* $NetBSD: uipc_syscalls_40.c,v 1.15.2.10 2018/09/20 07:34:09 pgoyette Exp $ */ /* written by Pavel Cahyna, 2006. Public domain. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.9 2018/04/16 03:41:34 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.15.2.10 2018/09/20 07:34:09 pgoyette Exp $"); /* * System call interface to the socket abstraction. @@ -15,6 +15,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall #include <sys/sysctl.h> #include <sys/syscallargs.h> #include <sys/errno.h> +#include <sys/compat_stub.h> #include <net/if.h> @@ -162,16 +163,19 @@ release_exit: return error; } +MODULE_SET_HOOK(uipc_syscalls_40_hook, "uipc40", compat_ifconf); +MODULE_UNSET_HOOK(uipc_syscalls_40_hook); + void uipc_syscalls_40_init(void) { - vec_compat_ifconf = compat_ifconf; + uipc_syscalls_40_hook_set(); } void uipc_syscalls_40_fini(void) { - vec_compat_ifconf = (void *)enosys; + uipc_syscalls_40_hook_unset(); } Index: src/sys/compat/common/uipc_syscalls_50.c diff -u src/sys/compat/common/uipc_syscalls_50.c:1.3.56.8 src/sys/compat/common/uipc_syscalls_50.c:1.3.56.9 --- src/sys/compat/common/uipc_syscalls_50.c:1.3.56.8 Wed May 2 07:20:06 2018 +++ src/sys/compat/common/uipc_syscalls_50.c Thu Sep 20 07:34:09 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_syscalls_50.c,v 1.3.56.8 2018/05/02 07:20:06 pgoyette Exp $ */ +/* $NetBSD: uipc_syscalls_50.c,v 1.3.56.9 2018/09/20 07:34:09 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3.56.8 2018/05/02 07:20:06 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_50.c,v 1.3.56.9 2018/09/20 07:34:09 pgoyette Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall #include <sys/kauth.h> #include <sys/proc.h> #include <sys/time.h> +#include <sys/compat_stub.h> #include <net/if.h> @@ -108,18 +109,20 @@ compat_ifdatareq(struct lwp *l, u_long c } } -/* Save and restore compat vector as needed */ +MODULE_SET_HOOK(uipc_syscalls_50_hook, "uipc50", compat_ifdatareq); +MODULE_UNSET_HOOK(uipc_syscalls_50_hook); void uipc_syscalls_50_init(void) { - vec_compat_ifdatareq = compat_ifdatareq; + uipc_syscalls_50_hook_set(); } void uipc_syscalls_50_fini(void) { + + uipc_syscalls_50_hook_unset(); +} - vec_compat_ifdatareq = (void *)enosys; - } Index: src/sys/kern/compat_stub.c diff -u src/sys/kern/compat_stub.c:1.1.2.20 src/sys/kern/compat_stub.c:1.1.2.21 --- src/sys/kern/compat_stub.c:1.1.2.20 Wed Sep 19 04:12:43 2018 +++ src/sys/kern/compat_stub.c Thu Sep 20 07:34:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_stub.c,v 1.1.2.20 2018/09/19 04:12:43 pgoyette Exp $ */ +/* $NetBSD: compat_stub.c,v 1.1.2.21 2018/09/20 07:34:10 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -130,10 +130,25 @@ struct compat_vndioctl_50_hook_t compat_ struct ieee80211_ostats_hook_t ieee80211_ostats_hook; struct ieee80211_get_ostats_20_hook_t ieee80211_get_ostats_20_hook; -int (*ieee80211_get_ostats_20)(struct ieee80211_ostats *, +/*XXX PRG */int (*ieee80211_get_ostats_20)(struct ieee80211_ostats *, struct ieee80211_stats *) = (void *)enosys; -int (*if43_20_cvtcmd)(int) = (void *)enosys; +/* + * if_43 compatability + */ +struct if_43_hook_t if_43_hook; + +/* + * upic_syscalls_40 compatability + */ +struct uipc_syscalls_40_hook_t uipc_syscalls_40_hook; + +/* + * upic_syscalls_50 compatability + */ +struct uipc_syscalls_50_hook_t uipc_syscalls_50_hook; + +/*XXX PRG */int (*if43_20_cvtcmd)(int) = (void *)enosys; /* * rtsock 14 compatability Index: src/sys/net/if.c diff -u src/sys/net/if.c:1.419.2.10 src/sys/net/if.c:1.419.2.11 --- src/sys/net/if.c:1.419.2.10 Thu Sep 6 06:56:44 2018 +++ src/sys/net/if.c Thu Sep 20 07:34:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.419.2.10 2018/09/06 06:56:44 pgoyette Exp $ */ +/* $NetBSD: if.c,v 1.419.2.11 2018/09/20 07:34:10 pgoyette Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.10 2018/09/06 06:56:44 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419.2.11 2018/09/20 07:34:10 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -120,6 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.419 #include <sys/xcall.h> #include <sys/cpu.h> #include <sys/intr.h> +#include <sys/compat_stub.h> #include <net/if.h> #include <net/if_dl.h> @@ -246,8 +247,6 @@ static void if_sysctl_setup(struct sysct u_long (*vec_compat_cvtcmd)(u_long) = NULL; int (*vec_compat_ifioctl)(struct socket *, u_long, u_long, void *, struct lwp *) = NULL; -int (*vec_compat_ifconf)(struct lwp *, u_long, void *) = (void *)enosys; -int (*vec_compat_ifdatareq)(struct lwp *, u_long, void *) = (void *)enosys; static int if_listener_cb(kauth_cred_t cred, kauth_action_t action, void *cookie, @@ -3108,6 +3107,19 @@ out: } /* + * Interface for calling the compat routines + */ +MODULE_CALL_HOOK_DECL(uipc_syscalls_40_hook, f, + (struct lwp *l, int cmd, void *data), (l, cmd, data), enosys()); +MODULE_CALL_HOOK(uipc_syscalls_40_hook, f, + (struct lwp *l, int cmd, void *data), (l, cmd, data), enosys()); + +MODULE_CALL_HOOK_DECL(uipc_syscalls_50_hook, f, + (struct lwp *l, int cmd, void *data), (l, cmd, data), enosys()); +MODULE_CALL_HOOK(uipc_syscalls_50_hook, f, + (struct lwp *l, int cmd, void *data), (l, cmd, data), enosys()); + +/* * Interface ioctls. */ static int @@ -3134,12 +3146,13 @@ doifioctl(struct socket *so, u_long cmd, case SIOCINITIFADDR: return EPERM; default: - error = (*vec_compat_ifconf)(l, cmd, data); + error = uipc_syscalls_40_hook_f_call(l, cmd, data); if (error != ENOSYS) return error; - error = (*vec_compat_ifdatareq)(l, cmd, data); + error = uipc_syscalls_50_hook_f_call(l, cmd, data); if (error != ENOSYS) return error; + error = 0; break; } Index: src/sys/sys/compat_stub.h diff -u src/sys/sys/compat_stub.h:1.1.2.29 src/sys/sys/compat_stub.h:1.1.2.30 --- src/sys/sys/compat_stub.h:1.1.2.29 Wed Sep 19 04:12:43 2018 +++ src/sys/sys/compat_stub.h Thu Sep 20 07:34:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_stub.h,v 1.1.2.29 2018/09/19 04:12:43 pgoyette Exp $ */ +/* $NetBSD: compat_stub.h,v 1.1.2.30 2018/09/20 07:34:10 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -158,10 +158,30 @@ MODULE_HOOK(ieee80211_ostats_hook, (stru struct ieee80211_stats *)); MODULE_HOOK(ieee80211_get_ostats_20_hook, (int)); -extern int (*ieee80211_get_ostats_20)(struct ieee80211_ostats *, +/* XXX PRG*/extern int (*ieee80211_get_ostats_20)(struct ieee80211_ostats *, struct ieee80211_stats *); -extern int (*if43_20_cvtcmd)(int); +/* + * if_43 compatability + */ +struct socket; + +MODULE_HOOK2(if_43_hook, (int), + (struct socket *, u_long, u_long, void *, struct lwp *)); + +/* XXX PRG */extern int (*if43_20_cvtcmd)(int); + +/* + * uipc_syscalls_40 compatability + */ + +MODULE_HOOK(uipc_syscalls_40_hook, (struct lwp *, u_long, void *)); + +/* + * uipc_syscalls_50 compatability + */ + +MODULE_HOOK(uipc_syscalls_50_hook, (struct lwp *, u_long, void *)); /* * rtsock 14 compatability