January 2019 - Linux-stable-mirror

[PATCH 1/4] media: imx: csi: Allow unknown nearest upstream entities

by Steve Longerbeam

On i.MX6, the nearest upstream entity to the CSI can only be the CSI video muxes or the Synopsys DW MIPI CSI-2 receiver. However the i.MX53 has no CSI video muxes or a MIPI CSI-2 receiver. So allow for the nearest upstream entity to the CSI to be something other than those. Fixes: bf3cfaa712e5c ("media: staging/imx: get CSI bus type from nearest upstream entity") Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Cc: stable(a)vger.kernel.org --- drivers/staging/media/imx/imx-media-csi.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 555aa45e02e3..b9af7d3d4974 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -154,9 +154,10 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep, /* * Parses the fwnode endpoint from the source pad of the entity * connected to this CSI. This will either be the entity directly - * upstream from the CSI-2 receiver, or directly upstream from the - * video mux. The endpoint is needed to determine the bus type and - * bus config coming into the CSI. + * upstream from the CSI-2 receiver, directly upstream from the + * video mux, or directly upstream from the CSI itself. The endpoint + * is needed to determine the bus type and bus config coming into + * the CSI. */ static int csi_get_upstream_endpoint(struct csi_priv *priv, struct v4l2_fwnode_endpoint *ep) @@ -172,7 +173,8 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, if (!priv->src_sd) return -EPIPE; - src = &priv->src_sd->entity; + sd = priv->src_sd; + src = &sd->entity; if (src->function == MEDIA_ENT_F_VID_MUX) { /* @@ -186,6 +188,14 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, src = &sd->entity; } + /* + * If the source is neither the video mux nor the CSI-2 receiver, + * get the source pad directly upstream from CSI itself. + */ + if (src->function != MEDIA_ENT_F_VID_MUX && + sd->grp_id != IMX_MEDIA_GRP_ID_CSI2) + src = &priv->sd.entity; + /* get source pad of entity directly upstream from src */ pad = imx_media_find_upstream_pad(priv->md, src, 0); if (IS_ERR(pad)) -- 2.17.1

5 years, 9 months

2
2
0 0

PASS: Test report for kernel 4.20.4-rc1.cki+ (linux-stable-rc)

by CKI

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: f919db9355d0 Linux 4.20.4-rc1 The results of these automated tests are provided below. Overall result: PASSED Patch merge: OK Compile: OK Kernel 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: s390x: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/s390x/f919db9355d0c1509c925f9bac22… powerpc64le: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/ppc64le/f919db9355d0c1509c925f9bac… aarch64: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/aarch64/f919db9355d0c1509c925f9bac… x86_64: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j32', 'targz-pkg', '-j32'] configuration: https://artifacts.cki-project.org/builds/x86_64/f919db9355d0c1509c925f9bac2… Hardware testing ---------------- We booted each kernel and ran the following tests: s390: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… Memory function: memfd_create - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Networking route: pmtu - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… powerpc: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: ext4 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… Memory function: memfd_create - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Networking route: pmtu - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… arm64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: ext4 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… Memory function: memfd_create - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Networking route: pmtu - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… x86_64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: ext4 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… Memory function: memfd_create - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/memory/func… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Networking route: pmtu - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/networking/… Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

5 years, 9 months

1
0
0 0

[PATCH v4 3/3] media: imx: prpencvf: Stop upstream before disabling IDMA channel

by Steve Longerbeam

Upstream must be stopped immediately after receiving the last EOF and before disabling the IDMA channel. This can be accomplished by moving upstream stream off to just after receiving the last EOF completion in prp_stop(). For symmetry also move upstream stream on to end of prp_start(). This fixes a complete system hard lockup on the SabreAuto when streaming from the ADV7180, by repeatedly sending a stream off immediately followed by stream on: while true; do v4l2-ctl -d1 --stream-mmap --stream-count=3; done Eventually this either causes the system lockup or EOF timeouts at all subsequent stream on, until a system reset. The lockup occurs when disabling the IDMA channel at stream off. Stopping the video data stream entering the IDMA channel before disabling the channel itself appears to be a reliable fix for the hard lockup. Fixes: f0d9c8924e2c3 ("[media] media: imx: Add IC subdev drivers") Reported-by: Gaël PORTAY <gael.portay(a)collabora.com> Tested-by: Gaël PORTAY <gael.portay(a)collabora.com> Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Cc: stable(a)vger.kernel.org --- Changes in v4: - none. Changes in v3: - Reword the commit subject and message. No functional changes. Changes in v2: - Add Fixes: and Cc: stable --- drivers/staging/media/imx/imx-ic-prpencvf.c | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c index 053a911d477a..3637693c2bc8 100644 --- a/drivers/staging/media/imx/imx-ic-prpencvf.c +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c @@ -706,12 +706,23 @@ static int prp_start(struct prp_priv *priv) goto out_free_nfb4eof_irq; } + /* start upstream */ + ret = v4l2_subdev_call(priv->src_sd, video, s_stream, 1); + ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0; + if (ret) { + v4l2_err(&ic_priv->sd, + "upstream stream on failed: %d\n", ret); + goto out_free_eof_irq; + } + /* start the EOF timeout timer */ mod_timer(&priv->eof_timeout_timer, jiffies + msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT)); return 0; +out_free_eof_irq: + devm_free_irq(ic_priv->dev, priv->eof_irq, priv); out_free_nfb4eof_irq: devm_free_irq(ic_priv->dev, priv->nfb4eof_irq, priv); out_unsetup: @@ -743,6 +754,12 @@ static void prp_stop(struct prp_priv *priv) if (ret == 0) v4l2_warn(&ic_priv->sd, "wait last EOF timeout\n"); + /* stop upstream */ + ret = v4l2_subdev_call(priv->src_sd, video, s_stream, 0); + if (ret && ret != -ENOIOCTLCMD) + v4l2_warn(&ic_priv->sd, + "upstream stream off failed: %d\n", ret); + devm_free_irq(ic_priv->dev, priv->eof_irq, priv); devm_free_irq(ic_priv->dev, priv->nfb4eof_irq, priv); @@ -1173,15 +1190,6 @@ static int prp_s_stream(struct v4l2_subdev *sd, int enable) if (ret) goto out; - /* start/stop upstream */ - ret = v4l2_subdev_call(priv->src_sd, video, s_stream, enable); - ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0; - if (ret) { - if (enable) - prp_stop(priv); - goto out; - } - update_count: priv->stream_count += enable ? 1 : -1; if (priv->stream_count < 0) -- 2.17.1

