Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
281f42af
Unverified
Commit
281f42af
authored
Feb 18, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpf: use __u32 not uint32_t
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
a38a34f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
cgroup2_devices.c
src/lxc/cgroups/cgroup2_devices.c
+1
-1
cgroup2_devices.h
src/lxc/cgroups/cgroup2_devices.h
+9
-8
No files found.
src/lxc/cgroups/cgroup2_devices.c
View file @
281f42af
...
@@ -363,7 +363,7 @@ static int bpf_program_load_kernel(struct bpf_program *prog)
...
@@ -363,7 +363,7 @@ static int bpf_program_load_kernel(struct bpf_program *prog)
}
}
int
bpf_program_cgroup_attach
(
struct
bpf_program
*
prog
,
int
type
,
int
fd_cgroup
,
int
bpf_program_cgroup_attach
(
struct
bpf_program
*
prog
,
int
type
,
int
fd_cgroup
,
int
replace_bpf_fd
,
uint32_t
flags
)
int
replace_bpf_fd
,
__u32
flags
)
{
{
__do_close
int
fd_cgroup_dup
=
-
EBADF
;
__do_close
int
fd_cgroup_dup
=
-
EBADF
;
int
ret
;
int
ret
;
...
...
src/lxc/cgroups/cgroup2_devices.h
View file @
281f42af
...
@@ -44,7 +44,7 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size)
...
@@ -44,7 +44,7 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size)
struct
bpf_program
{
struct
bpf_program
{
int
device_list_type
;
int
device_list_type
;
int
kernel_fd
;
int
kernel_fd
;
uint32_t
prog_type
;
__u32
prog_type
;
size_t
n_instructions
;
size_t
n_instructions
;
#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
...
@@ -53,7 +53,7 @@ struct bpf_program {
...
@@ -53,7 +53,7 @@ struct bpf_program {
int
fd_cgroup
;
int
fd_cgroup
;
int
attached_type
;
int
attached_type
;
uint32_t
attached_flags
;
__u32
attached_flags
;
};
};
static
inline
bool
bpf_device_block_all
(
const
struct
bpf_program
*
prog
)
static
inline
bool
bpf_device_block_all
(
const
struct
bpf_program
*
prog
)
...
@@ -96,13 +96,14 @@ static inline void bpf_device_set_type(struct bpf_program *prog,
...
@@ -96,13 +96,14 @@ static inline void bpf_device_set_type(struct bpf_program *prog,
}
}
#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
#ifdef HAVE_STRUCT_BPF_CGROUP_DEV_CTX
__hidden
extern
struct
bpf_program
*
bpf_program_new
(
uint32_t
prog_type
);
__hidden
extern
struct
bpf_program
*
bpf_program_new
(
__u32
prog_type
);
__hidden
extern
int
bpf_program_init
(
struct
bpf_program
*
prog
);
__hidden
extern
int
bpf_program_init
(
struct
bpf_program
*
prog
);
__hidden
extern
int
bpf_program_append_device
(
struct
bpf_program
*
prog
,
struct
device_item
*
device
);
__hidden
extern
int
bpf_program_append_device
(
struct
bpf_program
*
prog
,
struct
device_item
*
device
);
__hidden
extern
int
bpf_program_finalize
(
struct
bpf_program
*
prog
);
__hidden
extern
int
bpf_program_finalize
(
struct
bpf_program
*
prog
);
__hidden
extern
int
bpf_program_cgroup_attach
(
struct
bpf_program
*
prog
,
int
type
,
__hidden
extern
int
bpf_program_cgroup_attach
(
struct
bpf_program
*
prog
,
int
fd_cgroup
,
int
replace_bpf_fd
,
int
type
,
int
fd_cgroup
,
uint32_t
flags
);
__owns
int
replace_bpf_fd
,
__u32
flags
);
__hidden
extern
int
bpf_program_cgroup_detach
(
struct
bpf_program
*
prog
);
__hidden
extern
int
bpf_program_cgroup_detach
(
struct
bpf_program
*
prog
);
__hidden
extern
void
bpf_program_free
(
struct
bpf_program
*
prog
);
__hidden
extern
void
bpf_program_free
(
struct
bpf_program
*
prog
);
__hidden
extern
void
bpf_device_program_free
(
struct
cgroup_ops
*
ops
);
__hidden
extern
void
bpf_device_program_free
(
struct
cgroup_ops
*
ops
);
...
@@ -112,7 +113,7 @@ __hidden extern int bpf_list_add_device(struct lxc_conf *conf, struct device_ite
...
@@ -112,7 +113,7 @@ __hidden extern int bpf_list_add_device(struct lxc_conf *conf, struct device_ite
#else
/* !HAVE_STRUCT_BPF_CGROUP_DEV_CTX */
#else
/* !HAVE_STRUCT_BPF_CGROUP_DEV_CTX */
static
inline
struct
bpf_program
*
bpf_program_new
(
uint32_t
prog_type
)
static
inline
struct
bpf_program
*
bpf_program_new
(
__u32
prog_type
)
{
{
return
ret_set_errno
(
NULL
,
ENOSYS
);
return
ret_set_errno
(
NULL
,
ENOSYS
);
}
}
...
@@ -136,7 +137,7 @@ static inline int bpf_program_finalize(struct bpf_program *prog)
...
@@ -136,7 +137,7 @@ static inline int bpf_program_finalize(struct bpf_program *prog)
static
inline
int
bpf_program_cgroup_attach
(
struct
bpf_program
*
prog
,
int
type
,
static
inline
int
bpf_program_cgroup_attach
(
struct
bpf_program
*
prog
,
int
type
,
int
fd_cgroup
,
int
replace_bpf_fd
,
int
fd_cgroup
,
int
replace_bpf_fd
,
uint32_t
flags
)
__u32
flags
)
{
{
return
ret_errno
(
ENOSYS
);
return
ret_errno
(
ENOSYS
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment