May 2019 - Linux-stable-mirror

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c3a072597748 - Linux 4.19.45 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: c3a072597748 - Linux 4.19.45 We then merged the patchset with `git am`: ipv6-fix-src-addr-routing-with-the-exception-table.patch ipv6-prevent-possible-fib6-leaks.patch net-always-descend-into-dsa.patch net-avoid-weird-emergency-message.patch net-mlx4_core-change-the-error-print-to-info-print.patch net-test-nouarg-before-dereferencing-zerocopy-pointers.patch net-usb-qmi_wwan-add-telit-0x1260-and-0x1261-compositions.patch nfp-flower-add-rcu-locks-when-accessing-netdev-for-tunnels.patch ppp-deflate-fix-possible-crash-in-deflate_init.patch rtnetlink-always-put-ifla_link-for-links-with-a-link-netnsid.patch tipc-switch-order-of-device-registration-to-fix-a-crash.patch vsock-virtio-free-packets-during-the-socket-release.patch tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch vsock-virtio-initialize-core-virtio-vsock-before-registering-the-driver.patch net-mlx5-imply-mlxfw-in-mlx5_core.patch net-mlx5e-fix-ethtool-rxfh-commands-when-config_mlx5_en_rxnfc-is-disabled.patch parisc-export-running_on_qemu-symbol-for-modules.patch parisc-skip-registering-led-when-running-in-qemu.patch parisc-use-pa_asm_level-in-boot-code.patch parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch stm-class-fix-channel-free-in-stm-output-free-path.patch stm-class-fix-channel-bitmap-on-32-bit-systems.patch brd-re-enable-__gfp_highmem-in-brd_insert_page.patch proc-prevent-changes-to-overridden-credentials.patch revert-md-fix-lock-contention-for-flush-bios.patch md-batch-flush-requests.patch md-add-mddev-pers-to-avoid-potential-null-pointer-dereference.patch dcache-sort-the-freeing-without-rcu-delay-mess-for-good.patch intel_th-msu-fix-single-mode-with-iommu.patch p54-drop-device-reference-count-if-fails-to-enable-device.patch of-fix-clang-wunsequenced-for-be32_to_cpu.patch cifs-fix-strcat-buffer-overflow-and-reduce-raciness-in-smb21_set_oplock_level.patch phy-ti-pipe3-fix-missing-bit-wise-or-operator-when-assigning-val.patch media-ov6650-fix-sensor-possibly-not-detected-on-probe.patch media-imx-csi-allow-unknown-nearest-upstream-entities.patch media-imx-clear-fwnode-link-struct-for-each-endpoint-iteration.patch nfs4-fix-v4.0-client-state-corruption-when-mount.patch pnfs-fallback-to-mds-if-no-deviceid-found.patch clk-hi3660-mark-clk_gate_ufs_subsys-as-critical.patch clk-tegra-fix-pllm-programming-on-tegra124-when-pmc-overrides-divider.patch clk-mediatek-disable-tuner_en-before-change-pll-rate.patch clk-rockchip-fix-wrong-clock-definitions-for-rk3328.patch udlfb-delete-the-unused-parameter-for-dlfb_handle_damage.patch udlfb-fix-sleeping-inside-spinlock.patch udlfb-introduce-a-rendering-mutex.patch fuse-fix-writepages-on-32bit.patch fuse-honor-rlimit_fsize-in-fuse_file_fallocate.patch ovl-fix-missing-upper-fs-freeze-protection-on-copy-up-for-ioctl.patch iommu-tegra-smmu-fix-invalid-asid-bits-on-tegra30-114.patch ceph-flush-dirty-inodes-before-proceeding-with-remount.patch Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable_queue_4.19-a… ppc64le: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable_queue_4.19-p… s390x: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable_queue_4.19-s39… x86_64: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable_queue_4.19-x8… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ stress: stress-ng [9] ✅ Boot test [0] ✅ xfstests: xfs [10] ✅ selinux-policy: serge-testsuite [11] 🚧 ✅ Networking socket: fuzz [12] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] ppc64le: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ stress: stress-ng [9] ✅ Boot test [0] ✅ xfstests: xfs [10] ✅ selinux-policy: serge-testsuite [11] 🚧 ✅ Networking socket: fuzz [12] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] s390x: x86_64: ✅ Boot test [0] ✅ xfstests: xfs [10] ✅ selinux-policy: serge-testsuite [11] ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ AMTU (Abstract Machine Test Utility) [3] ✅ Ethernet drivers sanity [4] ✅ audit: audit testsuite test [5] ✅ httpd: mod_ssl smoke sanity [6] ✅ iotop: sanity [7] ✅ tuned: tune-processes-through-perf [8] ✅ stress: stress-ng [9] 🚧 ✅ Networking socket: fuzz [12] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking route: pmtu [13] 🚧 ✅ Networking route_func: local [14] 🚧 ✅ Networking route_func: forward [14] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

5 years, 9 months

1
0
0 0

