@@ -5620,6 +5620,7 @@ struct option {
const char *opts;
bool no_dev;
int (*func)(struct cmd_context *);
+ nl_chk_t nlchk;
nl_func_t nlfunc;
const char *help;
const char *xhelp;
@@ -6282,6 +6283,7 @@ int main(int argc, char **argp)
int (*func)(struct cmd_context *);
struct cmd_context ctx = {};
nl_func_t nlfunc = NULL;
+ nl_chk_t nlchk = NULL;
bool no_dev;
int ret;
int k;
@@ -6341,6 +6343,7 @@ int main(int argc, char **argp)
argc--;
func = args[k].func;
nlfunc = args[k].nlfunc;
+ nlchk = args[k].nlchk;
no_dev = args[k].no_dev;
goto opt_found;
}
@@ -6360,7 +6363,7 @@ int main(int argc, char **argp)
}
ctx.argc = argc;
ctx.argp = argp;
- netlink_run_handler(&ctx, nlfunc, !func);
+ netlink_run_handler(&ctx, nlchk, nlfunc, !func);
ret = ioctl_init(&ctx, no_dev);
if (ret)
@@ -11,11 +11,12 @@ struct cmd_context;
struct nl_context;
typedef int (*nl_func_t)(struct cmd_context *);
+typedef bool (*nl_chk_t)(struct cmd_context *);
#ifdef ETHTOOL_ENABLE_NETLINK
-void netlink_run_handler(struct cmd_context *ctx, nl_func_t nlfunc,
- bool no_fallback);
+void netlink_run_handler(struct cmd_context *ctx, nl_chk_t nlchk,
+ nl_func_t nlfunc, bool no_fallback);
int nl_gset(struct cmd_context *ctx);
int nl_sset(struct cmd_context *ctx);
@@ -47,6 +48,7 @@ void nl_monitor_usage(void);
#else /* ETHTOOL_ENABLE_NETLINK */
static inline void netlink_run_handler(struct cmd_context *ctx __maybe_unused,
+ nl_chk_t nlchk __maybe_unused,
nl_func_t nlfunc __maybe_unused,
bool no_fallback)
{
@@ -454,14 +454,15 @@ static void netlink_done(struct cmd_context *ctx)
/**
* netlink_run_handler() - run netlink handler for subcommand
* @ctx: command context
+ * @nlchk: netlink capability check
* @nlfunc: subcommand netlink handler to call
* @no_fallback: there is no ioctl fallback handler
*
* This function returns only if ioctl() handler should be run as fallback.
* Otherwise it exits with appropriate return code.
*/
-void netlink_run_handler(struct cmd_context *ctx, nl_func_t nlfunc,
- bool no_fallback)
+void netlink_run_handler(struct cmd_context *ctx, nl_chk_t nlchk,
+ nl_func_t nlfunc, bool no_fallback)
{
bool wildcard = ctx->devname && !strcmp(ctx->devname, WILDCARD_DEVNAME);
bool wildcard_unsupported, ioctl_fallback;
@@ -469,6 +470,10 @@ void netlink_run_handler(struct cmd_context *ctx, nl_func_t nlfunc,
const char *reason;
int ret;
+ if (nlchk && !nlchk(ctx)) {
+ reason = "ioctl-only request";
+ goto no_support;
+ }
if (ctx->devname && strlen(ctx->devname) >= ALTIFNAMSIZ) {
fprintf(stderr, "device name '%s' longer than %u characters\n",
ctx->devname, ALTIFNAMSIZ - 1);
To support commands which differ from the ioctl implementation add a new callback which can check if the arguments on the command line indicate that the request should be sent over netlink. The decision should be inferred from the arguments, rather than an explicit --netlink argument. v3: fix --disable-netlink build Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- ethtool.c | 5 ++++- netlink/extapi.h | 6 ++++-- netlink/netlink.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-)