git: d7e2c1479ccf - stable/13 - bhyve: Add support for EVFILT_VNODE mevents.

[John Baldwin]

The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=d7e2c1479ccf5bbbe7d80c203e05300353d24e52

commit d7e2c1479ccf5bbbe7d80c203e05300353d24e52
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-06-12 00:59:13 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-08-12 15:56:18 +0000

    bhyve: Add support for EVFILT_VNODE mevents.
    
    This allows registering an event to watch for changes to a file's
    attributes.  This is a bit imperfect as it would be nice to have a way
    to determine if an fd can use EVFILT_VNODE successfully.  mevent's
    current structure does not permit that and a failure to register a
    single kevent impacts several other kevents.
    
    Reviewed by:    grehan, markj
    MFC after:      1 month
    Differential Revision:  https://reviews.freebsd.org/D30503
    
    (cherry picked from commit 67d60dcce62c08250dceedaf761cb48bc74c75a4)
---
 usr.sbin/bhyve/mevent.c | 33 ++++++++++++++++++++++++++++-----
 usr.sbin/bhyve/mevent.h |  9 ++++++++-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/bhyve/mevent.c b/usr.sbin/bhyve/mevent.c
index a394b7c5d69f..0c5351cd31a9 100644
--- a/usr.sbin/bhyve/mevent.c
+++ b/usr.sbin/bhyve/mevent.c
@@ -80,6 +80,7 @@ struct mevent {
 	int	me_cq;
 	int	me_state; /* Desired kevent flags. */
 	int	me_closefd;
+	int	me_fflags;
 	LIST_ENTRY(mevent) me_list;
 };
 
@@ -165,6 +166,9 @@ mevent_kq_filter(struct mevent *mevp)
 	if (mevp->me_type == EVF_SIGNAL)
 		retval = EVFILT_SIGNAL;
 
+	if (mevp->me_type == EVF_VNODE)
+		retval = EVFILT_VNODE;
+
 	return (retval);
 }
 
@@ -177,8 +181,18 @@ mevent_kq_flags(struct mevent *mevp)
 static int
 mevent_kq_fflags(struct mevent *mevp)
 {
-	/* XXX nothing yet, perhaps EV_EOF for reads ? */
-	return (0);
+	int retval;
+
+	retval = 0;
+
+	switch (mevp->me_type) {
+	case EVF_VNODE:
+		if ((mevp->me_fflags & EVFF_ATTRIB) != 0)
+			retval |= NOTE_ATTRIB;
+		break;
+	}
+
+	return (retval);
 }
 
 static void
@@ -255,7 +269,7 @@ mevent_handle(struct kevent *kev, int numev)
 static struct mevent *
 mevent_add_state(int tfd, enum ev_type type,
 	   void (*func)(int, enum ev_type, void *), void *param,
-	   int state)
+	   int state, int fflags)
 {
 	struct kevent kev;
 	struct mevent *lp, *mevp;
@@ -305,6 +319,7 @@ mevent_add_state(int tfd, enum ev_type type,
 	mevp->me_func = func;
 	mevp->me_param = param;
 	mevp->me_state = state;
+	mevp->me_fflags = fflags;
 
 	/*
 	 * Try to add the event.  If this fails, report the failure to
@@ -332,7 +347,15 @@ mevent_add(int tfd, enum ev_type type,
 	   void (*func)(int, enum ev_type, void *), void *param)
 {
 
-	return (mevent_add_state(tfd, type, func, param, EV_ADD));
+	return (mevent_add_state(tfd, type, func, param, EV_ADD, 0));
+}
+
+struct mevent *
+mevent_add_flags(int tfd, enum ev_type type, int fflags,
+		 void (*func)(int, enum ev_type, void *), void *param)
+{
+
+	return (mevent_add_state(tfd, type, func, param, EV_ADD, fflags));
 }
 
 struct mevent *
@@ -340,7 +363,7 @@ mevent_add_disabled(int tfd, enum ev_type type,
 		    void (*func)(int, enum ev_type, void *), void *param)
 {
 
-	return (mevent_add_state(tfd, type, func, param, EV_ADD | EV_DISABLE));
+	return (mevent_add_state(tfd, type, func, param, EV_ADD | EV_DISABLE, 0));
 }
 
 static int
diff --git a/usr.sbin/bhyve/mevent.h b/usr.sbin/bhyve/mevent.h
index 503ec415a3b5..a26293867a09 100644
--- a/usr.sbin/bhyve/mevent.h
+++ b/usr.sbin/bhyve/mevent.h
@@ -35,14 +35,21 @@ enum ev_type {
 	EVF_READ,
 	EVF_WRITE,
 	EVF_TIMER,
-	EVF_SIGNAL
+	EVF_SIGNAL,
+	EVF_VNODE,
 };
 
+/* Filter flags for EVF_VNODE */
+#define	EVFF_ATTRIB	0x0001
+
 struct mevent;
 
 struct mevent *mevent_add(int fd, enum ev_type type, 
 			  void (*func)(int, enum ev_type, void *),
 			  void *param);
+struct mevent *mevent_add_flags(int fd, enum ev_type type, int fflags,
+			  void (*func)(int, enum ev_type, void *),
+			  void *param);
 struct mevent *mevent_add_disabled(int fd, enum ev_type type,
 			  void (*func)(int, enum ev_type, void *),
 			  void *param);