5 years, 9 months

1
0
0 0

[PATCH v4 2/3] media: imx: csi: Stop upstream before disabling IDMA channel

by Steve Longerbeam

Move upstream stream off to just after receiving the last EOF completion and disabling the CSI (and thus before disabling the IDMA channel) in csi_stop(). For symmetry also move upstream stream on to beginning of csi_start(). Doing this makes csi_s_stream() more symmetric with prp_s_stream() which will require the same change to fix a hard lockup. Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Cc: stable(a)vger.kernel.org --- drivers/staging/media/imx/imx-media-csi.c | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 920e38885292..d851ca2497b4 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -753,10 +753,16 @@ static int csi_start(struct csi_priv *priv) output_fi = &priv->frame_interval[priv->active_output_pad]; + /* start upstream */ + ret = v4l2_subdev_call(priv->src_sd, video, s_stream, 1); + ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0; + if (ret) + return ret; + if (priv->dest == IPU_CSI_DEST_IDMAC) { ret = csi_idmac_start(priv); if (ret) - return ret; + goto stop_upstream; } ret = csi_setup(priv); @@ -784,6 +790,8 @@ static int csi_start(struct csi_priv *priv) idmac_stop: if (priv->dest == IPU_CSI_DEST_IDMAC) csi_idmac_stop(priv); +stop_upstream: + v4l2_subdev_call(priv->src_sd, video, s_stream, 0); return ret; } @@ -799,6 +807,9 @@ static void csi_stop(struct csi_priv *priv) */ ipu_csi_disable(priv->csi); + /* stop upstream */ + v4l2_subdev_call(priv->src_sd, video, s_stream, 0); + if (priv->dest == IPU_CSI_DEST_IDMAC) { csi_idmac_stop(priv); @@ -966,23 +977,13 @@ static int csi_s_stream(struct v4l2_subdev *sd, int enable) goto update_count; if (enable) { - /* upstream must be started first, before starting CSI */ - ret = v4l2_subdev_call(priv->src_sd, video, s_stream, 1); - ret = (ret && ret != -ENOIOCTLCMD) ? ret : 0; - if (ret) - goto out; - dev_dbg(priv->dev, "stream ON\n"); ret = csi_start(priv); - if (ret) { - v4l2_subdev_call(priv->src_sd, video, s_stream, 0); + if (ret) goto out; - } } else { dev_dbg(priv->dev, "stream OFF\n"); - /* CSI must be stopped first, then stop upstream */ csi_stop(priv); - v4l2_subdev_call(priv->src_sd, video, s_stream, 0); } update_count: -- 2.17.1

5 years, 9 months

1
0
0 0

[PATCH v4 1/3] media: imx: csi: Disable CSI immediately after last EOF

by Steve Longerbeam

Disable the CSI immediately after receiving the last EOF before stream off (and thus before disabling the IDMA channel). Do this by moving the wait for EOF completion into a new function csi_idmac_wait_last_eof(). This fixes a complete system hard lockup on the SabreAuto when streaming from the ADV7180, by repeatedly sending a stream off immediately followed by stream on: while true; do v4l2-ctl -d4 --stream-mmap --stream-count=3; done Eventually this either causes the system lockup or EOF timeouts at all subsequent stream on, until a system reset. The lockup occurs when disabling the IDMA channel at stream off. Disabling the CSI before disabling the IDMA channel appears to be a reliable fix for the hard lockup. Fixes: 4a34ec8e470cb ("[media] media: imx: Add CSI subdev driver") Reported-by: Gaël PORTAY <gael.portay(a)collabora.com> Signed-off-by: Steve Longerbeam <slongerbeam(a)gmail.com> Cc: stable(a)vger.kernel.org --- Changes in v4: - Disabling SMFC will have no effect if both CSI's are streaming. So go back to disabling CSI before channel as in v2, but split up csi_idmac_stop such that ipu_csi_disable can still be called within csi_stop. Changes in v3: - switch from disabling the CSI before the channel to disabling the SMFC before the channel. Changes in v2: - restore an empty line - Add Fixes: and Cc: stable --- drivers/staging/media/imx/imx-media-csi.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 7abfe0aa1418..920e38885292 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -662,7 +662,7 @@ static int csi_idmac_start(struct csi_priv *priv) return ret; } -static void csi_idmac_stop(struct csi_priv *priv) +static void csi_idmac_wait_last_eof(struct csi_priv *priv) { unsigned long flags; int ret; @@ -679,7 +679,10 @@ static void csi_idmac_stop(struct csi_priv *priv) &priv->last_eof_comp, msecs_to_jiffies(IMX_MEDIA_EOF_TIMEOUT)); if (ret == 0) v4l2_warn(&priv->sd, "wait last EOF timeout\n"); +} +static void csi_idmac_stop(struct csi_priv *priv) +{ devm_free_irq(priv->dev, priv->eof_irq, priv); devm_free_irq(priv->dev, priv->nfb4eof_irq, priv); @@ -786,6 +789,16 @@ static int csi_start(struct csi_priv *priv) static void csi_stop(struct csi_priv *priv) { + if (priv->dest == IPU_CSI_DEST_IDMAC) + csi_idmac_wait_last_eof(priv); + + /* + * Disable the CSI asap, after syncing with the last EOF. + * Doing so after the IDMA channel is disabled has shown to + * create hard system-wide hangs. + */ + ipu_csi_disable(priv->csi); + if (priv->dest == IPU_CSI_DEST_IDMAC) { csi_idmac_stop(priv); @@ -793,8 +806,6 @@ static void csi_stop(struct csi_priv *priv) if (priv->fim) imx_media_fim_set_stream(priv->fim, NULL, false); } - - ipu_csi_disable(priv->csi); } static const struct csi_skip_desc csi_skip[12] = { -- 2.17.1

5 years, 9 months

1
0
0 0

Stable queue: queue-4.20

by CKI

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: e9a713f77bb2 Linux 4.20.3 The results of these automated tests are provided below. Overall result: PASSED Patch merge: OK Compile: OK Kernel 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 a ref: Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Ref: e9a713f77bb2 Linux 4.20.3 We then merged the following patches with `git am`: tty-ldsem-wake-up-readers-after-timed-out-down_write.patch tty-hold-tty_ldisc_lock-during-tty_reopen.patch tty-simplify-tty-count-math-in-tty_reopen.patch tty-don-t-hold-ldisc-lock-in-tty_reopen-if-ldisc-present.patch can-gw-ensure-dlc-boundaries-after-can-frame-modification.patch netfilter-nf_conncount-replace-conncount_lock_slots-with-conncount_slots.patch netfilter-nf_conncount-don-t-skip-eviction-when-age-is-negative.patch netfilter-nf_conncount-split-gc-in-two-phases.patch netfilter-nf_conncount-restart-search-when-nodes-have-been-erased.patch netfilter-nf_conncount-merge-lookup-and-add-functions.patch netfilter-nf_conncount-move-all-list-iterations-under-spinlock.patch netfilter-nf_conncount-speculative-garbage-collection-on-empty-lists.patch netfilter-nf_conncount-fix-argument-order-to-find_next_bit.patch mmc-sdhci-msm-disable-cdr-function-on-tx.patch arm64-kvm-consistently-handle-host-hcr_el2-flags.patch arm64-don-t-trap-host-pointer-auth-use-to-el2.patch ipv6-fix-kernel-infoleak-in-ipv6_local_error.patch net-bridge-fix-a-bug-on-using-a-neighbour-cache-entry-without-checking-its-state.patch packet-do-not-leak-dev-refcounts-on-error-exit.patch tcp-change-txhash-on-syn-data-timeout.patch tun-publish-tfile-after-it-s-fully-initialized.patch net-phy-add-missing-phy-driver-features.patch net-phy-add-missing-features-to-phy-drivers.patch net-phy-meson-gxl-use-the-genphy_soft_reset-callback.patch lan743x-remove-phy_read-from-link-status-change-function.patch in_badclass-fix-macro-to-actually-work.patch r8169-load-realtek-phy-driver-module-before-r8169.patch bonding-update-nest-level-on-unlink.patch ip-on-queued-skb-use-skb_header_pointer-instead-of-pskb_may_pull.patch r8169-don-t-try-to-read-counters-if-chip-is-in-a-pci-power-save-state.patch smc-move-unhash-as-early-as-possible-in-smc_release.patch crypto-sm3-fix-undefined-shift-by-width-of-value.patch crypto-caam-fix-zero-length-buffer-dma-mapping.patch crypto-authencesn-avoid-twice-completion-call-in-decrypt-path.patch crypto-ccree-convert-to-use-crypto_authenc_extractkeys.patch crypto-bcm-convert-to-use-crypto_authenc_extractkeys.patch crypto-authenc-fix-parsing-key-with-misaligned-rta_len.patch crypto-talitos-reorder-code-in-talitos_edesc_alloc.patch crypto-talitos-fix-ablkcipher-for-config_vmap_stack.patch xen-fix-x86-sched_clock-interface-for-xen.patch revert-btrfs-balance-dirty-metadata-pages-in-btrfs_finish_ordered_io.patch btrfs-wait-on-ordered-extents-on-abort-cleanup.patch yama-check-for-pid-death-before-checking-ancestry.patch scsi-core-synchronize-request-queue-pm-status-only-on-successful-resume.patch scsi-sd-fix-cache_type_store.patch virtio-don-t-allocate-vqs-when-names-null.patch virtio-balloon-tweak-config_changed-implementation.patch mips-fix-n32-compat_ipc_parse_version.patch mips-bcm47xx-setup-struct-device-for-the-soc.patch mips-lantiq-fix-ipi-interrupt-handling.patch mips-octeon-fix-kexec-support.patch drm-i915-gvt-fix-mmap-range-check.patch drm-rockchip-add-missing-of_node_put.patch of-properties-add-missing-of_node_put.patch mfd-tps6586x-handle-interrupts-on-suspend.patch media-v4l-ioctl-validate-num_planes-for-debug-messages.patch media-vim2m-only-cancel-work-if-it-is-for-right-context.patch rdma-nldev-don-t-expose-unsafe-global-rkey-to-regular-user.patch rdma-vmw_pvrdma-return-the-correct-opcode-when-creating-wr.patch kbuild-disable-ld_dead_code_data_elimination-with-ftrace-gcc-4.7.patch kbuild-fix-single-target-build-for-external-module.patch kbuild-mark-prepare0-as-phony-to-fix-external-module-build.patch net-dsa-realtek-smi-fix-of-child-node-lookup.patch pstore-ram-avoid-allocation-and-leak-of-platform-data.patch sunrpc-fix-tcp-receive-code-on-archs-with-flush_dcache_page.patch powerpc-tm-limit-tm-code-inside-ppc_transactional_mem.patch arm64-kaslr-ensure-randomized-quantities-are-clean-to-the-poc.patch arm64-dts-marvell-armada-ap806-reserve-psci-area.patch fbdev-offb-fix-of-node-name-handling.patch disable-msi-also-when-pcie-octeon.pcie_disable-on.patch fix-int_sqrt64-for-very-large-numbers.patch omap2fb-fix-stack-memory-disclosure.patch media-vivid-fix-error-handling-of-kthread_run.patch media-vivid-set-min-width-height-to-a-value-0.patch bpf-in-__bpf_redirect_no_mac-pull-mac-only-if-present.patch ipv6-make-icmp6_send-robust-against-null-skb-dev.patch lsm-check-for-null-cred-security-on-free.patch media-vb2-vb2_mmap-move-lock-up.patch sunrpc-handle-enomem-in-rpcb_getport_async.patch netfilter-ebtables-account-ebt_table_info-to-kmemcg.patch block-use-rcu_work-instead-of-call_rcu-to-avoid-sleep-in-softirq.patch drm-vkms-fix-plane-duplicate_state.patch gpu-drm-fix-lock-held-when-returning-to-user-space.patch selinux-fix-gpf-on-invalid-policy.patch blockdev-fix-livelocks-on-loop-device.patch sctp-allocate-sctp_sockaddr_entry-with-kzalloc.patch tipc-fix-uninit-value-in-in-tipc_conn_rcv_sub.patch tipc-fix-uninit-value-in-tipc_nl_compat_link_reset_stats.patch tipc-fix-uninit-value-in-tipc_nl_compat_bearer_enable.patch tipc-fix-uninit-value-in-tipc_nl_compat_link_set.patch tipc-fix-uninit-value-in-tipc_nl_compat_name_table_dump.patch tipc-fix-uninit-value-in-tipc_nl_compat_doit.patch block-loop-don-t-grab-struct-file-for-vfs_getattr-operation.patch block-loop-use-global-lock-for-ioctl-operation.patch loop-fold-__loop_release-into-loop_release.patch loop-get-rid-of-loop_index_mutex.patch loop-push-lo_ctl_mutex-down-into-individual-ioctls.patch loop-split-setting-of-lo_state-from-loop_clr_fd.patch loop-push-loop_ctl_mutex-down-into-loop_clr_fd.patch loop-push-loop_ctl_mutex-down-to-loop_get_status.patch loop-push-loop_ctl_mutex-down-to-loop_set_status.patch loop-push-loop_ctl_mutex-down-to-loop_set_fd.patch loop-push-loop_ctl_mutex-down-to-loop_change_fd.patch loop-move-special-partition-reread-handling-in-loop_clr_fd.patch loop-move-loop_reread_partitions-out-of-loop_ctl_mutex.patch loop-fix-deadlock-when-calling-blkdev_reread_part.patch loop-avoid-circular-locking-dependency-between-loop_ctl_mutex-and-bd_mutex.patch loop-get-rid-of-nested-acquisition-of-loop_ctl_mutex.patch loop-fix-double-mutex_unlock-loop_ctl_mutex-in-loop_control_ioctl.patch loop-drop-caches-if-offset-or-block_size-are-changed.patch drm-fb-helper-ignore-the-value-of-fb_var_screeninfo.pixclock.patch Compile testing --------------- We compiled the kernel for 4 architectures: s390x: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/s390x/f717a2edce8846f6b52e3ff950fe… powerpc64le: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/ppc64le/984a774bbb49d35f5c6bec1645… aarch64: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/aarch64/f7449b4fe59128d3ecc1ec3e4b… x86_64: make options: ['make', '-C', '/cki-project/cki-pipeline/workdir', 'INSTALL_MOD_STRIP=1', '-j64', 'targz-pkg', '-j64'] configuration: https://artifacts.cki-project.org/builds/x86_64/7325fdc894ecfda0efe243a65d5… Hardware testing ---------------- We booted each kernel and ran the following tests: s390: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu powerpc: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… arm64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us… x86_64: Boot test - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… /distribution/command LTP lite - release 20180926 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#distribution… xfstests: xfs - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#/filesystems… AMTU (Abstract Machine Test Utility) - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#misc/amtu Usex - version 1.9-29 - URL: https://github.com/CKI-project/tests-beaker/archive/master.zip#standards/us…

5 years, 9 months

1
0
0 0

[PATCH 1/2] RDMA/srp: Avoid calling mutex_lock() from inside scsi_queue_rq()

by Bart Van Assche

srp_queuecommand() can be called from the following contexts: * From inside scsi_queue_rq(). This function can be called by several kernel threads, including the SCSI error handler thread. * From inside scsi_send_eh_cmnd(). This function is only called from the SCSI error handler thread. In scsi-mq mode it is not allowed to sleep inside srp_queuecommand() since the flag BLK_MQ_F_BLOCKING has not been set. Since setting the request queue flag BLK_MQ_F_BLOCKING would slow down the hot path, make srp_queuecommand() skip the mutex_lock() and mutex_unlock() calls when called from inside scsi_queue_rq() from the SCSI EH thread. This patch avoids that the following appears in the kernel log: BUG: sleeping function called from invalid context at kernel/locking/mutex.c:908 in_atomic(): 1, irqs_disabled(): 0, pid: 30974, name: scsi_eh_4 INFO: lockdep is turned off. Preemption disabled at: [<ffffffff816b1d65>] __blk_mq_delay_run_hw_queue+0x185/0x290 CPU: 3 PID: 30974 Comm: scsi_eh_4 Not tainted 4.20.0-rc6-dbg+ #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 Call Trace: dump_stack+0x86/0xca ___might_sleep.cold.80+0x128/0x139 __might_sleep+0x71/0xe0 __mutex_lock+0xc8/0xbe0 mutex_lock_nested+0x1b/0x20 srp_queuecommand+0x7f2/0x19a0 [ib_srp] scsi_dispatch_cmd+0x15d/0x510 scsi_queue_rq+0x123/0xa90 blk_mq_dispatch_rq_list+0x678/0xc20 blk_mq_sched_dispatch_requests+0x25c/0x310 __blk_mq_run_hw_queue+0xd6/0x180 __blk_mq_delay_run_hw_queue+0x262/0x290 blk_mq_run_hw_queue+0x11f/0x1b0 blk_mq_run_hw_queues+0x87/0xb0 scsi_run_queue+0x402/0x6f0 scsi_run_host_queues+0x30/0x50 scsi_error_handler+0x2d3/0xa80 kthread+0x1cf/0x1f0 ret_from_fork+0x24/0x30 Cc: Sergey Gorenko <sergeygo(a)mellanox.com> Cc: Max Gurtovoy <maxg(a)mellanox.com> Cc: Laurence Oberman <loberman(a)redhat.com> Cc: <stable(a)vger.kernel.org> Fixes: a95cadb9dafe ("IB/srp: Add periodic reconnect functionality") # v3.13 Signed-off-by: Bart Van Assche <bvanassche(a)acm.org> --- drivers/infiniband/ulp/srp/ib_srp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 31d91538bbf4..23e5c9afb8fb 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2352,13 +2352,19 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd) u32 tag; u16 idx; int len, ret; - const bool in_scsi_eh = !in_interrupt() && current == shost->ehandler; + const bool in_scsi_eh = !in_interrupt() && current == shost->ehandler + && rcu_preempt_depth() == 0; /* - * The SCSI EH thread is the only context from which srp_queuecommand() - * can get invoked for blocked devices (SDEV_BLOCK / + * The scsi_send_eh_cmnd() function is the only function that can call + * .queuecommand() for blocked devices (SDEV_BLOCK / * SDEV_CREATED_BLOCK). Avoid racing with srp_reconnect_rport() by - * locking the rport mutex if invoked from inside the SCSI EH. + * locking the rport mutex if invoked from inside that function. + * Recognize this context by checking whether called from the SCSI EH + * thread and whether no RCU read lock is held. If + * blk_mq_run_hw_queues() is called from the context of the SCSI EH + * thread then an RCU read lock is held around scsi_queue_rq() calls + * becase the SRP driver does not set BLK_MQ_F_BLOCKING. */ if (in_scsi_eh) mutex_lock(&rport->mutex); -- 2.20.1.97.g81188d93c3-goog

5 years, 9 months

2
2
0 0

[PATCH 2/2] RDMA/srp: Rework SCSI device reset handling

by Bart Van Assche

Since .scsi_done() must only be called after scsi_queue_rq() has finished, make sure that the SRP initiator driver does not call .scsi_done() while scsi_queue_rq() is in progress. Although invoking sg_reset -d while I/O is in progress works fine with kernel v4.20 and before, that is not the case with kernel v5.0-rc1. This patch avoids that the following crash is triggered with kernel v5.0-rc1: BUG: unable to handle kernel NULL pointer dereference at 0000000000000138 CPU: 0 PID: 360 Comm: kworker/0:1H Tainted: G B 5.0.0-rc1-dbg+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 Workqueue: kblockd blk_mq_run_work_fn RIP: 0010:blk_mq_dispatch_rq_list+0x116/0xb10 Call Trace: blk_mq_sched_dispatch_requests+0x2f7/0x300 __blk_mq_run_hw_queue+0xd6/0x180 blk_mq_run_work_fn+0x27/0x30 process_one_work+0x4f1/0xa20 worker_thread+0x67/0x5b0 kthread+0x1cf/0x1f0 ret_from_fork+0x24/0x30 Cc: Sergey Gorenko <sergeygo(a)mellanox.com> Cc: Max Gurtovoy <maxg(a)mellanox.com> Cc: Laurence Oberman <loberman(a)redhat.com> Cc: <stable(a)vger.kernel.org> Fixes: 94a9174c630c ("IB/srp: reduce lock coverage of command completion") # v2.6.38 Signed-off-by: Bart Van Assche <bvanassche(a)acm.org> --- drivers/infiniband/ulp/srp/ib_srp.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 23e5c9afb8fb..f7ccbb07321b 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -3036,9 +3036,11 @@ static int srp_abort(struct scsi_cmnd *scmnd) static int srp_reset_device(struct scsi_cmnd *scmnd) { - struct srp_target_port *target = host_to_target(scmnd->device->host); + struct scsi_device *sdev = scmnd->device; + struct srp_target_port *target = host_to_target(sdev->host); struct srp_rdma_ch *ch; - int i, j; + struct request_queue *q = sdev->request_queue; + int time_left; u8 status; shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n"); @@ -3050,16 +3052,12 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) if (status) return FAILED; - for (i = 0; i < target->ch_count; i++) { - ch = &target->ch[i]; - for (j = 0; j < target->req_ring_size; ++j) { - struct srp_request *req = &ch->req_ring[j]; - - srp_finish_req(ch, req, scmnd->device, DID_RESET << 16); - } - } + /* Check whether all requests have finished. */ + blk_freeze_queue_start(q); + time_left = blk_mq_freeze_queue_wait_timeout(q, 1 * HZ); + blk_mq_unfreeze_queue(q); - return SUCCESS; + return time_left > 0 ? SUCCESS : FAILED; } static int srp_reset_host(struct scsi_cmnd *scmnd) -- 2.20.1.97.g81188d93c3-goog

5 years, 9 months

2
2
0 0

stable-rc/linux-4.14.y boot: 111 boots: 1 failed, 108 passed with 1 offline, 1 conflict (v4.14.94-62-gb18179b91e8b)

by kernelci.org bot

stable-rc/linux-4.14.y boot: 111 boots: 1 failed, 108 passed with 1 offline, 1 conflict (v4.14.94-62-gb18179b91e8b) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.1… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.94-62… Tree: stable-rc Branch: linux-4.14.y Git Describe: v4.14.94-62-gb18179b91e8b Git Commit: b18179b91e8b8e3c00f111995c6e358709589d67 Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 61 unique boards, 23 SoC families, 11 builds out of 197 Boot Failure Detected: arm64: defconfig rk3399-firefly: 1 failed lab Offline Platforms: arm64: defconfig: meson-gxl-s905x-khadas-vim: 1 offline lab Conflicting Boot Failure Detected: (These likely are not failures as other labs are reporting PASS. Needs review.) arm64: defconfig: meson-gxl-s905x-libretech-cc: lab-baylibre: PASS lab-baylibre-seattle: FAIL --- For more info write to <info(a)kernelci.org>

5 years, 9 months

1
0
0 0

stable-rc/linux-4.20.y boot: 116 boots: 1 failed, 114 passed with 1 conflict (v4.20.3-114-g67648eb553fb)

by kernelci.org bot

stable-rc/linux-4.20.y boot: 116 boots: 1 failed, 114 passed with 1 conflict (v4.20.3-114-g67648eb553fb) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.20.y/kernel/v4.2… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.20.y/kernel/v4.20.3-114… Tree: stable-rc Branch: linux-4.20.y Git Describe: v4.20.3-114-g67648eb553fb Git Commit: 67648eb553fb944194c327026f4be4632dce710d Git URL: http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 65 unique boards, 23 SoC families, 13 builds out of 202 Boot Regressions Detected: arm64: defconfig: meson-gxl-s905x-khadas-vim: lab-baylibre-seattle: new failure (last pass: v4.20.3-112-g2fce01b9fc1e) Boot Failure Detected: arm64: defconfig mt7622-rfb1: 1 failed lab Conflicting Boot Failure Detected: (These likely are not failures as other labs are reporting PASS. Needs review.) arm64: defconfig: meson-gxl-s905x-khadas-vim: lab-baylibre: PASS lab-baylibre-seattle: FAIL --- For more info write to <info(a)kernelci.org>

5 years, 9 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2019