summaryrefslogtreecommitdiff
path: root/sys/src/9/port/segment.c
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2020-05-10 16:54:42 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2020-05-10 16:54:42 +0200
commitdbfec06bf1f8de922ca3af09d14675ef44ada5d2 (patch)
tree157e0375612556991e488cdc6cef84e202dc50ea /sys/src/9/port/segment.c
parent0099db7b5b87adb72f1dfa69f893c41ab1c26d6e (diff)
kernel: fix checkpages() and segflush() on SG_PHYSICAL type segments
do not touch s->map on SG_PHYSICAL type segments as they do not have a pte map (s->mapsize == 0 && s->map == nil). also remove the SG_PHYSICAL switch in freepte(), this is never reached.
Diffstat (limited to 'sys/src/9/port/segment.c')
-rw-r--r--sys/src/9/port/segment.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/sys/src/9/port/segment.c b/sys/src/9/port/segment.c
index 1898beaeb..83b723eb8 100644
--- a/sys/src/9/port/segment.c
+++ b/sys/src/9/port/segment.c
@@ -64,8 +64,11 @@ newseg(int type, uintptr base, ulong size)
s->sema.prev = &s->sema;
s->sema.next = &s->sema;
- if((type & SG_TYPE) == SG_PHYSICAL)
+ if((type & SG_TYPE) == SG_PHYSICAL){
+ s->map = nil;
+ s->mapsize = 0;
return s;
+ }
mapsize = ROUND(size, PTEPERTAB)/PTEPERTAB;
if(mapsize > nelem(s->ssegmap)){
@@ -477,9 +480,6 @@ mcountseg(Segment *s)
Page **pg, **pe;
ulong pages;
- if((s->type&SG_TYPE) == SG_PHYSICAL)
- return 0;
-
pages = 0;
emap = &s->map[s->mapsize];
for(pte = s->map; pte < emap; pte++){
@@ -706,26 +706,25 @@ segflush(void *va, uintptr len)
s->flushme = 1;
more:
len = (s->top < to ? s->top : to) - from;
- off = from-s->base;
- pte = s->map[off/PTEMAPMEM];
- off &= PTEMAPMEM-1;
- if(off+len > PTEMAPMEM)
- len = PTEMAPMEM-off;
-
- if(pte != nil) {
- pg = &pte->pages[off/BY2PG];
- pe = pg + len/BY2PG;
- while(pg < pe) {
- if(!pagedout(*pg))
- (*pg)->txtflush = ~0;
- pg++;
+ if(s->mapsize > 0){
+ off = from-s->base;
+ pte = s->map[off/PTEMAPMEM];
+ off &= PTEMAPMEM-1;
+ if(off+len > PTEMAPMEM)
+ len = PTEMAPMEM-off;
+ if(pte != nil) {
+ pg = &pte->pages[off/BY2PG];
+ pe = pg + len/BY2PG;
+ while(pg < pe) {
+ if(!pagedout(*pg))
+ (*pg)->txtflush = ~0;
+ pg++;
+ }
}
}
-
from += len;
if(from < to && from < s->top)
goto more;
-
qunlock(s);
}
}