s390 patches for 2.6.26-rc1
Subsystems (6)
cover s390 patches for 2.6.26-rc1
The current s390 patch queue for 2.6.26-rc1. The most interesting patch is the guest page hinting patch for unused pages. It is purely s390 so it should be fine to push this even after -rc1, no?
Christian Borntraeger (1):
[S390] s390-kvm: leave sie context on work. Removes preemption requirement
Heiko Carstens (1):
[S390] tty3270: fix put_char fail/success conversion.
Martin Schwidefsky (3):
[S390] s390: Optimize user and work TIF check [S390] s390mach compile warning [S390] guest page hinting light
Michael Ernst (2):
[S390] cio: Remove cio_msg kernel parameter. [S390] cio: Fix parsing mechanism for blacklisted devices.
Roland McGrath (1):
[S390] compat ptrace cleanup
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 1/8 s390: Optimize user and work TIF check
From: Martin Schwidefsky <[email protected]>
On return from syscall or interrupt, we have to check if we return to userspace (likely) and if there is work todo (less likely) to decide if we handle the work. We can optimize this check: we first check for the less likely work case and then check for userspace.
This patch is also a preparation for an additional patch, that fixes a bug in KVM dealing with cpu bound guests.
---
arch/s390/kernel/entry.S | 29 ++++++++++++++--------------- arch/s390/kernel/entry64.S | 29 ++++++++++++++--------------- 2 files changed, 28 insertions(+), 30 deletions(-)
arch/s390/kernel/entry64.S +14 -15
@@ -271,8 +271,6 @@ sysc_noemu: stg %r2,SP_R2(%r15) # store return value (change R2 on stack) sysc_return: - tm SP_PSW+1(%r15),0x01 # returning to user ? - jno sysc_restore tm __TI_flags+7(%r9),_TIF_WORK_SVC jnz sysc_work # there is work to do (signals etc.) sysc_restore:
@@ -304,6 +302,8 @@ sysc_work_loop: # One of the work bits is on. Find out which one. # sysc_work: + tm SP_PSW+1(%r15),0x01 # returning to user ? + jno sysc_restore tm __TI_flags+7(%r9),_TIF_MCCK_PENDING jo sysc_mcck_pending tm __TI_flags+7(%r9),_TIF_NEED_RESCHED
@@ -585,12 +585,6 @@ io_no_vtime: la %r2,SP_PTREGS(%r15) # address of register-save area brasl %r14,do_IRQ # call standard irq handler io_return: - tm SP_PSW+1(%r15),0x01 # returning to user ? -#ifdef CONFIG_PREEMPT - jno io_preempt # no -> check for preemptive scheduling -#else - jno io_restore # no-> skip resched & signal -#endif tm __TI_flags+7(%r9),_TIF_WORK_INT jnz io_work # there is work to do (signals etc.) io_restore:
@@ -612,10 +606,18 @@ io_restore_trace_psw: .quad 0, io_restore_trace #endif -#ifdef CONFIG_PREEMPT -io_preempt: +# +# switch to kernel stack, then check TIF bits +# +io_work: + tm SP_PSW+1(%r15),0x01 # returning to user ? +#ifndef CONFIG_PREEMPT + jno io_restore # no-> skip resched & signal +#else + jnz io_work_user # yes -> do resched & signal + # check for preemptive scheduling icm %r0,15,__TI_precount(%r9) - jnz io_restore + jnz io_restore # preemption is disabled # switch to kernel stack lg %r1,SP_R15(%r15) aghi %r1,-SP_SIZE
@@ -629,10 +631,7 @@ io_resume_loop: jg preempt_schedule_irq #endif -# -# switch to kernel stack, then check TIF bits -# -io_work: +io_work_user: lg %r1,__LC_KERNEL_STACK aghi %r1,-SP_SIZE mvc SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
arch/s390/kernel/entry.S +14 -15
@@ -279,8 +279,6 @@ sysc_do_restart: st %r2,SP_R2(%r15) # store return value (change R2 on stack) sysc_return: - tm SP_PSW+1(%r15),0x01 # returning to user ? - bno BASED(sysc_restore) tm __TI_flags+3(%r9),_TIF_WORK_SVC bnz BASED(sysc_work) # there is work to do (signals etc.) sysc_restore:
@@ -312,6 +310,8 @@ sysc_work_loop: # One of the work bits is on. Find out which one. # sysc_work: + tm SP_PSW+1(%r15),0x01 # returning to user ? + bno BASED(sysc_restore) tm __TI_flags+3(%r9),_TIF_MCCK_PENDING bo BASED(sysc_mcck_pending) tm __TI_flags+3(%r9),_TIF_NEED_RESCHED
@@ -602,12 +602,6 @@ io_no_vtime: la %r2,SP_PTREGS(%r15) # address of register-save area basr %r14,%r1 # branch to standard irq handler io_return: - tm SP_PSW+1(%r15),0x01 # returning to user ? -#ifdef CONFIG_PREEMPT - bno BASED(io_preempt) # no -> check for preemptive scheduling -#else - bno BASED(io_restore) # no-> skip resched & signal -#endif tm __TI_flags+3(%r9),_TIF_WORK_INT bnz BASED(io_work) # there is work to do (signals etc.) io_restore:
@@ -629,10 +623,18 @@ io_restore_trace_psw: .long 0, io_restore_trace + 0x80000000 #endif -#ifdef CONFIG_PREEMPT -io_preempt: +# +# switch to kernel stack, then check the TIF bits +# +io_work: + tm SP_PSW+1(%r15),0x01 # returning to user ? +#ifndef CONFIG_PREEMPT + bno BASED(io_restore) # no-> skip resched & signal +#else + bnz BASED(io_work_user) # no -> check for preemptive scheduling + # check for preemptive scheduling icm %r0,15,__TI_precount(%r9) - bnz BASED(io_restore) + bnz BASED(io_restore) # preemption disabled l %r1,SP_R15(%r15) s %r1,BASED(.Lc_spsize) mvc SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
@@ -646,10 +648,7 @@ io_resume_loop: br %r1 # call schedule #endif -# -# switch to kernel stack, then check the TIF bits -# -io_work: +io_work_user: l %r1,__LC_KERNEL_STACK s %r1,BASED(.Lc_spsize) mvc SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 2/8 s390-kvm: leave sie context on work. Removes preemption requirement
In reply to Martin SchwidefskyFrom: Christian Borntraeger <[email protected]>
From: Martin Schwidefsky <[email protected]>
This patch fixes a bug with cpu bound guest on kvm-s390. Sometimes it was impossible to deliver a signal to a spinning guest. We used preemption as a circumvention. The preemption notifiers called vcpu_load, which checked for pending signals and triggered a host intercept. But even with preemption, a sigkill was not delivered immediately.
This patch changes the low level host interrupt handler to check for the SIE instruction, if TIF_WORK is set. In that case we change the instruction pointer of the return PSW to rerun the vcpu_run loop. The kvm code sees an intercept reason 0 if that happens. This patch adds accounting for these types of intercept as well.
The advantages:
- works with and without preemption
- signals are delivered immediately
- much better host latencies without preemption
---
arch/s390/kernel/entry64.S | 30 +++++++++++++++++++++++++++++- arch/s390/kvm/Kconfig | 1 - arch/s390/kvm/intercept.c | 3 +++ arch/s390/kvm/kvm-s390.c | 5 +---- include/asm-s390/kvm_host.h | 1 + 5 files changed, 34 insertions(+), 6 deletions(-)
arch/s390/kernel/entry64.S +29 -1
@@ -607,14 +607,37 @@ io_restore_trace_psw: #endif # -# switch to kernel stack, then check TIF bits +# There is work todo, we need to check if we return to userspace, then +# check, if we are in SIE, if yes leave it # io_work: tm SP_PSW+1(%r15),0x01 # returning to user ? #ifndef CONFIG_PREEMPT +#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) + jnz io_work_user # yes -> no need to check for SIE + la %r1, BASED(sie_opcode) # we return to kernel here + lg %r2, SP_PSW+8(%r15) + clc 0(2,%r1), 0(%r2) # is current instruction = SIE? + jne io_restore # no-> return to kernel + lg %r1, SP_PSW+8(%r15) # yes-> add 4 bytes to leave SIE + aghi %r1, 4 + stg %r1, SP_PSW+8(%r15) + j io_restore # return to kernel +#else jno io_restore # no-> skip resched & signal +#endif #else jnz io_work_user # yes -> do resched & signal +#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) + la %r1, BASED(sie_opcode) + lg %r2, SP_PSW+8(%r15) + clc 0(2,%r1), 0(%r2) # is current instruction = SIE? + jne 0f # no -> leave PSW alone + lg %r1, SP_PSW+8(%r15) # yes-> add 4 bytes to leave SIE + aghi %r1, 4 + stg %r1, SP_PSW+8(%r15) +0: +#endif # check for preemptive scheduling icm %r0,15,__TI_precount(%r9) jnz io_restore # preemption is disabled
@@ -652,6 +675,11 @@ io_work_loop: j io_restore io_work_done: +#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) +sie_opcode: + .long 0xb2140000 +#endif + # # _TIF_MCCK_PENDING is set, call handler #
arch/s390/kvm/intercept.c +3 -0
@@ -105,6 +105,9 @@ static intercept_handler_t instruction_hstatic int handle_noop (struct kvm_vcpu *vcpu) {switch (vcpu->arch.sie_block->icptcode) { +case 0x0 : + vcpu->stat.exit_null++; +break ;case 0x10 : vcpu->stat.exit_external_request++;break ;
arch/s390/kvm/Kconfig +0 -1
@@ -22,7 +22,6 @@ config KVM select PREEMPT_NOTIFIERS select ANON_INODES select S390_SWITCH_AMODE - select PREEMPT ---help--- Support hosting paravirtualized guest machines using the SIE virtualization capability on the mainframe. This should work
arch/s390/kvm/kvm-s390.c +1 -4
@@ -31,6 +31,7 @@struct kvm_stats_debugfs_item debugfs_entries[] = { {"userspace_handled" ,VCPU_STAT (exit_userspace) }, + {"exit_null" ,VCPU_STAT (exit_null) }, {"exit_validity" ,VCPU_STAT (exit_validity) }, {"exit_stop_request" ,VCPU_STAT (exit_stop_request) }, {"exit_external_request" ,VCPU_STAT (exit_external_request) },
@@ -221,10 +222,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu vcpu->arch.guest_fpregs.fpc &=FPC_VALID_MASK ;restore_fp_regs (&vcpu->arch.guest_fpregs);restore_access_regs (vcpu->arch.guest_acrs); - -if (signal_pending (current)) -atomic_set_mask (CPUSTAT_STOP_INT , - &vcpu->arch.sie_block->cpuflags); }void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu)
include/asm-s390/kvm_host.h +1 -0
@@ -104,6 +104,7 @@ struct sie_block {struct kvm_vcpu_stat {u32 exit_userspace; +u32 exit_null;u32 exit_external_request;u32 exit_external_interrupt;u32 exit_stop_request;
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 3/8 cio: Remove cio_msg kernel parameter.
In reply to Martin SchwidefskyFrom: Michael Ernst <[email protected]>
The only sporadically used CIO_DEBUG messages are replaced by ordinary CIO_MSG_EVENT messages. The CIO_MSG_EVENT messages debug levels are consolidated.
---
Documentation/s390/CommonIO | 11 ---------- drivers/s390/cio/blacklist.c | 1 drivers/s390/cio/cio.c | 39 +++++++++--------------------------- drivers/s390/cio/cio.h | 2 - drivers/s390/cio/cio_debug.h | 6 ----- drivers/s390/cio/css.c | 4 +-- drivers/s390/cio/device.c | 25 +++++++++++------------ drivers/s390/cio/device_fsm.c | 44 ++++++++++++++++++++--------------------- drivers/s390/cio/device_id.c | 4 +-- drivers/s390/cio/device_pgid.c | 12 +++++------ 10 files changed, 54 insertions(+), 94 deletions(-)
Documentation/s390/CommonIO +0 -11
@@ -8,17 +8,6 @@ Command line parameters Enable logging of debug information in case of ccw device timeouts. - -* cio_msg = yes | no - - Determines whether information on found devices and sensed device - characteristics should be shown during startup or when new devices are - found, i. e. messages of the types "Detected device 0.0.4711 on subchannel - 0.0.0042" and "SenseID: Device 0.0.4711 reports: ...". - - Default is off. - - * cio_ignore = {all} | {<device> | <range of devices>} | {!<device> | !<range of devices>}
drivers/s390/cio/blacklist.c +0 -1
@@ -199,7 +199,6 @@ blacklist_parse_parameters (char *str, rstatic int __init blacklist_setup (char *str) { -CIO_MSG_EVENT (6 ,"Reading blacklist parameters\n" );return blacklist_parse_parameters (str, add); }
drivers/s390/cio/cio.c +10 -29
@@ -39,23 +39,6 @@ debug_info_t *cio_debug_msg_id;debug_info_t *cio_debug_trace_id;debug_info_t *cio_debug_crw_id; -int cio_show_msg; - -static int __init -cio_setup (char *parm) -{ -if (!strcmp (parm,"yes" )) - cio_show_msg =1 ; -else if (!strcmp (parm,"no" )) - cio_show_msg =0 ; -else -printk (KERN_ERR "cio: cio_setup: " -"invalid cio_msg parameter '%s'" , parm); -return 1 ; -} - -__setup ("cio_msg=" , cio_setup); -/* * Function: cio_debug_init * Initializes three debug logs for common I/O:
@@ -166,7 +149,7 @@ cio_start_handle_notoper(struct subchannstsch (sch->schid, &sch->schib); -CIO_MSG_EVENT (0 ,"cio_start: 'not oper' status for " +CIO_MSG_EVENT (2 ,"cio_start: 'not oper' status for " "subchannel 0.%x.%04x!\n" , sch->schid.ssid, sch->schid.sch_no);sprintf (dbf_text,"no%s" , sch->dev.bus_id);
@@ -567,10 +550,9 @@ cio_validate_subchannel (struct subchann* ... just being curious we check for non I/O subchannels */ if (sch->st !=0 ) { -CIO_DEBUG (KERN_INFO ,0 , -"Subchannel 0.%x.%04x reports " -"non-I/O subchannel type %04X\n" , - sch->schid.ssid, sch->schid.sch_no, sch->st); +CIO_MSG_EVENT (4 ,"Subchannel 0.%x.%04x reports " +"non-I/O subchannel type %04X\n" , + sch->schid.ssid, sch->schid.sch_no, sch->st);/* We stop here for non-io subchannels. */ err = sch->st; goto out;
@@ -588,7 +570,7 @@ cio_validate_subchannel (struct subchann* This device must not be known to Linux. So we simply * say that there is no device and return ENODEV. */ -CIO_MSG_EVENT (4 ,"Blacklisted device detected " +CIO_MSG_EVENT (6 ,"Blacklisted device detected " "at devno %04X, subchannel set %x\n" , sch->schib.pmcw.dev, sch->schid.ssid); err = -ENODEV ;
@@ -601,12 +583,11 @@ cio_validate_subchannel (struct subchann sch->lpm = sch->schib.pmcw.pam & sch->opm; sch->isc =3 ; -CIO_DEBUG (KERN_INFO ,0 , -"Detected device %04x on subchannel 0.%x.%04X" -" - PIM = %02X, PAM = %02X, POM = %02X\n" , - sch->schib.pmcw.dev, sch->schid.ssid, - sch->schid.sch_no, sch->schib.pmcw.pim, - sch->schib.pmcw.pam, sch->schib.pmcw.pom); +CIO_MSG_EVENT (6 ,"Detected device %04x on subchannel 0.%x.%04X " +"- PIM = %02X, PAM = %02X, POM = %02X\n" , + sch->schib.pmcw.dev, sch->schid.ssid, + sch->schid.sch_no, sch->schib.pmcw.pim, + sch->schib.pmcw.pam, sch->schib.pmcw.pom);/* * We now have to initially ...
drivers/s390/cio/cio_debug.h +0 -6
@@ -31,10 +31,4 @@ static inline void CIO_HEX_EVENT(int lev } } -#define CIO_DEBUG(printk_level, event_level, msg...) do { \ - if (cio_show_msg) \ - printk(printk_level "cio: " msg); \ - CIO_MSG_EVENT(event_level, msg); \ - } while (0) -#endif
drivers/s390/cio/cio.h +0 -2
@@ -118,6 +118,4 @@ extern void *cio_get_console_priv(void);#define cio_get_console_priv () NULL#endif -extern int cio_show_msg; -#endif
drivers/s390/cio/css.c +2 -2
@@ -570,7 +570,7 @@ static void reprobe_all(struct work_stru {int ret; -CIO_MSG_EVENT (2 ,"reprobe start\n" ); +CIO_MSG_EVENT (4 ,"reprobe start\n" ); need_reprobe =0 ;/* Make sure initial subchannel scan is done. */
@@ -578,7 +578,7 @@ static void reprobe_all(struct work_stru atomic_read(&ccw_device_init_count) == 0); ret =for_each_subchannel_staged (NULL , reprobe_subchannel,NULL ); -CIO_MSG_EVENT (2 ,"reprobe done (rc=%d, need_reprobe=%d)\n" , ret, +CIO_MSG_EVENT (4 ,"reprobe done (rc=%d, need_reprobe=%d)\n" , ret, need_reprobe); }
drivers/s390/cio/device.c +12 -13
@@ -341,7 +341,7 @@ ccw_device_remove_disconnected(struct cc rc =device_schedule_callback (&cdev->dev, ccw_device_remove_orphan_cb);if (rc) -CIO_MSG_EVENT (2 ,"Couldn't unregister orphan " +CIO_MSG_EVENT (0 ,"Couldn't unregister orphan " "0.%x.%04x\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -351,7 +351,7 @@ ccw_device_remove_disconnected(struct cc rc =device_schedule_callback (cdev->dev.parent, ccw_device_remove_sch_cb);if (rc) -CIO_MSG_EVENT (2 ,"Couldn't unregister disconnected device " +CIO_MSG_EVENT (0 ,"Couldn't unregister disconnected device " "0.%x.%04x\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -397,7 +397,7 @@ int ccw_device_set_offline(struct ccw_deif (ret ==0 )wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev));else { -CIO_MSG_EVENT (2 ,"ccw_device_offline returned %d, " +CIO_MSG_EVENT (0 ,"ccw_device_offline returned %d, " "device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -433,7 +433,7 @@ int ccw_device_set_online(struct ccw_devif (ret ==0 )wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev));else { -CIO_MSG_EVENT (2 ,"ccw_device_online returned %d, " +CIO_MSG_EVENT (0 ,"ccw_device_online returned %d, " "device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -451,7 +451,7 @@ int ccw_device_set_online(struct ccw_devif (ret ==0 )wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev));else -CIO_MSG_EVENT (2 ,"ccw_device_offline returned %d, " +CIO_MSG_EVENT (0 ,"ccw_device_offline returned %d, " "device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -803,7 +803,7 @@ static void sch_attach_disconnected_devi other_sch =to_subchannel (get_device (cdev->dev.parent)); ret =device_move (&cdev->dev, &sch->dev);if (ret) { -CIO_MSG_EVENT (2 ,"Moving disconnected device 0.%x.%04x failed " +CIO_MSG_EVENT (0 ,"Moving disconnected device 0.%x.%04x failed " "(ret=%d)!\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno, ret);put_device (&other_sch->dev);
@@ -933,7 +933,7 @@ io_subchannel_register(struct work_struc ret =device_reprobe (&cdev->dev);if (ret)/* We can't do much here. */ -CIO_MSG_EVENT (2 ,"device_reprobe() returned" +CIO_MSG_EVENT (0 ,"device_reprobe() returned" " %d for 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -1086,7 +1086,7 @@ static void ccw_device_move_to_sch(struc rc =device_move (&cdev->dev, &sch->dev);mutex_unlock (&sch->reg_mutex);if (rc) { - CIO_MSG_EVENT(2, "Moving device 0.%x.%04x to subchannel " + CIO_MSG_EVENT(0, "Moving device 0.%x.%04x to subchannel " "0.%x.%04x failed (ret=%d)!\n", cdev->private->dev_id.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
@@ -1446,8 +1446,7 @@ ccw_device_remove (struct device *dev)wait_event (cdev->private->wait_q,dev_fsm_final_state (cdev)); else - //FIXME: we can't fail! - CIO_MSG_EVENT(2, "ccw_device_offline returned %d, " + CIO_MSG_EVENT(0, "ccw_device_offline returned %d, ""device 0.%x.%04x\n" , ret, cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
@@ -1524,7 +1523,7 @@ static int recovery_check(struct devicespin_lock_irq (cdev->ccwlock);switch (cdev->private->state) {case DEV_STATE_DISCONNECTED : -CIO_MSG_EVENT (3 ,"recovery: trigger 0.%x.%04x\n" , +CIO_MSG_EVENT (4 ,"recovery: trigger 0.%x.%04x\n" , cdev->private->dev_id.ssid, cdev->private->dev_id.devno);dev_fsm_event (cdev,DEV_EVENT_VERIFY );
@@ -1554,7 +1553,7 @@ static void recovery_work_func(struct wo }spin_unlock_irq (&recovery_lock); }else -CIO_MSG_EVENT (2 ,"recovery: end\n" ); +CIO_MSG_EVENT (4 ,"recovery: end\n" ); } static DECLARE_WORK(recovery_work, recovery_work_func);
@@ -1572,7 +1571,7 @@ void ccw_device_schedule_recovery(void) {unsigned long flags; -CIO_MSG_EVENT (2 ,"recovery: schedule\n" ); +CIO_MSG_EVENT (4 ,"recovery: schedule\n" );spin_lock_irqsave (&recovery_lock, flags);if (!timer_pending (&recovery_timer) || (recovery_phase !=0 )) { recovery_phase =0 ;
drivers/s390/cio/device_fsm.c +22 -22
76 lines not on this page · raw message
drivers/s390/cio/device_id.c +2 -2
@@ -214,7 +214,7 @@ ccw_device_check_sense_id(struct ccw_dev* sense id information. So, for intervention required, * we use the "whack it until it talks" strategy... */ -CIO_MSG_EVENT (2 ,"SenseID : device %04x on Subchannel " +CIO_MSG_EVENT (0 ,"SenseID : device %04x on Subchannel " "0.%x.%04x reports cmd reject\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no);
@@ -239,7 +239,7 @@ ccw_device_check_sense_id(struct ccw_dev lpm =to_io_private (sch)->orb.lpm;if ((lpm & sch->schib.pmcw.pim & sch->schib.pmcw.pam) !=0 ) - CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x " + CIO_MSG_EVENT(4, "SenseID : path %02X for device %04x " "on subchannel 0.%x.%04x is " "'not operational'\n", lpm, cdev->private->dev_id.devno,
drivers/s390/cio/device_pgid.c +6 -6
@@ -79,7 +79,7 @@ __ccw_device_sense_pgid_start(struct ccw/* ret is 0, -EBUSY, -EACCES or -ENODEV */ if (ret != -EACCES )return ret; - CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel " + CIO_MSG_EVENT(3, "SNID - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not " "operational'\n", cdev->private->dev_id.devno,
@@ -159,7 +159,7 @@ __ccw_device_check_sense_pgid(struct ccwu8 lpm; lpm =to_io_private (sch)->orb.lpm; -CIO_MSG_EVENT (2 ,"SNID - Device %04x on Subchannel 0.%x.%04x," +CIO_MSG_EVENT (3 ,"SNID - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, lpm);
@@ -275,7 +275,7 @@ __ccw_device_do_pgid(struct ccw_device *return ret; }/* PGID command failed on this path. */ -CIO_MSG_EVENT (2 ,"SPID - Device %04x on Subchannel " +CIO_MSG_EVENT (3 ,"SPID - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
@@ -317,7 +317,7 @@ static int __ccw_device_do_nop(struct ccreturn ret; }/* nop command failed on this path. */ -CIO_MSG_EVENT (2 ,"NOP - Device %04x on Subchannel " +CIO_MSG_EVENT (3 ,"NOP - Device %04x on Subchannel " "0.%x.%04x, lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
@@ -362,7 +362,7 @@ __ccw_device_check_pgid(struct ccw_devicreturn -EAGAIN ; }if (irb->scsw.cc ==3 ) { -CIO_MSG_EVENT (2 ,"SPID - Device %04x on Subchannel 0.%x.%04x," +CIO_MSG_EVENT (3 ,"SPID - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
@@ -391,7 +391,7 @@ static int __ccw_device_check_nop(structreturn -ETIME ; }if (irb->scsw.cc ==3 ) { -CIO_MSG_EVENT (2 ,"NOP - Device %04x on Subchannel 0.%x.%04x," +CIO_MSG_EVENT (3 ,"NOP - Device %04x on Subchannel 0.%x.%04x," " lpm %02X, became 'not operational'\n" , cdev->private->dev_id.devno, sch->schid.ssid, sch->schid.sch_no, cdev->private->imask);
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 4/8 cio: Fix parsing mechanism for blacklisted devices.
In reply to Martin SchwidefskyFrom: Michael Ernst <[email protected]>
New format cssid.ssid.devno is now parsed correctly.
---
drivers/s390/cio/blacklist.c | 324 ++++++++++++++++++++++--------------------- 1 file changed, 170 insertions(+), 154 deletions(-)
drivers/s390/cio/blacklist.c +170 -154
@@ -19,6 +19,7 @@#include <asm/cio.h> #include <asm/uaccess.h> +#include <asm/cio.h> #include "blacklist.h" #include "cio.h"
@@ -43,163 +44,169 @@ typedef enum {add, free} range_action;* Function: blacklist_range * (Un-)blacklist the devices from-to */ -static void -blacklist_range (range_action action,unsigned int from,unsigned int to, -unsigned int ssid) -{ -if (!to) - to = from; - -if (from > to || to > __MAX_SUBCHANNEL || ssid > __MAX_SSID) { -printk (KERN_WARNING "cio: Invalid blacklist range " -"0.%x.%04x to 0.%x.%04x, skipping\n" , - ssid, from, ssid, to); -return ; +static int blacklist_range (range_action action,unsigned int from_ssid, +unsigned int to_ssid,unsigned int from, +unsigned int to,int msgtrigger) +{ +if ((from_ssid > to_ssid) || ((from_ssid == to_ssid) && (from > to))) { +if (msgtrigger) +printk (KERN_WARNING "cio: Invalid cio_ignore range " +"0.%x.%04x-0.%x.%04x\n" , from_ssid, from, + to_ssid, to); +return 1 ; } -for (; from <= to; from++) { + +while ((from_ssid < to_ssid) || ((from_ssid == to_ssid) && + (from <= to))) {if (action == add) -set_bit (from, bl_dev[ssid]); +set_bit (from, bl_dev[from_ssid]);else -clear_bit (from, bl_dev[ssid]); +clear_bit (from, bl_dev[from_ssid]); + from++; +if (from > __MAX_SUBCHANNEL) { + from_ssid++; + from =0 ; + } } + +return 0 ; } -/* -* Function: blacklist_busid -* Get devno/busid from given string. -* Shamelessly grabbed from dasd_devmap.c. -*/ -static int -blacklist_busid (char **str,int *id0,int *ssid,int *devno) +static int pure_hex (char **cp,unsigned int *val,int min_digit, +int max_digit,int max_val) { -int val, old_style; -char *sav; +int diff; +unsigned int value; - sav = *str; + diff =0 ; + *val =0 ; -/* check for leading '0x' */ - old_style =0 ; -if ((*str)[0 ] =='0' && (*str)[1 ] =='x' ) { - *str +=2 ; - old_style =1 ; - } -if (!isxdigit ((*str)[0 ]))/* We require at least one hex digit */ - goto confused; - val =simple_strtoul (*str, str,16 ); -if (old_style || (*str)[0 ] !='.' ) { - *id0 = *ssid =0 ; -if (val <0 || val >0xffff ) - goto confused; - *devno = val; -if ((*str)[0 ] !=',' && (*str)[0 ] !='-' && - (*str)[0 ] !='\n' && (*str)[0 ] !='\0' ) - goto confused; -return 0 ; +while (isxdigit (**cp) && (diff <= max_digit)) { + +if (isdigit (**cp)) + value = **cp -'0' ; +else + value =tolower (**cp) -'a' +10 ; + *val = *val *16 + value; + (*cp)++; + diff++; } -/* New style x.y.z busid */ -if (val <0 || val >0xff ) - goto confused; - *id0 = val; - (*str)++; -if (!isxdigit ((*str)[0 ]))/* We require at least one hex digit */ - goto confused; - val =simple_strtoul (*str, str,16 ); -if (val <0 || val >0xff || (*str)++[0 ] !='.' ) - goto confused; - *ssid = val; -if (!isxdigit ((*str)[0 ]))/* We require at least one hex digit */ - goto confused; - val =simple_strtoul (*str, str,16 ); -if (val <0 || val >0xffff ) - goto confused; - *devno = val; -if ((*str)[0 ] !=',' && (*str)[0 ] !='-' && - (*str)[0 ] !='\n' && (*str)[0 ] !='\0' ) - goto confused; + +if ((diff < min_digit) || (diff > max_digit) || (*val > max_val)) +return 1 ; +return 0 ; -confused: -strsep (str,",\n" ); -printk (KERN_WARNING "cio: Invalid cio_ignore parameter '%s'\n" , sav); -return 1 ; } -static int -blacklist_parse_parameters (char *str,range_action action) +static int parse_busid (char *str,int *cssid,int *ssid,int *devno, +int msgtrigger) { -int from, to, from_id0, to_id0, from_ssid, to_ssid; +char *str_work; +int val, rc, ret; + + rc =1 ; -while (*str !=0 && *str !='\n' ) { -range_action ra = action; -while (*str ==',' ) - str++; -if (*str =='!' ) { - ra = !action; - ++str; +if (*str =='\0' ) + goto out; + +/* old style */ + str_work = str; + val =simple_strtoul (str, &str_work,16 ); + +if (*str_work =='\0' ) { +if (val <= __MAX_SUBCHANNEL) { + *devno = val; + *ssid =0 ; + *cssid =0 ; + rc =0 ; } + goto out; + } -/* -* Since we have to parse the proc commands and the -* kernel arguments we have to check four cases -*/ -if (strncmp (str,"all," ,4 ) ==0 ||strcmp (str,"all" ) ==0 || -strncmp (str,"all\n" ,4 ) ==0 ||strncmp (str,"all " ,4 ) ==0 ) { -int j; - - str +=3 ; -for (j=0 ; j <= __MAX_SSID; j++) -blacklist_range (ra,0 , __MAX_SUBCHANNEL, j); +/* new style */ + str_work = str; + ret =pure_hex (&str_work, cssid,1 ,2 , __MAX_CSSID); +if (ret || (str_work[0 ] !='.' )) + goto out; + str_work++; + ret =pure_hex (&str_work, ssid,1 ,1 , __MAX_SSID); +if (ret || (str_work[0 ] !='.' )) + goto out; + str_work++; + ret =pure_hex (&str_work, devno,4 ,4 , __MAX_SUBCHANNEL); +if (ret || (str_work[0 ] !='\0' )) + goto out; + + rc =0 ; +out: +if (rc && msgtrigger) +printk (KERN_WARNING "cio: Invalid cio_ignore device '%s'\n" , + str); + +return rc; +} + +static int blacklist_parse_parameters (char *str,range_action action, +int msgtrigger) +{ +int from_cssid, to_cssid, from_ssid, to_ssid, from, to; +int rc, totalrc; +char *parm; +range_action ra; + + totalrc =0 ; + +while ((parm =strsep (&str,"," ))) { + rc =0 ; + ra = action; +if (*parm =='!' ) { +if (ra == add) + ra = free; +else + ra = add; + parm++; + } +if (strcmp (parm,"all" ) ==0 ) { + from_cssid =0 ; + from_ssid =0 ; + from =0 ; + to_cssid = __MAX_CSSID; + to_ssid = __MAX_SSID; + to = __MAX_SUBCHANNEL; }else { -int rc; - - rc =blacklist_busid (&str, &from_id0, - &from_ssid, &from); -if (rc) -continue ; - to = from; - to_id0 = from_id0; - to_ssid = from_ssid; -if (*str =='-' ) { - str++; - rc =blacklist_busid (&str, &to_id0, - &to_ssid, &to); -if (rc) -continue ; - } -if (*str =='-' ) { -printk (KERN_WARNING "cio: invalid cio_ignore " -"parameter '%s'\n" , -strsep (&str,",\n" )); -continue ; + rc =parse_busid (strsep (&parm,"-" ), &from_cssid, + &from_ssid, &from, msgtrigger); +if (!rc) { +if (parm !=NULL ) + rc =parse_busid (parm, &to_cssid, + &to_ssid, &to, + msgtrigger); +else { + to_cssid = from_cssid; + to_ssid = from_ssid; + to = from; + } } -if ((from_id0 != to_id0) || - (from_ssid != to_ssid)) { -printk (KERN_WARNING "cio: invalid cio_ignore " -"range %x.%x.%04x-%x.%x.%04x\n" , - from_id0, from_ssid, from, - to_id0, to_ssid, to); -continue ; - } -blacklist_range (ra, from, to, to_ssid); } +if (!rc) { + rc =blacklist_range (ra, from_ssid, to_ssid, from, to, + msgtrigger); +if (rc) + totalrc =1 ; + }else + totalrc =1 ; } -return 1 ; + +return totalrc; } -/* Parsing the commandline for blacklist parameters, e.g. to blacklist -* bus ids 0.0.1234, 0.0.1235 and 0.0.1236, you could use any of: -* - cio_ignore=1234-1236 -* - cio_ignore=0x1234-0x1235,1236 -* - cio_ignore=0x1234,1235-1236 -* - cio_ignore=1236 cio_ignore=1234-0x1236 -* - cio_ignore=1234 cio_ignore=1236 cio_ignore=0x1235 -* - cio_ignore=0.0.1234-0.0.1236 -* - cio_ignore=0.0.1234,0x1235,1236 -* - ... -*/ static int __init blacklist_setup (char *str) { -return blacklist_parse_parameters (str, add); +CIO_MSG_EVENT (6 ,"Reading blacklist parameters\n" ); +if (blacklist_parse_parameters (str, add,1 )) +return 0 ; +return 1 ; }__setup ("cio_ignore=" , blacklist_setup);
@@ -223,27 +230,23 @@ is_blacklisted (int ssid, int devno)* Function: blacklist_parse_proc_parameters * parse the stuff which is piped to /proc/cio_ignore */ -static void -blacklist_parse_proc_parameters (char *buf) +static int blacklist_parse_proc_parameters (char *buf) { -if (strncmp (buf,"free " ,5 ) ==0 ) { -blacklist_parse_parameters (buf +5 , free); - }else if (strncmp (buf,"add " ,4 ) ==0 ) { -/* -* We don't need to check for known devices since -* css_probe_device will handle this correctly. -*/ -blacklist_parse_parameters (buf +4 , add); - }else { -printk (KERN_WARNING "cio: cio_ignore: Parse error; \n" -KERN_WARNING "try using 'free all|<devno-range>," -"<devno-range>,...'\n" -KERN_WARNING "or 'add <devno-range>," -"<devno-range>,...'\n" ); -return ; - } +int rc; +char *parm; + + parm =strsep (&buf," " ); + +if (strcmp ("free" , parm) ==0 ) + rc =blacklist_parse_parameters (buf, free,0 ); +else if (strcmp ("add" , parm) ==0 ) + rc =blacklist_parse_parameters (buf, add,0 ); +else +return 1 ;css_schedule_reprobe (); + +return rc; }/* Iterator struct for all devices. */
@@ -327,6 +330,8 @@ cio_ignore_write(struct file *file, cons size_t user_len, loff_t *offset) { char *buf; +size_t i; +ssize_t rc, ret;if (*offset)return -EINVAL ;
@@ -335,16 +340,27 @@ cio_ignore_write(struct file *file, cons buf =vmalloc (user_len +1 );/* maybe better use the stack? */ if (buf ==NULL )return -ENOMEM ; +memset (buf,0 , user_len +1 ); +if (strncpy_from_user (buf, user_buf, user_len) <0 ) { -vfree (buf); -return -EFAULT ; + rc = -EFAULT ; + goto out_free; } - buf[user_len] ='\0' ; -blacklist_parse_proc_parameters (buf); + i = user_len -1 ; +while ((i >=0 ) && (isspace (buf[i]) || (buf[i] ==0 ))) { + buf[i] ='\0' ; + i--; + } + ret =blacklist_parse_proc_parameters (buf); +if (ret) + rc = -EINVAL ; +else + rc = user_len; +out_free:vfree (buf); -return user_len; +return rc; }static const struct seq_operations cio_ignore_proc_seq_ops = {
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 5/8 s390mach compile warning
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Fix the following compile warning:
drivers/s390/s390mach.c: In function 's390_collect_crw_info':drivers/s390/s390mach.c:77: warning: ignoring return value of 'down_interruptibl
---
drivers/s390/s390mach.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/s390mach.c +2 -1
@@ -48,10 +48,11 @@ s390_collect_crw_info(void *param)int ccode;struct semaphore *sem;unsigned int chain; +int ignore; sem = (struct semaphore *)param; repeat: -down_interruptible (sem); + ignore =down_interruptible (sem); chain =0 ;while (1 ) {if (unlikely (chain >1 )) {
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 6/8 compat ptrace cleanup
In reply to Martin SchwidefskyFrom: Roland McGrath <[email protected]>
This removes redundant arch code for generic ptrace requests already handled by ptrace_request and compat_ptrace_request. It simplifies things to just have the standard entry points, and use the generic compat_sys_ptrace.
---
arch/s390/kernel/compat_wrapper.S | 2 arch/s390/kernel/ptrace.c | 100 ++------------------------------------ include/asm-s390/ptrace.h | 2 3 files changed, 9 insertions(+), 95 deletions(-)
arch/s390/kernel/compat_wrapper.S +1 -1
@@ -121,7 +121,7 @@ sys32_ptrace_wrapper: lgfr %r3,%r3 # long llgtr %r4,%r4 # long llgfr %r5,%r5 # long - jg sys_ptrace # branch to system call + jg compat_sys_ptrace # branch to system call .globl sys32_alarm_wrapper sys32_alarm_wrapper:
arch/s390/kernel/ptrace.c +6 -94
131 lines not on this page · raw message
include/asm-s390/ptrace.h +2 -0
@@ -471,6 +471,8 @@ struct task_struct;extern void user_enable_single_step (struct task_struct *);extern void user_disable_single_step (struct task_struct *); +#define __ARCH_WANT_COMPAT_SYS_PTRACE +#define user_mode (regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)#define instruction_pointer (regs) ((regs)->psw.addr & PSW_ADDR_INSN)#define regs_return_value (regs)((regs)->gprs[2])
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
PATCH 7/8 tty3270: fix put_char fail/success conversion.
In reply to Martin SchwidefskyFrom: Heiko Carstens <[email protected]>
The wrong function got coverted ;)
CC drivers/s390/char/tty3270.odrivers/s390/char/tty3270.c:1747:
warning: initialization from incompatible pointer type
---
drivers/s390/char/tty3270.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/s390/char/tty3270.c +6 -9
@@ -965,8 +965,7 @@ tty3270_write_room(struct tty_struct *tt* Insert character into the screen at the current position with the * current color and highlight. This function does NOT do cursor movement. */ -static int -tty3270_put_character (struct tty3270 *tp,char ch) +static void tty3270_put_character (struct tty3270 *tp,char ch) {struct tty3270_line *line;struct tty3270_cell *cell;
@@ -986,7 +985,6 @@ tty3270_put_character(struct tty3270 *tp cell->character = tp->view.ascebc[(unsigned int ) ch]; cell->highlight = tp->highlight; cell->f_color = tp->f_color; -return 1 ; }/*
@@ -1612,16 +1610,15 @@ tty3270_write(struct tty_struct * tty,/* * Put single characters to the ttys character buffer */ -static void -tty3270_put_char (struct tty_struct *tty,unsigned char ch) +static int tty3270_put_char (struct tty_struct *tty,unsigned char ch) {struct tty3270 *tp; tp = tty->driver_data; -if (!tp) -return ; -if (tp->char_count <TTY3270_CHAR_BUF_SIZE ) - tp->char_buf[tp->char_count++] = ch; +if (!tp || tp->char_count >=TTY3270_CHAR_BUF_SIZE ) +return 0 ; + tp->char_buf[tp->char_count++] = ch; +return 1 ; }/*
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
Re: [patch 7/8] tty3270: fix put_char fail/success conversion.
Quoted 2 lines · Martin Schwidefsky
From: Heiko Carstens <[email protected]>
The wrong function got coverted ;)
Hehe..
Quoted 4 lines
Cc Alan Cox <[email protected]>Cc Peter Oberparleiter <[email protected]>Signed-off-by Heiko Carstens <[email protected]>Signed-off-by Martin Schwidefsky <[email protected]>
PATCH 8/8 guest page hinting light
In reply to Martin SchwidefskyFrom: Martin Schwidefsky <[email protected]>
Use the existing arch_alloc_page/arch_free_page callbacks to do the guest page state transitions between stable and unused.
---
arch/s390/Kconfig | 7 +++ arch/s390/mm/Makefile | 1 arch/s390/mm/init.c | 3 + arch/s390/mm/page-states.c | 79 +++++++++++++++++++++++++++++++++++++++++++++ include/asm-s390/page.h | 11 ++++++ include/asm-s390/system.h | 6 +++ 6 files changed, 107 insertions(+)
arch/s390/Kconfig +7 -0
@@ -430,6 +430,13 @@ config CMM_IUCV Select this option to enable the special message interface to the cooperative memory management. +config PAGE_STATES + bool "Unused page notification" + help + This enables the notification of unused pages to the + hypervisor. The ESSA instruction is used to do the states + changes between a page that has content and the unused state. + config VIRT_TIMER bool "Virtual CPU timer support" help
arch/s390/mm/init.c +3 -0
@@ -126,6 +126,9 @@ void __init mem_init(void)/* clear the zero-page */ memset (empty_zero_page,0 ,PAGE_SIZE ); +/* Setup guest page hinting */ +cmma_init (); +/* this will put all low memory onto the freelists */ totalram_pages +=free_all_bootmem ();
arch/s390/mm/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-y := init.o fault.o extmem.o mmap.o vmem.o pgtable.o obj-$(CONFIG_CMM) += cmm.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o +obj-$(CONFIG_PAGE_STATES) += page-states.o
arch/s390/mm/page-states.c new file +79 -0
79 lines not on this page · raw message
include/asm-s390/page.h +11 -0
@@ -125,6 +125,17 @@ page_get_storage_key(unsigned long addr) return skey; } +#ifdef CONFIG_PAGE_STATES + +struct page ; +void arch_free_page (struct page *page,int order); +void arch_alloc_page (struct page *page,int order); + +#define HAVE_ARCH_FREE_PAGE +#define HAVE_ARCH_ALLOC_PAGE + +#endif +#endif /* !__ASSEMBLY__ */ /* to align the pointer to the (next) page boundary */
include/asm-s390/system.h +6 -0
@@ -116,6 +116,12 @@ extern void pfault_fini(void);#define pfault_fini () do { } while (0)#endif /* CONFIG_PFAULT */ +#ifdef CONFIG_PAGE_STATES +extern void cmma_init (void ); +#else +#define cmma_init () do { } while (0) +#endif +#define finish_arch_switch (prev) do { \ set_fs(current->thread.mm_segment); \ account_vtime(prev); \
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.
Re: [patch 8/8] guest page hinting light
Quoted 6 lines · On Tue, 06 May 2008 17:50:35 +0200 Martin Schwidefsky <[email protected]>…
From: Martin Schwidefsky <[email protected]>
Use the existing arch_alloc_page/arch_free_page callbacks to do the guest page state transitions between stable and unused.
Signed-off-by Martin Schwidefsky <[email protected]>
Signature · 1 line
All Rights Reversed