tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 's390-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

- Remove outdated linux390 link from MAINTAINERS

- Add few missing EX_TABLE entries to inline assemblies

- Fix raw data collection for pai_ext PMU

- Add kernel image secure boot trailer for future firmware versions

- Fix out-of-bounds access on cio_ignore free

- Fix memory allocation of mdev_types array in vfio-ap

* tag 's390-6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/vfio-ap: Fix memory allocation for mdev_types array
s390/cio: fix out-of-bounds access on cio_ignore free
s390/pai: fix raw data collection for PMU pai_ext
s390/boot: add secure boot trailer
s390/pci: add missing EX_TABLE entries to __pcistg_mio_inuser()/__pcilg_mio_inuser()
s390/futex: add missing EX_TABLE entry to __futex_atomic_op()
s390/uaccess: add missing EX_TABLE entries to __clear_user()
MAINTAINERS: remove outdated linux390 link

Linus Torvalds 576e61ce 283f13d4

+24 -29
-12
MAINTAINERS
··· 11258 11258 R: David Hildenbrand <david@redhat.com> 11259 11259 L: kvm@vger.kernel.org 11260 11260 S: Supported 11261 - W: http://www.ibm.com/developerworks/linux/linux390/ 11262 11261 T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git 11263 11262 F: Documentation/virt/kvm/s390* 11264 11263 F: arch/s390/include/asm/gmap.h ··· 17997 17998 R: Sven Schnelle <svens@linux.ibm.com> 17998 17999 L: linux-s390@vger.kernel.org 17999 18000 S: Supported 18000 - W: http://www.ibm.com/developerworks/linux/linux390/ 18001 18001 T: git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git 18002 18002 F: Documentation/driver-api/s390-drivers.rst 18003 18003 F: Documentation/s390/ ··· 18008 18010 M: Peter Oberparleiter <oberpar@linux.ibm.com> 18009 18011 L: linux-s390@vger.kernel.org 18010 18012 S: Supported 18011 - W: http://www.ibm.com/developerworks/linux/linux390/ 18012 18013 F: drivers/s390/cio/ 18013 18014 18014 18015 S390 DASD DRIVER ··· 18015 18018 M: Jan Hoeppner <hoeppner@linux.ibm.com> 18016 18019 L: linux-s390@vger.kernel.org 18017 18020 S: Supported 18018 - W: http://www.ibm.com/developerworks/linux/linux390/ 18019 18021 F: block/partitions/ibm.c 18020 18022 F: drivers/s390/block/dasd* 18021 18023 F: include/linux/dasd_mod.h ··· 18024 18028 M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> 18025 18029 L: linux-s390@vger.kernel.org 18026 18030 S: Supported 18027 - W: http://www.ibm.com/developerworks/linux/linux390/ 18028 18031 F: drivers/iommu/s390-iommu.c 18029 18032 18030 18033 S390 IUCV NETWORK LAYER ··· 18032 18037 L: linux-s390@vger.kernel.org 18033 18038 L: netdev@vger.kernel.org 18034 18039 S: Supported 18035 - W: http://www.ibm.com/developerworks/linux/linux390/ 18036 18040 F: drivers/s390/net/*iucv* 18037 18041 F: include/net/iucv/ 18038 18042 F: net/iucv/ ··· 18042 18048 L: linux-s390@vger.kernel.org 18043 18049 L: netdev@vger.kernel.org 18044 18050 S: Supported 18045 - W: http://www.ibm.com/developerworks/linux/linux390/ 18046 18051 F: drivers/s390/net/ 18047 18052 18048 18053 S390 PCI SUBSYSTEM ··· 18049 18056 M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> 18050 18057 L: linux-s390@vger.kernel.org 18051 18058 S: Supported 18052 - W: http://www.ibm.com/developerworks/linux/linux390/ 18053 18059 F: arch/s390/pci/ 18054 18060 F: drivers/pci/hotplug/s390_pci_hpc.c 18055 18061 F: Documentation/s390/pci.rst ··· 18059 18067 M: Jason Herne <jjherne@linux.ibm.com> 18060 18068 L: linux-s390@vger.kernel.org 18061 18069 S: Supported 18062 - W: http://www.ibm.com/developerworks/linux/linux390/ 18063 18070 F: Documentation/s390/vfio-ap* 18064 18071 F: drivers/s390/crypto/vfio_ap* 18065 18072 ··· 18087 18096 M: Harald Freudenberger <freude@linux.ibm.com> 18088 18097 L: linux-s390@vger.kernel.org 18089 18098 S: Supported 18090 - W: http://www.ibm.com/developerworks/linux/linux390/ 18091 18099 F: drivers/s390/crypto/ 18092 18100 18093 18101 S390 ZFCP DRIVER ··· 18094 18104 M: Benjamin Block <bblock@linux.ibm.com> 18095 18105 L: linux-s390@vger.kernel.org 18096 18106 S: Supported 18097 - W: http://www.ibm.com/developerworks/linux/linux390/ 18098 18107 F: drivers/s390/scsi/zfcp_* 18099 18108 18100 18109 S3C ADC BATTERY DRIVER ··· 18665 18676 M: Jan Karcher <jaka@linux.ibm.com> 18666 18677 L: linux-s390@vger.kernel.org 18667 18678 S: Supported 18668 - W: http://www.ibm.com/developerworks/linux/linux390/ 18669 18679 F: net/smc/ 18670 18680 18671 18681 SHARP GP2AP002A00F/GP2AP002S00F SENSOR DRIVER
+11 -2
arch/s390/boot/vmlinux.lds.S
··· 102 102 _compressed_start = .; 103 103 *(.vmlinux.bin.compressed) 104 104 _compressed_end = .; 105 - FILL(0xff); 106 - . = ALIGN(4096); 105 + } 106 + 107 + #define SB_TRAILER_SIZE 32 108 + /* Trailer needed for Secure Boot */ 109 + . += SB_TRAILER_SIZE; /* make sure .sb.trailer does not overwrite the previous section */ 110 + . = ALIGN(4096) - SB_TRAILER_SIZE; 111 + .sb.trailer : { 112 + QUAD(0) 113 + QUAD(0) 114 + QUAD(0) 115 + QUAD(0x000000207a49504c) 107 116 } 108 117 _end = .; 109 118
+2 -1
arch/s390/include/asm/futex.h
··· 17 17 "3: jl 1b\n" \ 18 18 " lhi %0,0\n" \ 19 19 "4: sacf 768\n" \ 20 - EX_TABLE(0b,4b) EX_TABLE(2b,4b) EX_TABLE(3b,4b) \ 20 + EX_TABLE(0b,4b) EX_TABLE(1b,4b) \ 21 + EX_TABLE(2b,4b) EX_TABLE(3b,4b) \ 21 22 : "=d" (ret), "=&d" (oldval), "=&d" (newval), \ 22 23 "=m" (*uaddr) \ 23 24 : "0" (-EFAULT), "d" (oparg), "a" (uaddr), \
+1
arch/s390/kernel/perf_pai_ext.c
··· 459 459 raw.frag.data = cpump->save; 460 460 raw.size = raw.frag.size; 461 461 data.raw = &raw; 462 + data.sample_flags |= PERF_SAMPLE_RAW; 462 463 } 463 464 464 465 overflow = perf_event_overflow(event, &data, &regs);
+3 -3
arch/s390/lib/uaccess.c
··· 157 157 asm volatile( 158 158 " lr 0,%[spec]\n" 159 159 "0: mvcos 0(%1),0(%4),%0\n" 160 - " jz 4f\n" 160 + "6: jz 4f\n" 161 161 "1: algr %0,%2\n" 162 162 " slgr %1,%2\n" 163 163 " j 0b\n" ··· 167 167 " clgr %0,%3\n" /* copy crosses next page boundary? */ 168 168 " jnh 5f\n" 169 169 "3: mvcos 0(%1),0(%4),%3\n" 170 - " slgr %0,%3\n" 170 + "7: slgr %0,%3\n" 171 171 " j 5f\n" 172 172 "4: slgr %0,%0\n" 173 173 "5:\n" 174 - EX_TABLE(0b,2b) EX_TABLE(3b,5b) 174 + EX_TABLE(0b,2b) EX_TABLE(6b,2b) EX_TABLE(3b,5b) EX_TABLE(7b,5b) 175 175 : "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2) 176 176 : "a" (empty_zero_page), [spec] "d" (spec.val) 177 177 : "cc", "memory", "0");
+4 -4
arch/s390/pci/pci_mmio.c
··· 64 64 asm volatile ( 65 65 " sacf 256\n" 66 66 "0: llgc %[tmp],0(%[src])\n" 67 - " sllg %[val],%[val],8\n" 67 + "4: sllg %[val],%[val],8\n" 68 68 " aghi %[src],1\n" 69 69 " ogr %[val],%[tmp]\n" 70 70 " brctg %[cnt],0b\n" ··· 72 72 "2: ipm %[cc]\n" 73 73 " srl %[cc],28\n" 74 74 "3: sacf 768\n" 75 - EX_TABLE(0b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b) 75 + EX_TABLE(0b, 3b) EX_TABLE(4b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b) 76 76 : 77 77 [src] "+a" (src), [cnt] "+d" (cnt), 78 78 [val] "+d" (val), [tmp] "=d" (tmp), ··· 215 215 "2: ahi %[shift],-8\n" 216 216 " srlg %[tmp],%[val],0(%[shift])\n" 217 217 "3: stc %[tmp],0(%[dst])\n" 218 - " aghi %[dst],1\n" 218 + "5: aghi %[dst],1\n" 219 219 " brctg %[cnt],2b\n" 220 220 "4: sacf 768\n" 221 - EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) 221 + EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) EX_TABLE(5b, 4b) 222 222 : 223 223 [ioaddr_len] "+&d" (ioaddr_len.pair), 224 224 [cc] "+d" (cc), [val] "=d" (val),
+2 -6
drivers/s390/cio/css.c
··· 753 753 { 754 754 struct idset *set = data; 755 755 struct subchannel *sch = to_subchannel(dev); 756 - struct ccw_device *cdev; 757 756 758 - if (sch->st == SUBCHANNEL_TYPE_IO) { 759 - cdev = sch_get_cdev(sch); 760 - if (cdev && cdev->online) 761 - idset_sch_del(set, sch->schid); 762 - } 757 + if (sch->st == SUBCHANNEL_TYPE_IO && sch->config.ena) 758 + idset_sch_del(set, sch->schid); 763 759 764 760 return 0; 765 761 }
+1 -1
drivers/s390/crypto/vfio_ap_private.h
··· 52 52 struct mutex guests_lock; /* serializes access to each KVM guest */ 53 53 struct mdev_parent parent; 54 54 struct mdev_type mdev_type; 55 - struct mdev_type *mdev_types[]; 55 + struct mdev_type *mdev_types[1]; 56 56 }; 57 57 58 58 extern struct ap_matrix_dev *matrix_dev;