✅ PASS: Test report for kernel 5.1.4-59a646a.cki (stable)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Commit: e0e8106a6cf1 - Linux 5.1.4 The results of these automated tests are provided below. Overall result: PASSED Merge: OK Compile: OK Tests: OK Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 4 architectures: aarch64: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-e0e8… kernel build: https://artifacts.cki-project.org/builds/aarch64/kernel-stable-aarch64-e0e8… ppc64le: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-e0e8… kernel build: https://artifacts.cki-project.org/builds/ppc64le/kernel-stable-ppc64le-e0e8… s390x: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-e0e8106a… kernel build: https://artifacts.cki-project.org/builds/s390x/kernel-stable-s390x-e0e8106a… x86_64: build options: -j25 INSTALL_MOD_STRIP=1 targz-pkg configuration: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-e0e810… kernel build: https://artifacts.cki-project.org/builds/x86_64/kernel-stable-x86_64-e0e810… Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ Memory function: memfd_create [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ Ethernet drivers sanity [5] ✅ audit: audit testsuite test [6] ✅ httpd: mod_ssl smoke sanity [7] ✅ iotop: sanity [8] ✅ redhat-rpm-config: detect-kabi-provides sanity [9] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [10] ✅ tuned: tune-processes-through-perf [11] ✅ Usex - version 1.9-29 [12] ✅ lvm thinp sanity [13] ✅ stress: stress-ng [14] ✅ Boot test [0] ✅ xfstests: ext4 [15] ✅ xfstests: xfs [15] ✅ selinux-policy: serge-testsuite [16] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking: igmp conformance test [19] 🚧 ✅ Networking route: pmtu [20] 🚧 ✅ Networking route_func: local [21] 🚧 ✅ Networking route_func: forward [21] 🚧 ✅ Networking TCP: keepalive test [22] 🚧 ✅ Networking UDP: socket [23] 🚧 ✅ networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns transport [25] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] ppc64le: ✅ Boot test [0] ✅ xfstests: ext4 [15] ✅ xfstests: xfs [15] ✅ selinux-policy: serge-testsuite [16] ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ Memory function: memfd_create [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ Ethernet drivers sanity [5] ✅ audit: audit testsuite test [6] ✅ httpd: mod_ssl smoke sanity [7] ✅ iotop: sanity [8] ✅ redhat-rpm-config: detect-kabi-provides sanity [9] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [10] ✅ tuned: tune-processes-through-perf [11] ✅ Usex - version 1.9-29 [12] ✅ lvm thinp sanity [13] ✅ stress: stress-ng [14] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking route: pmtu [20] 🚧 ✅ Networking route_func: local [21] 🚧 ✅ Networking route_func: forward [21] 🚧 ✅ Networking TCP: keepalive test [22] 🚧 ✅ Networking UDP: socket [23] 🚧 ✅ networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] s390x: x86_64: ✅ Boot test [0] ✅ kdump: sysrq-c - megaraid_sas [27] ✅ Boot test [0] ✅ xfstests: ext4 [15] ✅ xfstests: xfs [15] ✅ selinux-policy: serge-testsuite [16] ✅ Boot test [0] ✅ kdump: sysrq-c [27] ✅ Boot test [0] ✅ LTP lite [1] ✅ Loopdev Sanity [2] ✅ Memory function: memfd_create [3] ✅ AMTU (Abstract Machine Test Utility) [4] ✅ Ethernet drivers sanity [5] ✅ audit: audit testsuite test [6] ✅ httpd: mod_ssl smoke sanity [7] ✅ iotop: sanity [8] ✅ redhat-rpm-config: detect-kabi-provides sanity [9] ✅ redhat-rpm-config: kabi-whitelist-not-found sanity [10] ✅ tuned: tune-processes-through-perf [11] ✅ Usex - version 1.9-29 [12] ✅ lvm thinp sanity [13] ✅ stress: stress-ng [14] 🚧 ✅ Networking socket: fuzz [17] 🚧 ✅ /kernel/networking/ipv6/Fujitsu-socketapi-test 🚧 ✅ Networking sctp-auth: sockopts test [18] 🚧 ✅ Networking: igmp conformance test [19] 🚧 ✅ Networking route: pmtu [20] 🚧 ✅ Networking route_func: local [21] 🚧 ✅ Networking route_func: forward [21] 🚧 ✅ Networking TCP: keepalive test [22] 🚧 ✅ Networking UDP: socket [23] 🚧 ✅ networking tunnel: geneve basic test [24] 🚧 ✅ Networking ipsec: basic netns transport [25] 🚧 ✅ Networking ipsec: basic netns tunnel [25] 🚧 ✅ Storage blktests [26] Test source: 💚 Pull requests are welcome for new tests or improvements to existing tests! [0]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [1]: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… [2]: https://github.com/CKI-project/tests-beaker/archive/master.zip#filesystems/… [3]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… [4]: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu [5]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [6]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/aud… [7]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/htt… [8]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/iot… [9]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [10]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/red… [11]: https://github.com/CKI-project/tests-beaker/archive/master.zip#packages/tun… [12]: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… [13]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/lvm/… [14]: https://github.com/CKI-project/tests-beaker/archive/master.zip#stress/stres… [15]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… [16]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/packages/se… [17]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [18]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/s… [19]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/i… [20]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [21]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [22]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/t… [23]: https://github.com/CKI-project/tests-beaker/archive/master.zip#networking/u… [24]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [25]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… [26]: https://github.com/CKI-project/tests-beaker/archive/master.zip#storage/blk [27]: https://github.com/CKI-project/tests-beaker/archive/master.zip#/kdump/kdump… Waived tests (marked with 🚧) ----------------------------- This test run included waived tests. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed.

5 years, 9 months

1
0
0 0

[PATCH 2/2] zfcp: fix to prevent port_remove with pure auto scan LUNs (only sdevs)

by Steffen Maier

