f855ec814d
So far, intr_{g,s}etaffinity(9) take a single int for identifying
a device interrupt. This approach doesn't work on all architectures
supported, as a single int isn't sufficient to globally specify a
device interrupt. In particular, with multiple interrupt controllers
in one system as found on e. g. arm and arm64 machines, an interrupt
number as returned by rman_get_start(9) may be only unique relative
to the bus and, thus, interrupt controller, a certain device hangs
off from.
In turn, this makes taskqgroup_attach{,_cpu}(9) and - internal to
the gtaskqueue implementation - taskqgroup_attach_deferred{,_cpu}()
not work across architectures. Yet in turn, iflib(4) as gtaskqueue
consumer so far doesn't fit architectures where interrupt numbers
aren't globally unique.
However, at least for intr_setaffinity(..., CPU_WHICH_IRQ, ...) as
employed by the gtaskqueue implementation to bind an interrupt to a
particular CPU, using bus_bind_intr(9) instead is equivalent from
a functional point of view, with bus_bind_intr(9) taking the device
and interrupt resource arguments required for uniquely specifying a
device interrupt.
Thus, change the gtaskqueue implementation to employ bus_bind_intr(9)
instead and intr_{g,s}etaffinity(9) to take the device and interrupt
resource arguments required respectively. This change also moves
struct grouptask from <sys/_task.h> to <sys/gtaskqueue.h> and wraps
struct gtask along with the gtask_fn_t typedef into #ifdef _KERNEL
as userland likes to include <sys/_task.h> or indirectly drags it
in - for better or worse also with _KERNEL defined -, which with
device_t and struct resource dependencies otherwise is no longer
as easily possible now.
The userland inclusion problem probably can be improved a bit by
introducing a _WANT_TASK (as well as a _WANT_MOUNT) akin to the
existing _WANT_PRISON etc., which is orthogonal to this change,
though, and likely needs an exp-run.
While at it:
- Change the gt_cpu member in the grouptask structure to be of type
int as used elswhere for specifying CPUs (an int16_t may be too
narrow sooner or later),
- move the gtaskqueue_enqueue_fn typedef from <sys/gtaskqueue.h> to
the gtaskqueue implementation as it's only used and needed there,
- change the GTASK_INIT macro to use "gtask" rather than "task" as
argument given that it actually operates on a struct gtask rather
than a struct task, and
- let subr_gtaskqueue.c consistently use __func__ to print functions
names.
Reported by: mmel
Reviewed by: mmel
Differential Revision: https://reviews.freebsd.org/D19139
133 lines
4.5 KiB
C
133 lines
4.5 KiB
C
/*-
|
|
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
|
*
|
|
* Copyright (c) 2014 Jeffrey Roberson <jeff@freebsd.org>
|
|
* Copyright (c) 2016 Matthew Macy <mmacy@mattmacy.io>
|
|
* All rights reserved.
|
|
*
|
|
* 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.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _SYS_GTASKQUEUE_H_
|
|
#define _SYS_GTASKQUEUE_H_
|
|
|
|
#ifndef _KERNEL
|
|
#error "no user-serviceable parts inside"
|
|
#endif
|
|
|
|
#include <sys/_task.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/taskqueue.h>
|
|
#include <sys/types.h>
|
|
|
|
struct gtaskqueue;
|
|
|
|
/*
|
|
* Taskqueue groups. Manages dynamic thread groups and irq binding for
|
|
* device and other tasks.
|
|
*/
|
|
|
|
struct grouptask {
|
|
struct gtask gt_task;
|
|
void *gt_taskqueue;
|
|
LIST_ENTRY(grouptask) gt_list;
|
|
void *gt_uniq;
|
|
#define GROUPTASK_NAMELEN 32
|
|
char gt_name[GROUPTASK_NAMELEN];
|
|
device_t gt_dev;
|
|
struct resource *gt_irq;
|
|
int gt_cpu;
|
|
};
|
|
|
|
void gtaskqueue_block(struct gtaskqueue *queue);
|
|
void gtaskqueue_unblock(struct gtaskqueue *queue);
|
|
|
|
int gtaskqueue_cancel(struct gtaskqueue *queue, struct gtask *gtask);
|
|
void gtaskqueue_drain(struct gtaskqueue *queue, struct gtask *task);
|
|
void gtaskqueue_drain_all(struct gtaskqueue *queue);
|
|
|
|
void grouptask_block(struct grouptask *grouptask);
|
|
void grouptask_unblock(struct grouptask *grouptask);
|
|
int grouptaskqueue_enqueue(struct gtaskqueue *queue, struct gtask *task);
|
|
|
|
void taskqgroup_attach(struct taskqgroup *qgroup, struct grouptask *grptask,
|
|
void *uniq, device_t dev, struct resource *irq, const char *name);
|
|
int taskqgroup_attach_cpu(struct taskqgroup *qgroup,
|
|
struct grouptask *grptask, void *uniq, int cpu, device_t dev,
|
|
struct resource *irq, const char *name);
|
|
void taskqgroup_detach(struct taskqgroup *qgroup, struct grouptask *gtask);
|
|
struct taskqgroup *taskqgroup_create(const char *name);
|
|
void taskqgroup_destroy(struct taskqgroup *qgroup);
|
|
int taskqgroup_adjust(struct taskqgroup *qgroup, int cnt, int stride);
|
|
void taskqgroup_config_gtask_init(void *ctx, struct grouptask *gtask,
|
|
gtask_fn_t *fn, const char *name);
|
|
void taskqgroup_config_gtask_deinit(struct grouptask *gtask);
|
|
|
|
#define TASK_ENQUEUED 0x1
|
|
#define TASK_SKIP_WAKEUP 0x2
|
|
#define TASK_NOENQUEUE 0x4
|
|
|
|
#define GTASK_INIT(gtask, flags, priority, func, context) do { \
|
|
(gtask)->ta_flags = flags; \
|
|
(gtask)->ta_priority = (priority); \
|
|
(gtask)->ta_func = (func); \
|
|
(gtask)->ta_context = (context); \
|
|
} while (0)
|
|
|
|
#define GROUPTASK_INIT(gtask, priority, func, context) \
|
|
GTASK_INIT(&(gtask)->gt_task, TASK_SKIP_WAKEUP, priority, func, context)
|
|
|
|
#define GROUPTASK_ENQUEUE(gtask) \
|
|
grouptaskqueue_enqueue((gtask)->gt_taskqueue, &(gtask)->gt_task)
|
|
|
|
#define TASKQGROUP_DECLARE(name) \
|
|
extern struct taskqgroup *qgroup_##name
|
|
|
|
#define TASKQGROUP_DEFINE(name, cnt, stride) \
|
|
\
|
|
struct taskqgroup *qgroup_##name; \
|
|
\
|
|
static void \
|
|
taskqgroup_define_##name(void *arg) \
|
|
{ \
|
|
qgroup_##name = taskqgroup_create(#name); \
|
|
} \
|
|
\
|
|
SYSINIT(taskqgroup_##name, SI_SUB_TASKQ, SI_ORDER_FIRST, \
|
|
taskqgroup_define_##name, NULL); \
|
|
\
|
|
static void \
|
|
taskqgroup_adjust_##name(void *arg) \
|
|
{ \
|
|
taskqgroup_adjust(qgroup_##name, (cnt), (stride)); \
|
|
} \
|
|
\
|
|
SYSINIT(taskqgroup_adj_##name, SI_SUB_SMP, SI_ORDER_ANY, \
|
|
taskqgroup_adjust_##name, NULL)
|
|
|
|
TASKQGROUP_DECLARE(net);
|
|
TASKQGROUP_DECLARE(softirq);
|
|
|
|
#endif /* !_SYS_GTASKQUEUE_H_ */
|