Show loaded DCSS segments under /proc/iomem.
From: Gerald Schaefer <[email protected]>
[S390] Show loaded DCSS segments under /proc/iomem.
Currently loaded DCSS segments are now listed in /proc/iomem with their name followed by a trailing "(DCSS)".
Signed-off-by Gerald Schaefer <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/mm/extmem.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-)
arch/s390/mm/extmem.c +43 -3
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/bootmem.h> #include <linux/ctype.h> +#include <linux/ioport.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/ebcdic.h>
@@ -70,6 +71,7 @@ struct qin64 {struct dcss_segment {struct list_head list;char dcss_name[8 ]; +char res_name[15 ];unsigned long start_addr;unsigned long end;atomic_t ref_count;
@@ -77,6 +79,7 @@ struct dcss_segment {unsigned int vm_segtype;struct qrange range[6 ];int segcnt; +struct resource *res; };static DEFINE_MUTEX (dcss_lock);
@@ -303,6 +306,26 @@ __segment_load (char *name, int do_nonsh goto out_free; } + seg->res =kzalloc (sizeof (struct resource ),GFP_KERNEL ); +if (seg->res ==NULL ) { + rc = -ENOMEM ; + goto out_shared; + } + seg->res->flags =IORESOURCE_BUSY |IORESOURCE_MEM ; + seg->res->start = seg->start_addr; + seg->res->end = seg->end; +memcpy (&seg->res_name, seg->dcss_name,8 ); +EBCASC (seg->res_name,8 ); + seg->res_name[8 ] ='\0' ; +strncat (seg->res_name," (DCSS)" ,7 ); + seg->res->name = seg->res_name; + rc =request_resource (&iomem_resource, seg->res); +if (rc) { + rc = -EBUSY ; +kfree (seg->res); + goto out_shared; + } +if (do_nonshared) dcss_command =DCSS_LOADNSR ;else
@@ -316,12 +339,14 @@ __segment_load (char *name, int do_nonsh rc =dcss_diag_translate_rc (seg->end);dcss_diag (DCSS_PURGESEG , seg->dcss_name, &seg->start_addr, &seg->end); - goto out_shared; + goto out_resource; } seg->do_nonshared = do_nonshared;atomic_set (&seg->ref_count,1 );list_add (&seg->list, &dcss_list); rc = seg->vm_segtype; +if (rc ==SEG_TYPE_SC ) + seg->res->flags |=IORESOURCE_READONLY ; *addr = seg->start_addr; *end = seg->end;if (do_nonshared)
@@ -329,12 +354,18 @@ __segment_load (char *name, int do_nonsh"type %s in non-shared mode\n" , name, (void *)seg->start_addr, (void *)seg->end, segtype_string[seg->vm_segtype]); - else + else {PRINT_INFO ("segment_load: loaded segment %s range %p .. %p " "type %s in shared mode\n" , name, (void *)seg->start_addr, (void *)seg->end, segtype_string[seg->vm_segtype]); +if (rc ==SEG_TYPE_SR || rc ==SEG_TYPE_ER ) + seg->res->flags |=IORESOURCE_READONLY ; + } goto out; + out_resource: +release_resource (seg->res); +kfree (seg->res); out_shared:remove_shared_memory (seg->start_addr, seg->end - seg->start_addr +1 ); out_free:
@@ -433,7 +464,7 @@ segment_modify_shared (char *name, int dif (do_nonshared) dcss_command =DCSS_LOADNSR ;else - dcss_command =DCSS_LOADNOLY ; + dcss_command =DCSS_LOADNOLY ; diag_cc =dcss_diag (dcss_command, seg->dcss_name, &seg->start_addr, &seg->end);if (diag_cc >1 ) {
@@ -443,6 +474,13 @@ segment_modify_shared (char *name, int d goto out_del; } seg->do_nonshared = do_nonshared; +if (do_nonshared) + seg->res->flags &= ~IORESOURCE_READONLY ; +else +if (seg->vm_segtype ==SEG_TYPE_SR || + seg->vm_segtype ==SEG_TYPE_ER ) + seg->res->flags |=IORESOURCE_READONLY ; + rc =0 ; goto out_unlock; out_del:
@@ -478,6 +516,8 @@ segment_unload(char *name) }if (atomic_dec_return (&seg->ref_count) !=0 ) goto out_unlock; +release_resource (seg->res); +kfree (seg->res);remove_shared_memory (seg->start_addr, seg->end - seg->start_addr +1 );list_del (&seg->list);dcss_diag (DCSS_PURGESEG , seg->dcss_name, &dummy, &dummy);