When the user tries to remove a zfcp port via sysfs, we only rejected it if there are zfcp unit children under the port. With purely automatically scanned LUNs there are no zfcp units but only SCSI devices. In such cases, the port_remove erroneously continued. We close the port and this implicitly closes all LUNs under the port. The SCSI devices survive with their private zfcp_scsi_dev still holding a reference to the "removed" zfcp_port (still allocated but invisible in sysfs) [zfcp_get_port_by_wwpn in zfcp_scsi_slave_alloc]. This is not a problem as long as the fc_rport stays blocked. Once (auto) port scan brings back the removed port, we unblock its fc_rport again by design. However, there is no mechanism that would recover (open) the LUNs under the port (no "ersfs_3" without zfcp_unit [zfcp_erp_strategy_followup_success]). Any pending or new I/O to such LUN leads to repeated: Done: NEEDS_RETRY Result: hostbyte=DID_IMM_RETRY driverbyte=DRIVER_OK See also v4.10 commit 6f2ce1c6af37 ("scsi: zfcp: fix rport unblock race with LUN recovery"). Even a manual LUN recovery (echo 0 > /sys/bus/scsi/devices/H:C:T:L/zfcp_failed) does not help, as the LUN links to the old "removed" port which remains to lack ZFCP_STATUS_COMMON_RUNNING [zfcp_erp_required_act]. The only workaround is to first ensure that the fc_rport is blocked (e.g. port_remove again in case it was re-discovered by (auto) port scan), then delete the SCSI devices, and finally re-discover by (auto) port scan. The port scan includes an fc_rport unblock, which in turn triggers a new scan on the scsi target to freshly get new pure auto scan LUNs. Fix this by rejecting port_remove also if there are SCSI devices (even without any zfcp_unit) under this port. Re-use mechanics from v3.7 commit d99b601b6338 ("[SCSI] zfcp: restore refcount check on port_remove"). However, we have to give up zfcp_sysfs_port_units_mutex earlier in unit_add to prevent a deadlock with scsi_host scan taking shost->scan_mutex first and then zfcp_sysfs_port_units_mutex now in our zfcp_scsi_slave_alloc(). Signed-off-by: Steffen Maier <maier(a)linux.ibm.com> Fixes: b62a8d9b45b9 ("[SCSI] zfcp: Use SCSI device data zfcp scsi dev instead of zfcp unit") Fixes: f8210e34887e ("[SCSI] zfcp: Allow midlayer to scan for LUNs when running in NPIV mode") Cc: <stable(a)vger.kernel.org> #2.6.37+ Reviewed-by: Benjamin Block <bblock(a)linux.ibm.com> --- drivers/s390/scsi/zfcp_ext.h | 1 + drivers/s390/scsi/zfcp_scsi.c | 9 ++++++ drivers/s390/scsi/zfcp_sysfs.c | 54 ++++++++++++++++++++++++++++++---- drivers/s390/scsi/zfcp_unit.c | 8 ++++- 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index c6acca521ffe..31e8a7240fd7 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h @@ -167,6 +167,7 @@ extern const struct attribute_group *zfcp_port_attr_groups[]; extern struct mutex zfcp_sysfs_port_units_mutex; extern struct device_attribute *zfcp_sysfs_sdev_attrs[]; extern struct device_attribute *zfcp_sysfs_shost_attrs[]; +bool zfcp_sysfs_port_is_removing(const struct zfcp_port *const port); /* zfcp_unit.c */ extern int zfcp_unit_add(struct zfcp_port *, u64); diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 221d0dfb8493..e9ded2befa0d 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c @@ -129,6 +129,15 @@ static int zfcp_scsi_slave_alloc(struct scsi_device *sdev) zfcp_sdev->erp_action.port = port; + mutex_lock(&zfcp_sysfs_port_units_mutex); + if (zfcp_sysfs_port_is_removing(port)) { + /* port is already gone */ + mutex_unlock(&zfcp_sysfs_port_units_mutex); + put_device(&port->dev); /* undo zfcp_get_port_by_wwpn() */ + return -ENXIO; + } + mutex_unlock(&zfcp_sysfs_port_units_mutex); + unit = zfcp_unit_find(port, zfcp_scsi_dev_lun(sdev)); if (unit) put_device(&unit->dev); diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index 2d78732b270b..af197e2b3e69 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c @@ -235,6 +235,53 @@ static ZFCP_DEV_ATTR(adapter, port_rescan, S_IWUSR, NULL, DEFINE_MUTEX(zfcp_sysfs_port_units_mutex); +static void zfcp_sysfs_port_set_removing(struct zfcp_port *const port) +{ + lockdep_assert_held(&zfcp_sysfs_port_units_mutex); + atomic_set(&port->units, -1); +} + +bool zfcp_sysfs_port_is_removing(const struct zfcp_port *const port) +{ + lockdep_assert_held(&zfcp_sysfs_port_units_mutex); + return atomic_read(&port->units) == -1; +} + +static bool zfcp_sysfs_port_in_use(struct zfcp_port *const port) +{ + struct zfcp_adapter *const adapter = port->adapter; + unsigned long flags; + struct scsi_device *sdev; + bool in_use = true; + + mutex_lock(&zfcp_sysfs_port_units_mutex); + if (atomic_read(&port->units) > 0) + goto unlock_port_units_mutex; /* zfcp_unit(s) under port */ + + spin_lock_irqsave(adapter->scsi_host->host_lock, flags); + __shost_for_each_device(sdev, adapter->scsi_host) { + const struct zfcp_scsi_dev *zsdev = sdev_to_zfcp(sdev); + + if (sdev->sdev_state == SDEV_DEL || + sdev->sdev_state == SDEV_CANCEL) + continue; + if (zsdev->port != port) + continue; + /* alive scsi_device under port of interest */ + goto unlock_host_lock; + } + + /* port is about to be removed, so no more unit_add or slave_alloc */ + zfcp_sysfs_port_set_removing(port); + in_use = false; + +unlock_host_lock: + spin_unlock_irqrestore(adapter->scsi_host->host_lock, flags); +unlock_port_units_mutex: + mutex_unlock(&zfcp_sysfs_port_units_mutex); + return in_use; +} + static ssize_t zfcp_sysfs_port_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -257,16 +304,11 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev, else retval = 0; - mutex_lock(&zfcp_sysfs_port_units_mutex); - if (atomic_read(&port->units) > 0) { + if (zfcp_sysfs_port_in_use(port)) { retval = -EBUSY; - mutex_unlock(&zfcp_sysfs_port_units_mutex); put_device(&port->dev); /* undo zfcp_get_port_by_wwpn() */ goto out; } - /* port is about to be removed, so no more unit_add */ - atomic_set(&port->units, -1); - mutex_unlock(&zfcp_sysfs_port_units_mutex); write_lock_irq(&adapter->port_list_lock); list_del(&port->list); diff --git a/drivers/s390/scsi/zfcp_unit.c b/drivers/s390/scsi/zfcp_unit.c index 1bf0a0984a09..e67bf7388cae 100644 --- a/drivers/s390/scsi/zfcp_unit.c +++ b/drivers/s390/scsi/zfcp_unit.c @@ -124,7 +124,7 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun) int retval = 0; mutex_lock(&zfcp_sysfs_port_units_mutex); - if (atomic_read(&port->units) == -1) { + if (zfcp_sysfs_port_is_removing(port)) { /* port is already gone */ retval = -ENODEV; goto out; @@ -168,8 +168,14 @@ int zfcp_unit_add(struct zfcp_port *port, u64 fcp_lun) write_lock_irq(&port->unit_list_lock); list_add_tail(&unit->list, &port->unit_list); write_unlock_irq(&port->unit_list_lock); + /* + * lock order: shost->scan_mutex before zfcp_sysfs_port_units_mutex + * due to zfcp_unit_scsi_scan() => zfcp_scsi_slave_alloc() + */ + mutex_unlock(&zfcp_sysfs_port_units_mutex); zfcp_unit_scsi_scan(unit); + return retval; out: mutex_unlock(&zfcp_sysfs_port_units_mutex); -- 2.17.1

