* [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
Adding gen15.
v2->v3: - merge deprecation patch into gen 15 patch
- fix comments
- use gen15a and gen15b instead of cpuid
v1->v2: - rework csske deprecation
- white space fixes
- also require msa4 for msa9
Christian Borntraeger (9):
linux header sync
s390x/cpumodel: ignore csske for expansion
s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
s390x/cpumodel: msa9 facility
s390x/cpumodel: vector enhancements
s390x/cpumodel: enhanced sort facility
s390x/cpumodel: add Deflate-conversion facility
s390x/cpumodel: add gen15 defintions
s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
linux-headers/asm-s390/kvm.h | 5 +-
target/s390x/cpu_features.c | 54 ++++++++++++++++
target/s390x/cpu_features.h | 3 +
target/s390x/cpu_features_def.h | 49 +++++++++++++++
target/s390x/cpu_models.c | 13 ++--
target/s390x/gen-features.c | 105 ++++++++++++++++++++++++++++++++
target/s390x/kvm.c | 18 ++++++
7 files changed, 242 insertions(+), 5 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
Adding gen15.
v2->v3: - merge deprecation patch into gen 15 patch
- fix comments
- use gen15a and gen15b instead of cpuid
v1->v2: - rework csske deprecation
- white space fixes
- also require msa4 for msa9
Christian Borntraeger (9):
linux header sync
s390x/cpumodel: ignore csske for expansion
s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
s390x/cpumodel: msa9 facility
s390x/cpumodel: vector enhancements
s390x/cpumodel: enhanced sort facility
s390x/cpumodel: add Deflate-conversion facility
s390x/cpumodel: add gen15 defintions
s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
linux-headers/asm-s390/kvm.h | 5 +-
target/s390x/cpu_features.c | 54 ++++++++++++++++
target/s390x/cpu_features.h | 3 +
target/s390x/cpu_features_def.h | 49 +++++++++++++++
target/s390x/cpu_models.c | 13 ++--
target/s390x/gen-features.c | 105 ++++++++++++++++++++++++++++++++
target/s390x/kvm.c | 18 ++++++
7 files changed, 242 insertions(+), 5 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 1/9] linux header sync
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
to be replaced by a proper one
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
| 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
index 0265482f8f..03ab5968c7 100644
--- a/linux-headers/asm-s390/kvm.h
+++ b/linux-headers/asm-s390/kvm.h
@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc {
__u8 pcc[16]; /* with MSA4 */
__u8 ppno[16]; /* with MSA5 */
__u8 kma[16]; /* with MSA8 */
- __u8 reserved[1808];
+ __u8 kdsa[16]; /* with MSA9 */
+ __u8 sortl[32]; /* with STFLE.150 */
+ __u8 dfltcc[32]; /* with STFLE.151 */
+ __u8 reserved[1728];
};
/* kvm attributes for crypto */
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 1/9] linux header sync
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
to be replaced by a proper one
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
| 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
index 0265482f8f..03ab5968c7 100644
--- a/linux-headers/asm-s390/kvm.h
+++ b/linux-headers/asm-s390/kvm.h
@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc {
__u8 pcc[16]; /* with MSA4 */
__u8 ppno[16]; /* with MSA5 */
__u8 kma[16]; /* with MSA8 */
- __u8 reserved[1808];
+ __u8 kdsa[16]; /* with MSA9 */
+ __u8 sortl[32]; /* with STFLE.150 */
+ __u8 dfltcc[32]; /* with STFLE.151 */
+ __u8 reserved[1728];
};
/* kvm attributes for crypto */
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 2/9] s390x/cpumodel: ignore csske for expansion
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
csske will be removed in a future machine. Ignore it for expanding the
cpu model. Otherwise qemu falls back to z9.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_models.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index e5afa15512..b4bb5de635 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -1322,6 +1322,8 @@ static void init_ignored_base_feat(void)
S390_FEAT_KM_TDEA_192,
S390_FEAT_KIMD_SHA_1,
S390_FEAT_KLMD_SHA_1,
+ /* CSSKE is deprecated on newer generations */
+ S390_FEAT_CONDITIONAL_SSKE,
};
int i;
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 2/9] s390x/cpumodel: ignore csske for expansion
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
csske will be removed in a future machine. Ignore it for expanding the
cpu model. Otherwise qemu falls back to z9.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_models.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index e5afa15512..b4bb5de635 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -1322,6 +1322,8 @@ static void init_ignored_base_feat(void)
S390_FEAT_KM_TDEA_192,
S390_FEAT_KIMD_SHA_1,
S390_FEAT_KLMD_SHA_1,
+ /* CSSKE is deprecated on newer generations */
+ S390_FEAT_CONDITIONAL_SSKE,
};
int i;
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 3/9] s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
Provide the "Miscellaneous-Instruction-Extensions Facility 3" via
stfle.61.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_features.c | 1 +
target/s390x/cpu_features_def.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 1843c84aaa..bbd8902087 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -83,6 +83,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("minste2", S390_FEAT_TYPE_STFL, 58, "Miscellaneous-instruction-extensions facility 2"),
FEAT_INIT("sema", S390_FEAT_TYPE_STFL, 59, "Semaphore-assist facility"),
FEAT_INIT("tsi", S390_FEAT_TYPE_STFL, 60, "Time-slice Instrumentation facility"),
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
FEAT_INIT("ri", S390_FEAT_TYPE_STFL, 64, "CPU runtime-instrumentation facility"),
FEAT_INIT("zpci", S390_FEAT_TYPE_STFL, 69, "z/PCI facility"),
FEAT_INIT("aen", S390_FEAT_TYPE_STFL, 71, "General-purpose-adapter-event-notification facility"),
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index 5fc7e7bf01..31dd678301 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -71,6 +71,7 @@ typedef enum {
S390_FEAT_MISC_INSTRUCTION_EXT,
S390_FEAT_SEMAPHORE_ASSIST,
S390_FEAT_TIME_SLICE_INSTRUMENTATION,
+ S390_FEAT_MISC_INSTRUCTION_EXT3,
S390_FEAT_RUNTIME_INSTRUMENTATION,
S390_FEAT_ZPCI,
S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 3/9] s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
Provide the "Miscellaneous-Instruction-Extensions Facility 3" via
stfle.61.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_features.c | 1 +
target/s390x/cpu_features_def.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 1843c84aaa..bbd8902087 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -83,6 +83,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("minste2", S390_FEAT_TYPE_STFL, 58, "Miscellaneous-instruction-extensions facility 2"),
FEAT_INIT("sema", S390_FEAT_TYPE_STFL, 59, "Semaphore-assist facility"),
FEAT_INIT("tsi", S390_FEAT_TYPE_STFL, 60, "Time-slice Instrumentation facility"),
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
FEAT_INIT("ri", S390_FEAT_TYPE_STFL, 64, "CPU runtime-instrumentation facility"),
FEAT_INIT("zpci", S390_FEAT_TYPE_STFL, 69, "z/PCI facility"),
FEAT_INIT("aen", S390_FEAT_TYPE_STFL, 71, "General-purpose-adapter-event-notification facility"),
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index 5fc7e7bf01..31dd678301 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -71,6 +71,7 @@ typedef enum {
S390_FEAT_MISC_INSTRUCTION_EXT,
S390_FEAT_SEMAPHORE_ASSIST,
S390_FEAT_TIME_SLICE_INSTRUMENTATION,
+ S390_FEAT_MISC_INSTRUCTION_EXT3,
S390_FEAT_RUNTIME_INSTRUMENTATION,
S390_FEAT_ZPCI,
S390_FEAT_ADAPTER_EVENT_NOTIFICATION,
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
Provide the MSA9 facility (stfle.155).
This also contains pckmo functions for key wrapping. Keep them in a
separate group to disable those as a block if necessary.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
target/s390x/cpu_models.c | 2 ++
target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
target/s390x/kvm.c | 6 +++++
6 files changed, 114 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index bbd8902087..154e2bb354 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
/* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
@@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
@@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
@@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
+
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
};
const S390FeatDef *s390_feat_def(S390Feat feat)
@@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_PCC:
case S390_FEAT_TYPE_PPNO:
case S390_FEAT_TYPE_KMA:
+ case S390_FEAT_TYPE_KDSA:
set_be_bit(0, data); /* query is always available */
break;
default:
@@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
};
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index effe790271..5ffd3db083 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -39,6 +39,7 @@ typedef enum {
S390_FEAT_TYPE_PCC,
S390_FEAT_TYPE_PPNO,
S390_FEAT_TYPE_KMA,
+ S390_FEAT_TYPE_KDSA,
} S390FeatType;
/* Definition of a CPU feature */
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index 31dd678301..030784811b 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -96,6 +96,7 @@ typedef enum {
S390_FEAT_INSERT_REFERENCE_BITS_MULT,
S390_FEAT_MSA_EXT_8,
S390_FEAT_CMM_NT,
+ S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
/* Sclp Conf Char */
@@ -240,6 +241,11 @@ typedef enum {
S390_FEAT_PCKMO_AES_128,
S390_FEAT_PCKMO_AES_192,
S390_FEAT_PCKMO_AES_256,
+ S390_FEAT_PCKMO_ECC_P256,
+ S390_FEAT_PCKMO_ECC_P384,
+ S390_FEAT_PCKMO_ECC_P521,
+ S390_FEAT_PCKMO_ECC_ED25519,
+ S390_FEAT_PCKMO_ECC_ED448,
/* KMCTR */
S390_FEAT_KMCTR_DEA,
@@ -300,6 +306,13 @@ typedef enum {
S390_FEAT_PCC_XTS_AES_256,
S390_FEAT_PCC_XTS_EAES_128,
S390_FEAT_PCC_XTS_EAES_256,
+ S390_FEAT_PCC_SCALAR_MULT_P256,
+ S390_FEAT_PCC_SCALAR_MULT_P384,
+ S390_FEAT_PCC_SCALAR_MULT_P512,
+ S390_FEAT_PCC_SCALAR_MULT_ED25519,
+ S390_FEAT_PCC_SCALAR_MULT_ED448,
+ S390_FEAT_PCC_SCALAR_MULT_X25519,
+ S390_FEAT_PCC_SCALAR_MULT_X448,
/* PPNO/PRNO */
S390_FEAT_PPNO_SHA_512_DRNG,
@@ -313,6 +326,24 @@ typedef enum {
S390_FEAT_KMA_GCM_EAES_128,
S390_FEAT_KMA_GCM_EAES_192,
S390_FEAT_KMA_GCM_EAES_256,
+
+ /* KDSA */
+ S390_FEAT_ECDSA_VERIFY_P256,
+ S390_FEAT_ECDSA_VERIFY_P384,
+ S390_FEAT_ECDSA_VERIFY_P512,
+ S390_FEAT_ECDSA_SIGN_P256,
+ S390_FEAT_ECDSA_SIGN_P384,
+ S390_FEAT_ECDSA_SIGN_P512,
+ S390_FEAT_EECDSA_SIGN_P256,
+ S390_FEAT_EECDSA_SIGN_P384,
+ S390_FEAT_EECDSA_SIGN_P512,
+ S390_FEAT_EDDSA_VERIFY_ED25519,
+ S390_FEAT_EDDSA_VERIFY_ED448,
+ S390_FEAT_EDDSA_SIGN_ED25519,
+ S390_FEAT_EDDSA_SIGN_ED448,
+ S390_FEAT_EEDDSA_SIGN_ED25519,
+ S390_FEAT_EEDDSA_SIGN_ED448,
+
S390_FEAT_MAX,
} S390Feat;
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index b4bb5de635..d683635eb5 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
{ S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
{ S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
{ S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
+ { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
+ { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
{ S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
{ S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
{ S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index e4739a6b9f..a2f9e2b43f 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -213,6 +213,38 @@
S390_FEAT_KMA_GCM_EAES_192, \
S390_FEAT_KMA_GCM_EAES_256
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
+
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
+
/* cpu feature groups */
static uint16_t group_PLO[] = {
S390_FEAT_GROUP_PLO,
@@ -254,6 +286,14 @@ static uint16_t group_MSA_EXT_8[] = {
S390_FEAT_GROUP_MSA_EXT_8,
};
+static uint16_t group_MSA_EXT_9[] = {
+ S390_FEAT_GROUP_MSA_EXT_9,
+};
+
+static uint16_t group_MSA_EXT_9_PCKMO[] = {
+ S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+};
+
/* Base features (in order of release)
* Only non-hypervisor managed features belong here.
* Base feature sets are static meaning they do not change in future QEMU
@@ -709,6 +749,8 @@ static FeatGroupDefSpec FeatGroupDef[] = {
FEAT_GROUP_INITIALIZER(MSA_EXT_6),
FEAT_GROUP_INITIALIZER(MSA_EXT_7),
FEAT_GROUP_INITIALIZER(MSA_EXT_8),
+ FEAT_GROUP_INITIALIZER(MSA_EXT_9),
+ FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
};
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 7df7be4a1b..de0b984b68 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2073,6 +2073,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
s390_add_from_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
}
+ if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
+ s390_add_from_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
+ }
return 0;
}
@@ -2117,6 +2120,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
s390_fill_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
}
+ if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
+ s390_fill_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
+ }
return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
Provide the MSA9 facility (stfle.155).
This also contains pckmo functions for key wrapping. Keep them in a
separate group to disable those as a block if necessary.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
target/s390x/cpu_models.c | 2 ++
target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
target/s390x/kvm.c | 6 +++++
6 files changed, 114 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index bbd8902087..154e2bb354 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
/* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
@@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
@@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
@@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
+
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
};
const S390FeatDef *s390_feat_def(S390Feat feat)
@@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_PCC:
case S390_FEAT_TYPE_PPNO:
case S390_FEAT_TYPE_KMA:
+ case S390_FEAT_TYPE_KDSA:
set_be_bit(0, data); /* query is always available */
break;
default:
@@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
};
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index effe790271..5ffd3db083 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -39,6 +39,7 @@ typedef enum {
S390_FEAT_TYPE_PCC,
S390_FEAT_TYPE_PPNO,
S390_FEAT_TYPE_KMA,
+ S390_FEAT_TYPE_KDSA,
} S390FeatType;
/* Definition of a CPU feature */
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index 31dd678301..030784811b 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -96,6 +96,7 @@ typedef enum {
S390_FEAT_INSERT_REFERENCE_BITS_MULT,
S390_FEAT_MSA_EXT_8,
S390_FEAT_CMM_NT,
+ S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
/* Sclp Conf Char */
@@ -240,6 +241,11 @@ typedef enum {
S390_FEAT_PCKMO_AES_128,
S390_FEAT_PCKMO_AES_192,
S390_FEAT_PCKMO_AES_256,
+ S390_FEAT_PCKMO_ECC_P256,
+ S390_FEAT_PCKMO_ECC_P384,
+ S390_FEAT_PCKMO_ECC_P521,
+ S390_FEAT_PCKMO_ECC_ED25519,
+ S390_FEAT_PCKMO_ECC_ED448,
/* KMCTR */
S390_FEAT_KMCTR_DEA,
@@ -300,6 +306,13 @@ typedef enum {
S390_FEAT_PCC_XTS_AES_256,
S390_FEAT_PCC_XTS_EAES_128,
S390_FEAT_PCC_XTS_EAES_256,
+ S390_FEAT_PCC_SCALAR_MULT_P256,
+ S390_FEAT_PCC_SCALAR_MULT_P384,
+ S390_FEAT_PCC_SCALAR_MULT_P512,
+ S390_FEAT_PCC_SCALAR_MULT_ED25519,
+ S390_FEAT_PCC_SCALAR_MULT_ED448,
+ S390_FEAT_PCC_SCALAR_MULT_X25519,
+ S390_FEAT_PCC_SCALAR_MULT_X448,
/* PPNO/PRNO */
S390_FEAT_PPNO_SHA_512_DRNG,
@@ -313,6 +326,24 @@ typedef enum {
S390_FEAT_KMA_GCM_EAES_128,
S390_FEAT_KMA_GCM_EAES_192,
S390_FEAT_KMA_GCM_EAES_256,
+
+ /* KDSA */
+ S390_FEAT_ECDSA_VERIFY_P256,
+ S390_FEAT_ECDSA_VERIFY_P384,
+ S390_FEAT_ECDSA_VERIFY_P512,
+ S390_FEAT_ECDSA_SIGN_P256,
+ S390_FEAT_ECDSA_SIGN_P384,
+ S390_FEAT_ECDSA_SIGN_P512,
+ S390_FEAT_EECDSA_SIGN_P256,
+ S390_FEAT_EECDSA_SIGN_P384,
+ S390_FEAT_EECDSA_SIGN_P512,
+ S390_FEAT_EDDSA_VERIFY_ED25519,
+ S390_FEAT_EDDSA_VERIFY_ED448,
+ S390_FEAT_EDDSA_SIGN_ED25519,
+ S390_FEAT_EDDSA_SIGN_ED448,
+ S390_FEAT_EEDDSA_SIGN_ED25519,
+ S390_FEAT_EEDDSA_SIGN_ED448,
+
S390_FEAT_MAX,
} S390Feat;
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index b4bb5de635..d683635eb5 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
{ S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
{ S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
{ S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
+ { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
+ { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
{ S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
{ S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
{ S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index e4739a6b9f..a2f9e2b43f 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -213,6 +213,38 @@
S390_FEAT_KMA_GCM_EAES_192, \
S390_FEAT_KMA_GCM_EAES_256
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
+
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
+
/* cpu feature groups */
static uint16_t group_PLO[] = {
S390_FEAT_GROUP_PLO,
@@ -254,6 +286,14 @@ static uint16_t group_MSA_EXT_8[] = {
S390_FEAT_GROUP_MSA_EXT_8,
};
+static uint16_t group_MSA_EXT_9[] = {
+ S390_FEAT_GROUP_MSA_EXT_9,
+};
+
+static uint16_t group_MSA_EXT_9_PCKMO[] = {
+ S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+};
+
/* Base features (in order of release)
* Only non-hypervisor managed features belong here.
* Base feature sets are static meaning they do not change in future QEMU
@@ -709,6 +749,8 @@ static FeatGroupDefSpec FeatGroupDef[] = {
FEAT_GROUP_INITIALIZER(MSA_EXT_6),
FEAT_GROUP_INITIALIZER(MSA_EXT_7),
FEAT_GROUP_INITIALIZER(MSA_EXT_8),
+ FEAT_GROUP_INITIALIZER(MSA_EXT_9),
+ FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
};
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 7df7be4a1b..de0b984b68 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2073,6 +2073,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
s390_add_from_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
}
+ if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
+ s390_add_from_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
+ }
return 0;
}
@@ -2117,6 +2120,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
s390_fill_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
}
+ if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
+ s390_fill_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
+ }
return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 5/9] s390x/cpumodel: vector enhancements
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
Add vector enhancements to the cpu model.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_features.c | 2 ++
target/s390x/cpu_features_def.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 154e2bb354..35873253be 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -108,6 +108,8 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index 030784811b..ce2223c9d7 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -96,6 +96,8 @@ typedef enum {
S390_FEAT_INSERT_REFERENCE_BITS_MULT,
S390_FEAT_MSA_EXT_8,
S390_FEAT_CMM_NT,
+ S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_VECTOR_BCD_ENH,
S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 5/9] s390x/cpumodel: vector enhancements
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
Add vector enhancements to the cpu model.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_features.c | 2 ++
target/s390x/cpu_features_def.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 154e2bb354..35873253be 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -108,6 +108,8 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index 030784811b..ce2223c9d7 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -96,6 +96,8 @@ typedef enum {
S390_FEAT_INSERT_REFERENCE_BITS_MULT,
S390_FEAT_MSA_EXT_8,
S390_FEAT_CMM_NT,
+ S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_VECTOR_BCD_ENH,
S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 6/9] s390x/cpumodel: enhanced sort facility
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
add the enhanced sort facility.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_features.c | 10 ++++++++++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h | 8 ++++++++
target/s390x/gen-features.c | 14 ++++++++++++++
target/s390x/kvm.c | 6 ++++++
5 files changed, 39 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 35873253be..1d19b3072e 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -109,6 +109,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
@@ -340,6 +341,12 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
+
+ FEAT_INIT("sortl-sflr", S390_FEAT_TYPE_SORTL, 1, "SORTL SFLR"),
+ FEAT_INIT("sortl-svlr", S390_FEAT_TYPE_SORTL, 2, "SORTL SVLR"),
+ FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
+ FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
};
const S390FeatDef *s390_feat_def(S390Feat feat)
@@ -403,6 +410,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_PPNO:
case S390_FEAT_TYPE_KMA:
case S390_FEAT_TYPE_KDSA:
+ case S390_FEAT_TYPE_SORTL:
set_be_bit(0, data); /* query is always available */
break;
default:
@@ -430,6 +438,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
nr_bits = 16384;
break;
case S390_FEAT_TYPE_PLO:
+ case S390_FEAT_TYPE_SORTL:
nr_bits = 256;
break;
default:
@@ -501,6 +510,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
+ FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
};
const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index 5ffd3db083..3b8c5b25dd 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -40,6 +40,7 @@ typedef enum {
S390_FEAT_TYPE_PPNO,
S390_FEAT_TYPE_KMA,
S390_FEAT_TYPE_KDSA,
+ S390_FEAT_TYPE_SORTL,
} S390FeatType;
/* Definition of a CPU feature */
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index ce2223c9d7..bb8585847f 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -97,6 +97,7 @@ typedef enum {
S390_FEAT_MSA_EXT_8,
S390_FEAT_CMM_NT,
S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_ESORT_BASE,
S390_FEAT_VECTOR_BCD_ENH,
S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
@@ -346,6 +347,13 @@ typedef enum {
S390_FEAT_EEDDSA_SIGN_ED25519,
S390_FEAT_EEDDSA_SIGN_ED448,
+ /* SORTL */
+ S390_FEAT_SORTL_SFLR,
+ S390_FEAT_SORTL_SVLR,
+ S390_FEAT_SORTL_32,
+ S390_FEAT_SORTL_128,
+ S390_FEAT_SORTL_F0,
+
S390_FEAT_MAX,
} S390Feat;
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index a2f9e2b43f..0a62cc5631 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -245,6 +245,15 @@
S390_FEAT_PCKMO_ECC_ED25519, \
S390_FEAT_PCKMO_ECC_ED448
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
+
+
/* cpu feature groups */
static uint16_t group_PLO[] = {
S390_FEAT_GROUP_PLO,
@@ -294,6 +303,10 @@ static uint16_t group_MSA_EXT_9_PCKMO[] = {
S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
};
+static uint16_t group_ENH_SORT[] = {
+ S390_FEAT_GROUP_ENH_SORT,
+};
+
/* Base features (in order of release)
* Only non-hypervisor managed features belong here.
* Base feature sets are static meaning they do not change in future QEMU
@@ -752,6 +765,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
FEAT_GROUP_INITIALIZER(MSA_EXT_9),
FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
+ FEAT_GROUP_INITIALIZER(ENH_SORT),
};
#define QEMU_FEAT_INITIALIZER(_name) \
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index de0b984b68..f91f436a31 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2076,6 +2076,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
s390_add_from_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
}
+ if (test_bit(S390_FEAT_ESORT_BASE, features)) {
+ s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
+ }
return 0;
}
@@ -2123,6 +2126,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
s390_fill_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
}
+ if (test_bit(S390_FEAT_ESORT_BASE, features)) {
+ s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
+ }
return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 6/9] s390x/cpumodel: enhanced sort facility
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
add the enhanced sort facility.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
target/s390x/cpu_features.c | 10 ++++++++++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h | 8 ++++++++
target/s390x/gen-features.c | 14 ++++++++++++++
target/s390x/kvm.c | 6 ++++++
5 files changed, 39 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 35873253be..1d19b3072e 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -109,6 +109,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
@@ -340,6 +341,12 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
+
+ FEAT_INIT("sortl-sflr", S390_FEAT_TYPE_SORTL, 1, "SORTL SFLR"),
+ FEAT_INIT("sortl-svlr", S390_FEAT_TYPE_SORTL, 2, "SORTL SVLR"),
+ FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
+ FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
};
const S390FeatDef *s390_feat_def(S390Feat feat)
@@ -403,6 +410,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_PPNO:
case S390_FEAT_TYPE_KMA:
case S390_FEAT_TYPE_KDSA:
+ case S390_FEAT_TYPE_SORTL:
set_be_bit(0, data); /* query is always available */
break;
default:
@@ -430,6 +438,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
nr_bits = 16384;
break;
case S390_FEAT_TYPE_PLO:
+ case S390_FEAT_TYPE_SORTL:
nr_bits = 256;
break;
default:
@@ -501,6 +510,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
+ FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
};
const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index 5ffd3db083..3b8c5b25dd 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -40,6 +40,7 @@ typedef enum {
S390_FEAT_TYPE_PPNO,
S390_FEAT_TYPE_KMA,
S390_FEAT_TYPE_KDSA,
+ S390_FEAT_TYPE_SORTL,
} S390FeatType;
/* Definition of a CPU feature */
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index ce2223c9d7..bb8585847f 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -97,6 +97,7 @@ typedef enum {
S390_FEAT_MSA_EXT_8,
S390_FEAT_CMM_NT,
S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_ESORT_BASE,
S390_FEAT_VECTOR_BCD_ENH,
S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
@@ -346,6 +347,13 @@ typedef enum {
S390_FEAT_EEDDSA_SIGN_ED25519,
S390_FEAT_EEDDSA_SIGN_ED448,
+ /* SORTL */
+ S390_FEAT_SORTL_SFLR,
+ S390_FEAT_SORTL_SVLR,
+ S390_FEAT_SORTL_32,
+ S390_FEAT_SORTL_128,
+ S390_FEAT_SORTL_F0,
+
S390_FEAT_MAX,
} S390Feat;
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index a2f9e2b43f..0a62cc5631 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -245,6 +245,15 @@
S390_FEAT_PCKMO_ECC_ED25519, \
S390_FEAT_PCKMO_ECC_ED448
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
+
+
/* cpu feature groups */
static uint16_t group_PLO[] = {
S390_FEAT_GROUP_PLO,
@@ -294,6 +303,10 @@ static uint16_t group_MSA_EXT_9_PCKMO[] = {
S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
};
+static uint16_t group_ENH_SORT[] = {
+ S390_FEAT_GROUP_ENH_SORT,
+};
+
/* Base features (in order of release)
* Only non-hypervisor managed features belong here.
* Base feature sets are static meaning they do not change in future QEMU
@@ -752,6 +765,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
FEAT_GROUP_INITIALIZER(MSA_EXT_9),
FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
+ FEAT_GROUP_INITIALIZER(ENH_SORT),
};
#define QEMU_FEAT_INITIALIZER(_name) \
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index de0b984b68..f91f436a31 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2076,6 +2076,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
s390_add_from_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
}
+ if (test_bit(S390_FEAT_ESORT_BASE, features)) {
+ s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
+ }
return 0;
}
@@ -2123,6 +2126,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
if (test_bit(S390_FEAT_MSA_EXT_9, features)) {
s390_fill_feat_block(features, S390_FEAT_TYPE_KDSA, prop.kdsa);
}
+ if (test_bit(S390_FEAT_ESORT_BASE, features)) {
+ s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
+ }
return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 7/9] s390x/cpumodel: add Deflate-conversion facility
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
add the deflate conversion facility.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_features.c | 9 +++++++++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h | 7 +++++++
target/s390x/gen-features.c | 12 ++++++++++++
target/s390x/kvm.c | 6 ++++++
5 files changed, 35 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 1d19b3072e..f64f581c86 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -110,6 +110,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
@@ -347,6 +348,11 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
+
+ FEAT_INIT("dfltcc-gdht", S390_FEAT_TYPE_DFLTCC, 1, "DFLTCC GDHT"),
+ FEAT_INIT("dfltcc-cmpr", S390_FEAT_TYPE_DFLTCC, 2, "DFLTCC CMPR"),
+ FEAT_INIT("dfltcc-xpnd", S390_FEAT_TYPE_DFLTCC, 4, "DFLTCC XPND"),
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
};
const S390FeatDef *s390_feat_def(S390Feat feat)
@@ -411,6 +417,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_KMA:
case S390_FEAT_TYPE_KDSA:
case S390_FEAT_TYPE_SORTL:
+ case S390_FEAT_TYPE_DFLTCC:
set_be_bit(0, data); /* query is always available */
break;
default:
@@ -439,6 +446,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
break;
case S390_FEAT_TYPE_PLO:
case S390_FEAT_TYPE_SORTL:
+ case S390_FEAT_TYPE_DFLTCC:
nr_bits = 256;
break;
default:
@@ -511,6 +519,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
};
const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index 3b8c5b25dd..da695a8346 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -41,6 +41,7 @@ typedef enum {
S390_FEAT_TYPE_KMA,
S390_FEAT_TYPE_KDSA,
S390_FEAT_TYPE_SORTL,
+ S390_FEAT_TYPE_DFLTCC,
} S390FeatType;
/* Definition of a CPU feature */
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index bb8585847f..292b17b35d 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -98,6 +98,7 @@ typedef enum {
S390_FEAT_CMM_NT,
S390_FEAT_VECTOR_ENH2,
S390_FEAT_ESORT_BASE,
+ S390_FEAT_DEFLATE_BASE,
S390_FEAT_VECTOR_BCD_ENH,
S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
@@ -354,6 +355,12 @@ typedef enum {
S390_FEAT_SORTL_128,
S390_FEAT_SORTL_F0,
+ /* DEFLATE */
+ S390_FEAT_DEFLATE_GHDT,
+ S390_FEAT_DEFLATE_CMPR,
+ S390_FEAT_DEFLATE_XPND,
+ S390_FEAT_DEFLATE_F0,
+
S390_FEAT_MAX,
} S390Feat;
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 0a62cc5631..8fc2e8e72f 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -254,6 +254,13 @@
S390_FEAT_SORTL_F0
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
+
/* cpu feature groups */
static uint16_t group_PLO[] = {
S390_FEAT_GROUP_PLO,
@@ -307,6 +314,10 @@ static uint16_t group_ENH_SORT[] = {
S390_FEAT_GROUP_ENH_SORT,
};
+static uint16_t group_DEFLATE_CONVERSION[] = {
+ S390_FEAT_GROUP_DEFLATE_CONVERSION,
+};
+
/* Base features (in order of release)
* Only non-hypervisor managed features belong here.
* Base feature sets are static meaning they do not change in future QEMU
@@ -766,6 +777,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
FEAT_GROUP_INITIALIZER(ENH_SORT),
+ FEAT_GROUP_INITIALIZER(DEFLATE_CONVERSION),
};
#define QEMU_FEAT_INITIALIZER(_name) \
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index f91f436a31..e5e2b691f2 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2079,6 +2079,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
if (test_bit(S390_FEAT_ESORT_BASE, features)) {
s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
}
+ if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
+ s390_add_from_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
+ }
return 0;
}
@@ -2129,6 +2132,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
if (test_bit(S390_FEAT_ESORT_BASE, features)) {
s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
}
+ if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
+ s390_fill_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
+ }
return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 7/9] s390x/cpumodel: add Deflate-conversion facility
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
add the deflate conversion facility.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_features.c | 9 +++++++++
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h | 7 +++++++
target/s390x/gen-features.c | 12 ++++++++++++
target/s390x/kvm.c | 6 ++++++
5 files changed, 35 insertions(+)
diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
index 1d19b3072e..f64f581c86 100644
--- a/target/s390x/cpu_features.c
+++ b/target/s390x/cpu_features.c
@@ -110,6 +110,7 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
@@ -347,6 +348,11 @@ static const S390FeatDef s390_features[] = {
FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
+
+ FEAT_INIT("dfltcc-gdht", S390_FEAT_TYPE_DFLTCC, 1, "DFLTCC GDHT"),
+ FEAT_INIT("dfltcc-cmpr", S390_FEAT_TYPE_DFLTCC, 2, "DFLTCC CMPR"),
+ FEAT_INIT("dfltcc-xpnd", S390_FEAT_TYPE_DFLTCC, 4, "DFLTCC XPND"),
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
};
const S390FeatDef *s390_feat_def(S390Feat feat)
@@ -411,6 +417,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
case S390_FEAT_TYPE_KMA:
case S390_FEAT_TYPE_KDSA:
case S390_FEAT_TYPE_SORTL:
+ case S390_FEAT_TYPE_DFLTCC:
set_be_bit(0, data); /* query is always available */
break;
default:
@@ -439,6 +446,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
break;
case S390_FEAT_TYPE_PLO:
case S390_FEAT_TYPE_SORTL:
+ case S390_FEAT_TYPE_DFLTCC:
nr_bits = 256;
break;
default:
@@ -511,6 +519,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
};
const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index 3b8c5b25dd..da695a8346 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -41,6 +41,7 @@ typedef enum {
S390_FEAT_TYPE_KMA,
S390_FEAT_TYPE_KDSA,
S390_FEAT_TYPE_SORTL,
+ S390_FEAT_TYPE_DFLTCC,
} S390FeatType;
/* Definition of a CPU feature */
diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
index bb8585847f..292b17b35d 100644
--- a/target/s390x/cpu_features_def.h
+++ b/target/s390x/cpu_features_def.h
@@ -98,6 +98,7 @@ typedef enum {
S390_FEAT_CMM_NT,
S390_FEAT_VECTOR_ENH2,
S390_FEAT_ESORT_BASE,
+ S390_FEAT_DEFLATE_BASE,
S390_FEAT_VECTOR_BCD_ENH,
S390_FEAT_MSA_EXT_9,
S390_FEAT_ETOKEN,
@@ -354,6 +355,12 @@ typedef enum {
S390_FEAT_SORTL_128,
S390_FEAT_SORTL_F0,
+ /* DEFLATE */
+ S390_FEAT_DEFLATE_GHDT,
+ S390_FEAT_DEFLATE_CMPR,
+ S390_FEAT_DEFLATE_XPND,
+ S390_FEAT_DEFLATE_F0,
+
S390_FEAT_MAX,
} S390Feat;
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 0a62cc5631..8fc2e8e72f 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -254,6 +254,13 @@
S390_FEAT_SORTL_F0
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
+
/* cpu feature groups */
static uint16_t group_PLO[] = {
S390_FEAT_GROUP_PLO,
@@ -307,6 +314,10 @@ static uint16_t group_ENH_SORT[] = {
S390_FEAT_GROUP_ENH_SORT,
};
+static uint16_t group_DEFLATE_CONVERSION[] = {
+ S390_FEAT_GROUP_DEFLATE_CONVERSION,
+};
+
/* Base features (in order of release)
* Only non-hypervisor managed features belong here.
* Base feature sets are static meaning they do not change in future QEMU
@@ -766,6 +777,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
FEAT_GROUP_INITIALIZER(ENH_SORT),
+ FEAT_GROUP_INITIALIZER(DEFLATE_CONVERSION),
};
#define QEMU_FEAT_INITIALIZER(_name) \
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index f91f436a31..e5e2b691f2 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2079,6 +2079,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
if (test_bit(S390_FEAT_ESORT_BASE, features)) {
s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
}
+ if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
+ s390_add_from_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
+ }
return 0;
}
@@ -2129,6 +2132,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
if (test_bit(S390_FEAT_ESORT_BASE, features)) {
s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
}
+ if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
+ s390_fill_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
+ }
return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 8/9] s390x/cpumodel: add gen15 defintions
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
add several new features (msa9, sort, deflate, additional vector
instructions, new general purpose instructions) to generation 15.
Also disable csske and bpb from the default and base models >=15.
This will allow to migrate gen15 machines to future machines that
do not have these features.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/gen-features.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 8fc2e8e72f..c346b76bdf 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -13,6 +13,7 @@
#include <inttypes.h>
#include <stdio.h>
+#include <string.h>
#include "cpu_features_def.h"
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
@@ -419,6 +420,10 @@ static uint16_t base_GEN14_GA1[] = {
#define base_GEN14_GA2 EmptyFeat
+static uint16_t base_GEN15_GA1[] = {
+ S390_FEAT_MISC_INSTRUCTION_EXT3,
+};
+
/* Full features (in order of release)
* Automatically includes corresponding base features.
* Full features are all features this hardware supports even if kvm/QEMU do not
@@ -548,6 +553,16 @@ static uint16_t full_GEN14_GA1[] = {
#define full_GEN14_GA2 EmptyFeat
+static uint16_t full_GEN15_GA1[] = {
+ S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_GROUP_ENH_SORT,
+ S390_FEAT_GROUP_DEFLATE_CONVERSION,
+ S390_FEAT_VECTOR_BCD_ENH,
+ S390_FEAT_GROUP_MSA_EXT_9,
+ S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+ S390_FEAT_ETOKEN,
+};
+
/* Default features (in order of release)
* Automatically includes corresponding base features.
* Default features are all features this version of QEMU supports for this
@@ -624,6 +639,16 @@ static uint16_t default_GEN14_GA1[] = {
#define default_GEN14_GA2 EmptyFeat
+static uint16_t default_GEN15_GA1[] = {
+ S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_GROUP_ENH_SORT,
+ S390_FEAT_GROUP_DEFLATE_CONVERSION,
+ S390_FEAT_VECTOR_BCD_ENH,
+ S390_FEAT_GROUP_MSA_EXT_9,
+ S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+ S390_FEAT_ETOKEN,
+};
+
/* QEMU (CPU model) features */
static uint16_t qemu_V2_11[] = {
@@ -740,6 +765,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
CPU_FEAT_INITIALIZER(GEN13_GA2),
CPU_FEAT_INITIALIZER(GEN14_GA1),
CPU_FEAT_INITIALIZER(GEN14_GA2),
+ CPU_FEAT_INITIALIZER(GEN15_GA1),
};
#define FEAT_GROUP_INITIALIZER(_name) \
@@ -808,6 +834,11 @@ static void set_bits(uint64_t list[], BitSpec bits)
}
}
+static inline void clear_bit(uint64_t list[], unsigned long nr)
+{
+ list[nr / 64] &= ~(1ULL << (nr % 64));
+}
+
static void print_feature_defs(void)
{
uint64_t base_feat[S390_FEAT_MAX / 64 + 1] = {};
@@ -818,6 +849,12 @@ static void print_feature_defs(void)
printf("\n/* CPU model feature list data */\n");
for (i = 0; i < ARRAY_SIZE(CpuFeatDef); i++) {
+ /* With gen15 CSSKE and BPB are deprecated */
+ if (strcmp(CpuFeatDef[i].name, "S390_FEAT_LIST_GEN15_GA1") == 0) {
+ clear_bit(base_feat, S390_FEAT_CONDITIONAL_SSKE);
+ clear_bit(default_feat, S390_FEAT_CONDITIONAL_SSKE);
+ clear_bit(default_feat, S390_FEAT_BPB);
+ }
set_bits(base_feat, CpuFeatDef[i].base_bits);
/* add the base to the default features */
set_bits(default_feat, CpuFeatDef[i].base_bits);
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 8/9] s390x/cpumodel: add gen15 defintions
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
add several new features (msa9, sort, deflate, additional vector
instructions, new general purpose instructions) to generation 15.
Also disable csske and bpb from the default and base models >=15.
This will allow to migrate gen15 machines to future machines that
do not have these features.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/gen-features.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index 8fc2e8e72f..c346b76bdf 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -13,6 +13,7 @@
#include <inttypes.h>
#include <stdio.h>
+#include <string.h>
#include "cpu_features_def.h"
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
@@ -419,6 +420,10 @@ static uint16_t base_GEN14_GA1[] = {
#define base_GEN14_GA2 EmptyFeat
+static uint16_t base_GEN15_GA1[] = {
+ S390_FEAT_MISC_INSTRUCTION_EXT3,
+};
+
/* Full features (in order of release)
* Automatically includes corresponding base features.
* Full features are all features this hardware supports even if kvm/QEMU do not
@@ -548,6 +553,16 @@ static uint16_t full_GEN14_GA1[] = {
#define full_GEN14_GA2 EmptyFeat
+static uint16_t full_GEN15_GA1[] = {
+ S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_GROUP_ENH_SORT,
+ S390_FEAT_GROUP_DEFLATE_CONVERSION,
+ S390_FEAT_VECTOR_BCD_ENH,
+ S390_FEAT_GROUP_MSA_EXT_9,
+ S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+ S390_FEAT_ETOKEN,
+};
+
/* Default features (in order of release)
* Automatically includes corresponding base features.
* Default features are all features this version of QEMU supports for this
@@ -624,6 +639,16 @@ static uint16_t default_GEN14_GA1[] = {
#define default_GEN14_GA2 EmptyFeat
+static uint16_t default_GEN15_GA1[] = {
+ S390_FEAT_VECTOR_ENH2,
+ S390_FEAT_GROUP_ENH_SORT,
+ S390_FEAT_GROUP_DEFLATE_CONVERSION,
+ S390_FEAT_VECTOR_BCD_ENH,
+ S390_FEAT_GROUP_MSA_EXT_9,
+ S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
+ S390_FEAT_ETOKEN,
+};
+
/* QEMU (CPU model) features */
static uint16_t qemu_V2_11[] = {
@@ -740,6 +765,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
CPU_FEAT_INITIALIZER(GEN13_GA2),
CPU_FEAT_INITIALIZER(GEN14_GA1),
CPU_FEAT_INITIALIZER(GEN14_GA2),
+ CPU_FEAT_INITIALIZER(GEN15_GA1),
};
#define FEAT_GROUP_INITIALIZER(_name) \
@@ -808,6 +834,11 @@ static void set_bits(uint64_t list[], BitSpec bits)
}
}
+static inline void clear_bit(uint64_t list[], unsigned long nr)
+{
+ list[nr / 64] &= ~(1ULL << (nr % 64));
+}
+
static void print_feature_defs(void)
{
uint64_t base_feat[S390_FEAT_MAX / 64 + 1] = {};
@@ -818,6 +849,12 @@ static void print_feature_defs(void)
printf("\n/* CPU model feature list data */\n");
for (i = 0; i < ARRAY_SIZE(CpuFeatDef); i++) {
+ /* With gen15 CSSKE and BPB are deprecated */
+ if (strcmp(CpuFeatDef[i].name, "S390_FEAT_LIST_GEN15_GA1") == 0) {
+ clear_bit(base_feat, S390_FEAT_CONDITIONAL_SSKE);
+ clear_bit(default_feat, S390_FEAT_CONDITIONAL_SSKE);
+ clear_bit(default_feat, S390_FEAT_BPB);
+ }
set_bits(base_feat, CpuFeatDef[i].base_bits);
/* add the base to the default features */
set_bits(default_feat, CpuFeatDef[i].base_bits);
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 9/9] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
8561 and 8562 will be gen15 machines. There is no name yet, lets us use
gen15a and gen15tb as base name. Later on we can provide aliases with
the proper name.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_models.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index d683635eb5..21ea819483 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -43,10 +43,9 @@
}
/*
- * CPU definiton list in order of release. For now, base features of a
- * following release are always a subset of base features of the previous
- * release. Same is correct for the other feature sets.
- * A BC release always follows the corresponding EC release.
+ * CPU definition list in order of release. Up to generation 14 base features
+ * of a following release have been a superset of the previous release. With
+ * generation 15 one base feature and one optional feature have been deprecated.
*/
static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),
@@ -83,6 +82,8 @@ static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
+ CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
+ CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
};
#define QEMU_MAX_CPU_TYPE 0x2827
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [Qemu-devel] [PATCH v3 9/9] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
@ 2019-04-29 9:02 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-29 9:02 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
8561 and 8562 will be gen15 machines. There is no name yet, lets us use
gen15a and gen15tb as base name. Later on we can provide aliases with
the proper name.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target/s390x/cpu_models.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index d683635eb5..21ea819483 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -43,10 +43,9 @@
}
/*
- * CPU definiton list in order of release. For now, base features of a
- * following release are always a subset of base features of the previous
- * release. Same is correct for the other feature sets.
- * A BC release always follows the corresponding EC release.
+ * CPU definition list in order of release. Up to generation 14 base features
+ * of a following release have been a superset of the previous release. With
+ * generation 15 one base feature and one optional feature have been deprecated.
*/
static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),
@@ -83,6 +82,8 @@ static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
+ CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
+ CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
};
#define QEMU_MAX_CPU_TYPE 0x2827
--
2.17.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:25 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:25 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190426221528.30293-1-jsnow@redhat.com -> patchew/20190426221528.30293-1-jsnow@redhat.com
t [tag update] patchew/20190427162922.4207-1-f4bug@amsat.org -> patchew/20190427162922.4207-1-f4bug@amsat.org
* [new tag] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
99081a4e07 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
f36b5e963f s390x/cpumodel: add gen15 defintions
469d33aadf s390x/cpumodel: add Deflate-conversion facility
d08509db86 s390x/cpumodel: enhanced sort facility
fb2ea624ba s390x/cpumodel: vector enhancements
409ba7ad54 s390x/cpumodel: msa9 facility
3658d6287f s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
7e144efffc s390x/cpumodel: ignore csske for expansion
10af5a5a9c linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 10af5a5a9cec (linux header sync)
2/9 Checking commit 7e144efffc8c (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit 3658d6287fa9 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 409ba7ad5446 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit fb2ea624ba0b (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit d08509db86ef (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 469d33aadfc7 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit f36b5e963f12 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit 99081a4e072a (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:25 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:25 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190426221528.30293-1-jsnow@redhat.com -> patchew/20190426221528.30293-1-jsnow@redhat.com
t [tag update] patchew/20190427162922.4207-1-f4bug@amsat.org -> patchew/20190427162922.4207-1-f4bug@amsat.org
* [new tag] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
99081a4e07 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
f36b5e963f s390x/cpumodel: add gen15 defintions
469d33aadf s390x/cpumodel: add Deflate-conversion facility
d08509db86 s390x/cpumodel: enhanced sort facility
fb2ea624ba s390x/cpumodel: vector enhancements
409ba7ad54 s390x/cpumodel: msa9 facility
3658d6287f s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
7e144efffc s390x/cpumodel: ignore csske for expansion
10af5a5a9c linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 10af5a5a9cec (linux header sync)
2/9 Checking commit 7e144efffc8c (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit 3658d6287fa9 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 409ba7ad5446 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit fb2ea624ba0b (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit d08509db86ef (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 469d33aadfc7 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit f36b5e963f12 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit 99081a4e072a (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:30 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:30 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
ee71b70070 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
6ad0f9f6ac s390x/cpumodel: add gen15 defintions
1463ce1ffd s390x/cpumodel: add Deflate-conversion facility
3fd5028f36 s390x/cpumodel: enhanced sort facility
3a7a913cb7 s390x/cpumodel: vector enhancements
1074f30ea9 s390x/cpumodel: msa9 facility
263c878902 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
786bd340c1 s390x/cpumodel: ignore csske for expansion
249f1da8e1 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 249f1da8e1c1 (linux header sync)
2/9 Checking commit 786bd340c14c (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit 263c87890201 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 1074f30ea95d (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit 3a7a913cb75b (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 3fd5028f36d0 (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 1463ce1ffde2 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 6ad0f9f6ace2 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit ee71b7007047 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:30 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:30 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
ee71b70070 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
6ad0f9f6ac s390x/cpumodel: add gen15 defintions
1463ce1ffd s390x/cpumodel: add Deflate-conversion facility
3fd5028f36 s390x/cpumodel: enhanced sort facility
3a7a913cb7 s390x/cpumodel: vector enhancements
1074f30ea9 s390x/cpumodel: msa9 facility
263c878902 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
786bd340c1 s390x/cpumodel: ignore csske for expansion
249f1da8e1 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 249f1da8e1c1 (linux header sync)
2/9 Checking commit 786bd340c14c (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit 263c87890201 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 1074f30ea95d (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit 3a7a913cb75b (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 3fd5028f36d0 (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 1463ce1ffde2 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 6ad0f9f6ace2 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit ee71b7007047 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:35 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:35 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190426221528.30293-1-jsnow@redhat.com -> patchew/20190426221528.30293-1-jsnow@redhat.com
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
1620bdf85a s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
9f350bea66 s390x/cpumodel: add gen15 defintions
76a8bebfed s390x/cpumodel: add Deflate-conversion facility
453ad1ec16 s390x/cpumodel: enhanced sort facility
5b0879e745 s390x/cpumodel: vector enhancements
8fd6045593 s390x/cpumodel: msa9 facility
d7fb3df300 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
ae446abab7 s390x/cpumodel: ignore csske for expansion
64a177245c linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 64a177245cf4 (linux header sync)
2/9 Checking commit ae446abab74b (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit d7fb3df30077 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 8fd604559341 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit 5b0879e74554 (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 453ad1ec1662 (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 76a8bebfed5f (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 9f350bea6670 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit 1620bdf85ab8 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:35 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:35 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190426221528.30293-1-jsnow@redhat.com -> patchew/20190426221528.30293-1-jsnow@redhat.com
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
1620bdf85a s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
9f350bea66 s390x/cpumodel: add gen15 defintions
76a8bebfed s390x/cpumodel: add Deflate-conversion facility
453ad1ec16 s390x/cpumodel: enhanced sort facility
5b0879e745 s390x/cpumodel: vector enhancements
8fd6045593 s390x/cpumodel: msa9 facility
d7fb3df300 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
ae446abab7 s390x/cpumodel: ignore csske for expansion
64a177245c linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 64a177245cf4 (linux header sync)
2/9 Checking commit ae446abab74b (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit d7fb3df30077 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 8fd604559341 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit 5b0879e74554 (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 453ad1ec1662 (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 76a8bebfed5f (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 9f350bea6670 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit 1620bdf85ab8 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:40 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:40 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
f8740d5b68 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
8b6fadaceb s390x/cpumodel: add gen15 defintions
08c81fe433 s390x/cpumodel: add Deflate-conversion facility
b8bed2b328 s390x/cpumodel: enhanced sort facility
e08948fdd4 s390x/cpumodel: vector enhancements
5c823f012d s390x/cpumodel: msa9 facility
aefd976f26 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
8a89f56173 s390x/cpumodel: ignore csske for expansion
04dc093493 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 04dc093493e4 (linux header sync)
2/9 Checking commit 8a89f5617390 (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit aefd976f267c (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 5c823f012d64 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit e08948fdd448 (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit b8bed2b32840 (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 08c81fe43323 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 8b6fadaceb22 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit f8740d5b6870 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 9:40 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 9:40 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
f8740d5b68 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
8b6fadaceb s390x/cpumodel: add gen15 defintions
08c81fe433 s390x/cpumodel: add Deflate-conversion facility
b8bed2b328 s390x/cpumodel: enhanced sort facility
e08948fdd4 s390x/cpumodel: vector enhancements
5c823f012d s390x/cpumodel: msa9 facility
aefd976f26 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
8a89f56173 s390x/cpumodel: ignore csske for expansion
04dc093493 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 04dc093493e4 (linux header sync)
2/9 Checking commit 8a89f5617390 (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit aefd976f267c (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 5c823f012d64 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit e08948fdd448 (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit b8bed2b32840 (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 08c81fe43323 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#20: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#56: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#105: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 8b6fadaceb22 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit f8740d5b6870 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 9/9] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
@ 2019-04-29 10:17 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 10:17 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: qemu-devel, qemu-s390x, Halil Pasic, Richard Henderson,
Collin Walling, Jason J . Herne
On 29.04.19 11:02, Christian Borntraeger wrote:
> 8561 and 8562 will be gen15 machines. There is no name yet, lets us use
> gen15a and gen15tb as base name. Later on we can provide aliases with
nit: gen15b
> the proper name.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/cpu_models.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index d683635eb5..21ea819483 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -43,10 +43,9 @@
> }
>
> /*
> - * CPU definiton list in order of release. For now, base features of a
> - * following release are always a subset of base features of the previous
> - * release. Same is correct for the other feature sets.
> - * A BC release always follows the corresponding EC release.
> + * CPU definition list in order of release. Up to generation 14 base features
> + * of a following release have been a superset of the previous release. With
> + * generation 15 one base feature and one optional feature have been deprecated.
> */
> static S390CPUDef s390_cpu_defs[] = {
> CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),
> @@ -83,6 +82,8 @@ static S390CPUDef s390_cpu_defs[] = {
> CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
> CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
> CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
> + CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
> + CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
> };
>
> #define QEMU_MAX_CPU_TYPE 0x2827
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 9/9] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
@ 2019-04-29 10:17 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 10:17 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
qemu-s390x, Richard Henderson
On 29.04.19 11:02, Christian Borntraeger wrote:
> 8561 and 8562 will be gen15 machines. There is no name yet, lets us use
> gen15a and gen15tb as base name. Later on we can provide aliases with
nit: gen15b
> the proper name.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/cpu_models.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index d683635eb5..21ea819483 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -43,10 +43,9 @@
> }
>
> /*
> - * CPU definiton list in order of release. For now, base features of a
> - * following release are always a subset of base features of the previous
> - * release. Same is correct for the other feature sets.
> - * A BC release always follows the corresponding EC release.
> + * CPU definition list in order of release. Up to generation 14 base features
> + * of a following release have been a superset of the previous release. With
> + * generation 15 one base feature and one optional feature have been deprecated.
> */
> static S390CPUDef s390_cpu_defs[] = {
> CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),
> @@ -83,6 +82,8 @@ static S390CPUDef s390_cpu_defs[] = {
> CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
> CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
> CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
> + CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
> + CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
> };
>
> #define QEMU_MAX_CPU_TYPE 0x2827
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 8/9] s390x/cpumodel: add gen15 defintions
@ 2019-04-29 10:18 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 10:18 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: qemu-devel, qemu-s390x, Halil Pasic, Richard Henderson,
Collin Walling, Jason J . Herne
On 29.04.19 11:02, Christian Borntraeger wrote:
> add several new features (msa9, sort, deflate, additional vector
> instructions, new general purpose instructions) to generation 15.
>
> Also disable csske and bpb from the default and base models >=15.
> This will allow to migrate gen15 machines to future machines that
> do not have these features.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/gen-features.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index 8fc2e8e72f..c346b76bdf 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -13,6 +13,7 @@
>
> #include <inttypes.h>
> #include <stdio.h>
> +#include <string.h>
> #include "cpu_features_def.h"
>
> #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
> @@ -419,6 +420,10 @@ static uint16_t base_GEN14_GA1[] = {
>
> #define base_GEN14_GA2 EmptyFeat
>
> +static uint16_t base_GEN15_GA1[] = {
> + S390_FEAT_MISC_INSTRUCTION_EXT3,
> +};
> +
> /* Full features (in order of release)
> * Automatically includes corresponding base features.
> * Full features are all features this hardware supports even if kvm/QEMU do not
> @@ -548,6 +553,16 @@ static uint16_t full_GEN14_GA1[] = {
>
> #define full_GEN14_GA2 EmptyFeat
>
> +static uint16_t full_GEN15_GA1[] = {
> + S390_FEAT_VECTOR_ENH2,
> + S390_FEAT_GROUP_ENH_SORT,
> + S390_FEAT_GROUP_DEFLATE_CONVERSION,
> + S390_FEAT_VECTOR_BCD_ENH,
> + S390_FEAT_GROUP_MSA_EXT_9,
> + S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
> + S390_FEAT_ETOKEN,
> +};
> +
> /* Default features (in order of release)
> * Automatically includes corresponding base features.
> * Default features are all features this version of QEMU supports for this
> @@ -624,6 +639,16 @@ static uint16_t default_GEN14_GA1[] = {
>
> #define default_GEN14_GA2 EmptyFeat
>
> +static uint16_t default_GEN15_GA1[] = {
> + S390_FEAT_VECTOR_ENH2,
> + S390_FEAT_GROUP_ENH_SORT,
> + S390_FEAT_GROUP_DEFLATE_CONVERSION,
> + S390_FEAT_VECTOR_BCD_ENH,
> + S390_FEAT_GROUP_MSA_EXT_9,
> + S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
> + S390_FEAT_ETOKEN,
> +};
> +
> /* QEMU (CPU model) features */
>
> static uint16_t qemu_V2_11[] = {
> @@ -740,6 +765,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
> CPU_FEAT_INITIALIZER(GEN13_GA2),
> CPU_FEAT_INITIALIZER(GEN14_GA1),
> CPU_FEAT_INITIALIZER(GEN14_GA2),
> + CPU_FEAT_INITIALIZER(GEN15_GA1),
> };
>
> #define FEAT_GROUP_INITIALIZER(_name) \
> @@ -808,6 +834,11 @@ static void set_bits(uint64_t list[], BitSpec bits)
> }
> }
>
> +static inline void clear_bit(uint64_t list[], unsigned long nr)
> +{
> + list[nr / 64] &= ~(1ULL << (nr % 64));
> +}
> +
> static void print_feature_defs(void)
> {
> uint64_t base_feat[S390_FEAT_MAX / 64 + 1] = {};
> @@ -818,6 +849,12 @@ static void print_feature_defs(void)
> printf("\n/* CPU model feature list data */\n");
>
> for (i = 0; i < ARRAY_SIZE(CpuFeatDef); i++) {
> + /* With gen15 CSSKE and BPB are deprecated */
> + if (strcmp(CpuFeatDef[i].name, "S390_FEAT_LIST_GEN15_GA1") == 0) {
> + clear_bit(base_feat, S390_FEAT_CONDITIONAL_SSKE);
> + clear_bit(default_feat, S390_FEAT_CONDITIONAL_SSKE);
> + clear_bit(default_feat, S390_FEAT_BPB);
> + }
> set_bits(base_feat, CpuFeatDef[i].base_bits);
> /* add the base to the default features */
> set_bits(default_feat, CpuFeatDef[i].base_bits);
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 8/9] s390x/cpumodel: add gen15 defintions
@ 2019-04-29 10:18 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 10:18 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
qemu-s390x, Richard Henderson
On 29.04.19 11:02, Christian Borntraeger wrote:
> add several new features (msa9, sort, deflate, additional vector
> instructions, new general purpose instructions) to generation 15.
>
> Also disable csske and bpb from the default and base models >=15.
> This will allow to migrate gen15 machines to future machines that
> do not have these features.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/gen-features.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index 8fc2e8e72f..c346b76bdf 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -13,6 +13,7 @@
>
> #include <inttypes.h>
> #include <stdio.h>
> +#include <string.h>
> #include "cpu_features_def.h"
>
> #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
> @@ -419,6 +420,10 @@ static uint16_t base_GEN14_GA1[] = {
>
> #define base_GEN14_GA2 EmptyFeat
>
> +static uint16_t base_GEN15_GA1[] = {
> + S390_FEAT_MISC_INSTRUCTION_EXT3,
> +};
> +
> /* Full features (in order of release)
> * Automatically includes corresponding base features.
> * Full features are all features this hardware supports even if kvm/QEMU do not
> @@ -548,6 +553,16 @@ static uint16_t full_GEN14_GA1[] = {
>
> #define full_GEN14_GA2 EmptyFeat
>
> +static uint16_t full_GEN15_GA1[] = {
> + S390_FEAT_VECTOR_ENH2,
> + S390_FEAT_GROUP_ENH_SORT,
> + S390_FEAT_GROUP_DEFLATE_CONVERSION,
> + S390_FEAT_VECTOR_BCD_ENH,
> + S390_FEAT_GROUP_MSA_EXT_9,
> + S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
> + S390_FEAT_ETOKEN,
> +};
> +
> /* Default features (in order of release)
> * Automatically includes corresponding base features.
> * Default features are all features this version of QEMU supports for this
> @@ -624,6 +639,16 @@ static uint16_t default_GEN14_GA1[] = {
>
> #define default_GEN14_GA2 EmptyFeat
>
> +static uint16_t default_GEN15_GA1[] = {
> + S390_FEAT_VECTOR_ENH2,
> + S390_FEAT_GROUP_ENH_SORT,
> + S390_FEAT_GROUP_DEFLATE_CONVERSION,
> + S390_FEAT_VECTOR_BCD_ENH,
> + S390_FEAT_GROUP_MSA_EXT_9,
> + S390_FEAT_GROUP_MSA_EXT_9_PCKMO,
> + S390_FEAT_ETOKEN,
> +};
> +
> /* QEMU (CPU model) features */
>
> static uint16_t qemu_V2_11[] = {
> @@ -740,6 +765,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
> CPU_FEAT_INITIALIZER(GEN13_GA2),
> CPU_FEAT_INITIALIZER(GEN14_GA1),
> CPU_FEAT_INITIALIZER(GEN14_GA2),
> + CPU_FEAT_INITIALIZER(GEN15_GA1),
> };
>
> #define FEAT_GROUP_INITIALIZER(_name) \
> @@ -808,6 +834,11 @@ static void set_bits(uint64_t list[], BitSpec bits)
> }
> }
>
> +static inline void clear_bit(uint64_t list[], unsigned long nr)
> +{
> + list[nr / 64] &= ~(1ULL << (nr % 64));
> +}
> +
> static void print_feature_defs(void)
> {
> uint64_t base_feat[S390_FEAT_MAX / 64 + 1] = {};
> @@ -818,6 +849,12 @@ static void print_feature_defs(void)
> printf("\n/* CPU model feature list data */\n");
>
> for (i = 0; i < ARRAY_SIZE(CpuFeatDef); i++) {
> + /* With gen15 CSSKE and BPB are deprecated */
> + if (strcmp(CpuFeatDef[i].name, "S390_FEAT_LIST_GEN15_GA1") == 0) {
> + clear_bit(base_feat, S390_FEAT_CONDITIONAL_SSKE);
> + clear_bit(default_feat, S390_FEAT_CONDITIONAL_SSKE);
> + clear_bit(default_feat, S390_FEAT_BPB);
> + }
> set_bits(base_feat, CpuFeatDef[i].base_bits);
> /* add the base to the default features */
> set_bits(default_feat, CpuFeatDef[i].base_bits);
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 7/9] s390x/cpumodel: add Deflate-conversion facility
@ 2019-04-29 10:19 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 10:19 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: qemu-devel, qemu-s390x, Halil Pasic, Richard Henderson,
Collin Walling, Jason J . Herne
On 29.04.19 11:02, Christian Borntraeger wrote:
> add the deflate conversion facility.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/cpu_features.c | 9 +++++++++
> target/s390x/cpu_features.h | 1 +
> target/s390x/cpu_features_def.h | 7 +++++++
> target/s390x/gen-features.c | 12 ++++++++++++
> target/s390x/kvm.c | 6 ++++++
> 5 files changed, 35 insertions(+)
>
> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
> index 1d19b3072e..f64f581c86 100644
> --- a/target/s390x/cpu_features.c
> +++ b/target/s390x/cpu_features.c
> @@ -110,6 +110,7 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
> FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
> FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
> + FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
> FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
> FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
> @@ -347,6 +348,11 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
> FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
> FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
> +
> + FEAT_INIT("dfltcc-gdht", S390_FEAT_TYPE_DFLTCC, 1, "DFLTCC GDHT"),
> + FEAT_INIT("dfltcc-cmpr", S390_FEAT_TYPE_DFLTCC, 2, "DFLTCC CMPR"),
> + FEAT_INIT("dfltcc-xpnd", S390_FEAT_TYPE_DFLTCC, 4, "DFLTCC XPND"),
> + FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
> };
>
> const S390FeatDef *s390_feat_def(S390Feat feat)
> @@ -411,6 +417,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
> case S390_FEAT_TYPE_KMA:
> case S390_FEAT_TYPE_KDSA:
> case S390_FEAT_TYPE_SORTL:
> + case S390_FEAT_TYPE_DFLTCC:
> set_be_bit(0, data); /* query is always available */
> break;
> default:
> @@ -439,6 +446,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
> break;
> case S390_FEAT_TYPE_PLO:
> case S390_FEAT_TYPE_SORTL:
> + case S390_FEAT_TYPE_DFLTCC:
> nr_bits = 256;
> break;
> default:
> @@ -511,6 +519,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
> FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
> FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
> + FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
> };
>
> const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
> index 3b8c5b25dd..da695a8346 100644
> --- a/target/s390x/cpu_features.h
> +++ b/target/s390x/cpu_features.h
> @@ -41,6 +41,7 @@ typedef enum {
> S390_FEAT_TYPE_KMA,
> S390_FEAT_TYPE_KDSA,
> S390_FEAT_TYPE_SORTL,
> + S390_FEAT_TYPE_DFLTCC,
> } S390FeatType;
>
> /* Definition of a CPU feature */
> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
> index bb8585847f..292b17b35d 100644
> --- a/target/s390x/cpu_features_def.h
> +++ b/target/s390x/cpu_features_def.h
> @@ -98,6 +98,7 @@ typedef enum {
> S390_FEAT_CMM_NT,
> S390_FEAT_VECTOR_ENH2,
> S390_FEAT_ESORT_BASE,
> + S390_FEAT_DEFLATE_BASE,
> S390_FEAT_VECTOR_BCD_ENH,
> S390_FEAT_MSA_EXT_9,
> S390_FEAT_ETOKEN,
> @@ -354,6 +355,12 @@ typedef enum {
> S390_FEAT_SORTL_128,
> S390_FEAT_SORTL_F0,
>
> + /* DEFLATE */
> + S390_FEAT_DEFLATE_GHDT,
> + S390_FEAT_DEFLATE_CMPR,
> + S390_FEAT_DEFLATE_XPND,
> + S390_FEAT_DEFLATE_F0,
> +
> S390_FEAT_MAX,
> } S390Feat;
>
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index 0a62cc5631..8fc2e8e72f 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -254,6 +254,13 @@
> S390_FEAT_SORTL_F0
>
>
> +#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
> + S390_FEAT_DEFLATE_BASE, \
> + S390_FEAT_DEFLATE_GHDT, \
> + S390_FEAT_DEFLATE_CMPR, \
> + S390_FEAT_DEFLATE_XPND, \
> + S390_FEAT_DEFLATE_F0
> +
> /* cpu feature groups */
> static uint16_t group_PLO[] = {
> S390_FEAT_GROUP_PLO,
> @@ -307,6 +314,10 @@ static uint16_t group_ENH_SORT[] = {
> S390_FEAT_GROUP_ENH_SORT,
> };
>
> +static uint16_t group_DEFLATE_CONVERSION[] = {
> + S390_FEAT_GROUP_DEFLATE_CONVERSION,
> +};
> +
> /* Base features (in order of release)
> * Only non-hypervisor managed features belong here.
> * Base feature sets are static meaning they do not change in future QEMU
> @@ -766,6 +777,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
> FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
> FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
> FEAT_GROUP_INITIALIZER(ENH_SORT),
> + FEAT_GROUP_INITIALIZER(DEFLATE_CONVERSION),
> };
>
> #define QEMU_FEAT_INITIALIZER(_name) \
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index f91f436a31..e5e2b691f2 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -2079,6 +2079,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
> if (test_bit(S390_FEAT_ESORT_BASE, features)) {
> s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
> }
> + if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
> + s390_add_from_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
> + }
> return 0;
> }
>
> @@ -2129,6 +2132,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
> if (test_bit(S390_FEAT_ESORT_BASE, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
> }
> + if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
> + s390_fill_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
> + }
> return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
> }
>
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 7/9] s390x/cpumodel: add Deflate-conversion facility
@ 2019-04-29 10:19 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 10:19 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
qemu-s390x, Richard Henderson
On 29.04.19 11:02, Christian Borntraeger wrote:
> add the deflate conversion facility.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/cpu_features.c | 9 +++++++++
> target/s390x/cpu_features.h | 1 +
> target/s390x/cpu_features_def.h | 7 +++++++
> target/s390x/gen-features.c | 12 ++++++++++++
> target/s390x/kvm.c | 6 ++++++
> 5 files changed, 35 insertions(+)
>
> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
> index 1d19b3072e..f64f581c86 100644
> --- a/target/s390x/cpu_features.c
> +++ b/target/s390x/cpu_features.c
> @@ -110,6 +110,7 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
> FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
> FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
> + FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
> FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
> FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
> @@ -347,6 +348,11 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("sortl-32", S390_FEAT_TYPE_SORTL, 130, "SORTL 32 input lists"),
> FEAT_INIT("sortl-128", S390_FEAT_TYPE_SORTL, 132, "SORTL 128 input lists"),
> FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
> +
> + FEAT_INIT("dfltcc-gdht", S390_FEAT_TYPE_DFLTCC, 1, "DFLTCC GDHT"),
> + FEAT_INIT("dfltcc-cmpr", S390_FEAT_TYPE_DFLTCC, 2, "DFLTCC CMPR"),
> + FEAT_INIT("dfltcc-xpnd", S390_FEAT_TYPE_DFLTCC, 4, "DFLTCC XPND"),
> + FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
> };
>
> const S390FeatDef *s390_feat_def(S390Feat feat)
> @@ -411,6 +417,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
> case S390_FEAT_TYPE_KMA:
> case S390_FEAT_TYPE_KDSA:
> case S390_FEAT_TYPE_SORTL:
> + case S390_FEAT_TYPE_DFLTCC:
> set_be_bit(0, data); /* query is always available */
> break;
> default:
> @@ -439,6 +446,7 @@ void s390_add_from_feat_block(S390FeatBitmap features, S390FeatType type,
> break;
> case S390_FEAT_TYPE_PLO:
> case S390_FEAT_TYPE_SORTL:
> + case S390_FEAT_TYPE_DFLTCC:
> nr_bits = 256;
> break;
> default:
> @@ -511,6 +519,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
> FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
> FEAT_GROUP_INIT("esort", ENH_SORT, "Enhanced-sort facility"),
> + FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
> };
>
> const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
> index 3b8c5b25dd..da695a8346 100644
> --- a/target/s390x/cpu_features.h
> +++ b/target/s390x/cpu_features.h
> @@ -41,6 +41,7 @@ typedef enum {
> S390_FEAT_TYPE_KMA,
> S390_FEAT_TYPE_KDSA,
> S390_FEAT_TYPE_SORTL,
> + S390_FEAT_TYPE_DFLTCC,
> } S390FeatType;
>
> /* Definition of a CPU feature */
> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
> index bb8585847f..292b17b35d 100644
> --- a/target/s390x/cpu_features_def.h
> +++ b/target/s390x/cpu_features_def.h
> @@ -98,6 +98,7 @@ typedef enum {
> S390_FEAT_CMM_NT,
> S390_FEAT_VECTOR_ENH2,
> S390_FEAT_ESORT_BASE,
> + S390_FEAT_DEFLATE_BASE,
> S390_FEAT_VECTOR_BCD_ENH,
> S390_FEAT_MSA_EXT_9,
> S390_FEAT_ETOKEN,
> @@ -354,6 +355,12 @@ typedef enum {
> S390_FEAT_SORTL_128,
> S390_FEAT_SORTL_F0,
>
> + /* DEFLATE */
> + S390_FEAT_DEFLATE_GHDT,
> + S390_FEAT_DEFLATE_CMPR,
> + S390_FEAT_DEFLATE_XPND,
> + S390_FEAT_DEFLATE_F0,
> +
> S390_FEAT_MAX,
> } S390Feat;
>
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index 0a62cc5631..8fc2e8e72f 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -254,6 +254,13 @@
> S390_FEAT_SORTL_F0
>
>
> +#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
> + S390_FEAT_DEFLATE_BASE, \
> + S390_FEAT_DEFLATE_GHDT, \
> + S390_FEAT_DEFLATE_CMPR, \
> + S390_FEAT_DEFLATE_XPND, \
> + S390_FEAT_DEFLATE_F0
> +
> /* cpu feature groups */
> static uint16_t group_PLO[] = {
> S390_FEAT_GROUP_PLO,
> @@ -307,6 +314,10 @@ static uint16_t group_ENH_SORT[] = {
> S390_FEAT_GROUP_ENH_SORT,
> };
>
> +static uint16_t group_DEFLATE_CONVERSION[] = {
> + S390_FEAT_GROUP_DEFLATE_CONVERSION,
> +};
> +
> /* Base features (in order of release)
> * Only non-hypervisor managed features belong here.
> * Base feature sets are static meaning they do not change in future QEMU
> @@ -766,6 +777,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
> FEAT_GROUP_INITIALIZER(MSA_EXT_9_PCKMO),
> FEAT_GROUP_INITIALIZER(MULTIPLE_EPOCH_PTFF),
> FEAT_GROUP_INITIALIZER(ENH_SORT),
> + FEAT_GROUP_INITIALIZER(DEFLATE_CONVERSION),
> };
>
> #define QEMU_FEAT_INITIALIZER(_name) \
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index f91f436a31..e5e2b691f2 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -2079,6 +2079,9 @@ static int query_cpu_subfunc(S390FeatBitmap features)
> if (test_bit(S390_FEAT_ESORT_BASE, features)) {
> s390_add_from_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
> }
> + if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
> + s390_add_from_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
> + }
> return 0;
> }
>
> @@ -2129,6 +2132,9 @@ static int configure_cpu_subfunc(const S390FeatBitmap features)
> if (test_bit(S390_FEAT_ESORT_BASE, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_SORTL, prop.sortl);
> }
> + if (test_bit(S390_FEAT_DEFLATE_BASE, features)) {
> + s390_fill_feat_block(features, S390_FEAT_TYPE_DFLTCC, prop.dfltcc);
> + }
> return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
> }
>
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 10:28 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 10:28 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
e18f2a8267 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
5a536b0602 s390x/cpumodel: add gen15 defintions
64368df1c0 s390x/cpumodel: add Deflate-conversion facility
223614d7e5 s390x/cpumodel: enhanced sort facility
a4e53b7163 s390x/cpumodel: vector enhancements
875e5abd5b s390x/cpumodel: msa9 facility
72a0712c69 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
8fe9336821 s390x/cpumodel: ignore csske for expansion
78d0972997 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 78d09729971d (linux header sync)
2/9 Checking commit 8fe9336821b5 (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit 72a0712c69e3 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 875e5abd5b37 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit a4e53b716316 (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 223614d7e51c (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 64368df1c090 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#33: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#106: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 5a536b060287 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit e18f2a826775 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 10:28 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 10:28 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
e18f2a8267 s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
5a536b0602 s390x/cpumodel: add gen15 defintions
64368df1c0 s390x/cpumodel: add Deflate-conversion facility
223614d7e5 s390x/cpumodel: enhanced sort facility
a4e53b7163 s390x/cpumodel: vector enhancements
875e5abd5b s390x/cpumodel: msa9 facility
72a0712c69 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
8fe9336821 s390x/cpumodel: ignore csske for expansion
78d0972997 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 78d09729971d (linux header sync)
2/9 Checking commit 8fe9336821b5 (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit 72a0712c69e3 (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 875e5abd5b37 (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#30: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#33: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#42: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#45: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#48: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#63: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#69: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#70: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#87: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#88: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#188: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#213: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit a4e53b716316 (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 223614d7e51c (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 64368df1c090 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#33: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#106: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 5a536b060287 (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit e18f2a826775 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 16:08 ` Cornelia Huck
0 siblings, 0 replies; 55+ messages in thread
From: Cornelia Huck @ 2019-04-29 16:08 UTC (permalink / raw)
To: Christian Borntraeger
Cc: qemu-devel, qemu-s390x, David Hildenbrand, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
On Mon, 29 Apr 2019 05:02:41 -0400
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> Adding gen15.
>
> v2->v3: - merge deprecation patch into gen 15 patch
> - fix comments
> - use gen15a and gen15b instead of cpuid
> v1->v2: - rework csske deprecation
> - white space fixes
> - also require msa4 for msa9
>
> Christian Borntraeger (9):
> linux header sync
I think we can do that sync once the companion kernel series hits the
kvm next branch.
> s390x/cpumodel: ignore csske for expansion
> s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
> s390x/cpumodel: msa9 facility
This seems to be the only patch that does not yet have a R-b from David
-- David, do you plan to review this one as well?
> s390x/cpumodel: vector enhancements
> s390x/cpumodel: enhanced sort facility
> s390x/cpumodel: add Deflate-conversion facility
> s390x/cpumodel: add gen15 defintions
> s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
>
> linux-headers/asm-s390/kvm.h | 5 +-
> target/s390x/cpu_features.c | 54 ++++++++++++++++
> target/s390x/cpu_features.h | 3 +
> target/s390x/cpu_features_def.h | 49 +++++++++++++++
> target/s390x/cpu_models.c | 13 ++--
> target/s390x/gen-features.c | 105 ++++++++++++++++++++++++++++++++
> target/s390x/kvm.c | 18 ++++++
> 7 files changed, 242 insertions(+), 5 deletions(-)
>
Only thing I noticed were some minor typos in some commit messages, I
can fix up while applying.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 16:08 ` Cornelia Huck
0 siblings, 0 replies; 55+ messages in thread
From: Cornelia Huck @ 2019-04-29 16:08 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
On Mon, 29 Apr 2019 05:02:41 -0400
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> Adding gen15.
>
> v2->v3: - merge deprecation patch into gen 15 patch
> - fix comments
> - use gen15a and gen15b instead of cpuid
> v1->v2: - rework csske deprecation
> - white space fixes
> - also require msa4 for msa9
>
> Christian Borntraeger (9):
> linux header sync
I think we can do that sync once the companion kernel series hits the
kvm next branch.
> s390x/cpumodel: ignore csske for expansion
> s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
> s390x/cpumodel: msa9 facility
This seems to be the only patch that does not yet have a R-b from David
-- David, do you plan to review this one as well?
> s390x/cpumodel: vector enhancements
> s390x/cpumodel: enhanced sort facility
> s390x/cpumodel: add Deflate-conversion facility
> s390x/cpumodel: add gen15 defintions
> s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
>
> linux-headers/asm-s390/kvm.h | 5 +-
> target/s390x/cpu_features.c | 54 ++++++++++++++++
> target/s390x/cpu_features.h | 3 +
> target/s390x/cpu_features_def.h | 49 +++++++++++++++
> target/s390x/cpu_models.c | 13 ++--
> target/s390x/gen-features.c | 105 ++++++++++++++++++++++++++++++++
> target/s390x/kvm.c | 18 ++++++
> 7 files changed, 242 insertions(+), 5 deletions(-)
>
Only thing I noticed were some minor typos in some commit messages, I
can fix up while applying.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-29 19:24 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 19:24 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: qemu-devel, qemu-s390x, Halil Pasic, Richard Henderson,
Collin Walling, Jason J . Herne
On 29.04.19 11:02, Christian Borntraeger wrote:
> Provide the MSA9 facility (stfle.155).
> This also contains pckmo functions for key wrapping. Keep them in a
> separate group to disable those as a block if necessary.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
> target/s390x/cpu_features.h | 1 +
> target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
> target/s390x/cpu_models.c | 2 ++
> target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
> target/s390x/kvm.c | 6 +++++
> 6 files changed, 114 insertions(+)
>
> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
> index bbd8902087..154e2bb354 100644
> --- a/target/s390x/cpu_features.c
> +++ b/target/s390x/cpu_features.c
> @@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
> FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
> + FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
>
> /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
> @@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
> FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
> FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
> + FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
> + FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
> + FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
> + FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
> + FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
>
> FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
> FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
> @@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
> FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
> FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
> + FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
> + FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
> + FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
> + FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
> + FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
> + FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
> + FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
>
> FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
> FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
> @@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
> FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
> FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
> +
> + FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
> + FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
> + FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
> + FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
> + FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
> + FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
> + FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
> + FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
> + FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
> + FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
> + FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
> + FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
> + FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
> + FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
> + FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
> };
>
> const S390FeatDef *s390_feat_def(S390Feat feat)
> @@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
> case S390_FEAT_TYPE_PCC:
> case S390_FEAT_TYPE_PPNO:
> case S390_FEAT_TYPE_KMA:
> + case S390_FEAT_TYPE_KDSA:
> set_be_bit(0, data); /* query is always available */
> break;
> default:
> @@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
> + FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
> + FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
> };
>
> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
> index effe790271..5ffd3db083 100644
> --- a/target/s390x/cpu_features.h
> +++ b/target/s390x/cpu_features.h
> @@ -39,6 +39,7 @@ typedef enum {
> S390_FEAT_TYPE_PCC,
> S390_FEAT_TYPE_PPNO,
> S390_FEAT_TYPE_KMA,
> + S390_FEAT_TYPE_KDSA,
> } S390FeatType;
>
> /* Definition of a CPU feature */
> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
> index 31dd678301..030784811b 100644
> --- a/target/s390x/cpu_features_def.h
> +++ b/target/s390x/cpu_features_def.h
> @@ -96,6 +96,7 @@ typedef enum {
> S390_FEAT_INSERT_REFERENCE_BITS_MULT,
> S390_FEAT_MSA_EXT_8,
> S390_FEAT_CMM_NT,
> + S390_FEAT_MSA_EXT_9,
> S390_FEAT_ETOKEN,
>
> /* Sclp Conf Char */
> @@ -240,6 +241,11 @@ typedef enum {
> S390_FEAT_PCKMO_AES_128,
> S390_FEAT_PCKMO_AES_192,
> S390_FEAT_PCKMO_AES_256,
> + S390_FEAT_PCKMO_ECC_P256,
> + S390_FEAT_PCKMO_ECC_P384,
> + S390_FEAT_PCKMO_ECC_P521,
> + S390_FEAT_PCKMO_ECC_ED25519,
> + S390_FEAT_PCKMO_ECC_ED448,
>
> /* KMCTR */
> S390_FEAT_KMCTR_DEA,
> @@ -300,6 +306,13 @@ typedef enum {
> S390_FEAT_PCC_XTS_AES_256,
> S390_FEAT_PCC_XTS_EAES_128,
> S390_FEAT_PCC_XTS_EAES_256,
> + S390_FEAT_PCC_SCALAR_MULT_P256,
> + S390_FEAT_PCC_SCALAR_MULT_P384,
> + S390_FEAT_PCC_SCALAR_MULT_P512,
> + S390_FEAT_PCC_SCALAR_MULT_ED25519,
> + S390_FEAT_PCC_SCALAR_MULT_ED448,
> + S390_FEAT_PCC_SCALAR_MULT_X25519,
> + S390_FEAT_PCC_SCALAR_MULT_X448,
>
> /* PPNO/PRNO */
> S390_FEAT_PPNO_SHA_512_DRNG,
> @@ -313,6 +326,24 @@ typedef enum {
> S390_FEAT_KMA_GCM_EAES_128,
> S390_FEAT_KMA_GCM_EAES_192,
> S390_FEAT_KMA_GCM_EAES_256,
> +
> + /* KDSA */
> + S390_FEAT_ECDSA_VERIFY_P256,
> + S390_FEAT_ECDSA_VERIFY_P384,
> + S390_FEAT_ECDSA_VERIFY_P512,
> + S390_FEAT_ECDSA_SIGN_P256,
> + S390_FEAT_ECDSA_SIGN_P384,
> + S390_FEAT_ECDSA_SIGN_P512,
> + S390_FEAT_EECDSA_SIGN_P256,
> + S390_FEAT_EECDSA_SIGN_P384,
> + S390_FEAT_EECDSA_SIGN_P512,
> + S390_FEAT_EDDSA_VERIFY_ED25519,
> + S390_FEAT_EDDSA_VERIFY_ED448,
> + S390_FEAT_EDDSA_SIGN_ED25519,
> + S390_FEAT_EDDSA_SIGN_ED448,
> + S390_FEAT_EEDDSA_SIGN_ED25519,
> + S390_FEAT_EEDDSA_SIGN_ED448,
> +
> S390_FEAT_MAX,
> } S390Feat;
>
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index b4bb5de635..d683635eb5 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
> { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
> { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
> { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
> { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
> { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
> { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index e4739a6b9f..a2f9e2b43f 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -213,6 +213,38 @@
> S390_FEAT_KMA_GCM_EAES_192, \
> S390_FEAT_KMA_GCM_EAES_256
>
> +#define S390_FEAT_GROUP_MSA_EXT_9 \
> + S390_FEAT_MSA_EXT_9, \
> + S390_FEAT_ECDSA_VERIFY_P256, \
> + S390_FEAT_ECDSA_VERIFY_P384, \
> + S390_FEAT_ECDSA_VERIFY_P512, \
> + S390_FEAT_ECDSA_SIGN_P256, \
> + S390_FEAT_ECDSA_SIGN_P384, \
> + S390_FEAT_ECDSA_SIGN_P512, \
> + S390_FEAT_EECDSA_SIGN_P256, \
> + S390_FEAT_EECDSA_SIGN_P384, \
> + S390_FEAT_EECDSA_SIGN_P512, \
> + S390_FEAT_EDDSA_VERIFY_ED25519, \
> + S390_FEAT_EDDSA_VERIFY_ED448, \
> + S390_FEAT_EDDSA_SIGN_ED25519, \
> + S390_FEAT_EDDSA_SIGN_ED448, \
> + S390_FEAT_EEDDSA_SIGN_ED25519, \
> + S390_FEAT_EEDDSA_SIGN_ED448, \
> + S390_FEAT_PCC_SCALAR_MULT_P256, \
> + S390_FEAT_PCC_SCALAR_MULT_P384, \
> + S390_FEAT_PCC_SCALAR_MULT_P512, \
> + S390_FEAT_PCC_SCALAR_MULT_ED25519, \
> + S390_FEAT_PCC_SCALAR_MULT_ED448, \
> + S390_FEAT_PCC_SCALAR_MULT_X25519, \
> + S390_FEAT_PCC_SCALAR_MULT_X448
> +
> +#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
> + S390_FEAT_PCKMO_ECC_P256, \
> + S390_FEAT_PCKMO_ECC_P384, \
> + S390_FEAT_PCKMO_ECC_P521, \
> + S390_FEAT_PCKMO_ECC_ED25519, \
> + S390_FEAT_PCKMO_ECC_ED448
> +
Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
Many subfunctions, luckily we have feature groups.
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-29 19:24 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-29 19:24 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
qemu-s390x, Richard Henderson
On 29.04.19 11:02, Christian Borntraeger wrote:
> Provide the MSA9 facility (stfle.155).
> This also contains pckmo functions for key wrapping. Keep them in a
> separate group to disable those as a block if necessary.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
> target/s390x/cpu_features.h | 1 +
> target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
> target/s390x/cpu_models.c | 2 ++
> target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
> target/s390x/kvm.c | 6 +++++
> 6 files changed, 114 insertions(+)
>
> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
> index bbd8902087..154e2bb354 100644
> --- a/target/s390x/cpu_features.c
> +++ b/target/s390x/cpu_features.c
> @@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
> FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
> + FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
>
> /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
> @@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
> FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
> FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
> + FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
> + FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
> + FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
> + FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
> + FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
>
> FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
> FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
> @@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
> FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
> FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
> + FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
> + FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
> + FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
> + FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
> + FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
> + FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
> + FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
>
> FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
> FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
> @@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
> FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
> FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
> FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
> +
> + FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
> + FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
> + FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
> + FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
> + FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
> + FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
> + FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
> + FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
> + FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
> + FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
> + FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
> + FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
> + FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
> + FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
> + FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
> };
>
> const S390FeatDef *s390_feat_def(S390Feat feat)
> @@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
> case S390_FEAT_TYPE_PCC:
> case S390_FEAT_TYPE_PPNO:
> case S390_FEAT_TYPE_KMA:
> + case S390_FEAT_TYPE_KDSA:
> set_be_bit(0, data); /* query is always available */
> break;
> default:
> @@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
> + FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
> + FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
> };
>
> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
> index effe790271..5ffd3db083 100644
> --- a/target/s390x/cpu_features.h
> +++ b/target/s390x/cpu_features.h
> @@ -39,6 +39,7 @@ typedef enum {
> S390_FEAT_TYPE_PCC,
> S390_FEAT_TYPE_PPNO,
> S390_FEAT_TYPE_KMA,
> + S390_FEAT_TYPE_KDSA,
> } S390FeatType;
>
> /* Definition of a CPU feature */
> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
> index 31dd678301..030784811b 100644
> --- a/target/s390x/cpu_features_def.h
> +++ b/target/s390x/cpu_features_def.h
> @@ -96,6 +96,7 @@ typedef enum {
> S390_FEAT_INSERT_REFERENCE_BITS_MULT,
> S390_FEAT_MSA_EXT_8,
> S390_FEAT_CMM_NT,
> + S390_FEAT_MSA_EXT_9,
> S390_FEAT_ETOKEN,
>
> /* Sclp Conf Char */
> @@ -240,6 +241,11 @@ typedef enum {
> S390_FEAT_PCKMO_AES_128,
> S390_FEAT_PCKMO_AES_192,
> S390_FEAT_PCKMO_AES_256,
> + S390_FEAT_PCKMO_ECC_P256,
> + S390_FEAT_PCKMO_ECC_P384,
> + S390_FEAT_PCKMO_ECC_P521,
> + S390_FEAT_PCKMO_ECC_ED25519,
> + S390_FEAT_PCKMO_ECC_ED448,
>
> /* KMCTR */
> S390_FEAT_KMCTR_DEA,
> @@ -300,6 +306,13 @@ typedef enum {
> S390_FEAT_PCC_XTS_AES_256,
> S390_FEAT_PCC_XTS_EAES_128,
> S390_FEAT_PCC_XTS_EAES_256,
> + S390_FEAT_PCC_SCALAR_MULT_P256,
> + S390_FEAT_PCC_SCALAR_MULT_P384,
> + S390_FEAT_PCC_SCALAR_MULT_P512,
> + S390_FEAT_PCC_SCALAR_MULT_ED25519,
> + S390_FEAT_PCC_SCALAR_MULT_ED448,
> + S390_FEAT_PCC_SCALAR_MULT_X25519,
> + S390_FEAT_PCC_SCALAR_MULT_X448,
>
> /* PPNO/PRNO */
> S390_FEAT_PPNO_SHA_512_DRNG,
> @@ -313,6 +326,24 @@ typedef enum {
> S390_FEAT_KMA_GCM_EAES_128,
> S390_FEAT_KMA_GCM_EAES_192,
> S390_FEAT_KMA_GCM_EAES_256,
> +
> + /* KDSA */
> + S390_FEAT_ECDSA_VERIFY_P256,
> + S390_FEAT_ECDSA_VERIFY_P384,
> + S390_FEAT_ECDSA_VERIFY_P512,
> + S390_FEAT_ECDSA_SIGN_P256,
> + S390_FEAT_ECDSA_SIGN_P384,
> + S390_FEAT_ECDSA_SIGN_P512,
> + S390_FEAT_EECDSA_SIGN_P256,
> + S390_FEAT_EECDSA_SIGN_P384,
> + S390_FEAT_EECDSA_SIGN_P512,
> + S390_FEAT_EDDSA_VERIFY_ED25519,
> + S390_FEAT_EDDSA_VERIFY_ED448,
> + S390_FEAT_EDDSA_SIGN_ED25519,
> + S390_FEAT_EDDSA_SIGN_ED448,
> + S390_FEAT_EEDDSA_SIGN_ED25519,
> + S390_FEAT_EEDDSA_SIGN_ED448,
> +
> S390_FEAT_MAX,
> } S390Feat;
>
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index b4bb5de635..d683635eb5 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
> { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
> { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
> { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
> { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
> { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
> { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
> index e4739a6b9f..a2f9e2b43f 100644
> --- a/target/s390x/gen-features.c
> +++ b/target/s390x/gen-features.c
> @@ -213,6 +213,38 @@
> S390_FEAT_KMA_GCM_EAES_192, \
> S390_FEAT_KMA_GCM_EAES_256
>
> +#define S390_FEAT_GROUP_MSA_EXT_9 \
> + S390_FEAT_MSA_EXT_9, \
> + S390_FEAT_ECDSA_VERIFY_P256, \
> + S390_FEAT_ECDSA_VERIFY_P384, \
> + S390_FEAT_ECDSA_VERIFY_P512, \
> + S390_FEAT_ECDSA_SIGN_P256, \
> + S390_FEAT_ECDSA_SIGN_P384, \
> + S390_FEAT_ECDSA_SIGN_P512, \
> + S390_FEAT_EECDSA_SIGN_P256, \
> + S390_FEAT_EECDSA_SIGN_P384, \
> + S390_FEAT_EECDSA_SIGN_P512, \
> + S390_FEAT_EDDSA_VERIFY_ED25519, \
> + S390_FEAT_EDDSA_VERIFY_ED448, \
> + S390_FEAT_EDDSA_SIGN_ED25519, \
> + S390_FEAT_EDDSA_SIGN_ED448, \
> + S390_FEAT_EEDDSA_SIGN_ED25519, \
> + S390_FEAT_EEDDSA_SIGN_ED448, \
> + S390_FEAT_PCC_SCALAR_MULT_P256, \
> + S390_FEAT_PCC_SCALAR_MULT_P384, \
> + S390_FEAT_PCC_SCALAR_MULT_P512, \
> + S390_FEAT_PCC_SCALAR_MULT_ED25519, \
> + S390_FEAT_PCC_SCALAR_MULT_ED448, \
> + S390_FEAT_PCC_SCALAR_MULT_X25519, \
> + S390_FEAT_PCC_SCALAR_MULT_X448
> +
> +#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
> + S390_FEAT_PCKMO_ECC_P256, \
> + S390_FEAT_PCKMO_ECC_P384, \
> + S390_FEAT_PCKMO_ECC_P521, \
> + S390_FEAT_PCKMO_ECC_ED25519, \
> + S390_FEAT_PCKMO_ECC_ED448
> +
Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
Many subfunctions, luckily we have feature groups.
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 19:28 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 19:28 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
2bcae2ee9e s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
2f800f6edb s390x/cpumodel: add gen15 defintions
0af201cd6e s390x/cpumodel: add Deflate-conversion facility
451dd145d3 s390x/cpumodel: enhanced sort facility
9aaaf489c6 s390x/cpumodel: vector enhancements
768edd46e6 s390x/cpumodel: msa9 facility
dc3d28bcd3 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
0a650d08dd s390x/cpumodel: ignore csske for expansion
606e1e12c3 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 606e1e12c3f0 (linux header sync)
2/9 Checking commit 0a650d08ddae (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit dc3d28bcd3ac (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 768edd46e63c (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#23: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#33: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#35: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#45: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#48: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#49: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#63: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#69: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#70: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#72: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#88: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#89: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#189: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#214: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit 9aaaf489c69a (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 451dd145d33b (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 0af201cd6e10 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#33: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#106: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 2f800f6edb0c (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit 2bcae2ee9e31 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-04-29 19:28 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-04-29 19:28 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190429090250.7648-1-borntraeger@de.ibm.com
Subject: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
t [tag update] patchew/20190429090250.7648-1-borntraeger@de.ibm.com -> patchew/20190429090250.7648-1-borntraeger@de.ibm.com
Switched to a new branch 'test'
2bcae2ee9e s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
2f800f6edb s390x/cpumodel: add gen15 defintions
0af201cd6e s390x/cpumodel: add Deflate-conversion facility
451dd145d3 s390x/cpumodel: enhanced sort facility
9aaaf489c6 s390x/cpumodel: vector enhancements
768edd46e6 s390x/cpumodel: msa9 facility
dc3d28bcd3 s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
0a650d08dd s390x/cpumodel: ignore csske for expansion
606e1e12c3 linux header sync
=== OUTPUT BEGIN ===
1/9 Checking commit 606e1e12c3f0 (linux header sync)
2/9 Checking commit 0a650d08ddae (s390x/cpumodel: ignore csske for expansion)
3/9 Checking commit dc3d28bcd3ac (s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3)
ERROR: line over 90 characters
#22: FILE: target/s390x/cpu_features.c:86:
+ FEAT_INIT("minste3", S390_FEAT_TYPE_STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3"),
total: 1 errors, 0 warnings, 14 lines checked
Patch 3/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/9 Checking commit 768edd46e63c (s390x/cpumodel: msa9 facility)
ERROR: line over 90 characters
#23: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
WARNING: line over 80 characters
#31: FILE: target/s390x/cpu_features.c:246:
+ FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
WARNING: line over 80 characters
#32: FILE: target/s390x/cpu_features.c:247:
+ FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
WARNING: line over 80 characters
#33: FILE: target/s390x/cpu_features.c:248:
+ FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
ERROR: line over 90 characters
#34: FILE: target/s390x/cpu_features.c:249:
+ FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
ERROR: line over 90 characters
#35: FILE: target/s390x/cpu_features.c:250:
+ FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
WARNING: line over 80 characters
#43: FILE: target/s390x/cpu_features.c:307:
+ FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
WARNING: line over 80 characters
#44: FILE: target/s390x/cpu_features.c:308:
+ FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
WARNING: line over 80 characters
#45: FILE: target/s390x/cpu_features.c:309:
+ FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
ERROR: line over 90 characters
#46: FILE: target/s390x/cpu_features.c:310:
+ FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
ERROR: line over 90 characters
#47: FILE: target/s390x/cpu_features.c:311:
+ FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
ERROR: line over 90 characters
#48: FILE: target/s390x/cpu_features.c:312:
+ FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
WARNING: line over 80 characters
#49: FILE: target/s390x/cpu_features.c:313:
+ FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
WARNING: line over 80 characters
#58: FILE: target/s390x/cpu_features.c:326:
+ FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
WARNING: line over 80 characters
#59: FILE: target/s390x/cpu_features.c:327:
+ FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
WARNING: line over 80 characters
#60: FILE: target/s390x/cpu_features.c:328:
+ FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
WARNING: line over 80 characters
#61: FILE: target/s390x/cpu_features.c:329:
+ FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
WARNING: line over 80 characters
#62: FILE: target/s390x/cpu_features.c:330:
+ FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
WARNING: line over 80 characters
#63: FILE: target/s390x/cpu_features.c:331:
+ FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
ERROR: line over 90 characters
#64: FILE: target/s390x/cpu_features.c:332:
+ FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
ERROR: line over 90 characters
#65: FILE: target/s390x/cpu_features.c:333:
+ FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
ERROR: line over 90 characters
#66: FILE: target/s390x/cpu_features.c:334:
+ FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
ERROR: line over 90 characters
#67: FILE: target/s390x/cpu_features.c:335:
+ FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
ERROR: line over 90 characters
#68: FILE: target/s390x/cpu_features.c:336:
+ FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
ERROR: line over 90 characters
#69: FILE: target/s390x/cpu_features.c:337:
+ FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
WARNING: line over 80 characters
#70: FILE: target/s390x/cpu_features.c:338:
+ FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
ERROR: line over 90 characters
#71: FILE: target/s390x/cpu_features.c:339:
+ FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
ERROR: line over 90 characters
#72: FILE: target/s390x/cpu_features.c:340:
+ FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
WARNING: line over 80 characters
#88: FILE: target/s390x/cpu_features.c:499:
+ FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
ERROR: line over 90 characters
#89: FILE: target/s390x/cpu_features.c:500:
+ FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
ERROR: Macros with complex values should be enclosed in parenthesis
#189: FILE: target/s390x/gen-features.c:216:
+#define S390_FEAT_GROUP_MSA_EXT_9 \
+ S390_FEAT_MSA_EXT_9, \
+ S390_FEAT_ECDSA_VERIFY_P256, \
+ S390_FEAT_ECDSA_VERIFY_P384, \
+ S390_FEAT_ECDSA_VERIFY_P512, \
+ S390_FEAT_ECDSA_SIGN_P256, \
+ S390_FEAT_ECDSA_SIGN_P384, \
+ S390_FEAT_ECDSA_SIGN_P512, \
+ S390_FEAT_EECDSA_SIGN_P256, \
+ S390_FEAT_EECDSA_SIGN_P384, \
+ S390_FEAT_EECDSA_SIGN_P512, \
+ S390_FEAT_EDDSA_VERIFY_ED25519, \
+ S390_FEAT_EDDSA_VERIFY_ED448, \
+ S390_FEAT_EDDSA_SIGN_ED25519, \
+ S390_FEAT_EDDSA_SIGN_ED448, \
+ S390_FEAT_EEDDSA_SIGN_ED25519, \
+ S390_FEAT_EEDDSA_SIGN_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_P256, \
+ S390_FEAT_PCC_SCALAR_MULT_P384, \
+ S390_FEAT_PCC_SCALAR_MULT_P512, \
+ S390_FEAT_PCC_SCALAR_MULT_ED25519, \
+ S390_FEAT_PCC_SCALAR_MULT_ED448, \
+ S390_FEAT_PCC_SCALAR_MULT_X25519, \
+ S390_FEAT_PCC_SCALAR_MULT_X448
ERROR: Macros with complex values should be enclosed in parenthesis
#214: FILE: target/s390x/gen-features.c:241:
+#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
+ S390_FEAT_PCKMO_ECC_P256, \
+ S390_FEAT_PCKMO_ECC_P384, \
+ S390_FEAT_PCKMO_ECC_P521, \
+ S390_FEAT_PCKMO_ECC_ED25519, \
+ S390_FEAT_PCKMO_ECC_ED448
total: 17 errors, 15 warnings, 216 lines checked
Patch 4/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/9 Checking commit 9aaaf489c69a (s390x/cpumodel: vector enhancements)
WARNING: line over 80 characters
#21: FILE: target/s390x/cpu_features.c:111:
+ FEAT_INIT("vxeh2", S390_FEAT_TYPE_STFL, 148, "Vector Enhancements facility 2"),
WARNING: line over 80 characters
#22: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("vxbeh", S390_FEAT_TYPE_STFL, 152, "Vector BCD enhancements facility 1"),
total: 0 errors, 2 warnings, 16 lines checked
Patch 5/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
6/9 Checking commit 451dd145d33b (s390x/cpumodel: enhanced sort facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:112:
+ FEAT_INIT("esort-base", S390_FEAT_TYPE_STFL, 150, "Enhanced-sort facility (excluding subfunctions)"),
WARNING: line over 80 characters
#34: FILE: target/s390x/cpu_features.c:349:
+ FEAT_INIT("sortl-f0", S390_FEAT_TYPE_SORTL, 192, "SORTL format 0 parameter-block"),
ERROR: Macros with complex values should be enclosed in parenthesis
#108: FILE: target/s390x/gen-features.c:248:
+#define S390_FEAT_GROUP_ENH_SORT \
+ S390_FEAT_ESORT_BASE, \
+ S390_FEAT_SORTL_SFLR, \
+ S390_FEAT_SORTL_SVLR, \
+ S390_FEAT_SORTL_32, \
+ S390_FEAT_SORTL_128, \
+ S390_FEAT_SORTL_F0
total: 2 errors, 1 warnings, 117 lines checked
Patch 6/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
7/9 Checking commit 0af201cd6e10 (s390x/cpumodel: add Deflate-conversion facility)
ERROR: line over 90 characters
#21: FILE: target/s390x/cpu_features.c:113:
+ FEAT_INIT("deflate-base", S390_FEAT_TYPE_STFL, 151, "Deflate-conversion facility (excluding subfunctions)"),
WARNING: line over 80 characters
#33: FILE: target/s390x/cpu_features.c:355:
+ FEAT_INIT("dfltcc-f0", S390_FEAT_TYPE_DFLTCC, 192, "DFLTCC format 0 parameter-block"),
WARNING: line over 80 characters
#57: FILE: target/s390x/cpu_features.c:522:
+ FEAT_GROUP_INIT("deflate", DEFLATE_CONVERSION, "Deflate-conversion facility"),
ERROR: Macros with complex values should be enclosed in parenthesis
#106: FILE: target/s390x/gen-features.c:257:
+#define S390_FEAT_GROUP_DEFLATE_CONVERSION \
+ S390_FEAT_DEFLATE_BASE, \
+ S390_FEAT_DEFLATE_GHDT, \
+ S390_FEAT_DEFLATE_CMPR, \
+ S390_FEAT_DEFLATE_XPND, \
+ S390_FEAT_DEFLATE_F0
total: 2 errors, 2 warnings, 113 lines checked
Patch 7/9 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/9 Checking commit 2f800f6edb0c (s390x/cpumodel: add gen15 defintions)
9/9 Checking commit 2bcae2ee9e31 (s390x/cpumodel: wire up 8561 and 8562 as gen15 machines)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-30 5:41 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-30 5:41 UTC (permalink / raw)
To: David Hildenbrand, Cornelia Huck
Cc: qemu-devel, qemu-s390x, Halil Pasic, Richard Henderson,
Collin Walling, Jason J . Herne
On 29.04.19 21:24, David Hildenbrand wrote:
> On 29.04.19 11:02, Christian Borntraeger wrote:
>> Provide the MSA9 facility (stfle.155).
>> This also contains pckmo functions for key wrapping. Keep them in a
>> separate group to disable those as a block if necessary.
>>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
>> target/s390x/cpu_features.h | 1 +
>> target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
>> target/s390x/cpu_models.c | 2 ++
>> target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
>> target/s390x/kvm.c | 6 +++++
>> 6 files changed, 114 insertions(+)
>>
>> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
>> index bbd8902087..154e2bb354 100644
>> --- a/target/s390x/cpu_features.c
>> +++ b/target/s390x/cpu_features.c
>> @@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
>> FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
>> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
>> + FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
>> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
>>
>> /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
>> @@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
>> FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
>> FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
>> + FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
>> + FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
>> + FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
>> + FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
>> + FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
>>
>> FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
>> FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
>> @@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
>> FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
>> FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
>> + FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
>> + FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
>> + FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
>> + FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
>> + FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
>> + FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
>> + FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
>>
>> FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
>> FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
>> @@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
>> FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
>> FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
>> +
>> + FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
>> + FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
>> + FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
>> + FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
>> + FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
>> + FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
>> + FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
>> + FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
>> + FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
>> + FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
>> + FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
>> + FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
>> + FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
>> + FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
>> + FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
>> };
>>
>> const S390FeatDef *s390_feat_def(S390Feat feat)
>> @@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
>> case S390_FEAT_TYPE_PCC:
>> case S390_FEAT_TYPE_PPNO:
>> case S390_FEAT_TYPE_KMA:
>> + case S390_FEAT_TYPE_KDSA:
>> set_be_bit(0, data); /* query is always available */
>> break;
>> default:
>> @@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
>> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
>> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
>> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
>> + FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
>> + FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
>> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
>> };
>>
>> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
>> index effe790271..5ffd3db083 100644
>> --- a/target/s390x/cpu_features.h
>> +++ b/target/s390x/cpu_features.h
>> @@ -39,6 +39,7 @@ typedef enum {
>> S390_FEAT_TYPE_PCC,
>> S390_FEAT_TYPE_PPNO,
>> S390_FEAT_TYPE_KMA,
>> + S390_FEAT_TYPE_KDSA,
>> } S390FeatType;
>>
>> /* Definition of a CPU feature */
>> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
>> index 31dd678301..030784811b 100644
>> --- a/target/s390x/cpu_features_def.h
>> +++ b/target/s390x/cpu_features_def.h
>> @@ -96,6 +96,7 @@ typedef enum {
>> S390_FEAT_INSERT_REFERENCE_BITS_MULT,
>> S390_FEAT_MSA_EXT_8,
>> S390_FEAT_CMM_NT,
>> + S390_FEAT_MSA_EXT_9,
>> S390_FEAT_ETOKEN,
>>
>> /* Sclp Conf Char */
>> @@ -240,6 +241,11 @@ typedef enum {
>> S390_FEAT_PCKMO_AES_128,
>> S390_FEAT_PCKMO_AES_192,
>> S390_FEAT_PCKMO_AES_256,
>> + S390_FEAT_PCKMO_ECC_P256,
>> + S390_FEAT_PCKMO_ECC_P384,
>> + S390_FEAT_PCKMO_ECC_P521,
>> + S390_FEAT_PCKMO_ECC_ED25519,
>> + S390_FEAT_PCKMO_ECC_ED448,
>>
>> /* KMCTR */
>> S390_FEAT_KMCTR_DEA,
>> @@ -300,6 +306,13 @@ typedef enum {
>> S390_FEAT_PCC_XTS_AES_256,
>> S390_FEAT_PCC_XTS_EAES_128,
>> S390_FEAT_PCC_XTS_EAES_256,
>> + S390_FEAT_PCC_SCALAR_MULT_P256,
>> + S390_FEAT_PCC_SCALAR_MULT_P384,
>> + S390_FEAT_PCC_SCALAR_MULT_P512,
>> + S390_FEAT_PCC_SCALAR_MULT_ED25519,
>> + S390_FEAT_PCC_SCALAR_MULT_ED448,
>> + S390_FEAT_PCC_SCALAR_MULT_X25519,
>> + S390_FEAT_PCC_SCALAR_MULT_X448,
>>
>> /* PPNO/PRNO */
>> S390_FEAT_PPNO_SHA_512_DRNG,
>> @@ -313,6 +326,24 @@ typedef enum {
>> S390_FEAT_KMA_GCM_EAES_128,
>> S390_FEAT_KMA_GCM_EAES_192,
>> S390_FEAT_KMA_GCM_EAES_256,
>> +
>> + /* KDSA */
>> + S390_FEAT_ECDSA_VERIFY_P256,
>> + S390_FEAT_ECDSA_VERIFY_P384,
>> + S390_FEAT_ECDSA_VERIFY_P512,
>> + S390_FEAT_ECDSA_SIGN_P256,
>> + S390_FEAT_ECDSA_SIGN_P384,
>> + S390_FEAT_ECDSA_SIGN_P512,
>> + S390_FEAT_EECDSA_SIGN_P256,
>> + S390_FEAT_EECDSA_SIGN_P384,
>> + S390_FEAT_EECDSA_SIGN_P512,
>> + S390_FEAT_EDDSA_VERIFY_ED25519,
>> + S390_FEAT_EDDSA_VERIFY_ED448,
>> + S390_FEAT_EDDSA_SIGN_ED25519,
>> + S390_FEAT_EDDSA_SIGN_ED448,
>> + S390_FEAT_EEDDSA_SIGN_ED25519,
>> + S390_FEAT_EEDDSA_SIGN_ED448,
>> +
>> S390_FEAT_MAX,
>> } S390Feat;
>>
>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
>> index b4bb5de635..d683635eb5 100644
>> --- a/target/s390x/cpu_models.c
>> +++ b/target/s390x/cpu_models.c
>> @@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
>> { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
>> { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
>> { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
>> { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
>> { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
>> { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
>> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
>> index e4739a6b9f..a2f9e2b43f 100644
>> --- a/target/s390x/gen-features.c
>> +++ b/target/s390x/gen-features.c
>> @@ -213,6 +213,38 @@
>> S390_FEAT_KMA_GCM_EAES_192, \
>> S390_FEAT_KMA_GCM_EAES_256
>>
>> +#define S390_FEAT_GROUP_MSA_EXT_9 \
>> + S390_FEAT_MSA_EXT_9, \
>> + S390_FEAT_ECDSA_VERIFY_P256, \
>> + S390_FEAT_ECDSA_VERIFY_P384, \
>> + S390_FEAT_ECDSA_VERIFY_P512, \
>> + S390_FEAT_ECDSA_SIGN_P256, \
>> + S390_FEAT_ECDSA_SIGN_P384, \
>> + S390_FEAT_ECDSA_SIGN_P512, \
>> + S390_FEAT_EECDSA_SIGN_P256, \
>> + S390_FEAT_EECDSA_SIGN_P384, \
>> + S390_FEAT_EECDSA_SIGN_P512, \
>> + S390_FEAT_EDDSA_VERIFY_ED25519, \
>> + S390_FEAT_EDDSA_VERIFY_ED448, \
>> + S390_FEAT_EDDSA_SIGN_ED25519, \
>> + S390_FEAT_EDDSA_SIGN_ED448, \
>> + S390_FEAT_EEDDSA_SIGN_ED25519, \
>> + S390_FEAT_EEDDSA_SIGN_ED448, \
>> + S390_FEAT_PCC_SCALAR_MULT_P256, \
>> + S390_FEAT_PCC_SCALAR_MULT_P384, \
>> + S390_FEAT_PCC_SCALAR_MULT_P512, \
>> + S390_FEAT_PCC_SCALAR_MULT_ED25519, \
>> + S390_FEAT_PCC_SCALAR_MULT_ED448, \
>> + S390_FEAT_PCC_SCALAR_MULT_X25519, \
>> + S390_FEAT_PCC_SCALAR_MULT_X448
>> +
>> +#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
>> + S390_FEAT_PCKMO_ECC_P256, \
>> + S390_FEAT_PCKMO_ECC_P384, \
>> + S390_FEAT_PCKMO_ECC_P521, \
>> + S390_FEAT_PCKMO_ECC_ED25519, \
>> + S390_FEAT_PCKMO_ECC_ED448
>> +
>
> Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
Because those can be disabled at the HMC. It is painful to disable 5 elements
for LPARs that are configured that way. So I created a group for those. That
will allow to disable the full group.
(we have the same issue with the exisiting AES and DEA pckmo functions).
> Many subfunctions, luckily we have feature groups.
>
> Reviewed-by: David Hildenbrand <david@redhat.com>
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-30 5:41 ` Christian Borntraeger
0 siblings, 0 replies; 55+ messages in thread
From: Christian Borntraeger @ 2019-04-30 5:41 UTC (permalink / raw)
To: David Hildenbrand, Cornelia Huck
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
qemu-s390x, Richard Henderson
On 29.04.19 21:24, David Hildenbrand wrote:
> On 29.04.19 11:02, Christian Borntraeger wrote:
>> Provide the MSA9 facility (stfle.155).
>> This also contains pckmo functions for key wrapping. Keep them in a
>> separate group to disable those as a block if necessary.
>>
>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>> ---
>> target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
>> target/s390x/cpu_features.h | 1 +
>> target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
>> target/s390x/cpu_models.c | 2 ++
>> target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
>> target/s390x/kvm.c | 6 +++++
>> 6 files changed, 114 insertions(+)
>>
>> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
>> index bbd8902087..154e2bb354 100644
>> --- a/target/s390x/cpu_features.c
>> +++ b/target/s390x/cpu_features.c
>> @@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
>> FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
>> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
>> + FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
>> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
>>
>> /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
>> @@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
>> FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
>> FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
>> + FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
>> + FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
>> + FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
>> + FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
>> + FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
>>
>> FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
>> FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
>> @@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
>> FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
>> FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
>> + FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
>> + FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
>> + FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
>> + FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
>> + FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
>> + FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
>> + FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
>>
>> FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
>> FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
>> @@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
>> FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
>> FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
>> FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
>> +
>> + FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
>> + FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
>> + FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
>> + FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
>> + FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
>> + FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
>> + FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
>> + FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
>> + FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
>> + FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
>> + FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
>> + FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
>> + FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
>> + FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
>> + FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
>> };
>>
>> const S390FeatDef *s390_feat_def(S390Feat feat)
>> @@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
>> case S390_FEAT_TYPE_PCC:
>> case S390_FEAT_TYPE_PPNO:
>> case S390_FEAT_TYPE_KMA:
>> + case S390_FEAT_TYPE_KDSA:
>> set_be_bit(0, data); /* query is always available */
>> break;
>> default:
>> @@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
>> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
>> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
>> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
>> + FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
>> + FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
>> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
>> };
>>
>> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
>> index effe790271..5ffd3db083 100644
>> --- a/target/s390x/cpu_features.h
>> +++ b/target/s390x/cpu_features.h
>> @@ -39,6 +39,7 @@ typedef enum {
>> S390_FEAT_TYPE_PCC,
>> S390_FEAT_TYPE_PPNO,
>> S390_FEAT_TYPE_KMA,
>> + S390_FEAT_TYPE_KDSA,
>> } S390FeatType;
>>
>> /* Definition of a CPU feature */
>> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
>> index 31dd678301..030784811b 100644
>> --- a/target/s390x/cpu_features_def.h
>> +++ b/target/s390x/cpu_features_def.h
>> @@ -96,6 +96,7 @@ typedef enum {
>> S390_FEAT_INSERT_REFERENCE_BITS_MULT,
>> S390_FEAT_MSA_EXT_8,
>> S390_FEAT_CMM_NT,
>> + S390_FEAT_MSA_EXT_9,
>> S390_FEAT_ETOKEN,
>>
>> /* Sclp Conf Char */
>> @@ -240,6 +241,11 @@ typedef enum {
>> S390_FEAT_PCKMO_AES_128,
>> S390_FEAT_PCKMO_AES_192,
>> S390_FEAT_PCKMO_AES_256,
>> + S390_FEAT_PCKMO_ECC_P256,
>> + S390_FEAT_PCKMO_ECC_P384,
>> + S390_FEAT_PCKMO_ECC_P521,
>> + S390_FEAT_PCKMO_ECC_ED25519,
>> + S390_FEAT_PCKMO_ECC_ED448,
>>
>> /* KMCTR */
>> S390_FEAT_KMCTR_DEA,
>> @@ -300,6 +306,13 @@ typedef enum {
>> S390_FEAT_PCC_XTS_AES_256,
>> S390_FEAT_PCC_XTS_EAES_128,
>> S390_FEAT_PCC_XTS_EAES_256,
>> + S390_FEAT_PCC_SCALAR_MULT_P256,
>> + S390_FEAT_PCC_SCALAR_MULT_P384,
>> + S390_FEAT_PCC_SCALAR_MULT_P512,
>> + S390_FEAT_PCC_SCALAR_MULT_ED25519,
>> + S390_FEAT_PCC_SCALAR_MULT_ED448,
>> + S390_FEAT_PCC_SCALAR_MULT_X25519,
>> + S390_FEAT_PCC_SCALAR_MULT_X448,
>>
>> /* PPNO/PRNO */
>> S390_FEAT_PPNO_SHA_512_DRNG,
>> @@ -313,6 +326,24 @@ typedef enum {
>> S390_FEAT_KMA_GCM_EAES_128,
>> S390_FEAT_KMA_GCM_EAES_192,
>> S390_FEAT_KMA_GCM_EAES_256,
>> +
>> + /* KDSA */
>> + S390_FEAT_ECDSA_VERIFY_P256,
>> + S390_FEAT_ECDSA_VERIFY_P384,
>> + S390_FEAT_ECDSA_VERIFY_P512,
>> + S390_FEAT_ECDSA_SIGN_P256,
>> + S390_FEAT_ECDSA_SIGN_P384,
>> + S390_FEAT_ECDSA_SIGN_P512,
>> + S390_FEAT_EECDSA_SIGN_P256,
>> + S390_FEAT_EECDSA_SIGN_P384,
>> + S390_FEAT_EECDSA_SIGN_P512,
>> + S390_FEAT_EDDSA_VERIFY_ED25519,
>> + S390_FEAT_EDDSA_VERIFY_ED448,
>> + S390_FEAT_EDDSA_SIGN_ED25519,
>> + S390_FEAT_EDDSA_SIGN_ED448,
>> + S390_FEAT_EEDDSA_SIGN_ED25519,
>> + S390_FEAT_EEDDSA_SIGN_ED448,
>> +
>> S390_FEAT_MAX,
>> } S390Feat;
>>
>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
>> index b4bb5de635..d683635eb5 100644
>> --- a/target/s390x/cpu_models.c
>> +++ b/target/s390x/cpu_models.c
>> @@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
>> { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
>> { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
>> { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
>> { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
>> { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
>> { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
>> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
>> index e4739a6b9f..a2f9e2b43f 100644
>> --- a/target/s390x/gen-features.c
>> +++ b/target/s390x/gen-features.c
>> @@ -213,6 +213,38 @@
>> S390_FEAT_KMA_GCM_EAES_192, \
>> S390_FEAT_KMA_GCM_EAES_256
>>
>> +#define S390_FEAT_GROUP_MSA_EXT_9 \
>> + S390_FEAT_MSA_EXT_9, \
>> + S390_FEAT_ECDSA_VERIFY_P256, \
>> + S390_FEAT_ECDSA_VERIFY_P384, \
>> + S390_FEAT_ECDSA_VERIFY_P512, \
>> + S390_FEAT_ECDSA_SIGN_P256, \
>> + S390_FEAT_ECDSA_SIGN_P384, \
>> + S390_FEAT_ECDSA_SIGN_P512, \
>> + S390_FEAT_EECDSA_SIGN_P256, \
>> + S390_FEAT_EECDSA_SIGN_P384, \
>> + S390_FEAT_EECDSA_SIGN_P512, \
>> + S390_FEAT_EDDSA_VERIFY_ED25519, \
>> + S390_FEAT_EDDSA_VERIFY_ED448, \
>> + S390_FEAT_EDDSA_SIGN_ED25519, \
>> + S390_FEAT_EDDSA_SIGN_ED448, \
>> + S390_FEAT_EEDDSA_SIGN_ED25519, \
>> + S390_FEAT_EEDDSA_SIGN_ED448, \
>> + S390_FEAT_PCC_SCALAR_MULT_P256, \
>> + S390_FEAT_PCC_SCALAR_MULT_P384, \
>> + S390_FEAT_PCC_SCALAR_MULT_P512, \
>> + S390_FEAT_PCC_SCALAR_MULT_ED25519, \
>> + S390_FEAT_PCC_SCALAR_MULT_ED448, \
>> + S390_FEAT_PCC_SCALAR_MULT_X25519, \
>> + S390_FEAT_PCC_SCALAR_MULT_X448
>> +
>> +#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
>> + S390_FEAT_PCKMO_ECC_P256, \
>> + S390_FEAT_PCKMO_ECC_P384, \
>> + S390_FEAT_PCKMO_ECC_P521, \
>> + S390_FEAT_PCKMO_ECC_ED25519, \
>> + S390_FEAT_PCKMO_ECC_ED448
>> +
>
> Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
Because those can be disabled at the HMC. It is painful to disable 5 elements
for LPARs that are configured that way. So I created a group for those. That
will allow to disable the full group.
(we have the same issue with the exisiting AES and DEA pckmo functions).
> Many subfunctions, luckily we have feature groups.
>
> Reviewed-by: David Hildenbrand <david@redhat.com>
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-30 7:00 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-30 7:00 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: qemu-devel, qemu-s390x, Halil Pasic, Richard Henderson,
Collin Walling, Jason J . Herne
On 30.04.19 07:41, Christian Borntraeger wrote:
>
>
> On 29.04.19 21:24, David Hildenbrand wrote:
>> On 29.04.19 11:02, Christian Borntraeger wrote:
>>> Provide the MSA9 facility (stfle.155).
>>> This also contains pckmo functions for key wrapping. Keep them in a
>>> separate group to disable those as a block if necessary.
>>>
>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>> ---
>>> target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
>>> target/s390x/cpu_features.h | 1 +
>>> target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
>>> target/s390x/cpu_models.c | 2 ++
>>> target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
>>> target/s390x/kvm.c | 6 +++++
>>> 6 files changed, 114 insertions(+)
>>>
>>> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
>>> index bbd8902087..154e2bb354 100644
>>> --- a/target/s390x/cpu_features.c
>>> +++ b/target/s390x/cpu_features.c
>>> @@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
>>> FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
>>> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
>>> + FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
>>> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
>>>
>>> /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
>>> @@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
>>> FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
>>> FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
>>> + FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
>>> + FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
>>> + FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
>>> + FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
>>> + FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
>>>
>>> FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
>>> FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
>>> @@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
>>> FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
>>> FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
>>> + FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
>>> + FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
>>> + FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
>>> + FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
>>> + FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
>>> + FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
>>> + FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
>>>
>>> FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
>>> FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
>>> @@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
>>> FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
>>> FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
>>> +
>>> + FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
>>> + FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
>>> + FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
>>> + FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
>>> + FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
>>> + FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
>>> + FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
>>> + FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
>>> + FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
>>> + FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
>>> + FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
>>> + FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
>>> + FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
>>> + FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
>>> + FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
>>> };
>>>
>>> const S390FeatDef *s390_feat_def(S390Feat feat)
>>> @@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
>>> case S390_FEAT_TYPE_PCC:
>>> case S390_FEAT_TYPE_PPNO:
>>> case S390_FEAT_TYPE_KMA:
>>> + case S390_FEAT_TYPE_KDSA:
>>> set_be_bit(0, data); /* query is always available */
>>> break;
>>> default:
>>> @@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
>>> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
>>> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
>>> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
>>> + FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
>>> + FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
>>> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
>>> };
>>>
>>> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
>>> index effe790271..5ffd3db083 100644
>>> --- a/target/s390x/cpu_features.h
>>> +++ b/target/s390x/cpu_features.h
>>> @@ -39,6 +39,7 @@ typedef enum {
>>> S390_FEAT_TYPE_PCC,
>>> S390_FEAT_TYPE_PPNO,
>>> S390_FEAT_TYPE_KMA,
>>> + S390_FEAT_TYPE_KDSA,
>>> } S390FeatType;
>>>
>>> /* Definition of a CPU feature */
>>> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
>>> index 31dd678301..030784811b 100644
>>> --- a/target/s390x/cpu_features_def.h
>>> +++ b/target/s390x/cpu_features_def.h
>>> @@ -96,6 +96,7 @@ typedef enum {
>>> S390_FEAT_INSERT_REFERENCE_BITS_MULT,
>>> S390_FEAT_MSA_EXT_8,
>>> S390_FEAT_CMM_NT,
>>> + S390_FEAT_MSA_EXT_9,
>>> S390_FEAT_ETOKEN,
>>>
>>> /* Sclp Conf Char */
>>> @@ -240,6 +241,11 @@ typedef enum {
>>> S390_FEAT_PCKMO_AES_128,
>>> S390_FEAT_PCKMO_AES_192,
>>> S390_FEAT_PCKMO_AES_256,
>>> + S390_FEAT_PCKMO_ECC_P256,
>>> + S390_FEAT_PCKMO_ECC_P384,
>>> + S390_FEAT_PCKMO_ECC_P521,
>>> + S390_FEAT_PCKMO_ECC_ED25519,
>>> + S390_FEAT_PCKMO_ECC_ED448,
>>>
>>> /* KMCTR */
>>> S390_FEAT_KMCTR_DEA,
>>> @@ -300,6 +306,13 @@ typedef enum {
>>> S390_FEAT_PCC_XTS_AES_256,
>>> S390_FEAT_PCC_XTS_EAES_128,
>>> S390_FEAT_PCC_XTS_EAES_256,
>>> + S390_FEAT_PCC_SCALAR_MULT_P256,
>>> + S390_FEAT_PCC_SCALAR_MULT_P384,
>>> + S390_FEAT_PCC_SCALAR_MULT_P512,
>>> + S390_FEAT_PCC_SCALAR_MULT_ED25519,
>>> + S390_FEAT_PCC_SCALAR_MULT_ED448,
>>> + S390_FEAT_PCC_SCALAR_MULT_X25519,
>>> + S390_FEAT_PCC_SCALAR_MULT_X448,
>>>
>>> /* PPNO/PRNO */
>>> S390_FEAT_PPNO_SHA_512_DRNG,
>>> @@ -313,6 +326,24 @@ typedef enum {
>>> S390_FEAT_KMA_GCM_EAES_128,
>>> S390_FEAT_KMA_GCM_EAES_192,
>>> S390_FEAT_KMA_GCM_EAES_256,
>>> +
>>> + /* KDSA */
>>> + S390_FEAT_ECDSA_VERIFY_P256,
>>> + S390_FEAT_ECDSA_VERIFY_P384,
>>> + S390_FEAT_ECDSA_VERIFY_P512,
>>> + S390_FEAT_ECDSA_SIGN_P256,
>>> + S390_FEAT_ECDSA_SIGN_P384,
>>> + S390_FEAT_ECDSA_SIGN_P512,
>>> + S390_FEAT_EECDSA_SIGN_P256,
>>> + S390_FEAT_EECDSA_SIGN_P384,
>>> + S390_FEAT_EECDSA_SIGN_P512,
>>> + S390_FEAT_EDDSA_VERIFY_ED25519,
>>> + S390_FEAT_EDDSA_VERIFY_ED448,
>>> + S390_FEAT_EDDSA_SIGN_ED25519,
>>> + S390_FEAT_EDDSA_SIGN_ED448,
>>> + S390_FEAT_EEDDSA_SIGN_ED25519,
>>> + S390_FEAT_EEDDSA_SIGN_ED448,
>>> +
>>> S390_FEAT_MAX,
>>> } S390Feat;
>>>
>>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
>>> index b4bb5de635..d683635eb5 100644
>>> --- a/target/s390x/cpu_models.c
>>> +++ b/target/s390x/cpu_models.c
>>> @@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
>>> { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
>>> { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
>>> { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
>>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
>>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
>>> { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
>>> { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
>>> { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
>>> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
>>> index e4739a6b9f..a2f9e2b43f 100644
>>> --- a/target/s390x/gen-features.c
>>> +++ b/target/s390x/gen-features.c
>>> @@ -213,6 +213,38 @@
>>> S390_FEAT_KMA_GCM_EAES_192, \
>>> S390_FEAT_KMA_GCM_EAES_256
>>>
>>> +#define S390_FEAT_GROUP_MSA_EXT_9 \
>>> + S390_FEAT_MSA_EXT_9, \
>>> + S390_FEAT_ECDSA_VERIFY_P256, \
>>> + S390_FEAT_ECDSA_VERIFY_P384, \
>>> + S390_FEAT_ECDSA_VERIFY_P512, \
>>> + S390_FEAT_ECDSA_SIGN_P256, \
>>> + S390_FEAT_ECDSA_SIGN_P384, \
>>> + S390_FEAT_ECDSA_SIGN_P512, \
>>> + S390_FEAT_EECDSA_SIGN_P256, \
>>> + S390_FEAT_EECDSA_SIGN_P384, \
>>> + S390_FEAT_EECDSA_SIGN_P512, \
>>> + S390_FEAT_EDDSA_VERIFY_ED25519, \
>>> + S390_FEAT_EDDSA_VERIFY_ED448, \
>>> + S390_FEAT_EDDSA_SIGN_ED25519, \
>>> + S390_FEAT_EDDSA_SIGN_ED448, \
>>> + S390_FEAT_EEDDSA_SIGN_ED25519, \
>>> + S390_FEAT_EEDDSA_SIGN_ED448, \
>>> + S390_FEAT_PCC_SCALAR_MULT_P256, \
>>> + S390_FEAT_PCC_SCALAR_MULT_P384, \
>>> + S390_FEAT_PCC_SCALAR_MULT_P512, \
>>> + S390_FEAT_PCC_SCALAR_MULT_ED25519, \
>>> + S390_FEAT_PCC_SCALAR_MULT_ED448, \
>>> + S390_FEAT_PCC_SCALAR_MULT_X25519, \
>>> + S390_FEAT_PCC_SCALAR_MULT_X448
>>> +
>>> +#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
>>> + S390_FEAT_PCKMO_ECC_P256, \
>>> + S390_FEAT_PCKMO_ECC_P384, \
>>> + S390_FEAT_PCKMO_ECC_P521, \
>>> + S390_FEAT_PCKMO_ECC_ED25519, \
>>> + S390_FEAT_PCKMO_ECC_ED448
>>> +
>>
>> Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
>
> Because those can be disabled at the HMC. It is painful to disable 5 elements
> for LPARs that are configured that way. So I created a group for those. That
> will allow to disable the full group.
> (we have the same issue with the exisiting AES and DEA pckmo functions).
Rings a bell, maybe that information would be good to have in the cover
letter. I guess Conny might want to change the description when picking up:
"Provide the MSA9 facility (stfle.155). This also contains pckmo
subfunctions for key wrapping. Keep them in a separate group to disable
those as a block if necessary. This is for example needed when disabling
key wrapping via the HMC."
Thanks
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-30 7:00 ` David Hildenbrand
0 siblings, 0 replies; 55+ messages in thread
From: David Hildenbrand @ 2019-04-30 7:00 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
qemu-s390x, Richard Henderson
On 30.04.19 07:41, Christian Borntraeger wrote:
>
>
> On 29.04.19 21:24, David Hildenbrand wrote:
>> On 29.04.19 11:02, Christian Borntraeger wrote:
>>> Provide the MSA9 facility (stfle.155).
>>> This also contains pckmo functions for key wrapping. Keep them in a
>>> separate group to disable those as a block if necessary.
>>>
>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>>> ---
>>> target/s390x/cpu_features.c | 32 +++++++++++++++++++++++++
>>> target/s390x/cpu_features.h | 1 +
>>> target/s390x/cpu_features_def.h | 31 ++++++++++++++++++++++++
>>> target/s390x/cpu_models.c | 2 ++
>>> target/s390x/gen-features.c | 42 +++++++++++++++++++++++++++++++++
>>> target/s390x/kvm.c | 6 +++++
>>> 6 files changed, 114 insertions(+)
>>>
>>> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
>>> index bbd8902087..154e2bb354 100644
>>> --- a/target/s390x/cpu_features.c
>>> +++ b/target/s390x/cpu_features.c
>>> @@ -108,6 +108,7 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("irbm", S390_FEAT_TYPE_STFL, 145, "Insert-reference-bits-multiple facility"),
>>> FEAT_INIT("msa8-base", S390_FEAT_TYPE_STFL, 146, "Message-security-assist-extension-8 facility (excluding subfunctions)"),
>>> FEAT_INIT("cmmnt", S390_FEAT_TYPE_STFL, 147, "CMM: ESSA-enhancement (no translate) facility"),
>>> + FEAT_INIT("msa9-base", S390_FEAT_TYPE_STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)"),
>>> FEAT_INIT("etoken", S390_FEAT_TYPE_STFL, 156, "Etoken facility"),
>>>
>>> /* SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */
>>> @@ -242,6 +243,11 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("pckmo-aes-128", S390_FEAT_TYPE_PCKMO, 18, "PCKMO Encrypted-AES-128-Key"),
>>> FEAT_INIT("pckmo-aes-192", S390_FEAT_TYPE_PCKMO, 19, "PCKMO Encrypted-AES-192-Key"),
>>> FEAT_INIT("pckmo-aes-256", S390_FEAT_TYPE_PCKMO, 20, "PCKMO Encrypted-AES-256-Key"),
>>> + FEAT_INIT("pckmo-ecc-p256", S390_FEAT_TYPE_PCKMO, 32, "PCKMO Encrypt-ECC-P256-Key"),
>>> + FEAT_INIT("pckmo-ecc-p384", S390_FEAT_TYPE_PCKMO, 33, "PCKMO Encrypt-ECC-P384-Key"),
>>> + FEAT_INIT("pckmo-ecc-p521", S390_FEAT_TYPE_PCKMO, 34, "PCKMO Encrypt-ECC-P521-Key"),
>>> + FEAT_INIT("pckmo-ecc-ed25519", S390_FEAT_TYPE_PCKMO, 40 , "PCKMO Encrypt-ECC-Ed25519-Key"),
>>> + FEAT_INIT("pckmo-ecc-ed448", S390_FEAT_TYPE_PCKMO, 41 , "PCKMO Encrypt-ECC-Ed448-Key"),
>>>
>>> FEAT_INIT("kmctr-dea", S390_FEAT_TYPE_KMCTR, 1, "KMCTR DEA"),
>>> FEAT_INIT("kmctr-tdea-128", S390_FEAT_TYPE_KMCTR, 2, "KMCTR TDEA-128"),
>>> @@ -298,6 +304,13 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("pcc-xts-aes-256", S390_FEAT_TYPE_PCC, 52, "PCC Compute-XTS-Parameter-Using-AES-256"),
>>> FEAT_INIT("pcc-xts-eaes-128", S390_FEAT_TYPE_PCC, 58, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-128"),
>>> FEAT_INIT("pcc-xts-eaes-256", S390_FEAT_TYPE_PCC, 60, "PCC Compute-XTS-Parameter-Using-Encrypted-AES-256"),
>>> + FEAT_INIT("pcc-scalar-mult-p256", S390_FEAT_TYPE_PCC, 64, "PCC Scalar-Multiply-P256"),
>>> + FEAT_INIT("pcc-scalar-mult-p384", S390_FEAT_TYPE_PCC, 65, "PCC Scalar-Multiply-P384"),
>>> + FEAT_INIT("pcc-scalar-mult-p521", S390_FEAT_TYPE_PCC, 66, "PCC Scalar-Multiply-P521"),
>>> + FEAT_INIT("pcc-scalar-mult-ed25519", S390_FEAT_TYPE_PCC, 72, "PCC Scalar-Multiply-Ed25519"),
>>> + FEAT_INIT("pcc-scalar-mult-ed448", S390_FEAT_TYPE_PCC, 73, "PCC Scalar-Multiply-Ed448"),
>>> + FEAT_INIT("pcc-scalar-mult-x25519", S390_FEAT_TYPE_PCC, 80, "PCC Scalar-Multiply-X25519"),
>>> + FEAT_INIT("pcc-scalar-mult-x448", S390_FEAT_TYPE_PCC, 81, "PCC Scalar-Multiply-X448"),
>>>
>>> FEAT_INIT("ppno-sha-512-drng", S390_FEAT_TYPE_PPNO, 3, "PPNO SHA-512-DRNG"),
>>> FEAT_INIT("prno-trng-qrtcr", S390_FEAT_TYPE_PPNO, 112, "PRNO TRNG-Query-Raw-to-Conditioned-Ratio"),
>>> @@ -309,6 +322,22 @@ static const S390FeatDef s390_features[] = {
>>> FEAT_INIT("kma-gcm-eaes-128", S390_FEAT_TYPE_KMA, 26, "KMA GCM-Encrypted-AES-128"),
>>> FEAT_INIT("kma-gcm-eaes-192", S390_FEAT_TYPE_KMA, 27, "KMA GCM-Encrypted-AES-192"),
>>> FEAT_INIT("kma-gcm-eaes-256", S390_FEAT_TYPE_KMA, 28, "KMA GCM-Encrypted-AES-256"),
>>> +
>>> + FEAT_INIT("kdsa-ecdsa-verify-p256", S390_FEAT_TYPE_KDSA, 1, "KDSA ECDSA-Verify-P256"),
>>> + FEAT_INIT("kdsa-ecdsa-verify-p384", S390_FEAT_TYPE_KDSA, 2, "KDSA ECDSA-Verify-P384"),
>>> + FEAT_INIT("kdsa-ecdsa-verify-p521", S390_FEAT_TYPE_KDSA, 3, "KDSA ECDSA-Verify-P521"),
>>> + FEAT_INIT("kdsa-ecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 9, "KDSA ECDSA-Sign-P256"),
>>> + FEAT_INIT("kdsa-ecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 10, "KDSA ECDSA-Sign-P384"),
>>> + FEAT_INIT("kdsa-ecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 11, "KDSA ECDSA-Sign-P521"),
>>> + FEAT_INIT("kdsa-eecdsa-sign-p256", S390_FEAT_TYPE_KDSA, 17, "KDSA Encrypted-ECDSA-Sign-P256"),
>>> + FEAT_INIT("kdsa-eecdsa-sign-p384", S390_FEAT_TYPE_KDSA, 18, "KDSA Encrypted-ECDSA-Sign-P384"),
>>> + FEAT_INIT("kdsa-eecdsa-sign-p521", S390_FEAT_TYPE_KDSA, 19, "KDSA Encrypted-ECDSA-Sign-P521"),
>>> + FEAT_INIT("kdsa-eddsa-verify-ed25519", S390_FEAT_TYPE_KDSA, 32, "KDSA EdDSA-Verify-Ed25519"),
>>> + FEAT_INIT("kdsa-eddsa-verify-ed448", S390_FEAT_TYPE_KDSA, 36, "KDSA EdDSA-Verify-Ed448"),
>>> + FEAT_INIT("kdsa-eddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 40, "KDSA EdDSA-Sign-Ed25519"),
>>> + FEAT_INIT("kdsa-eddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 44, "KDSA EdDSA-Sign-Ed448"),
>>> + FEAT_INIT("kdsa-eeddsa-sign-ed25519", S390_FEAT_TYPE_KDSA, 48, "KDSA Encrypted-EdDSA-Sign-Ed25519"),
>>> + FEAT_INIT("kdsa-eeddsa-sign-ed448", S390_FEAT_TYPE_KDSA, 52, "KDSA Encrypted-EdDSA-Sign-Ed448"),
>>> };
>>>
>>> const S390FeatDef *s390_feat_def(S390Feat feat)
>>> @@ -371,6 +400,7 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type,
>>> case S390_FEAT_TYPE_PCC:
>>> case S390_FEAT_TYPE_PPNO:
>>> case S390_FEAT_TYPE_KMA:
>>> + case S390_FEAT_TYPE_KDSA:
>>> set_be_bit(0, data); /* query is always available */
>>> break;
>>> default:
>>> @@ -466,6 +496,8 @@ static S390FeatGroupDef s390_feature_groups[] = {
>>> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6 facility"),
>>> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7 facility"),
>>> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8 facility"),
>>> + FEAT_GROUP_INIT("msa9", MSA_EXT_9, "Message-security-assist-extension 9 facility"),
>>> + FEAT_GROUP_INIT("msa9_pckmo", MSA_EXT_9_PCKMO, "Message-security-assist-extension 9 PCKMO subfunctions"),
>>> FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"),
>>> };
>>>
>>> diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
>>> index effe790271..5ffd3db083 100644
>>> --- a/target/s390x/cpu_features.h
>>> +++ b/target/s390x/cpu_features.h
>>> @@ -39,6 +39,7 @@ typedef enum {
>>> S390_FEAT_TYPE_PCC,
>>> S390_FEAT_TYPE_PPNO,
>>> S390_FEAT_TYPE_KMA,
>>> + S390_FEAT_TYPE_KDSA,
>>> } S390FeatType;
>>>
>>> /* Definition of a CPU feature */
>>> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h
>>> index 31dd678301..030784811b 100644
>>> --- a/target/s390x/cpu_features_def.h
>>> +++ b/target/s390x/cpu_features_def.h
>>> @@ -96,6 +96,7 @@ typedef enum {
>>> S390_FEAT_INSERT_REFERENCE_BITS_MULT,
>>> S390_FEAT_MSA_EXT_8,
>>> S390_FEAT_CMM_NT,
>>> + S390_FEAT_MSA_EXT_9,
>>> S390_FEAT_ETOKEN,
>>>
>>> /* Sclp Conf Char */
>>> @@ -240,6 +241,11 @@ typedef enum {
>>> S390_FEAT_PCKMO_AES_128,
>>> S390_FEAT_PCKMO_AES_192,
>>> S390_FEAT_PCKMO_AES_256,
>>> + S390_FEAT_PCKMO_ECC_P256,
>>> + S390_FEAT_PCKMO_ECC_P384,
>>> + S390_FEAT_PCKMO_ECC_P521,
>>> + S390_FEAT_PCKMO_ECC_ED25519,
>>> + S390_FEAT_PCKMO_ECC_ED448,
>>>
>>> /* KMCTR */
>>> S390_FEAT_KMCTR_DEA,
>>> @@ -300,6 +306,13 @@ typedef enum {
>>> S390_FEAT_PCC_XTS_AES_256,
>>> S390_FEAT_PCC_XTS_EAES_128,
>>> S390_FEAT_PCC_XTS_EAES_256,
>>> + S390_FEAT_PCC_SCALAR_MULT_P256,
>>> + S390_FEAT_PCC_SCALAR_MULT_P384,
>>> + S390_FEAT_PCC_SCALAR_MULT_P512,
>>> + S390_FEAT_PCC_SCALAR_MULT_ED25519,
>>> + S390_FEAT_PCC_SCALAR_MULT_ED448,
>>> + S390_FEAT_PCC_SCALAR_MULT_X25519,
>>> + S390_FEAT_PCC_SCALAR_MULT_X448,
>>>
>>> /* PPNO/PRNO */
>>> S390_FEAT_PPNO_SHA_512_DRNG,
>>> @@ -313,6 +326,24 @@ typedef enum {
>>> S390_FEAT_KMA_GCM_EAES_128,
>>> S390_FEAT_KMA_GCM_EAES_192,
>>> S390_FEAT_KMA_GCM_EAES_256,
>>> +
>>> + /* KDSA */
>>> + S390_FEAT_ECDSA_VERIFY_P256,
>>> + S390_FEAT_ECDSA_VERIFY_P384,
>>> + S390_FEAT_ECDSA_VERIFY_P512,
>>> + S390_FEAT_ECDSA_SIGN_P256,
>>> + S390_FEAT_ECDSA_SIGN_P384,
>>> + S390_FEAT_ECDSA_SIGN_P512,
>>> + S390_FEAT_EECDSA_SIGN_P256,
>>> + S390_FEAT_EECDSA_SIGN_P384,
>>> + S390_FEAT_EECDSA_SIGN_P512,
>>> + S390_FEAT_EDDSA_VERIFY_ED25519,
>>> + S390_FEAT_EDDSA_VERIFY_ED448,
>>> + S390_FEAT_EDDSA_SIGN_ED25519,
>>> + S390_FEAT_EDDSA_SIGN_ED448,
>>> + S390_FEAT_EEDDSA_SIGN_ED25519,
>>> + S390_FEAT_EEDDSA_SIGN_ED448,
>>> +
>>> S390_FEAT_MAX,
>>> } S390Feat;
>>>
>>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
>>> index b4bb5de635..d683635eb5 100644
>>> --- a/target/s390x/cpu_models.c
>>> +++ b/target/s390x/cpu_models.c
>>> @@ -782,6 +782,8 @@ static void check_consistency(const S390CPUModel *model)
>>> { S390_FEAT_SIE_CMMA, S390_FEAT_SIE_GSLS },
>>> { S390_FEAT_SIE_PFMFI, S390_FEAT_EDAT },
>>> { S390_FEAT_MSA_EXT_8, S390_FEAT_MSA_EXT_3 },
>>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_3 },
>>> + { S390_FEAT_MSA_EXT_9, S390_FEAT_MSA_EXT_4 },
>>> { S390_FEAT_MULTIPLE_EPOCH, S390_FEAT_TOD_CLOCK_STEERING },
>>> { S390_FEAT_VECTOR_PACKED_DECIMAL, S390_FEAT_VECTOR },
>>> { S390_FEAT_VECTOR_ENH, S390_FEAT_VECTOR },
>>> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
>>> index e4739a6b9f..a2f9e2b43f 100644
>>> --- a/target/s390x/gen-features.c
>>> +++ b/target/s390x/gen-features.c
>>> @@ -213,6 +213,38 @@
>>> S390_FEAT_KMA_GCM_EAES_192, \
>>> S390_FEAT_KMA_GCM_EAES_256
>>>
>>> +#define S390_FEAT_GROUP_MSA_EXT_9 \
>>> + S390_FEAT_MSA_EXT_9, \
>>> + S390_FEAT_ECDSA_VERIFY_P256, \
>>> + S390_FEAT_ECDSA_VERIFY_P384, \
>>> + S390_FEAT_ECDSA_VERIFY_P512, \
>>> + S390_FEAT_ECDSA_SIGN_P256, \
>>> + S390_FEAT_ECDSA_SIGN_P384, \
>>> + S390_FEAT_ECDSA_SIGN_P512, \
>>> + S390_FEAT_EECDSA_SIGN_P256, \
>>> + S390_FEAT_EECDSA_SIGN_P384, \
>>> + S390_FEAT_EECDSA_SIGN_P512, \
>>> + S390_FEAT_EDDSA_VERIFY_ED25519, \
>>> + S390_FEAT_EDDSA_VERIFY_ED448, \
>>> + S390_FEAT_EDDSA_SIGN_ED25519, \
>>> + S390_FEAT_EDDSA_SIGN_ED448, \
>>> + S390_FEAT_EEDDSA_SIGN_ED25519, \
>>> + S390_FEAT_EEDDSA_SIGN_ED448, \
>>> + S390_FEAT_PCC_SCALAR_MULT_P256, \
>>> + S390_FEAT_PCC_SCALAR_MULT_P384, \
>>> + S390_FEAT_PCC_SCALAR_MULT_P512, \
>>> + S390_FEAT_PCC_SCALAR_MULT_ED25519, \
>>> + S390_FEAT_PCC_SCALAR_MULT_ED448, \
>>> + S390_FEAT_PCC_SCALAR_MULT_X25519, \
>>> + S390_FEAT_PCC_SCALAR_MULT_X448
>>> +
>>> +#define S390_FEAT_GROUP_MSA_EXT_9_PCKMO \
>>> + S390_FEAT_PCKMO_ECC_P256, \
>>> + S390_FEAT_PCKMO_ECC_P384, \
>>> + S390_FEAT_PCKMO_ECC_P521, \
>>> + S390_FEAT_PCKMO_ECC_ED25519, \
>>> + S390_FEAT_PCKMO_ECC_ED448
>>> +
>>
>> Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
>
> Because those can be disabled at the HMC. It is painful to disable 5 elements
> for LPARs that are configured that way. So I created a group for those. That
> will allow to disable the full group.
> (we have the same issue with the exisiting AES and DEA pckmo functions).
Rings a bell, maybe that information would be good to have in the cover
letter. I guess Conny might want to change the description when picking up:
"Provide the MSA9 facility (stfle.155). This also contains pckmo
subfunctions for key wrapping. Keep them in a separate group to disable
those as a block if necessary. This is for example needed when disabling
key wrapping via the HMC."
Thanks
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-30 7:13 ` Cornelia Huck
0 siblings, 0 replies; 55+ messages in thread
From: Cornelia Huck @ 2019-04-30 7:13 UTC (permalink / raw)
To: David Hildenbrand
Cc: Christian Borntraeger, qemu-devel, qemu-s390x, Halil Pasic,
Richard Henderson, Collin Walling, Jason J . Herne
On Tue, 30 Apr 2019 09:00:56 +0200
David Hildenbrand <david@redhat.com> wrote:
> On 30.04.19 07:41, Christian Borntraeger wrote:
> >
> >
> > On 29.04.19 21:24, David Hildenbrand wrote:
> >> Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
> >
> > Because those can be disabled at the HMC. It is painful to disable 5 elements
> > for LPARs that are configured that way. So I created a group for those. That
> > will allow to disable the full group.
> > (we have the same issue with the exisiting AES and DEA pckmo functions).
>
> Rings a bell, maybe that information would be good to have in the cover
> letter. I guess Conny might want to change the description when picking up:
>
> "Provide the MSA9 facility (stfle.155). This also contains pckmo
> subfunctions for key wrapping. Keep them in a separate group to disable
> those as a block if necessary. This is for example needed when disabling
> key wrapping via the HMC."
Sure, makes sense to fold that in.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility
@ 2019-04-30 7:13 ` Cornelia Huck
0 siblings, 0 replies; 55+ messages in thread
From: Cornelia Huck @ 2019-04-30 7:13 UTC (permalink / raw)
To: David Hildenbrand
Cc: Jason J . Herne, Collin Walling, qemu-devel, Halil Pasic,
Christian Borntraeger, qemu-s390x, Richard Henderson
On Tue, 30 Apr 2019 09:00:56 +0200
David Hildenbrand <david@redhat.com> wrote:
> On 30.04.19 07:41, Christian Borntraeger wrote:
> >
> >
> > On 29.04.19 21:24, David Hildenbrand wrote:
> >> Just wondering, why keep the PCKMO ones separate, but not e.g. PCC ?
> >
> > Because those can be disabled at the HMC. It is painful to disable 5 elements
> > for LPARs that are configured that way. So I created a group for those. That
> > will allow to disable the full group.
> > (we have the same issue with the exisiting AES and DEA pckmo functions).
>
> Rings a bell, maybe that information would be good to have in the cover
> letter. I guess Conny might want to change the description when picking up:
>
> "Provide the MSA9 facility (stfle.155). This also contains pckmo
> subfunctions for key wrapping. Keep them in a separate group to disable
> those as a block if necessary. This is for example needed when disabling
> key wrapping via the HMC."
Sure, makes sense to fold that in.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-05-01 13:33 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-05-01 13:33 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
COPY RUNNER
RUN test-mingw in qemu:fedora
container_linux.go:247: starting container process caused "process_linux.go:258: applying cgroup configuration for process caused \"The maximum number of active connections for UID 0 has been reached\""
/usr/bin/docker-current: Error response from daemon: oci runtime error: The maximum number of active connections for UID 0 has been reached.
Traceback (most recent call last):
File "./tests/docker/docker.py", line 615, in <module>
sys.exit(main())
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-05-01 13:33 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-05-01 13:33 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
COPY RUNNER
RUN test-mingw in qemu:fedora
container_linux.go:247: starting container process caused "process_linux.go:258: applying cgroup configuration for process caused \"The maximum number of active connections for UID 0 has been reached\""
/usr/bin/docker-current: Error response from daemon: oci runtime error: The maximum number of active connections for UID 0 has been reached.
Traceback (most recent call last):
File "./tests/docker/docker.py", line 615, in <module>
sys.exit(main())
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-05-01 14:04 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-05-01 14:04 UTC (permalink / raw)
To: borntraeger
Cc: fam, cohuck, jjherne, walling, david, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
@ 2019-05-01 14:04 ` no-reply
0 siblings, 0 replies; 55+ messages in thread
From: no-reply @ 2019-05-01 14:04 UTC (permalink / raw)
To: borntraeger
Cc: fam, jjherne, walling, david, cohuck, qemu-devel, pasic, qemu-s390x, rth
Patchew URL: https://patchew.org/QEMU/20190429090250.7648-1-borntraeger@de.ibm.com/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/20190429090250.7648-1-borntraeger@de.ibm.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [qemu-s390x] [PATCH v3 0/9] s390x: new guest features
2019-04-29 16:08 ` Cornelia Huck
(?)
@ 2019-05-07 9:07 ` Christian Borntraeger
2019-05-07 9:49 ` Cornelia Huck
-1 siblings, 1 reply; 55+ messages in thread
From: Christian Borntraeger @ 2019-05-07 9:07 UTC (permalink / raw)
To: Cornelia Huck
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
On 29.04.19 18:08, Cornelia Huck wrote:
> On Mon, 29 Apr 2019 05:02:41 -0400
> Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>
>> Adding gen15.
>>
>> v2->v3: - merge deprecation patch into gen 15 patch
>> - fix comments
>> - use gen15a and gen15b instead of cpuid
>> v1->v2: - rework csske deprecation
>> - white space fixes
>> - also require msa4 for msa9
>>
>> Christian Borntraeger (9):
>> linux header sync
FWIW, all the patches are in kvm/next so they should hit 5.2-rc1. We can either wait
for that or do a header sync on kvm/next.
>
> I think we can do that sync once the companion kernel series hits the
> kvm next branch.
>
>> s390x/cpumodel: ignore csske for expansion
>> s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
>> s390x/cpumodel: msa9 facility
>
> This seems to be the only patch that does not yet have a R-b from David
> -- David, do you plan to review this one as well?
>
>> s390x/cpumodel: vector enhancements
>> s390x/cpumodel: enhanced sort facility
>> s390x/cpumodel: add Deflate-conversion facility
>> s390x/cpumodel: add gen15 defintions
>> s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
>>
>> linux-headers/asm-s390/kvm.h | 5 +-
>> target/s390x/cpu_features.c | 54 ++++++++++++++++
>> target/s390x/cpu_features.h | 3 +
>> target/s390x/cpu_features_def.h | 49 +++++++++++++++
>> target/s390x/cpu_models.c | 13 ++--
>> target/s390x/gen-features.c | 105 ++++++++++++++++++++++++++++++++
>> target/s390x/kvm.c | 18 ++++++
>> 7 files changed, 242 insertions(+), 5 deletions(-)
>>
>
> Only thing I noticed were some minor typos in some commit messages, I
> can fix up while applying.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [qemu-s390x] [PATCH v3 0/9] s390x: new guest features
2019-05-07 9:07 ` [Qemu-devel] [qemu-s390x] " Christian Borntraeger
@ 2019-05-07 9:49 ` Cornelia Huck
0 siblings, 0 replies; 55+ messages in thread
From: Cornelia Huck @ 2019-05-07 9:49 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
On Tue, 7 May 2019 11:07:50 +0200
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> On 29.04.19 18:08, Cornelia Huck wrote:
> > On Mon, 29 Apr 2019 05:02:41 -0400
> > Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> >
> >> Adding gen15.
> >>
> >> v2->v3: - merge deprecation patch into gen 15 patch
> >> - fix comments
> >> - use gen15a and gen15b instead of cpuid
> >> v1->v2: - rework csske deprecation
> >> - white space fixes
> >> - also require msa4 for msa9
> >>
> >> Christian Borntraeger (9):
> >> linux header sync
>
> FWIW, all the patches are in kvm/next so they should hit 5.2-rc1. We can either wait
> for that or do a header sync on kvm/next.
I'd prefer to wait for the kvm patches to hit master... there are some
changes I'd like to include in a headers sync (for vfio-ccw) that are
already in master (but do not go via the kvm tree).
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/9] s390x: new guest features
2019-04-29 9:02 ` Christian Borntraeger
` (18 preceding siblings ...)
(?)
@ 2019-05-20 6:42 ` Cornelia Huck
-1 siblings, 0 replies; 55+ messages in thread
From: Cornelia Huck @ 2019-05-20 6:42 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Jason J . Herne, Collin Walling, David Hildenbrand, qemu-devel,
Halil Pasic, qemu-s390x, Richard Henderson
On Mon, 29 Apr 2019 05:02:41 -0400
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> Adding gen15.
>
> v2->v3: - merge deprecation patch into gen 15 patch
> - fix comments
> - use gen15a and gen15b instead of cpuid
> v1->v2: - rework csske deprecation
> - white space fixes
> - also require msa4 for msa9
>
> Christian Borntraeger (9):
> linux header sync
> s390x/cpumodel: ignore csske for expansion
> s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3
> s390x/cpumodel: msa9 facility
> s390x/cpumodel: vector enhancements
> s390x/cpumodel: enhanced sort facility
> s390x/cpumodel: add Deflate-conversion facility
> s390x/cpumodel: add gen15 defintions
> s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
>
> linux-headers/asm-s390/kvm.h | 5 +-
> target/s390x/cpu_features.c | 54 ++++++++++++++++
> target/s390x/cpu_features.h | 3 +
> target/s390x/cpu_features_def.h | 49 +++++++++++++++
> target/s390x/cpu_models.c | 13 ++--
> target/s390x/gen-features.c | 105 ++++++++++++++++++++++++++++++++
> target/s390x/kvm.c | 18 ++++++
> 7 files changed, 242 insertions(+), 5 deletions(-)
>
Thanks, queued to s390-next (with a proper header sync against
5.2-rc1).
^ permalink raw reply [flat|nested] 55+ messages in thread
end of thread, other threads:[~2019-05-20 6:43 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-29 9:02 [Qemu-devel] [PATCH v3 0/9] s390x: new guest features Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 1/9] linux header sync Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 2/9] s390x/cpumodel: ignore csske for expansion Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 3/9] s390x/cpumodel: Miscellaneous-Instruction-Extensions Facility 3 Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 4/9] s390x/cpumodel: msa9 facility Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 19:24 ` David Hildenbrand
2019-04-29 19:24 ` David Hildenbrand
2019-04-30 5:41 ` Christian Borntraeger
2019-04-30 5:41 ` Christian Borntraeger
2019-04-30 7:00 ` David Hildenbrand
2019-04-30 7:00 ` David Hildenbrand
2019-04-30 7:13 ` Cornelia Huck
2019-04-30 7:13 ` Cornelia Huck
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 5/9] s390x/cpumodel: vector enhancements Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 6/9] s390x/cpumodel: enhanced sort facility Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 7/9] s390x/cpumodel: add Deflate-conversion facility Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 10:19 ` David Hildenbrand
2019-04-29 10:19 ` David Hildenbrand
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 8/9] s390x/cpumodel: add gen15 defintions Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 10:18 ` David Hildenbrand
2019-04-29 10:18 ` David Hildenbrand
2019-04-29 9:02 ` [Qemu-devel] [PATCH v3 9/9] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines Christian Borntraeger
2019-04-29 9:02 ` Christian Borntraeger
2019-04-29 10:17 ` David Hildenbrand
2019-04-29 10:17 ` David Hildenbrand
2019-04-29 9:25 ` [Qemu-devel] [PATCH v3 0/9] s390x: new guest features no-reply
2019-04-29 9:25 ` no-reply
2019-04-29 9:30 ` no-reply
2019-04-29 9:30 ` no-reply
2019-04-29 9:35 ` no-reply
2019-04-29 9:35 ` no-reply
2019-04-29 9:40 ` no-reply
2019-04-29 9:40 ` no-reply
2019-04-29 10:28 ` no-reply
2019-04-29 10:28 ` no-reply
2019-04-29 16:08 ` Cornelia Huck
2019-04-29 16:08 ` Cornelia Huck
2019-05-07 9:07 ` [Qemu-devel] [qemu-s390x] " Christian Borntraeger
2019-05-07 9:49 ` Cornelia Huck
2019-04-29 19:28 ` [Qemu-devel] " no-reply
2019-04-29 19:28 ` no-reply
2019-05-01 13:33 ` no-reply
2019-05-01 13:33 ` no-reply
2019-05-01 14:04 ` no-reply
2019-05-01 14:04 ` no-reply
2019-05-20 6:42 ` Cornelia Huck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.