| From: Thomas Richter <tmricht@linux.ibm.com> |
| Date: Tue, 8 May 2018 10:18:39 +0200 |
| Subject: s390/cpum_sf: Add data entry sizes to sampling trailer entry |
| |
| commit 77715b7ddb446bd39a06f3376e85f4bb95b29bb8 upstream. |
| |
| The CPU Measurement sampling facility creates a trailer entry for each |
| Sample-Data-Block of stored samples. The trailer entry contains the sizes |
| (in bytes) of the stored sampling types: |
| - basic-sampling data entry size |
| - diagnostic-sampling data entry size |
| Both sizes are 2 bytes long. |
| |
| This patch changes the trailer entry definition to reflect this. |
| |
| Fixes: fcc77f507333 ("s390/cpum_sf: Atomically reset trailer entry fields of sample-data-blocks") |
| Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> |
| Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com> |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/s390/include/asm/cpu_mf.h | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/arch/s390/include/asm/cpu_mf.h |
| +++ b/arch/s390/include/asm/cpu_mf.h |
| @@ -134,7 +134,9 @@ struct hws_trailer_entry { |
| unsigned int f:1; /* 0 - Block Full Indicator */ |
| unsigned int a:1; /* 1 - Alert request control */ |
| unsigned int t:1; /* 2 - Timestamp format */ |
| - unsigned long long:61; /* 3 - 63: Reserved */ |
| + unsigned int :29; /* 3 - 31: Reserved */ |
| + unsigned int bsdes:16; /* 32-47: size of basic SDE */ |
| + unsigned int dsdes:16; /* 48-63: size of diagnostic SDE */ |
| }; |
| unsigned long long flags; /* 0 - 63: All indicators */ |
| }; |