5 years, 9 months

1
0
0 0

[PATCH 1/2] zfcp: fix missing zfcp_port reference put on -EBUSY from port_remove

by Steffen Maier

With this early return due to zfcp_unit child(ren), we don't use the zfcp_port reference from the earlier zfcp_get_port_by_wwpn()any more and need to put it. Signed-off-by: Steffen Maier <maier(a)linux.ibm.com> Fixes: d99b601b6338 ("[SCSI] zfcp: restore refcount check on port_remove") Cc: <stable(a)vger.kernel.org> #3.7+ Reviewed-by: Jens Remus <jremus(a)linux.ibm.com> Reviewed-by: Benjamin Block <bblock(a)linux.ibm.com> --- drivers/s390/scsi/zfcp_sysfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index b277be6f7611..2d78732b270b 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c @@ -261,6 +261,7 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev, if (atomic_read(&port->units) > 0) { retval = -EBUSY; mutex_unlock(&zfcp_sysfs_port_units_mutex); + put_device(&port->dev); /* undo zfcp_get_port_by_wwpn() */ goto out; } /* port is about to be removed, so no more unit_add */ -- 2.17.1

5 years, 9 months

1
0
0 0

Linux 3.16.68

by Ben Hutchings

I'm announcing the release of the 3.16.68 kernel. All users of the 3.16 kernel series should upgrade. The updated 3.16.y git tree can be found at: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.16.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git The diff from 3.16.67 is attached to this message. Ben. ------------ Documentation/ABI/testing/sysfs-devices-system-cpu | 2 + Documentation/hw-vuln/mds.rst | 305 ++++++++++ Documentation/kernel-parameters.txt | 106 +++- Documentation/spec_ctrl.rst | 9 + Documentation/static-keys.txt | 99 ++-- Documentation/x86/mds.rst | 225 ++++++++ Makefile | 3 +- arch/arm/include/asm/jump_label.h | 30 +- arch/arm/kernel/jump_label.c | 2 +- arch/arm64/include/asm/jump_label.h | 24 +- arch/arm64/kernel/jump_label.c | 2 +- arch/mips/include/asm/jump_label.h | 32 +- arch/mips/kernel/jump_label.c | 44 +- arch/powerpc/include/asm/jump_label.h | 19 +- arch/powerpc/kernel/jump_label.c | 2 +- arch/s390/include/asm/jump_label.h | 29 +- arch/s390/kernel/jump_label.c | 65 ++- arch/sparc/include/asm/jump_label.h | 38 +- arch/sparc/kernel/jump_label.c | 2 +- arch/x86/Kconfig | 8 +- arch/x86/boot/cpuflags.h | 2 +- arch/x86/boot/mkcpustr.c | 2 +- arch/x86/crypto/crc32-pclmul_glue.c | 2 +- arch/x86/crypto/crc32c-intel_glue.c | 2 +- arch/x86/crypto/crct10dif-pclmul_glue.c | 2 +- arch/x86/ia32/ia32entry.S | 2 + arch/x86/include/asm/alternative.h | 6 - arch/x86/include/asm/apic.h | 1 - arch/x86/include/asm/arch_hweight.h | 2 + arch/x86/include/asm/atomic.h | 1 - arch/x86/include/asm/atomic64_32.h | 1 - arch/x86/include/asm/barrier.h | 1 + arch/x86/include/asm/cmpxchg.h | 1 + arch/x86/include/asm/cpufeature.h | 278 +-------- arch/x86/include/asm/cpufeatures.h | 278 +++++++++ arch/x86/include/asm/intel-family.h | 30 +- arch/x86/include/asm/irqflags.h | 5 + arch/x86/include/asm/jump_label.h | 85 ++- arch/x86/include/asm/mwait.h | 7 + arch/x86/include/asm/nospec-branch.h | 83 ++- arch/x86/include/asm/processor.h | 10 +- arch/x86/include/asm/smap.h | 2 +- arch/x86/include/asm/smp.h | 1 - arch/x86/include/asm/spec-ctrl.h | 20 +- arch/x86/include/asm/switch_to.h | 3 - arch/x86/include/asm/thread_info.h | 28 +- arch/x86/include/asm/tlbflush.h | 7 + arch/x86/include/asm/uaccess_64.h | 2 +- arch/x86/include/uapi/asm/msr-index.h | 20 +- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/bugs.c | 629 ++++++++++++++++++--- arch/x86/kernel/cpu/centaur.c | 2 +- arch/x86/kernel/cpu/common.c | 133 +++-- arch/x86/kernel/cpu/cyrix.c | 1 + arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- arch/x86/kernel/cpu/match.c | 2 +- arch/x86/kernel/cpu/mkcapflags.sh | 51 +- arch/x86/kernel/cpu/mtrr/main.c | 2 +- arch/x86/kernel/cpu/proc.c | 8 + arch/x86/kernel/cpu/transmeta.c | 2 +- arch/x86/kernel/e820.c | 1 + arch/x86/kernel/entry_32.S | 4 +- arch/x86/kernel/entry_64.S | 7 +- arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/hpet.c | 1 + arch/x86/kernel/jump_label.c | 2 +- arch/x86/kernel/msr.c | 2 +- arch/x86/kernel/nmi.c | 4 + arch/x86/kernel/process.c | 101 +++- arch/x86/kernel/process.h | 39 ++ arch/x86/kernel/process_32.c | 9 +- arch/x86/kernel/process_64.c | 9 +- arch/x86/kernel/traps.c | 9 + arch/x86/kernel/verify_cpu.S | 2 +- arch/x86/kvm/cpuid.c | 5 +- arch/x86/lib/clear_page_64.S | 2 +- arch/x86/lib/copy_page_64.S | 2 +- arch/x86/lib/copy_user_64.S | 2 +- arch/x86/lib/memcpy_64.S | 2 +- arch/x86/lib/memmove_64.S | 2 +- arch/x86/lib/memset_64.S | 2 +- arch/x86/lib/retpoline.S | 2 +- arch/x86/mm/kaiser.c | 4 +- arch/x86/mm/setup_nx.c | 1 + arch/x86/mm/tlb.c | 102 +++- arch/x86/oprofile/op_model_amd.c | 1 - arch/x86/um/asm/barrier.h | 2 +- arch/x86/vdso/vdso32-setup.c | 1 - arch/x86/vdso/vma.c | 1 + drivers/base/cpu.c | 8 + include/linux/cpu.h | 19 + include/linux/jump_label.h | 301 +++++++--- include/linux/module.h | 5 + include/linux/ptrace.h | 21 +- include/linux/sched.h | 9 + include/linux/sched/smt.h | 20 + include/uapi/linux/prctl.h | 1 + kernel/cpu.c | 23 +- kernel/jump_label.c | 159 ++++-- kernel/module.c | 12 +- kernel/ptrace.c | 10 + kernel/sched/core.c | 19 + kernel/sched/sched.h | 1 + lib/atomic64_test.c | 4 + 105 files changed, 2872 insertions(+), 829 deletions(-) Andi Kleen (4): x86/headers: Don't include asm/processor.h in asm/atomic.h x86/speculation/mds: Add basic bug infrastructure for MDS x86/kvm: Expose X86_FEATURE_MD_CLEAR to guests x86/cpu/bugs: Use __initconst for 'const' init data Andy Lutomirski (2): x86/asm: Error out if asm/jump_label.h is included inappropriately x86/asm: Add asm macros for static keys/jump labels Anton Blanchard (2): jump_label: Allow asm/jump_label.h to be included in assembly jump_label: Allow jump labels to be used in assembly Ben Hutchings (4): sched: Add sched_smt_active() x86/speculation/l1tf: Document l1tf in sysfs x86/bugs: Change L1TF mitigation string to match upstream Linux 3.16.68 Boris Ostrovsky (1): x86/speculation/mds: Fix comment Borislav Petkov (2): x86/cpufeature: Add bug flags to /proc/cpuinfo x86/cpufeature: Carve out X86_FEATURE_* Dominik Brodowski (1): x86/speculation: Simplify the CPU bug detection logic Eduardo Habkost (1): kvm: x86: Report STIBP on GET_SUPPORTED_CPUID Heiko Carstens (2): s390/jump label: add sanity checks s390/jump label: use different nop instruction Ingo Molnar (1): jump_label: Fix small typos in the documentation Jason Baron (1): jump label, locking/static_keys: Update docs Jiang Biao (1): x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation Jiri Kosina (3): x86/speculation: Apply IBPB more strictly to avoid cross-process data leak x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation x86/speculation: Propagate information about RSB filling mitigation to sysfs Jonathan Corbet (2): locking/static_keys: Fix a silly typo locking/static_keys: Fix up the static keys documentation Josh Poimboeuf (6): x86/speculation: Move arch_smt_update() call to after mitigation decisions x86/speculation/mds: Add SMT warning message cpu/speculation: Add 'mitigations=' cmdline option x86/speculation: Support 'mitigations=' cmdline option x86/speculation/mds: Add 'mitigations=' support for MDS x86/speculation/mds: Fix documentation typo Konrad Rzeszutek Wilk (1): x86/speculation/mds: Print SMT vulnerable on MSBDS with mitigations off Maciej W. Rozycki (2): MIPS: jump_label.c: Correct the span of the J instruction MIPS: jump_label.c: Handle the microMIPS J instruction encoding Paolo Bonzini (1): locking/static_key: Fix concurrent static_key_slow_inc() Peter Zijlstra (8): module, jump_label: Fix module locking jump_label: Rename JUMP_LABEL_{EN,DIS}ABLE to JUMP_LABEL_{JMP,NOP} jump_label, locking/static_keys: Rename JUMP_LABEL_TYPE_* and related helpers to the static_key* pattern jump_label: Add jump_entry_key() helper locking/static_keys: Rework update logic locking/static_keys: Add a new static_key interface jump_label/x86: Work around asm build bug on older/backported GCCs x86/cpu: Sanitize FAM6_ATOM naming Petr Mladek (1): module: add within_module() function Sai Praneeth (1): x86/speculation: Support Enhanced IBRS on future CPUs Tejun Heo (1): jump_label: make static_key_enabled() work on static_key_true/false types too Thomas Gleixner (29): x86/speculation: Rename SSBD update functions x86/Kconfig: Select SCHED_SMT if SMP enabled x86/speculation: Rework SMT state change x86/speculation: Reorder the spec_v2 code x86/speculation: Mark string arrays const correctly x86/speculataion: Mark command line parser data __initdata x86/speculation: Unify conditional spectre v2 print functions x86/speculation: Add command line control for indirect branch speculation x86/process: Consolidate and simplify switch_to_xtra() code x86/speculation: Avoid __switch_to_xtra() calls x86/speculation: Prepare for conditional IBPB in switch_mm() x86/speculation: Split out TIF update x86/speculation: Prepare arch_smt_update() for PRCTL mode x86/speculation: Prevent stale SPEC_CTRL msr content x86/speculation: Add prctl() control for indirect branch speculation x86/speculation: Enable prctl mode for spectre_v2_user x86/speculation: Add seccomp Spectre v2 user space protection mode x86/speculation: Provide IBPB always command line options x86/msr-index: Cleanup bit defines x86/speculation: Consolidate CPU whitelists x86/speculation/mds: Add BUG_MSBDS_ONLY x86/speculation/mds: Add mds_clear_cpu_buffers() x86/speculation/mds: Clear CPU buffers on exit to user x86/speculation/mds: Conditionally clear CPU buffers on idle entry x86/speculation/mds: Add mitigation control for MDS x86/speculation/mds: Add sysfs reporting for MDS x86/speculation/mds: Add mitigation mode VMWERV Documentation: Move L1TF to separate directory Documentation: Add MDS vulnerability documentation Tim Chen (7): x86/speculation: Update the TIF_SSBD comment x86/speculation: Clean up spectre_v2_parse_cmdline() x86/speculation: Remove unnecessary ret variable in cpu_show_common() x86/speculation: Move STIPB/IBPB string conditionals out of cpu_show_common() x86/speculation: Disable STIBP when enhanced IBRS is in use x86/speculation: Reorganize speculation control MSRs update x86/speculation: Prepare for per task indirect branch speculation control Tony Luck (1): locking/static_keys: Provide DECLARE and well as DEFINE macros Tyler Hicks (1): Documentation: Correct the possible MDS sysfs values speck for Pawan Gupta (1): x86/mds: Add MDSUM variant to the MDS documentation

