more s390 updates for 5.17 merge window
Heiko Carstens
maintainerHi Linus,
please pull more s390 updates for 5.17 merge window.
Thanks,
Heiko
The following changes since commit f0d43b3a3809f280806825df2454fd83f71874c4:
Merge tag 's390-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (2022-01-10 08:58:16 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.17-2
for you to fetch changes up to 5754f9084f261f6fbfdcc6e57dae97c86a6ff688:
s390: add Sven Schnelle as reviewer (2022-01-17 14:13:09 +0100)
----------------------------------------------------------------
more s390 updates for 5.17 merge window
- add Sven Schnelle as reviewer for s390 code
- make uaccess code more readable
- change cpu measurement facility code to also support counter second version number 7, and add discard support for limited samples
----------------------------------------------------------------
Heiko Carstens (1):
s390: add Sven Schnelle as reviewer
Nico Boehr (1):
s390/uaccess: introduce bit field for OAC specifier
Thomas Richter (2):
s390/cpumf: Support for CPU Measurement Facility CSVN 7 s390/cpumf: Support for CPU Measurement Sampling Facility LS bit
MAINTAINERS | 1 + arch/s390/include/asm/cpu_mf.h | 4 +- arch/s390/include/asm/uaccess.h | 120 +++++++++++++++++++++------------ arch/s390/kernel/perf_cpum_cf_common.c | 4 +- arch/s390/kernel/perf_cpum_cf_events.c | 6 +- arch/s390/kernel/perf_cpum_sf.c | 2 +- arch/s390/lib/uaccess.c | 24 +++++-- 7 files changed, 105 insertions(+), 56 deletions(-)
MAINTAINERS +1 -0
@@ -16611,6 +16611,7 @@ M: Heiko Carstens <[email protected]> M: Vasily Gorbik <[email protected]> M: Christian Borntraeger <[email protected]> R: Alexander Gordeev <[email protected]> +R: Sven Schnelle <[email protected]> L: [email protected] S: Supported W: http://www.ibm.com/developerworks/linux/linux390/
arch/s390/include/asm/cpu_mf.h +3 -1
@@ -109,7 +109,9 @@ struct hws_basic_entry { unsigned int AS:2; /* 29-30 PSW address-space control */ unsigned int I:1; /* 31 entry valid or invalid */ unsigned int CL:2; /* 32-33 Configuration Level */ - unsigned int:14; + unsigned int H:1; /* 34 Host Indicator */ + unsigned int LS:1; /* 35 Limited Sampling */ + unsigned int:12; unsigned int prim_asn:16; /* primary ASN */unsigned long long ia;/* Instruction Address */ unsigned long long gpp;/* Guest Program Parameter */
arch/s390/include/asm/uaccess.h +77 -43
152 lines not on this page · raw message
arch/s390/kernel/perf_cpum_cf_common.c +2 -2
@@ -178,7 +178,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset,case CPUMF_CTR_SET_CRYPTO :if (info->csvn >=1 && info->csvn <=5 ) ctrset_size =16 ; -else if (info->csvn ==6 ) +else if (info->csvn ==6 || info->csvn ==7 ) ctrset_size =20 ;break ;case CPUMF_CTR_SET_EXT :
@@ -188,7 +188,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset, ctrset_size =48 ; else if (info->csvn >= 3 && info->csvn <= 5) ctrset_size =128 ; - else if (info->csvn == 6) + else if (info->csvn == 6 || info->csvn == 7) ctrset_size =160 ;break ;case CPUMF_CTR_SET_MT_DIAG :
arch/s390/kernel/perf_cpum_cf_events.c +3 -3
@@ -344,7 +344,7 @@ static struct attribute *cpumcf_svn_12345_pmu_event_attr[] __initdata = { NULL, }; -static struct attribute *cpumcf_svn_6_pmu_event_attr[]__initdata = { +static struct attribute *cpumcf_svn_67_pmu_event_attr[]__initdata = {CPUMF_EVENT_PTR (cf_svn_12345,PRNG_FUNCTIONS ),CPUMF_EVENT_PTR (cf_svn_12345,PRNG_CYCLES ),CPUMF_EVENT_PTR (cf_svn_12345,PRNG_BLOCKED_FUNCTIONS ),
@@ -715,8 +715,8 @@ __init const struct attribute_group **cpumf_cf_event_group(void) case 1 ... 5: csvn = cpumcf_svn_12345_pmu_event_attr;break ; -case 6 : - csvn = cpumcf_svn_6_pmu_event_attr; + case 6 ... 7: + csvn = cpumcf_svn_67_pmu_event_attr;break ;default : csvn = none;
arch/s390/kernel/perf_cpum_sf.c +1 -1
@@ -1179,7 +1179,7 @@ static void hw_collect_samples(struct perf_event *event, unsigned long *sdbt, sample = (struct hws_basic_entry *) *sdbt;while ((unsigned long *) sample < (unsigned long *) te) {/* Check for an empty sample */ -if (!sample->def) +if (!sample->def || sample->LS)break ;/* Update perf event period */
arch/s390/lib/uaccess.c +18 -6
@@ -62,10 +62,14 @@ static inline unsigned long copy_from_user_mvcos(void *x, const void __user *ptr unsigned long size) {unsigned long tmp1, tmp2; +union oac spec = { + .oac2.as =PSW_BITS_AS_SECONDARY , + .oac2.a =1 , + }; tmp1 =-4096UL ; asmvolatile ( -" lghi 0,%[spec]\n" +" lr 0,%[spec]\n" "0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n" "6: jz 4f\n" "1: algr %0,%3\n"
@@ -84,7 +88,7 @@ static inline unsigned long copy_from_user_mvcos(void *x, const void __user *ptr"5:\n" EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b) : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) - : [spec] "K" (0x81UL) + : [spec] "d" (spec.val) : "cc", "memory", "0");return size; }
@@ -135,10 +139,14 @@ static inline unsigned long copy_to_user_mvcos(void __user *ptr, const void *x, unsigned long size) {unsigned long tmp1, tmp2; +union oac spec = { + .oac1.as =PSW_BITS_AS_SECONDARY , + .oac1.a =1 , + }; tmp1 =-4096UL ; asmvolatile ( -" llilh 0,%[spec]\n" +" lr 0,%[spec]\n" "0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n" "6: jz 4f\n" "1: algr %0,%3\n"
@@ -157,7 +165,7 @@ static inline unsigned long copy_to_user_mvcos(void __user *ptr, const void *x,"5:\n" EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b) : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) - : [spec] "K" (0x81UL) + : [spec] "d" (spec.val) : "cc", "memory", "0");return size; }
@@ -207,10 +215,14 @@ EXPORT_SYMBOL(raw_copy_to_user);static inline unsigned long clear_user_mvcos (void __user *to,unsigned long size) {unsigned long tmp1, tmp2; +union oac spec = { + .oac1.as =PSW_BITS_AS_SECONDARY , + .oac1.a =1 , + }; tmp1 =-4096UL ; asmvolatile ( -" llilh 0,%[spec]\n" +" lr 0,%[spec]\n" "0: .insn ss,0xc80000000000,0(%0,%1),0(%4),0\n" " jz 4f\n" "1: algr %0,%2\n"
@@ -228,7 +240,7 @@ static inline unsigned long clear_user_mvcos(void __user *to, unsigned long size"5:\n" EX_TABLE(0b,2b) EX_TABLE(3b,5b) : "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2) - : "a" (empty_zero_page), [spec] "K" (0x81UL) + : "a" (empty_zero_page), [spec] "d" (spec.val) : "cc", "memory", "0");return size; }
The pull request you sent on Thu, 20 Jan 2022 19:56:28 +0100:
The pull request you sent on Thu, 20 Jan 2022 19:56:28 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.17-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/85e67d56ebdecd8601d62e3aadcd2927845c97b9
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html