s390 patches for 4.14-rc2
Subsystems (5)
Hi Linus,
please pull from the 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
- A couple of bug fixes: memory management, perf, cio, dasd and scm_blk.
- A larger change in regard to the CPU topology to improve performance for systems running under z/VM or KVM.
The shortlog:
Gerald Schaefer (2):
s390/mm: make pmdp_invalidate() do invalidation only s390/mm: fix write access check in gup_huge_pmd()
Heiko Carstens (2):
s390/topology: alternative topology for topology-less machines s390/topology: enable / disable topology dynamically
Pu Hou (1):
s390/perf: fix bug when creating per-thread event
Sebastian Ott (2):
s390/scm_blk: consistently use blk_status_t as error type s390/cio: recover from bad paths
Stefan Haberland (1):
s390/dasd: fix race during dasd initialization
arch/s390/include/asm/pgtable.h | 4 +- arch/s390/kernel/early.c | 12 ---- arch/s390/kernel/perf_cpum_sf.c | 9 ++- arch/s390/kernel/topology.c | 148 ++++++++++++++++++++++++++++++++++++---- arch/s390/mm/gup.c | 7 +- drivers/s390/block/dasd.c | 12 +++- drivers/s390/block/scm_blk.c | 6 +- drivers/s390/cio/device.c | 12 +++- drivers/s390/cio/device.h | 1 + drivers/s390/cio/device_fsm.c | 12 ++++ drivers/s390/cio/io_sch.h | 2 + 11 files changed, 183 insertions(+), 42 deletions(-)
arch/s390/include/asm/pgtable.h +3 -1
@@ -1507,7 +1507,9 @@ static inline pmd_t pmdp_huge_clear_flush(struct vm_area_struct *vma,static inline void pmdp_invalidate (struct vm_area_struct *vma,unsigned long addr,pmd_t *pmdp) { -pmdp_xchg_direct (vma->vm_mm, addr, pmdp,__pmd (_SEGMENT_ENTRY_EMPTY)); +pmd_t pmd =__pmd (pmd_val (*pmdp) | _SEGMENT_ENTRY_INVALID); + +pmdp_xchg_direct (vma->vm_mm, addr, pmdp, pmd); }#define __HAVE_ARCH_PMDP_SET_WRPROTECT
arch/s390/kernel/early.c +0 -12
@@ -404,18 +404,6 @@ static inline void save_vector_registers(void)#endif } -static int __init topology_setup (char *str) -{ -bool enabled; -int rc; - - rc =kstrtobool (str, &enabled); -if (!rc && !enabled) - S390_lowcore.machine_flags &= ~MACHINE_FLAG_TOPOLOGY ; -return rc; -} -early_param ("topology" , topology_setup); -static int __init disable_vector_extension (char *str) { S390_lowcore.machine_flags &= ~MACHINE_FLAG_VX ;
arch/s390/kernel/perf_cpum_sf.c +6 -3
@@ -823,9 +823,12 @@ static int cpumsf_pmu_event_init(struct perf_event *event) }/* Check online status of the CPU to which the event is pinned */ -if ((unsigned int )event->cpu >= nr_cpumask_bits || - (event->cpu >=0 && !cpu_online (event->cpu))) -return -ENODEV ; +if (event->cpu >=0 ) { +if ((unsigned int )event->cpu >= nr_cpumask_bits) +return -ENODEV ; +if (!cpu_online (event->cpu)) +return -ENODEV ; + }/* Force reset of idle/hv excludes regardless of what the * user requested.
arch/s390/kernel/topology.c +135 -13
236 lines not on this page · raw message
arch/s390/mm/gup.c +3 -4
@@ -56,13 +56,12 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,static inline int gup_huge_pmd (pmd_t *pmdp,pmd_t pmd,unsigned long addr,unsigned long end,int write,struct page **pages,int *nr) { -unsigned long mask, result;struct page *head, *page; +unsigned long mask;int refs; - result = write ?0 : _SEGMENT_ENTRY_PROTECT; - mask = result | _SEGMENT_ENTRY_INVALID; -if ((pmd_val (pmd) & mask) != result) + mask = (write ? _SEGMENT_ENTRY_PROTECT :0 ) | _SEGMENT_ENTRY_INVALID; +if ((pmd_val (pmd) & mask) !=0 )return 0 ;VM_BUG_ON (!pfn_valid (pmd_val (pmd) >>PAGE_SHIFT ));
drivers/s390/block/dasd.c +9 -3
@@ -1644,7 +1644,9 @@ void dasd_generic_handle_state_change(struct dasd_device *device)dasd_schedule_device_bh (device);if (device->block) {dasd_schedule_block_bh (device->block); -blk_mq_run_hw_queues (device->block->request_queue, true); +if (device->block->request_queue) +blk_mq_run_hw_queues (device->block->request_queue, + true); } }EXPORT_SYMBOL_GPL (dasd_generic_handle_state_change);
@@ -3759,7 +3761,9 @@ int dasd_generic_path_operational(struct dasd_device *device)dasd_schedule_device_bh (device);if (device->block) {dasd_schedule_block_bh (device->block); -blk_mq_run_hw_queues (device->block->request_queue, true); +if (device->block->request_queue) +blk_mq_run_hw_queues (device->block->request_queue, + true); }if (!device->stopped)
@@ -4025,7 +4029,9 @@ int dasd_generic_restore_device(struct ccw_device *cdev)if (device->block) {dasd_schedule_block_bh (device->block); -blk_mq_run_hw_queues (device->block->request_queue, true); +if (device->block->request_queue) +blk_mq_run_hw_queues (device->block->request_queue, + true); }clear_bit (DASD_FLAG_SUSPENDED , &device->flags);
drivers/s390/block/scm_blk.c +3 -3
@@ -249,7 +249,7 @@ static void scm_request_requeue(struct scm_request *scmrq)static void scm_request_finish (struct scm_request *scmrq) {struct scm_blk_dev *bdev = scmrq->bdev; -int *error; +blk_status_t *error;int i;for (i =0 ; i < nr_requests_per_io && scmrq->request[i]; i++) {
@@ -415,7 +415,7 @@ void scm_blk_irq(struct scm_device *scmdev, void *data, blk_status_t error)static void scm_blk_request_done (struct request *req) { -int *error =blk_mq_rq_to_pdu (req); +blk_status_t *error =blk_mq_rq_to_pdu (req);blk_mq_end_request (req, *error); }
@@ -450,7 +450,7 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)atomic_set (&bdev->queued_reqs,0 ); bdev->tag_set.ops = &scm_mq_ops; - bdev->tag_set.cmd_size =sizeof (int ); + bdev->tag_set.cmd_size =sizeof (blk_status_t); bdev->tag_set.nr_hw_queues = nr_requests; bdev->tag_set.queue_depth = nr_requests_per_io * nr_requests; bdev->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ;
drivers/s390/cio/device.c +9 -3
@@ -1225,10 +1225,16 @@ static int device_is_disconnected(struct ccw_device *cdev)static int recovery_check (struct device *dev,void *data) {struct ccw_device *cdev =to_ccwdev (dev); +struct subchannel *sch;int *redo = data;spin_lock_irq (cdev->ccwlock);switch (cdev->private->state) { +case DEV_STATE_ONLINE : + sch =to_subchannel (cdev->dev.parent); +if ((sch->schib.pmcw.pam & sch->opm) == sch->vpm) +break ; +/* fall through */ case DEV_STATE_DISCONNECTED : CIO_MSG_EVENT(3, "recovery: trigger 0.%x.%04x\n", cdev->private->dev_id.ssid,
@@ -1260,7 +1266,7 @@ static void recovery_work_func(struct work_struct *unused) }spin_unlock_irq (&recovery_lock); }else -CIO_MSG_EVENT (4 ,"recovery: end\n" ); +CIO_MSG_EVENT (3 ,"recovery: end\n" ); } static DECLARE_WORK(recovery_work, recovery_work_func);
@@ -1274,11 +1280,11 @@ static void recovery_func(unsigned long data)schedule_work (&recovery_work); } -static void ccw_device_schedule_recovery (void ) +void ccw_device_schedule_recovery (void ) {unsigned long flags; -CIO_MSG_EVENT (4 ,"recovery: schedule\n" ); +CIO_MSG_EVENT (3 ,"recovery: schedule\n" );spin_lock_irqsave (&recovery_lock, flags);if (!timer_pending (&recovery_timer) || (recovery_phase !=0 )) { recovery_phase =0 ;
drivers/s390/cio/device.h +1 -0
@@ -134,6 +134,7 @@ void ccw_device_set_disconnected(struct ccw_device *cdev);void ccw_device_set_notoper (struct ccw_device *cdev);void ccw_device_set_timeout (struct ccw_device *,int ); +void ccw_device_schedule_recovery (void );/* Channel measurement facility related */ void retry_set_schib (struct ccw_device *cdev);
drivers/s390/cio/device_fsm.c +12 -0
@@ -476,6 +476,17 @@ static void create_fake_irb(struct irb *irb, int type) } } +static void ccw_device_handle_broken_paths (struct ccw_device *cdev) +{ +struct subchannel *sch =to_subchannel (cdev->dev.parent); +u8 broken_paths = (sch->schib.pmcw.pam & sch->opm) ^ sch->vpm; + +if (broken_paths && (cdev->private->path_broken_mask != broken_paths)) +ccw_device_schedule_recovery (); + + cdev->private->path_broken_mask = broken_paths; +} +void ccw_device_verify_done (struct ccw_device *cdev,int err) {struct subchannel *sch;
@@ -508,6 +519,7 @@ void ccw_device_verify_done(struct ccw_device *cdev, int err)memset (&cdev->private->irb,0 ,sizeof (struct irb )); }ccw_device_report_path_events (cdev); +ccw_device_handle_broken_paths (cdev);break ;case -ETIME :case -EUSERS :
drivers/s390/cio/io_sch.h +2 -0
@@ -131,6 +131,8 @@ struct ccw_device_private {not operable */ u8 path_gone_mask;/* mask of paths, that became unavailable */ u8 path_new_mask;/* mask of paths, that became available */ +u8 path_broken_mask;/* mask of paths, which were found to be +unusable */ struct {unsigned int fast:1 ;/* post with "channel end" */ unsigned int repall:1 ;/* report every interrupt status */