5 years, 9 months

1
0
0 0

[PATCH v4 1/3] powerpc: Fix vDSO clock_getres()

by Vincenzo Frascino

clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res(). In particular, posix_get_hrtimer_res() does: sec = 0; ns = hrtimer_resolution; and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time. Fix the powerpc vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly. Fixes: a7f290dad32e ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel") Cc: stable(a)vger.kernel.org Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Signed-off-by: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Reviewed-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- Note: This patch is independent from the others in this series, hence it can be merged singularly by the powerpc maintainers. arch/powerpc/include/asm/vdso_datapage.h | 2 ++ arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h index bbc06bd72b1f..4333b9a473dc 100644 --- a/arch/powerpc/include/asm/vdso_datapage.h +++ b/arch/powerpc/include/asm/vdso_datapage.h @@ -86,6 +86,7 @@ struct vdso_data { __s32 wtom_clock_nsec; /* Wall to monotonic clock nsec */ __s64 wtom_clock_sec; /* Wall to monotonic clock sec */ struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ + __u32 hrtimer_res; /* hrtimer resolution */ __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */ __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ }; @@ -107,6 +108,7 @@ struct vdso_data { __s32 wtom_clock_nsec; struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ __u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */ + __u32 hrtimer_res; /* hrtimer resolution */ __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ __u32 dcache_block_size; /* L1 d-cache block size */ __u32 icache_block_size; /* L1 i-cache block size */ diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 8e02444e9d3d..dfc40f29f2b9 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -389,6 +389,7 @@ int main(void) OFFSET(WTOM_CLOCK_NSEC, vdso_data, wtom_clock_nsec); OFFSET(STAMP_XTIME, vdso_data, stamp_xtime); OFFSET(STAMP_SEC_FRAC, vdso_data, stamp_sec_fraction); + OFFSET(CLOCK_REALTIME_RES, vdso_data, hrtimer_res); OFFSET(CFG_ICACHE_BLOCKSZ, vdso_data, icache_block_size); OFFSET(CFG_DCACHE_BLOCKSZ, vdso_data, dcache_block_size); OFFSET(CFG_ICACHE_LOGBLOCKSZ, vdso_data, icache_log_block_size); @@ -419,7 +420,6 @@ int main(void) DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE); DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE); DEFINE(NSEC_PER_SEC, NSEC_PER_SEC); - DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC); #ifdef CONFIG_BUG DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 325d60633dfa..4ea4e9d7a58e 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -963,6 +963,7 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->wtom_clock_nsec = tk->wall_to_monotonic.tv_nsec; vdso_data->stamp_xtime = xt; vdso_data->stamp_sec_fraction = frac_sec; + vdso_data->hrtimer_res = hrtimer_resolution; smp_wmb(); ++(vdso_data->tb_update_count); } diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index afd516b572f8..2b5f9e83c610 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) cror cr0*4+eq,cr0*4+eq,cr1*4+eq bne cr0,99f + mflr r12 + .cfi_register lr,r12 + bl __get_datapage@local + lwz r5,CLOCK_REALTIME_RES(r3) + mtlr r12 li r3,0 cmpli cr0,r4,0 crclr cr0*4+so beqlr - lis r5,CLOCK_REALTIME_RES@h - ori r5,r5,CLOCK_REALTIME_RES@l stw r3,TSPC32_TV_SEC(r4) stw r5,TSPC32_TV_NSEC(r4) blr diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S index 1f324c28705b..f07730f73d5e 100644 --- a/arch/powerpc/kernel/vdso64/gettimeofday.S +++ b/arch/powerpc/kernel/vdso64/gettimeofday.S @@ -190,12 +190,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) cror cr0*4+eq,cr0*4+eq,cr1*4+eq bne cr0,99f + mflr r12 + .cfi_register lr,r12 + bl V_LOCAL_FUNC(__get_datapage) + lwz r5,CLOCK_REALTIME_RES(r3) + mtlr r12 li r3,0 cmpldi cr0,r4,0 crclr cr0*4+so beqlr - lis r5,CLOCK_REALTIME_RES@h - ori r5,r5,CLOCK_REALTIME_RES@l std r3,TSPC64_TV_SEC(r4) std r5,TSPC64_TV_NSEC(r4) blr -- 2.21.0

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code" failed to apply to 5.0-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.0-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6fdd3bf5aecd8615f31a5128775b9abcf3e0d86 Mon Sep 17 00:00:00 2001 From: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Date: Fri, 29 Mar 2019 11:58:53 +0000 Subject: [PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code Use devm_pci_alloc_host_bridge() to simplify the error code path. This also fixes a leak in the dw_pcie_host_init() error path. Signed-off-by: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Acked-by: Gustavo Pimentel <gustavo.pimentel(a)synopsys.com> CC: stable(a)vger.kernel.org # v4.13+ diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index acc9be5cf34a..dcc7405aff9a 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -358,7 +358,7 @@ int dw_pcie_host_init(struct pcie_port *pp) dev_err(dev, "Missing *config* reg space\n"); } - bridge = pci_alloc_host_bridge(0); + bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge) return -ENOMEM; @@ -369,7 +369,7 @@ int dw_pcie_host_init(struct pcie_port *pp) ret = devm_request_pci_bus_resources(dev, &bridge->windows); if (ret) - goto error; + return ret; /* Get the I/O and memory ranges from DT */ resource_list_for_each_entry_safe(win, tmp, &bridge->windows) { @@ -413,8 +413,7 @@ int dw_pcie_host_init(struct pcie_port *pp) resource_size(pp->cfg)); if (!pci->dbi_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -425,8 +424,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base, pp->cfg0_size); if (!pp->va_cfg0_base) { dev_err(dev, "Error with ioremap in function\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -436,8 +434,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg1_size); if (!pp->va_cfg1_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -460,14 +457,14 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->num_vectors == 0) { dev_err(dev, "Invalid number of vectors\n"); - goto error; + return -EINVAL; } } if (!pp->ops->msi_host_init) { ret = dw_pcie_allocate_domains(pp); if (ret) - goto error; + return ret; if (pp->msi_irq) irq_set_chained_handler_and_data(pp->msi_irq, @@ -476,7 +473,7 @@ int dw_pcie_host_init(struct pcie_port *pp) } else { ret = pp->ops->msi_host_init(pp); if (ret < 0) - goto error; + return ret; } } @@ -516,8 +513,6 @@ int dw_pcie_host_init(struct pcie_port *pp) err_free_msi: if (pci_msi_enabled() && !pp->ops->msi_host_init) dw_pcie_free_msi(pp); -error: - pci_free_host_bridge(bridge); return ret; }

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6fdd3bf5aecd8615f31a5128775b9abcf3e0d86 Mon Sep 17 00:00:00 2001 From: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Date: Fri, 29 Mar 2019 11:58:53 +0000 Subject: [PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code Use devm_pci_alloc_host_bridge() to simplify the error code path. This also fixes a leak in the dw_pcie_host_init() error path. Signed-off-by: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Acked-by: Gustavo Pimentel <gustavo.pimentel(a)synopsys.com> CC: stable(a)vger.kernel.org # v4.13+ diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index acc9be5cf34a..dcc7405aff9a 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -358,7 +358,7 @@ int dw_pcie_host_init(struct pcie_port *pp) dev_err(dev, "Missing *config* reg space\n"); } - bridge = pci_alloc_host_bridge(0); + bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge) return -ENOMEM; @@ -369,7 +369,7 @@ int dw_pcie_host_init(struct pcie_port *pp) ret = devm_request_pci_bus_resources(dev, &bridge->windows); if (ret) - goto error; + return ret; /* Get the I/O and memory ranges from DT */ resource_list_for_each_entry_safe(win, tmp, &bridge->windows) { @@ -413,8 +413,7 @@ int dw_pcie_host_init(struct pcie_port *pp) resource_size(pp->cfg)); if (!pci->dbi_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -425,8 +424,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base, pp->cfg0_size); if (!pp->va_cfg0_base) { dev_err(dev, "Error with ioremap in function\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -436,8 +434,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg1_size); if (!pp->va_cfg1_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -460,14 +457,14 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->num_vectors == 0) { dev_err(dev, "Invalid number of vectors\n"); - goto error; + return -EINVAL; } } if (!pp->ops->msi_host_init) { ret = dw_pcie_allocate_domains(pp); if (ret) - goto error; + return ret; if (pp->msi_irq) irq_set_chained_handler_and_data(pp->msi_irq, @@ -476,7 +473,7 @@ int dw_pcie_host_init(struct pcie_port *pp) } else { ret = pp->ops->msi_host_init(pp); if (ret < 0) - goto error; + return ret; } } @@ -516,8 +513,6 @@ int dw_pcie_host_init(struct pcie_port *pp) err_free_msi: if (pci_msi_enabled() && !pp->ops->msi_host_init) dw_pcie_free_msi(pp); -error: - pci_free_host_bridge(bridge); return ret; }

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6fdd3bf5aecd8615f31a5128775b9abcf3e0d86 Mon Sep 17 00:00:00 2001 From: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Date: Fri, 29 Mar 2019 11:58:53 +0000 Subject: [PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code Use devm_pci_alloc_host_bridge() to simplify the error code path. This also fixes a leak in the dw_pcie_host_init() error path. Signed-off-by: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Acked-by: Gustavo Pimentel <gustavo.pimentel(a)synopsys.com> CC: stable(a)vger.kernel.org # v4.13+ diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index acc9be5cf34a..dcc7405aff9a 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -358,7 +358,7 @@ int dw_pcie_host_init(struct pcie_port *pp) dev_err(dev, "Missing *config* reg space\n"); } - bridge = pci_alloc_host_bridge(0); + bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge) return -ENOMEM; @@ -369,7 +369,7 @@ int dw_pcie_host_init(struct pcie_port *pp) ret = devm_request_pci_bus_resources(dev, &bridge->windows); if (ret) - goto error; + return ret; /* Get the I/O and memory ranges from DT */ resource_list_for_each_entry_safe(win, tmp, &bridge->windows) { @@ -413,8 +413,7 @@ int dw_pcie_host_init(struct pcie_port *pp) resource_size(pp->cfg)); if (!pci->dbi_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -425,8 +424,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base, pp->cfg0_size); if (!pp->va_cfg0_base) { dev_err(dev, "Error with ioremap in function\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -436,8 +434,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg1_size); if (!pp->va_cfg1_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -460,14 +457,14 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->num_vectors == 0) { dev_err(dev, "Invalid number of vectors\n"); - goto error; + return -EINVAL; } } if (!pp->ops->msi_host_init) { ret = dw_pcie_allocate_domains(pp); if (ret) - goto error; + return ret; if (pp->msi_irq) irq_set_chained_handler_and_data(pp->msi_irq, @@ -476,7 +473,7 @@ int dw_pcie_host_init(struct pcie_port *pp) } else { ret = pp->ops->msi_host_init(pp); if (ret < 0) - goto error; + return ret; } } @@ -516,8 +513,6 @@ int dw_pcie_host_init(struct pcie_port *pp) err_free_msi: if (pci_msi_enabled() && !pp->ops->msi_host_init) dw_pcie_free_msi(pp); -error: - pci_free_host_bridge(bridge); return ret; }

5 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code" failed to apply to 5.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6fdd3bf5aecd8615f31a5128775b9abcf3e0d86 Mon Sep 17 00:00:00 2001 From: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Date: Fri, 29 Mar 2019 11:58:53 +0000 Subject: [PATCH] PCI: dwc: Use devm_pci_alloc_host_bridge() to simplify code Use devm_pci_alloc_host_bridge() to simplify the error code path. This also fixes a leak in the dw_pcie_host_init() error path. Signed-off-by: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi(a)arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Acked-by: Gustavo Pimentel <gustavo.pimentel(a)synopsys.com> CC: stable(a)vger.kernel.org # v4.13+ diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index acc9be5cf34a..dcc7405aff9a 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -358,7 +358,7 @@ int dw_pcie_host_init(struct pcie_port *pp) dev_err(dev, "Missing *config* reg space\n"); } - bridge = pci_alloc_host_bridge(0); + bridge = devm_pci_alloc_host_bridge(dev, 0); if (!bridge) return -ENOMEM; @@ -369,7 +369,7 @@ int dw_pcie_host_init(struct pcie_port *pp) ret = devm_request_pci_bus_resources(dev, &bridge->windows); if (ret) - goto error; + return ret; /* Get the I/O and memory ranges from DT */ resource_list_for_each_entry_safe(win, tmp, &bridge->windows) { @@ -413,8 +413,7 @@ int dw_pcie_host_init(struct pcie_port *pp) resource_size(pp->cfg)); if (!pci->dbi_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -425,8 +424,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base, pp->cfg0_size); if (!pp->va_cfg0_base) { dev_err(dev, "Error with ioremap in function\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -436,8 +434,7 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg1_size); if (!pp->va_cfg1_base) { dev_err(dev, "Error with ioremap\n"); - ret = -ENOMEM; - goto error; + return -ENOMEM; } } @@ -460,14 +457,14 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->num_vectors == 0) { dev_err(dev, "Invalid number of vectors\n"); - goto error; + return -EINVAL; } } if (!pp->ops->msi_host_init) { ret = dw_pcie_allocate_domains(pp); if (ret) - goto error; + return ret; if (pp->msi_irq) irq_set_chained_handler_and_data(pp->msi_irq, @@ -476,7 +473,7 @@ int dw_pcie_host_init(struct pcie_port *pp) } else { ret = pp->ops->msi_host_init(pp); if (ret < 0) - goto error; + return ret; } } @@ -516,8 +513,6 @@ int dw_pcie_host_init(struct pcie_port *pp) err_free_msi: if (pci_msi_enabled() && !pp->ops->msi_host_init) dw_pcie_free_msi(pp); -error: - pci_free_host_bridge(bridge); return ret; }

5 years, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror May 2019