Sun Jul 30 10:45:11 2023 UTC ()

wsmouse(4): Make wsmouse_input safe to call from MP-safe interrupts.

XXX pullup-10


(riastradh)

diff -r1.72 -r1.73 src/sys/dev/wscons/wsmouse.c

--- src/sys/dev/wscons/wsmouse.c 2022/07/17 11:44:30	1.72
+++ src/sys/dev/wscons/wsmouse.c 2023/07/30 10:45:11	1.73

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsmouse.c,v 1.72 2022/07/17 11:44:30 riastradh Exp $ */
+/* $NetBSD: wsmouse.c,v 1.73 2023/07/30 10:45:11 riastradh Exp $ */
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -94,27 +94,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ms.c	8.1 (Berkeley) 6/11/93
  */
 /*
  * Mouse driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.72 2022/07/17 11:44:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.73 2023/07/30 10:45:11 riastradh Exp $");
 #include "wsmouse.h"
 #include "wsdisplay.h"
 #include "wsmux.h"
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 @@ -362,37 +362,39 @@ wsmouse_detach(device_t self, int flags)
 	return (0);
+}
 void
 wsmouse_input(device_t wsmousedev, u_int btns /* 0 is up */,
 	int x, int y, int z, int w, u_int flags)
+{
 	struct wsmouse_softc *sc = device_private(wsmousedev);
 	struct wseventvar *evar;
 	int mb, ub, d, nevents;
 	/* one for each dimension (4) + a bit for each button */
 	struct wscons_event events[4 + sizeof(d) * 8];
 	KERNEL_LOCK(1, NULL);
         /*
          * Discard input if not open.
          */
 	evar = sc->sc_base.me_evp;
 	if (evar == NULL)
-		return;
+		goto out;
 #ifdef DIAGNOSTIC
 	if (evar->q == NULL) {
 		printf("wsmouse_input: evar->q=NULL\n");
-		return;
+		goto out;
+	}
 #endif
 #if NWSMUX > 0
 	DPRINTFN(5,("wsmouse_input: %s mux=%p, evar=%p\n",
 		    device_xname(sc->sc_base.me_dv),
 		    sc->sc_base.me_parent, evar));
 #endif
 	sc->sc_mb = btns;
 	if (!(flags & WSMOUSE_INPUT_ABSOLUTE_X))
 		sc->sc_dx += x;
 	if (!(flags & WSMOUSE_INPUT_ABSOLUTE_Y))
 @@ -518,26 +520,28 @@ wsmouse_input(device_t wsmousedev, u_int
 		/* All events were correctly injected into the queue.
 		 * Synchronize the mouse's status with what the user
 		 * has received. */
 		sc->sc_x = x; sc->sc_dx = 0;
 		sc->sc_y = y; sc->sc_dy = 0;
 		sc->sc_z = z; sc->sc_dz = 0;
 		sc->sc_w = w; sc->sc_dw = 0;
 		sc->sc_ub = ub;
 #if NWSMUX > 0
 		DPRINTFN(5,("wsmouse_input: %s wakeup evar=%p\n",
 			    device_xname(sc->sc_base.me_dv), evar));
 #endif
+	}
 out:	KERNEL_UNLOCK_ONE(NULL);
+}
 void
 wsmouse_precision_scroll(device_t wsmousedev, int x, int y)
+{
 	struct wsmouse_softc *sc = device_private(wsmousedev);
 	struct wseventvar *evar;
 	struct wscons_event events[2];
 	int nevents = 0;
 	evar = sc->sc_base.me_evp;
 	if (evar == NULL)
 		return;