R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: mm/damon: remove some unneeded function definitions in damon.h

Browse Source 
In damon.h some func definitions about VA & PA can only be used in its
own file, so there no need to define in the header file, and the header
file will look cleaner.

If other files later need these functions, the prototypes can be added
to damon.h at that time.

[sj@kernel.org: remove unnecessary function prototype position changes]
 Link: https://lkml.kernel.org/r/20211118114827.20052-1-sj@kernel.org

Link: https://lkml.kernel.org/r/45fd5b3ef6cce8e28dbc1c92f9dc845ccfc949d7.1636989871.git.xhao@linux.alibaba.com
Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
Signed-off-by: SeongJae Park <sj@kernel.org>
Reviewed-by: SeongJae Park <sj@kernel.org>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit cdeed009f3bceee41f73f0137db785fd29a05cb8)

Bug: 228223814
Signed-off-by: Hailong Tu <tuhailong@oppo.com>
Change-Id: I2203b9c8e4625493797e1f3e506431799c4404c9
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
Xin Hao 2022-01-14 14:09:44 -08:00 committed by spakkkk
parent 8b9ac54ec9
commit 607816e355
3 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/linux/damon.h
View File

@ -461,34 +461,13 @@ int damon_stop(struct damon_ctx **ctxs, int nr_ctxs);
#endif /* CONFIG_DAMON */ #endif /* CONFIG_DAMON */
#ifdef CONFIG_DAMON_VADDR #ifdef CONFIG_DAMON_VADDR
/* Monitoring primitives for virtual memory address spaces */
void damon_va_init(struct damon_ctx *ctx);
void damon_va_update(struct damon_ctx *ctx);
void damon_va_prepare_access_checks(struct damon_ctx *ctx);
unsigned int damon_va_check_accesses(struct damon_ctx *ctx);
bool damon_va_target_valid(void *t); bool damon_va_target_valid(void *t);
void damon_va_cleanup(struct damon_ctx *ctx);
int damon_va_apply_scheme(struct damon_ctx *context, struct damon_target *t,
struct damon_region *r, struct damos *scheme);
int damon_va_scheme_score(struct damon_ctx *context, struct damon_target *t,
struct damon_region *r, struct damos *scheme);
void damon_va_set_primitives(struct damon_ctx *ctx); void damon_va_set_primitives(struct damon_ctx *ctx);
#endif /* CONFIG_DAMON_VADDR */ #endif /* CONFIG_DAMON_VADDR */
#ifdef CONFIG_DAMON_PADDR #ifdef CONFIG_DAMON_PADDR
/* Monitoring primitives for the physical memory address space */
void damon_pa_prepare_access_checks(struct damon_ctx *ctx);
unsigned int damon_pa_check_accesses(struct damon_ctx *ctx);
bool damon_pa_target_valid(void *t); bool damon_pa_target_valid(void *t);
int damon_pa_apply_scheme(struct damon_ctx *context, struct damon_target *t,
struct damon_region *r, struct damos *scheme);
int damon_pa_scheme_score(struct damon_ctx *context, struct damon_target *t,
struct damon_region *r, struct damos *scheme);
void damon_pa_set_primitives(struct damon_ctx *ctx); void damon_pa_set_primitives(struct damon_ctx *ctx);
#endif /* CONFIG_DAMON_PADDR */ #endif /* CONFIG_DAMON_PADDR */
#endif /* _DAMON_H */ #endif /* _DAMON_H */

11
mm/damon/paddr.c
View File

