[PATCH] perf: fix invalid bit in diagnostic entry

[PATCH] perf: fix invalid bit in diagnostic entry

[Thomas Richter]

The s390 CPU measurement facility sampling mode
supports basic entries and diagnostic entries.
Each entry has a valid bit to indicate the
status of the entry as valid or invalid.

This bit is bit 31 in the diagnostic entry,
but the bit mask definition refers to bit 30.

Fix this by making the reserved field one
bit larger.

Cc: stable@vger.kernel.org # v3.14+
Fixes: 7e75fc3ff4cf ("s390/cpum_sf: Add raw data sampling to support the diagnostic-sampling function")
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
---
 arch/s390/include/asm/cpu_mf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h
index f58d17e9dd65..7093a27520ee 100644
--- a/arch/s390/include/asm/cpu_mf.h
+++ b/arch/s390/include/asm/cpu_mf.h
@@ -113,7 +113,7 @@ struct hws_basic_entry {
 
 struct hws_diag_entry {
 	unsigned int def:16;	    /* 0-15  Data Entry Format		 */
-	unsigned int R:14;	    /* 16-19 and 20-30 reserved		 */
+	unsigned int R:15;	    /* 16-19 and 20-30 reserved		 */
 	unsigned int I:1;	    /* 31 entry valid or invalid	 */
 	u8	     data[];	    /* Machine-dependent sample data	 */
 } __packed;
-- 
2.16.3

Re: [PATCH] perf: fix invalid bit in diagnostic entry

[Hendrik Brueckner]

On Tue, May 08, 2018 at 09:57:29AM +0200, Thomas Richter wrote:
> The s390 CPU measurement facility sampling mode
> supports basic entries and diagnostic entries.
> Each entry has a valid bit to indicate the
> status of the entry as valid or invalid.
> 
> This bit is bit 31 in the diagnostic entry,
> but the bit mask definition refers to bit 30.
> 
> Fix this by making the reserved field one
> bit larger.
> 
> Cc: stable@vger.kernel.org # v3.14+
> Fixes: 7e75fc3ff4cf ("s390/cpum_sf: Add raw data sampling to support the diagnostic-sampling function")
> Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
> Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
                                                  ^^^^
Please remove "vnet" and push to devel. Thanks.