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
Unified · Split
| @@ -461,34 +461,13 @@ int damon_stop(struct damon_ctx **ctxs, int nr_ctxs); · 460 unmodified lines | ||
| 461 | 461 | #endif /* CONFIG_DAMON */ |
| 462 | 462 | |
| 463 | 463 | #ifdef CONFIG_DAMON_VADDR |
| 464 | − | |
| 465 | −/* Monitoring primitives for virtual memory address spaces */ | |
| 466 | −void damon_va_init(struct damon_ctx *ctx); | |
| 467 | −void damon_va_update(struct damon_ctx *ctx); | |
| 468 | −void damon_va_prepare_access_checks(struct damon_ctx *ctx); | |
| 469 | −unsigned int damon_va_check_accesses(struct damon_ctx *ctx); | |
| 470 | 464 | bool damon_va_target_valid(void *t); |
| 471 | −void damon_va_cleanup(struct damon_ctx *ctx); | |
| 472 | −int damon_va_apply_scheme(struct damon_ctx *context, struct damon_target *t, | |
| 473 | − struct damon_region *r, struct damos *scheme); | |
| 474 | −int damon_va_scheme_score(struct damon_ctx *context, struct damon_target *t, | |
| 475 | − struct damon_region *r, struct damos *scheme); | |
| 476 | 465 | void damon_va_set_primitives(struct damon_ctx *ctx); |
| 477 | − | |
| 478 | 466 | #endif /* CONFIG_DAMON_VADDR */ |
| 479 | 467 | |
| 480 | 468 | #ifdef CONFIG_DAMON_PADDR |
| 481 | − | |
| 482 | −/* Monitoring primitives for the physical memory address space */ | |
| 483 | −void damon_pa_prepare_access_checks(struct damon_ctx *ctx); | |
| 484 | −unsigned int damon_pa_check_accesses(struct damon_ctx *ctx); | |
| 485 | 469 | bool damon_pa_target_valid(void *t); |
| 486 | −int damon_pa_apply_scheme(struct damon_ctx *context, struct damon_target *t, | |
| 487 | − struct damon_region *r, struct damos *scheme); | |
| 488 | −int damon_pa_scheme_score(struct damon_ctx *context, struct damon_target *t, | |
| 489 | − struct damon_region *r, struct damos *scheme); | |
| 490 | 470 | void damon_pa_set_primitives(struct damon_ctx *ctx); |
| 491 | − | |
| 492 | 471 | #endif /* CONFIG_DAMON_PADDR */ |
| 493 | 472 | |
| 494 | 473 | #endif /* _DAMON_H */ |
| @@ -73,7 +73,7 @@ static void __damon_pa_prepare_access_check(struct damon_ctx *ctx, · 72 unmodified lines | ||
| 73 | 73 | damon_pa_mkold(r->sampling_addr); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | −void damon_pa_prepare_access_checks(struct damon_ctx *ctx) | |
| 76 | +static void damon_pa_prepare_access_checks(struct damon_ctx *ctx) | |
| 77 | 77 | { |
| 78 | 78 | struct damon_target *t; |
| 79 | 79 | struct damon_region *r; |
| @@ -192,7 +192,7 @@ static void __damon_pa_check_access(struct damon_ctx *ctx, · 112 unmodified lines | ||
| 192 | 192 | last_addr = r->sampling_addr; |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | −unsigned int damon_pa_check_accesses(struct damon_ctx *ctx) | |
| 195 | +static unsigned int damon_pa_check_accesses(struct damon_ctx *ctx) | |
| 196 | 196 | { |
| 197 | 197 | struct damon_target *t; |
| 198 | 198 | struct damon_region *r; |
| @@ -213,7 +213,7 @@ bool damon_pa_target_valid(void *t) · 14 unmodified lines | ||
| 213 | 213 | return true; |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | −int damon_pa_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, | |
| 216 | +static int damon_pa_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, | |
| 217 | 217 | struct damon_region *r, struct damos *scheme) |
| 218 | 218 | { |
| 219 | 219 | unsigned long addr; |
| @@ -246,8 +246,9 @@ int damon_pa_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, · 26 unmodified lines | ||
| 246 | 246 | return 0; |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | −int damon_pa_scheme_score(struct damon_ctx *context, struct damon_target *t, | |
| 250 | − struct damon_region *r, struct damos *scheme) | |
| 249 | +static int damon_pa_scheme_score(struct damon_ctx *context, | |
| 250 | + struct damon_target *t, struct damon_region *r, | |
| 251 | + struct damos *scheme) | |
| 251 | 252 | { |
| 252 | 253 | switch (scheme->action) { |
| 253 | 254 | case DAMOS_PAGEOUT: |
| @@ -272,7 +272,7 @@ static void __damon_va_init_regions(struct damon_ctx *ctx, · 271 unmodified lines | ||
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | /* Initialize '->regions_list' of every target (task) */ |
| 275 | −void damon_va_init(struct damon_ctx *ctx) | |
| 275 | +static void damon_va_init(struct damon_ctx *ctx) | |
| 276 | 276 | { |
| 277 | 277 | struct damon_target *t; |
| 278 | 278 | |
| @@ -292,7 +292,8 @@ void damon_va_init(struct damon_ctx *ctx) · 13 unmodified lines | ||
| 292 | 292 | * |
| 293 | 293 | * Returns true if it is. |
| 294 | 294 | */ |
| 295 | −static bool damon_intersect(struct damon_region *r, struct damon_addr_range *re) | |
| 295 | +static bool damon_intersect(struct damon_region *r, | |
| 296 | + struct damon_addr_range *re) | |
| 296 | 297 | { |
| 297 | 298 | return !(r->ar.end <= re->start || re->end <= r->ar.start); |
| 298 | 299 | } |
| @@ -356,7 +357,7 @@ static void damon_va_apply_three_regions(struct damon_target *t, · 57 unmodified lines | ||
| 356 | 357 | /* |
| 357 | 358 | * Update regions for current memory mappings |
| 358 | 359 | */ |
| 359 | −void damon_va_update(struct damon_ctx *ctx) | |
| 360 | +static void damon_va_update(struct damon_ctx *ctx) | |
| 360 | 361 | { |
| 361 | 362 | struct damon_addr_range three_regions[3]; |
| 362 | 363 | struct damon_target *t; |
| @@ -418,7 +419,7 @@ static void __damon_va_prepare_access_check(struct damon_ctx *ctx, · 55 unmodified lines | ||
| 418 | 419 | damon_va_mkold(mm, r->sampling_addr); |
| 419 | 420 | } |
| 420 | 421 | |
| 421 | −void damon_va_prepare_access_checks(struct damon_ctx *ctx) | |
| 422 | +static void damon_va_prepare_access_checks(struct damon_ctx *ctx) | |
| 422 | 423 | { |
| 423 | 424 | struct damon_target *t; |
| 424 | 425 | struct mm_struct *mm; |
| @@ -539,7 +540,7 @@ static void __damon_va_check_access(struct damon_ctx *ctx, · 114 unmodified lines | ||
| 539 | 540 | last_addr = r->sampling_addr; |
| 540 | 541 | } |
| 541 | 542 | |
| 542 | −unsigned int damon_va_check_accesses(struct damon_ctx *ctx) | |
| 543 | +static unsigned int damon_va_check_accesses(struct damon_ctx *ctx) | |
| 543 | 544 | { |
| 544 | 545 | struct damon_target *t; |
| 545 | 546 | struct mm_struct *mm; |
| @@ -603,7 +604,7 @@ out: · 57 unmodified lines | ||
| 603 | 604 | } |
| 604 | 605 | #endif /* CONFIG_ADVISE_SYSCALLS */ |
| 605 | 606 | |
| 606 | −int damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, | |
| 607 | +static int damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, | |
| 607 | 608 | struct damon_region *r, struct damos *scheme) |
| 608 | 609 | { |
| 609 | 610 | int madv_action; |
| @@ -633,8 +634,9 @@ int damon_va_apply_scheme(struct damon_ctx *ctx, struct damon_target *t, · 23 unmodified lines | ||
| 633 | 634 | return damos_madvise(t, r, madv_action); |
| 634 | 635 | } |
| 635 | 636 | |
| 636 | −int damon_va_scheme_score(struct damon_ctx *context, struct damon_target *t, | |
| 637 | − struct damon_region *r, struct damos *scheme) | |
| 637 | +static int damon_va_scheme_score(struct damon_ctx *context, | |
| 638 | + struct damon_target *t, struct damon_region *r, | |
| 639 | + struct damos *scheme) | |
| 638 | 640 | { |
| 639 | 641 | |
| 640 | 642 | switch (scheme->action) { |