@ -73,7 +73,7 @@ static void __damon_pa_prepare_access_check(struct damon_ctx *ctx,
damon_pa_mkold(r->sampling_addr); damon_pa_mkold(r->sampling_addr);
} }
void damon_pa_prepare_access_checks(struct damon_ctx *ctx) static void damon_pa_prepare_access_checks(struct damon_ctx *ctx)
{ {
struct damon_target *t; struct damon_target *t;
struct damon_region *r; struct damon_region *r;
@ -192,7 +192,7 @@ static void __damon_pa_check_access(struct damon_ctx *ctx,
last_addr = r->sampling_addr; last_addr = r->sampling_addr;
} }
unsigned int damon_pa_check_accesses(struct damon_ctx *ctx) static unsigned int damon_pa_check_accesses(struct damon_ctx *ctx)
{ {
struct damon_target *t; struct damon_target *t;
struct damon_region *r; struct damon_region *r;
@ -213,7 +213,7 @@ bool damon_pa_target_valid(void *t)
return true; return true;
} }
int damon_pa_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, static int damon_pa_apply_scheme(struct damon_ctx *ctx, struct damon_target *t,
struct damon_region *r, struct damos *scheme) struct damon_region *r, struct damos *scheme)
{ {
unsigned long addr; unsigned long addr;
@ -246,8 +246,9 @@ int damon_pa_apply_scheme(struct damon_ctx *ctx, struct damon_target *t,
return 0; return 0;
} }
int damon_pa_scheme_score(struct damon_ctx *context, struct damon_target *t, static int damon_pa_scheme_score(struct damon_ctx *context,
struct damon_region *r, struct damos *scheme) struct damon_target *t, struct damon_region *r,
struct damos *scheme)
{ {
switch (scheme->action) { switch (scheme->action) {
case DAMOS_PAGEOUT: case DAMOS_PAGEOUT:

18
mm/damon/vaddr.c
View File

@ -272,7 +272,7 @@ static void __damon_va_init_regions(struct damon_ctx *ctx,
} }
/* Initialize '->regions_list' of every target (task) */ /* Initialize '->regions_list' of every target (task) */
void damon_va_init(struct damon_ctx *ctx) static void damon_va_init(struct damon_ctx *ctx)
{ {
struct damon_target *t; struct damon_target *t;
@ -292,7 +292,8 @@ void damon_va_init(struct damon_ctx *ctx)
* *
* Returns true if it is. * Returns true if it is.
*/ */
static bool damon_intersect(struct damon_region *r, struct damon_addr_range *re) static bool damon_intersect(struct damon_region *r,
struct damon_addr_range *re)
{ {
return !(r->ar.end <= re->start || re->end <= r->ar.start); return !(r->ar.end <= re->start || re->end <= r->ar.start);
} }
@ -356,7 +357,7 @@ static void damon_va_apply_three_regions(struct damon_target *t,
/* /*
* Update regions for current memory mappings * Update regions for current memory mappings
*/ */
void damon_va_update(struct damon_ctx *ctx) static void damon_va_update(struct damon_ctx *ctx)
{ {
struct damon_addr_range three_regions[3]; struct damon_addr_range three_regions[3];
struct damon_target *t; struct damon_target *t;
@ -418,7 +419,7 @@ static void __damon_va_prepare_access_check(struct damon_ctx *ctx,
damon_va_mkold(mm, r->sampling_addr); damon_va_mkold(mm, r->sampling_addr);
} }
void damon_va_prepare_access_checks(struct damon_ctx *ctx) static void damon_va_prepare_access_checks(struct damon_ctx *ctx)
{ {
struct damon_target *t; struct damon_target *t;
struct mm_struct *mm; struct mm_struct *mm;
@ -539,7 +540,7 @@ static void __damon_va_check_access(struct damon_ctx *ctx,
last_addr = r->sampling_addr; last_addr = r->sampling_addr;
} }
unsigned int damon_va_check_accesses(struct damon_ctx *ctx) static unsigned int damon_va_check_accesses(struct damon_ctx *ctx)
{ {
struct damon_target *t; struct damon_target *t;
struct mm_struct *mm; struct mm_struct *mm;
@ -603,7 +604,7 @@ out:
} }
#endif /* CONFIG_ADVISE_SYSCALLS */ #endif /* CONFIG_ADVISE_SYSCALLS */
int damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, static int damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t,
struct damon_region *r, struct damos *scheme) struct damon_region *r, struct damos *scheme)
{ {
int madv_action; int madv_action;
@ -633,8 +634,9 @@ int damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t,
return damos_madvise(t, r, madv_action); return damos_madvise(t, r, madv_action);
} }
int damon_va_scheme_score(struct damon_ctx *context, struct damon_target *t, static int damon_va_scheme_score(struct damon_ctx *context,
struct damon_region *r, struct damos *scheme) struct damon_target *t, struct damon_region *r,
struct damos *scheme)
{ {
switch (scheme->action) { switch (scheme->action) {