| Message ID | 8bde5ee38597a86334b86822de920802483a7179.1715100071.git.matthew.barnes@cloud.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [XEN,v3] tools/lsevtchn: Use errno macro to handle hypercall error cases | expand |
On 08.05.2024 13:04, Matthew Barnes wrote: > @@ -24,7 +25,18 @@ int main(int argc, char **argv) > status.port = port; > rc = xc_evtchn_status(xch, &status); > if ( rc < 0 ) > - break; > + { > + if ( errno == ESRCH ) > + { > + fprintf(stderr, "Domain ID '%d' does not correspond to valid domain.\n", domid); > + break; > + } > + > + if ( errno == EINVAL ) > + break; > + > + continue; > + } Hmm, I'm not sure "black listing" certain error codes is useful. I'd have expected a "white listing" approach, special casing just EACCES and EPERM (which iirc is what XSM would return). I'm also not convinced of the error message text of the ESRCH case you special case: There are valid domain IDs which still cannot be used with rcu_lock_domain_by_any_id(), e.g. DOM_IO and DOM_XEN. I'd be curious to hear what others think. Andrew, ftaod - this is the patch I've mentioned in reply to your revert touching evtchn_status(). And as mentioned there - lsevtchn should never have outright bailed on _any_ error it gets back (i.e. even ones coming from XSM). Jan
diff --git a/tools/xcutils/lsevtchn.c b/tools/xcutils/lsevtchn.c index d1710613ddc5..e4b3f88fe4ec 100644 --- a/tools/xcutils/lsevtchn.c +++ b/tools/xcutils/lsevtchn.c @@ -3,6 +3,7 @@ #include <stdint.h> #include <string.h> #include <stdio.h> +#include <errno.h> #include <xenctrl.h> @@ -24,7 +25,18 @@ int main(int argc, char **argv) status.port = port; rc = xc_evtchn_status(xch, &status); if ( rc < 0 ) - break; + { + if ( errno == ESRCH ) + { + fprintf(stderr, "Domain ID '%d' does not correspond to valid domain.\n", domid); + break; + } + + if ( errno == EINVAL ) + break; + + continue; + } if ( status.status == EVTCHNSTAT_closed ) continue;
Currently, lsevtchn aborts its event channel enumeration when it hits its first hypercall error, namely: * When an event channel doesn't exist at the specified port * When the event channel is owned by Xen lsevtchn does not distinguish between different hypercall errors, which results in lsevtchn missing potential relevant event channels with higher port numbers. Use the errno macro to distinguish between hypercall errors, and continue event channel enumeration if the hypercall error is not critical to enumeration. Signed-off-by: Matthew Barnes <matthew.barnes@cloud.com> --- tools/xcutils/lsevtchn.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)