4.19.92-stable review
Subsystems (11)
Greg Kroah-Hartman
maintainerPATCH 163/219 iwlwifi: mvm: fix unaligned read of rx_pkt_status
In reply to Greg Kroah-HartmanFrom: Wang Xuerui <[email protected]>
[ Upstream commit c5aaa8be29b25dfe1731e9a8b19fd91b7b789ee3 ]
This is present since the introduction of iwlmvm.
Example stack trace on MIPS:
[<ffffffffc0789328>] iwl_mvm_rx_rx_mpdu+0xa8/0xb88 [iwlmvm] [<ffffffffc0632b40>] iwl_pcie_rx_handle+0x420/0xc48 [iwlwifi]
Tested with a Wireless AC 7265 for ~6 months, confirmed to fix the problem. No other unaligned accesses are spotted yet.
--- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/rx.c +2 -1
@@ -62,6 +62,7 @@* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ +#include <asm/unaligned.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> #include "iwl-trans.h"
@@ -360,7 +361,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, rx_res = (struct iwl_rx_mpdu_res_start *)pkt->data; hdr = (struct ieee80211_hdr *)(pkt->data +sizeof (*rx_res)); len =le16_to_cpu (rx_res->byte_count); - rx_pkt_status =le32_to_cpup ((__le32 *) + rx_pkt_status =get_unaligned_le32 ((__le32 *) (pkt->data +sizeof (*rx_res) + len));/* Dont use dev_alloc_skb(), we'll have enough headroom once
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/219 ASoC: wm8904: fix regcache handling
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit e9149b8c00d25dbaef1aa174fc604bed207e576d ]
The current code assumes that the power is turned off in SND_SOC_BIAS_OFF. If there are no actual regulator the codec isn't turned off and the registers are not reset to their default values but the regcache is still marked as dirty. Thus a value might not be written to the hardware if it is set to the default value. Do a software reset before turning off the power to make sure the registers are always reset to their default states.
--- sound/soc/codecs/wm8904.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/wm8904.c +1 -0
@@ -1902,6 +1902,7 @@ static int wm8904_set_bias_level(struct snd_soc_component *component,snd_soc_component_update_bits (component,WM8904_BIAS_CONTROL_0 ,WM8904_BIAS_ENA ,0 ); +snd_soc_component_write (component,WM8904_SW_RESET_AND_ID ,0 );regcache_cache_only (wm8904->regmap, true);regcache_mark_dirty (wm8904->regmap);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/219 spi: tegra20-slink: add missed clk_unprepare
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 04358e40ba96d687c0811c21d9dede73f5244a98 ]
The driver misses calling clk_unprepare in probe failure and remove. Add the calls to fix it.
--- drivers/spi/spi-tegra20-slink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/spi/spi-tegra20-slink.c +4 -1
@@ -1078,7 +1078,7 @@ static int tegra_slink_probe(struct platform_device *pdev) ret =clk_enable (tspi->clk);if (ret <0 ) {dev_err (&pdev->dev,"Clock enable failed %d\n" , ret); - goto exit_free_master; + goto exit_clk_unprepare; } spi_irq =platform_get_irq (pdev,0 );
@@ -1151,6 +1151,8 @@ exit_free_irq:free_irq (spi_irq, tspi); exit_clk_disable:clk_disable (tspi->clk); +exit_clk_unprepare: +clk_unprepare (tspi->clk); exit_free_master:spi_master_put (master);return ret;
@@ -1164,6 +1166,7 @@ static int tegra_slink_remove(struct platform_device *pdev)free_irq (tspi->irq, tspi);clk_disable (tspi->clk); +clk_unprepare (tspi->clk);if (tspi->tx_dma_chan)tegra_slink_deinit_dma_param (tspi, false);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/219 tun: fix data-race in gro_normal_list()
In reply to Greg Kroah-HartmanFrom: Petar Penkov <[email protected]>
[ Upstream commit c39e342a050a4425348e6fe7f75827c0a1a7ebc5 ]
There is a race in the TUN driver between napi_busy_loop and napi_gro_frags. This commit resolves the race by adding the NAPI struct via netif_tx_napi_add, instead of netif_napi_add, which disables polling for the NAPI struct.
KCSAN reported:
BUG: KCSAN: data-race in gro_normal_list.part.0 / napi_busy_loop
write to 0xffff8880b5d474b0 of 4 bytes by task 11205 on cpu 0:
gro_normal_list.part.0+0x77/0xb0 net/core/dev.c:5682 gro_normal_list net/core/dev.c:5678 [inline] gro_normal_one net/core/dev.c:5692 [inline] napi_frags_finish net/core/dev.c:5705 [inline] napi_gro_frags+0x625/0x770 net/core/dev.c:5778 tun_get_user+0x2150/0x26a0 drivers/net/tun.c:1976 tun_chr_write_iter+0x79/0xd0 drivers/net/tun.c:2022 call_write_iter include/linux/fs.h:1895 [inline] do_iter_readv_writev+0x487/0x5b0 fs/read_write.c:693 do_iter_write fs/read_write.c:970 [inline] do_iter_write+0x13b/0x3c0 fs/read_write.c:951 vfs_writev+0x118/0x1c0 fs/read_write.c:1015 do_writev+0xe3/0x250 fs/read_write.c:1058 __do_sys_writev fs/read_write.c:1131 [inline] __se_sys_writev fs/read_write.c:1128 [inline] __x64_sys_writev+0x4e/0x60 fs/read_write.c:1128 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
read to 0xffff8880b5d474b0 of 4 bytes by task 11168 on cpu 1:
gro_normal_list net/core/dev.c:5678 [inline] napi_busy_loop+0xda/0x4f0 net/core/dev.c:6126 sk_busy_loop include/net/busy_poll.h:108 [inline] __skb_recv_udp+0x4ad/0x560 net/ipv4/udp.c:1689 udpv6_recvmsg+0x29e/0xe90 net/ipv6/udp.c:288 inet6_recvmsg+0xbb/0x240 net/ipv6/af_inet6.c:592 sock_recvmsg_nosec net/socket.c:871 [inline] sock_recvmsg net/socket.c:889 [inline] sock_recvmsg+0x92/0xb0 net/socket.c:885 sock_read_iter+0x15f/0x1e0 net/socket.c:967 call_read_iter include/linux/fs.h:1889 [inline] new_sync_read+0x389/0x4f0 fs/read_write.c:414 __vfs_read+0xb1/0xc0 fs/read_write.c:427 vfs_read fs/read_write.c:461 [inline] vfs_read+0x143/0x2c0 fs/read_write.c:446 ksys_read+0xd5/0x1b0 fs/read_write.c:587 __do_sys_read fs/read_write.c:597 [inline] __se_sys_read fs/read_write.c:595 [inline] __x64_sys_read+0x4c/0x60 fs/read_write.c:595 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 11168 Comm: syz-executor.0 Not tainted 5.4.0-rc6+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- drivers/net/tun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/tun.c +2 -2
@@ -319,8 +319,8 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile, tfile->napi_enabled = napi_en; tfile->napi_frags_enabled = napi_en && napi_frags;if (napi_en) { -netif_napi_add (tun->dev, &tfile->napi, tun_napi_poll, -NAPI_POLL_WEIGHT ); +netif_tx_napi_add (tun->dev, &tfile->napi, tun_napi_poll, +NAPI_POLL_WEIGHT );napi_enable (&tfile->napi); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/219 crypto: virtio - deal with unsupported input sizes
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 19c5da7d4a2662e85ea67d2d81df57e038fde3ab ]
Return -EINVAL for input sizes that are not a multiple of the AES block size, since they are not supported by our CBC chaining mode.
While at it, remove the pr_err() that reports unsupported key sizes being used: we shouldn't spam the kernel log with that.
--- drivers/crypto/virtio/virtio_crypto_algs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/crypto/virtio/virtio_crypto_algs.c +10 -2
@@ -117,8 +117,6 @@ virtio_crypto_alg_validate_key(int key_len, uint32_t *alg) *alg =VIRTIO_CRYPTO_CIPHER_AES_CBC ;break ;default : -pr_err ("virtio_crypto: Unsupported key length: %d\n" , - key_len);return -EINVAL ; }return 0 ;
@@ -498,6 +496,11 @@ static int virtio_crypto_ablkcipher_encrypt(struct ablkcipher_request *req)/* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0 ]; +if (!req->nbytes) +return 0 ; +if (req->nbytes %AES_BLOCK_SIZE ) +return -EINVAL ; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx;
@@ -518,6 +521,11 @@ static int virtio_crypto_ablkcipher_decrypt(struct ablkcipher_request *req)/* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0 ]; +if (!req->nbytes) +return 0 ; +if (req->nbytes %AES_BLOCK_SIZE ) +return -EINVAL ; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 168/219 mmc: tmio: Add MMC_CAP_ERASE to allow erase/discard/trim requests
In reply to Greg Kroah-HartmanFrom: Eugeniu Rosca <[email protected]>
[ Upstream commit c91843463e9e821dc3b48fe37e3155fa38299f6e ]
Isolated initially to renesas_sdhi_internal_dmac [1], Ulf suggested adding MMC_CAP_ERASE to the TMIO mmc core:
On Fri, Nov 15, 2019 at 10:27:25AM +0100, Ulf Hansson wrote:
-- snip --
This test and due to the discussions with Wolfram and you in this thread, I would actually suggest that you enable MMC_CAP_ERASE for all tmio variants, rather than just for this particular one.
In other words, set the cap in tmio_mmc_host_probe() should be fine, as it seems none of the tmio variants supports HW busy detection at this point.
-- snip --
Testing on R-Car H3ULCB-KF doesn't reveal any issues (v5.4-rc7):
root@rcar-gen3:~# lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT mmcblk0 179:0 0 59.2G 0 disk <--- eMMC mmcblk0boot0 179:8 0 4M 1 disk mmcblk0boot1 179:16 0 4M 1 disk mmcblk1 179:24 0 30G 0 disk <--- SD card
root@rcar-gen3:~# time blkdiscard /dev/mmcblk0 real 0m8.659s user 0m0.001s sys 0m1.920s
root@rcar-gen3:~# time blkdiscard /dev/mmcblk1 real 0m1.176s user 0m0.001s sys 0m0.124s
[1] https://lore.kernel.org/linux-renesas-soc/[email protected]/
--- drivers/mmc/host/tmio_mmc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/tmio_mmc_core.c +1 -1
@@ -1267,7 +1267,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)return ret; } - mmc->caps |=MMC_CAP_4_BIT_DATA | pdata->capabilities; + mmc->caps |=MMC_CAP_ERASE |MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; mmc->max_segs = pdata->max_segs ? :32 ; mmc->max_blk_size =512 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 169/219 btrfs: dont prematurely free work in end_workqueue_fn()
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
[ Upstream commit 9be490f1e15c34193b1aae17da58e14dd9f55a95 ]
Currently, end_workqueue_fn() frees the end_io_wq entry (which embeds the work item) and then calls bio_endio(). This is another potential instance of the bug in "btrfs: don't prematurely free work in run_ordered_work()".
In particular, the endio call may depend on other work items. For example, btrfs_end_dio_bio() can call btrfs_subio_endio_read() -> __btrfs_correct_data_nocsum() -> dio_read_error() -> submit_dio_repair_bio(), which submits a bio that is also completed through a end_workqueue_fn() work item. However, __btrfs_correct_data_nocsum() waits for the newly submitted bio to complete, thus it depends on another work item.
This example currently usually works because we use different workqueue helper functions for BTRFS_WQ_ENDIO_DATA and BTRFS_WQ_ENDIO_DIO_REPAIR. However, it may deadlock with stacked filesystems and is fragile overall. The proper fix is to free the work item at the very end of the work function, so let's do that.
--- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -1
@@ -1660,8 +1660,8 @@ static void end_workqueue_fn(struct btrfs_work *work) bio->bi_status = end_io_wq->status; bio->bi_private = end_io_wq->private; bio->bi_end_io = end_io_wq->end_io; -kmem_cache_free (btrfs_end_io_wq_cache, end_io_wq);bio_endio (bio); +kmem_cache_free (btrfs_end_io_wq_cache, end_io_wq); }static int cleaner_kthread (void *arg)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 170/219 btrfs: dont prematurely free work in run_ordered_work()
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
[ Upstream commit c495dcd6fbe1dce51811a76bb85b4675f6494938 ]
We hit the following very strange deadlock on a system with Btrfs on a loop device backed by another Btrfs filesystem:
1. The top (loop device) filesystem queues an async_cow work item from cow_file_range_async(). We'll call this work X.
2. Worker thread A starts work X (normal_work_helper()).
3. Worker thread A executes the ordered work for the top filesystem (run_ordered_work()).
4. Worker thread A finishes the ordered work for work X and frees X (work->ordered_free()).
5. Worker thread A executes another ordered work and gets blocked on I/O to the bottom filesystem (still in run_ordered_work()).
6. Meanwhile, the bottom filesystem allocates and queues an async_cow work item which happens to be the recently-freed X.
7. The workqueue code sees that X is already being executed by worker thread A, so it schedules X to be executed _after_ worker thread A finishes (see the find_worker_executing_work() call in process_one_work()).
Now, the top filesystem is waiting for I/O on the bottom filesystem, but the bottom filesystem is waiting for the top filesystem to finish, so we deadlock.
This happens because we are breaking the workqueue assumption that a work item cannot be recycled while it still depends on other work. Fix it by waiting to free the work item until we are done with all of the related ordered work.
P.S.:
One might ask why the workqueue code doesn't try to detect a recycled work item. It actually does try by checking whether the work item has the same work function (find_worker_executing_work()), but in our case the function is the same. This is the only key that the workqueue code has available to compare, short of adding an additional, layer-violating "custom key". Considering that we're the only ones that have ever hit this, we should just play by the rules.
Unfortunately, we haven't been able to create a minimal reproducer other than our full container setup using a compress-force=zstd filesystem on top of another compress-force=zstd filesystem.
--- fs/btrfs/async-thread.c | 56 ++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 12 deletions(-)
fs/btrfs/async-thread.c +44 -12
@@ -252,16 +252,17 @@ out: } } -static void run_ordered_work (struct __btrfs_workqueue *wq) +static void run_ordered_work (struct __btrfs_workqueue *wq, +struct btrfs_work *self) {struct list_head *list = &wq->ordered_list;struct btrfs_work *work;spinlock_t *lock = &wq->list_lock;unsigned long flags; +void *wtag; +bool free_self = false;while (1 ) { -void *wtag; -spin_lock_irqsave (lock, flags);if (list_empty (list))break ;
@@ -287,16 +288,47 @@ static void run_ordered_work(struct __btrfs_workqueue *wq)list_del (&work->ordered_list);spin_unlock_irqrestore (lock, flags); -/* -* We don't want to call the ordered free functions with the -* lock held though. Save the work as tag for the trace event, -* because the callback could free the structure. -*/ - wtag = work; - work->ordered_free (work); -trace_btrfs_all_work_done (wq->fs_info, wtag); +if (work == self) { +/* +* This is the work item that the worker is currently +* executing. +* +* The kernel workqueue code guarantees non-reentrancy +* of work items. I.e., if a work item with the same +* address and work function is queued twice, the second +* execution is blocked until the first one finishes. A +* work item may be freed and recycled with the same +* work function; the workqueue code assumes that the +* original work item cannot depend on the recycled work +* item in that case (see find_worker_executing_work()). +* +* Note that the work of one Btrfs filesystem may depend +* on the work of another Btrfs filesystem via, e.g., a +* loop device. Therefore, we must not allow the current +* work item to be recycled until we are really done, +* otherwise we break the above assumption and can +* deadlock. +*/ + free_self = true; + }else { +/* +* We don't want to call the ordered free functions with +* the lock held though. Save the work as tag for the +* trace event, because the callback could free the +* structure. +*/ + wtag = work; + work->ordered_free (work); +trace_btrfs_all_work_done (wq->fs_info, wtag); + } }spin_unlock_irqrestore (lock, flags); + +if (free_self) { + wtag = self; + self->ordered_free (self); +trace_btrfs_all_work_done (wq->fs_info, wtag); + } }static void normal_work_helper (struct btrfs_work *work)
@@ -324,7 +356,7 @@ static void normal_work_helper(struct btrfs_work *work) work->func (work);if (need_order) {set_bit (WORK_DONE_BIT , &work->flags); -run_ordered_work (wq); +run_ordered_work (wq, work); }if (!need_order)trace_btrfs_all_work_done (wq->fs_info, wtag);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 171/219 ASoC: wm2200: add missed operations in remove and probe failure
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 2dab09be49a1e7a4dd13cb47d3a1441a2ef33a87 ]
This driver misses calls to pm_runtime_disable and regulator_bulk_disable in remove and a call to free_irq in probe failure.
Add the calls to fix it.
--- sound/soc/codecs/wm2200.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/wm2200.c +5 -0
@@ -2413,6 +2413,8 @@ static int wm2200_i2c_probe(struct i2c_client *i2c, err_pm_runtime:pm_runtime_disable (&i2c->dev); +if (i2c->irq) +free_irq (i2c->irq, wm2200); err_reset:if (wm2200->pdata.reset)gpio_set_value_cansleep (wm2200->pdata.reset,0 );
@@ -2429,12 +2431,15 @@ static int wm2200_i2c_remove(struct i2c_client *i2c) {struct wm2200_priv *wm2200 =i2c_get_clientdata (i2c); +pm_runtime_disable (&i2c->dev);if (i2c->irq)free_irq (i2c->irq, wm2200);if (wm2200->pdata.reset)gpio_set_value_cansleep (wm2200->pdata.reset,0 );if (wm2200->pdata.ldo_ena)gpio_set_value_cansleep (wm2200->pdata.ldo_ena,0 ); +regulator_bulk_disable (ARRAY_SIZE (wm2200->core_supplies), + wm2200->core_supplies);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 172/219 spi: st-ssc4: add missed pm_runtime_disable
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit cd050abeba2a95fe5374eec28ad2244617bcbab6 ]
The driver forgets to call pm_runtime_disable in probe failure and remove.
Add the missed calls to fix it.
--- drivers/spi/spi-st-ssc4.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-st-ssc4.c +3 -0
@@ -385,6 +385,7 @@ static int spi_st_probe(struct platform_device *pdev)return 0 ; clk_disable: +pm_runtime_disable (&pdev->dev);clk_disable_unprepare (spi_st->clk); put_master:spi_master_put (master);
@@ -396,6 +397,8 @@ static int spi_st_remove(struct platform_device *pdev)struct spi_master *master =platform_get_drvdata (pdev);struct spi_st *spi_st =spi_master_get_devdata (master); +pm_runtime_disable (&pdev->dev); +clk_disable_unprepare (spi_st->clk);pinctrl_pm_select_sleep_state (&pdev->dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 173/219 ASoC: wm5100: add missed pm_runtime_disable
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit b1176bbb70866f24099cd2720283c7219fb4a81c ]
The driver forgets to call pm_runtime_disable in remove and probe failure.
Add the calls to fix it.
--- sound/soc/codecs/wm5100.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/wm5100.c +2 -0
@@ -2620,6 +2620,7 @@ static int wm5100_i2c_probe(struct i2c_client *i2c,return ret; err_reset: +pm_runtime_disable (&i2c->dev);if (i2c->irq)free_irq (i2c->irq, wm5100);wm5100_free_gpio (i2c);
@@ -2643,6 +2644,7 @@ static int wm5100_i2c_remove(struct i2c_client *i2c) {struct wm5100_priv *wm5100 =i2c_get_clientdata (i2c); +pm_runtime_disable (&i2c->dev);if (i2c->irq)free_irq (i2c->irq, wm5100);wm5100_free_gpio (i2c);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 174/219 ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 0bb887709eb16bdc4b5baddd8337abf3de72917f ]
When the Acer Switch 10 SW5-012 quirk was added we did not have jack-detection support yet; and the builtin microphone selection of the original quirk is wrong too.
Fix the microphone-input quirk and add jack-detection info so that the internal-microphone and headphone/set jack on the Switch 10 work properly.
--- sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/intel/boards/bytcr_rt5640.c +6 -4
@@ -414,10 +414,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), }, - .driver_data = (void *)(BYT_RT5640_IN1_MAP | -BYT_RT5640_MCLK_EN | -BYT_RT5640_SSP0_AIF1 ), - + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | +BYT_RT5640_JD_SRC_JD2_IN4N | +BYT_RT5640_OVCD_TH_2000UA | +BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_SSP0_AIF1 | + BYT_RT5640_MCLK_EN), }, { .matches = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 175/219 x86/insn: Add some Intel instructions to the opcode map
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit b980be189c9badba50634671e2303e92bf28e35a ]
Add to the opcode map the following instructions:
cldemote
tpause
umonitor
umwait
movdiri
movdir64b
enqcmd
enqcmds
encls
enclu
enclv
pconfig
wbnoinvd
For information about the instructions, refer Intel SDM May 2019 (325462-070US) and Intel Architecture Instruction Set Extensions May 2019 (319433-037).
The instruction decoding can be tested using the perf tools' "x86 instruction decoder - new instructions" test as folllows:
$ perf test -v "new " 2>&1 | grep -i cldemote Decoded ok: 0f 1c 00 cldemote (%eax) Decoded ok: 0f 1c 05 78 56 34 12 cldemote 0x12345678 Decoded ok: 0f 1c 84 c8 78 56 34 12 cldemote 0x12345678(%eax,%ecx,8) Decoded ok: 0f 1c 00 cldemote (%rax) Decoded ok: 41 0f 1c 00 cldemote (%r8) Decoded ok: 0f 1c 04 25 78 56 34 12 cldemote 0x12345678 Decoded ok: 0f 1c 84 c8 78 56 34 12 cldemote 0x12345678(%rax,%rcx,8) Decoded ok: 41 0f 1c 84 c8 78 56 34 12 cldemote 0x12345678(%r8,%rcx,8) $ perf test -v "new " 2>&1 | grep -i tpause Decoded ok: 66 0f ae f3 tpause %ebx Decoded ok: 66 0f ae f3 tpause %ebx Decoded ok: 66 41 0f ae f0 tpause %r8d $ perf test -v "new " 2>&1 | grep -i umonitor Decoded ok: 67 f3 0f ae f0 umonitor %ax Decoded ok: f3 0f ae f0 umonitor %eax Decoded ok: 67 f3 0f ae f0 umonitor %eax Decoded ok: f3 0f ae f0 umonitor %rax Decoded ok: 67 f3 41 0f ae f0 umonitor %r8d $ perf test -v "new " 2>&1 | grep -i umwait Decoded ok: f2 0f ae f0 umwait %eax Decoded ok: f2 0f ae f0 umwait %eax Decoded ok: f2 41 0f ae f0 umwait %r8d $ perf test -v "new " 2>&1 | grep -i movdiri Decoded ok: 0f 38 f9 03 movdiri %eax,(%ebx) Decoded ok: 0f 38 f9 88 78 56 34 12 movdiri %ecx,0x12345678(%eax) Decoded ok: 48 0f 38 f9 03 movdiri %rax,(%rbx) Decoded ok: 48 0f 38 f9 88 78 56 34 12 movdiri %rcx,0x12345678(%rax) $ perf test -v "new " 2>&1 | grep -i movdir64b Decoded ok: 66 0f 38 f8 18 movdir64b (%eax),%ebx Decoded ok: 66 0f 38 f8 88 78 56 34 12 movdir64b 0x12345678(%eax),%ecx Decoded ok: 67 66 0f 38 f8 1c movdir64b (%si),%bx Decoded ok: 67 66 0f 38 f8 8c 34 12 movdir64b 0x1234(%si),%cx Decoded ok: 66 0f 38 f8 18 movdir64b (%rax),%rbx Decoded ok: 66 0f 38 f8 88 78 56 34 12 movdir64b 0x12345678(%rax),%rcx Decoded ok: 67 66 0f 38 f8 18 movdir64b (%eax),%ebx Decoded ok: 67 66 0f 38 f8 88 78 56 34 12 movdir64b 0x12345678(%eax),%ecx $ perf test -v "new " 2>&1 | grep -i enqcmd Decoded ok: f2 0f 38 f8 18 enqcmd (%eax),%ebx Decoded ok: f2 0f 38 f8 88 78 56 34 12 enqcmd 0x12345678(%eax),%ecx Decoded ok: 67 f2 0f 38 f8 1c enqcmd (%si),%bx Decoded ok: 67 f2 0f 38 f8 8c 34 12 enqcmd 0x1234(%si),%cx Decoded ok: f3 0f 38 f8 18 enqcmds (%eax),%ebx Decoded ok: f3 0f 38 f8 88 78 56 34 12 enqcmds 0x12345678(%eax),%ecx Decoded ok: 67 f3 0f 38 f8 1c enqcmds (%si),%bx Decoded ok: 67 f3 0f 38 f8 8c 34 12 enqcmds 0x1234(%si),%cx Decoded ok: f2 0f 38 f8 18 enqcmd (%rax),%rbx Decoded ok: f2 0f 38 f8 88 78 56 34 12 enqcmd 0x12345678(%rax),%rcx Decoded ok: 67 f2 0f 38 f8 18 enqcmd (%eax),%ebx Decoded ok: 67 f2 0f 38 f8 88 78 56 34 12 enqcmd 0x12345678(%eax),%ecx Decoded ok: f3 0f 38 f8 18 enqcmds (%rax),%rbx Decoded ok: f3 0f 38 f8 88 78 56 34 12 enqcmds 0x12345678(%rax),%rcx Decoded ok: 67 f3 0f 38 f8 18 enqcmds (%eax),%ebx Decoded ok: 67 f3 0f 38 f8 88 78 56 34 12 enqcmds 0x12345678(%eax),%ecx $ perf test -v "new " 2>&1 | grep -i enqcmds Decoded ok: f3 0f 38 f8 18 enqcmds (%eax),%ebx Decoded ok: f3 0f 38 f8 88 78 56 34 12 enqcmds 0x12345678(%eax),%ecx Decoded ok: 67 f3 0f 38 f8 1c enqcmds (%si),%bx Decoded ok: 67 f3 0f 38 f8 8c 34 12 enqcmds 0x1234(%si),%cx Decoded ok: f3 0f 38 f8 18 enqcmds (%rax),%rbx Decoded ok: f3 0f 38 f8 88 78 56 34 12 enqcmds 0x12345678(%rax),%rcx Decoded ok: 67 f3 0f 38 f8 18 enqcmds (%eax),%ebx Decoded ok: 67 f3 0f 38 f8 88 78 56 34 12 enqcmds 0x12345678(%eax),%ecx $ perf test -v "new " 2>&1 | grep -i encls Decoded ok: 0f 01 cf encls Decoded ok: 0f 01 cf encls $ perf test -v "new " 2>&1 | grep -i enclu Decoded ok: 0f 01 d7 enclu Decoded ok: 0f 01 d7 enclu $ perf test -v "new " 2>&1 | grep -i enclv Decoded ok: 0f 01 c0 enclv Decoded ok: 0f 01 c0 enclv $ perf test -v "new " 2>&1 | grep -i pconfig Decoded ok: 0f 01 c5 pconfig Decoded ok: 0f 01 c5 pconfig $ perf test -v "new " 2>&1 | grep -i wbnoinvd Decoded ok: f3 0f 09 wbnoinvd Decoded ok: f3 0f 09 wbnoinvd
--- arch/x86/lib/x86-opcode-map.txt | 18 ++++++++++++------ tools/objtool/arch/x86/lib/x86-opcode-map.txt | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-)
arch/x86/lib/x86-opcode-map.txt +12 -6
@@ -333,7 +333,7 @@ AVXcode: 1 06: CLTS 07: SYSRET (o64) 08: INVD -09: WBINVD +09: WBINVD | WBNOINVD (F3) 0a: 0b: UD2 (1B) 0c:
@@ -364,7 +364,7 @@ AVXcode: 1 # a ModR/M byte. 1a: BNDCL Gv,Ev (F3) | BNDCU Gv,Ev (F2) | BNDMOV Gv,Ev (66) | BNDLDX Gv,Ev 1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv -1c: +1c: Grp20 (1A),(1C) 1d: 1e: 1f: NOP Ev
@@ -792,6 +792,8 @@ f3: Grp17 (1A) f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) +f8: MOVDIR64B Gv,Mdqq (66) | ENQCMD Gv,Mdqq (F2) | ENQCMDS Gv,Mdqq (F3) +f9: MOVDIRI My,Gy EndTable Table: 3-byte opcode 2 (0x0f 0x3a)
@@ -943,9 +945,9 @@ GrpTable: Grp6 EndTable GrpTable: Grp7 -0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) -1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) -2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) +0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B) +1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B) +2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B) 3: LIDT Ms 4: SMSW Mw/Rv 5: rdpkru (110),(11B) | wrpkru (111),(11B)
@@ -1020,7 +1022,7 @@ GrpTable: Grp15 3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B) 4: XSAVE | ptwrite Ey (F3),(11B) 5: XRSTOR | lfence (11B) -6: XSAVEOPT | clwb (66) | mfence (11B) +6: XSAVEOPT | clwb (66) | mfence (11B) | TPAUSE Rd (66),(11B) | UMONITOR Rv (F3),(11B) | UMWAIT Rd (F2),(11B) 7: clflush | clflushopt (66) | sfence (11B) EndTable
@@ -1051,6 +1053,10 @@ GrpTable: Grp19 6: vscatterpf1qps/d Wx (66),(ev) EndTable +GrpTable: Grp20 +0: cldemote Mb +EndTable + # AMD's Prefetch Group GrpTable: GrpP 0: PREFETCH
tools/objtool/arch/x86/lib/x86-opcode-map.txt +12 -6
@@ -333,7 +333,7 @@ AVXcode: 1 06: CLTS 07: SYSRET (o64) 08: INVD -09: WBINVD +09: WBINVD | WBNOINVD (F3) 0a: 0b: UD2 (1B) 0c:
@@ -364,7 +364,7 @@ AVXcode: 1 # a ModR/M byte. 1a: BNDCL Gv,Ev (F3) | BNDCU Gv,Ev (F2) | BNDMOV Gv,Ev (66) | BNDLDX Gv,Ev 1b: BNDCN Gv,Ev (F2) | BNDMOV Ev,Gv (66) | BNDMK Gv,Ev (F3) | BNDSTX Ev,Gv -1c: +1c: Grp20 (1A),(1C) 1d: 1e: 1f: NOP Ev
@@ -792,6 +792,8 @@ f3: Grp17 (1A) f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v) f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) +f8: MOVDIR64B Gv,Mdqq (66) | ENQCMD Gv,Mdqq (F2) | ENQCMDS Gv,Mdqq (F3) +f9: MOVDIRI My,Gy EndTable Table: 3-byte opcode 2 (0x0f 0x3a)
@@ -943,9 +945,9 @@ GrpTable: Grp6 EndTable GrpTable: Grp7 -0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) -1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) -2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) +0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B) | PCONFIG (101),(11B) | ENCLV (000),(11B) +1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B) | ENCLS (111),(11B) +2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B) | ENCLU (111),(11B) 3: LIDT Ms 4: SMSW Mw/Rv 5: rdpkru (110),(11B) | wrpkru (111),(11B)
@@ -1020,7 +1022,7 @@ GrpTable: Grp15 3: vstmxcsr Md (v1) | WRGSBASE Ry (F3),(11B) 4: XSAVE | ptwrite Ey (F3),(11B) 5: XRSTOR | lfence (11B) -6: XSAVEOPT | clwb (66) | mfence (11B) +6: XSAVEOPT | clwb (66) | mfence (11B) | TPAUSE Rd (66),(11B) | UMONITOR Rv (F3),(11B) | UMWAIT Rd (F2),(11B) 7: clflush | clflushopt (66) | sfence (11B) EndTable
@@ -1051,6 +1053,10 @@ GrpTable: Grp19 6: vscatterpf1qps/d Wx (66),(ev) EndTable +GrpTable: Grp20 +0: cldemote Mb +EndTable + # AMD's Prefetch Group GrpTable: GrpP 0: PREFETCH
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 176/219 brcmfmac: remove monitor interface when detaching
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 4f61563da075bc8faefddfd5f8fc0cc14c49650a ]
This fixes a minor WARNING in the cfg80211:
[ 130.658034] ------------[ cut here ]------------ [ 130.662805] WARNING: CPU: 1 PID: 610 at net/wireless/core.c:954 wiphy_unregister+0xb4/0x198 [cfg80211]
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +5 -0
@@ -1246,6 +1246,11 @@ void brcmf_detach(struct device *dev)brcmf_proto_detach_pre_delif (drvr); +if (drvr->mon_if) { +brcmf_net_detach (drvr->mon_if->ndev, false); + drvr->mon_if =NULL ; + } +/* make sure primary interface removed last */ for (i =BRCMF_MAX_IFS -1 ; i >-1 ; i--)brcmf_remove_interface (drvr->iflist[i], false);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 177/219 iwlwifi: check kasprintf() return value
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 5974fbb5e10b018fdbe3c3b81cb4cc54e1105ab9 ]
kasprintf() can fail, we should check the return value.
--- drivers/net/wireless/intel/iwlwifi/dvm/led.c | 3 +++ drivers/net/wireless/intel/iwlwifi/mvm/led.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/net/wireless/intel/iwlwifi/dvm/led.c +3 -0
@@ -185,6 +185,9 @@ void iwl_leds_init(struct iwl_priv *priv) priv->led.name =kasprintf (GFP_KERNEL ,"%s-led" ,wiphy_name (priv->hw->wiphy)); +if (!priv->led.name) +return ; + priv->led.brightness_set = iwl_led_brightness_set; priv->led.blink_set = iwl_led_blink_set; priv->led.max_brightness =1 ;
drivers/net/wireless/intel/iwlwifi/mvm/led.c +3 -0
@@ -131,6 +131,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm) mvm->led.name =kasprintf (GFP_KERNEL ,"%s-led" ,wiphy_name (mvm->hw->wiphy)); +if (!mvm->led.name) +return -ENOMEM ; + mvm->led.brightness_set = iwl_led_brightness_set; mvm->led.max_brightness =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 178/219 fbtft: Make sure string is NULL terminated
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 21f585480deb4bcf0d92b08879c35d066dfee030 ]
New GCC warns about inappropriate use of strncpy():
drivers/staging/fbtft/fbtft-core.c: In function ‘fbtft_framebuffer_alloc’:drivers/staging/fbtft/fbtft-core.c:665:2: warning: ‘strncpy’ specified bound 16 equals destination size [-Wstringop-truncation]
665 | strncpy(info->fix.id, dev->driver->name, 16);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Later on the copy is being used with the assumption to be NULL terminated. Make sure string is NULL terminated by switching to snprintf().
--- drivers/staging/fbtft/fbtft-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/fbtft/fbtft-core.c +1 -1
@@ -771,7 +771,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, fbdefio->deferred_io = fbtft_deferred_io;fb_deferred_io_init (info); -strncpy (info->fix.id, dev->driver->name,16 ); +snprintf (info->fix.id,sizeof (info->fix.id),"%s" , dev->driver->name); info->fix.type =FB_TYPE_PACKED_PIXELS ; info->fix.visual =FB_VISUAL_TRUECOLOR ; info->fix.xpanstep =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 179/219 net: ethernet: ti: ale: clean ale tbl on init and intf restart
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 7fe579dfb90fcdf0c7722f33c772d5f0d1bc7cb6 ]
Clean CPSW ALE on init and intf restart (up/down) to avoid reading obsolete or garbage entries from ALE table.
--- drivers/net/ethernet/ti/cpsw_ale.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/ti/cpsw_ale.c +2 -0
@@ -793,6 +793,7 @@ EXPORT_SYMBOL_GPL(cpsw_ale_start);void cpsw_ale_stop (struct cpsw_ale *ale) {del_timer_sync (&ale->timer); +cpsw_ale_control_set (ale,0 ,ALE_CLEAR ,1 );cpsw_ale_control_set (ale,0 ,ALE_ENABLE ,0 ); }EXPORT_SYMBOL_GPL (cpsw_ale_stop);
@@ -877,6 +878,7 @@ struct cpsw_ale *cpsw_ale_create(struct cpsw_ale_params *params)ALE_UNKNOWNVLAN_FORCE_UNTAG_EGRESS ; } +cpsw_ale_control_set (ale,0 ,ALE_CLEAR ,1 );return ale; }EXPORT_SYMBOL_GPL (cpsw_ale_create);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 180/219 crypto: sun4i-ss - Fix 64-bit size_t warnings
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit d6e9da21ee8246b5e556b3b153401ab045adb986 ]
If you try to compile this driver on a 64-bit platform then you will get warnings because it mixes size_t with unsigned int which only works on 32-bit.
This patch fixes all of the warnings.
--- drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c +14 -8
@@ -81,7 +81,8 @@ static int sun4i_ss_opti_poll(struct skcipher_request *areq) oi =0 ; oo =0 ; do { - todo = min3(rx_cnt, ileft, (mi.length - oi) / 4); + todo = min(rx_cnt, ileft); + todo = min_t(size_t, todo, (mi.length - oi) / 4); if (todo) { ileft -= todo; writesl(ss->base + SS_RXFIFO, mi.addr + oi, todo);
@@ -96,7 +97,8 @@ static int sun4i_ss_opti_poll(struct skcipher_request *areq) rx_cnt =SS_RXFIFO_SPACES (spaces); tx_cnt =SS_TXFIFO_SPACES (spaces); - todo =min3 (tx_cnt, oleft, (mo.length - oo) /4 ); + todo =min (tx_cnt, oleft); + todo =min_t (size_t, todo, (mo.length - oo) /4 );if (todo) { oleft -= todo;readsl (ss->base +SS_TXFIFO , mo.addr + oo, todo);
@@ -220,7 +222,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)* todo is the number of consecutive 4byte word that we * can read from current SG */ - todo =min3 (rx_cnt, ileft /4 , (mi.length - oi) /4 ); + todo =min (rx_cnt, ileft /4 ); + todo =min_t (size_t, todo, (mi.length - oi) /4 );if (todo && !ob) {writesl (ss->base +SS_RXFIFO , mi.addr + oi, todo);
@@ -234,8 +237,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)* we need to be able to write all buf in one * pass, so it is why we min() with rx_cnt */ - todo =min3 (rx_cnt *4 - ob, ileft, - mi.length - oi); + todo =min (rx_cnt *4 - ob, ileft); + todo =min_t (size_t, todo, mi.length - oi);memcpy (buf + ob, mi.addr + oi, todo); ileft -= todo; oi += todo;
@@ -255,7 +258,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq) spaces =readl (ss->base +SS_FCSR ); rx_cnt =SS_RXFIFO_SPACES (spaces); tx_cnt =SS_TXFIFO_SPACES (spaces); -dev_dbg (ss->dev,"%x %u/%u %u/%u cnt=%u %u/%u %u/%u cnt=%u %u\n" , +dev_dbg (ss->dev, +"%x %u/%zu %u/%u cnt=%u %u/%zu %u/%u cnt=%u %u\n" , mode, oi, mi.length, ileft, areq->cryptlen, rx_cnt, oo, mo.length, oleft, areq->cryptlen, tx_cnt, ob);
@@ -263,7 +267,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)if (!tx_cnt)continue ;/* todo in 4bytes word */ - todo =min3 (tx_cnt, oleft /4 , (mo.length - oo) /4 ); + todo =min (tx_cnt, oleft /4 ); + todo =min_t (size_t, todo, (mo.length - oo) /4 );if (todo) {readsl (ss->base +SS_TXFIFO , mo.addr + oo, todo); oleft -= todo *4 ;
@@ -287,7 +292,8 @@ static int sun4i_ss_cipher_poll(struct skcipher_request *areq)* no more than remaining buffer * no need to test against oleft */ - todo =min (mo.length - oo, obl - obo); + todo =min_t (size_t, + mo.length - oo, obl - obo);memcpy (mo.addr + oo, bufo + obo, todo); oleft -= todo; obo += todo;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 181/219 crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit a7126603d46fe8f01aeedf589e071c6aaa6c6c39 ]
If you try to compile this driver on a 64-bit platform then you will get warnings because it mixes size_t with unsigned int which only works on 32-bit.
This patch fixes all of the warnings on sun4i-ss-hash.c.
--- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/crypto/sunxi-ss/sun4i-ss-hash.c +6 -6
@@ -276,8 +276,8 @@ static int sun4i_hash(struct ahash_request *areq)*/ while (op->len <64 && i < end) {/* how many bytes we can read from current SG */ - in_r =min3 (mi.length - in_i, end - i, -64 - op->len); + in_r =min (end - i,64 - op->len); + in_r =min_t (size_t, mi.length - in_i, in_r);memcpy (op->buf + op->len, mi.addr + in_i, in_r); op->len += in_r; i += in_r;
@@ -297,8 +297,8 @@ static int sun4i_hash(struct ahash_request *areq) }if (mi.length - in_i >3 && i < end) {/* how many bytes we can read from current SG */ - in_r =min3 (mi.length - in_i, areq->nbytes - i, - ((mi.length - in_i) /4 ) *4 ); + in_r =min_t (size_t, mi.length - in_i, areq->nbytes - i); + in_r =min_t (size_t, ((mi.length - in_i) /4 ) *4 , in_r);/* how many bytes we can write in the device*/ todo =min3 ((u32)(end - i) /4 , rx_cnt, (u32 )in_r /4 );writesl (ss->base +SS_RXFIFO , mi.addr + in_i, todo);
@@ -324,8 +324,8 @@ static int sun4i_hash(struct ahash_request *areq)if ((areq->nbytes - i) <64 ) {while (i < areq->nbytes && in_i < mi.length && op->len <64 ) {/* how many bytes we can read from current SG */ - in_r =min3 (mi.length - in_i, areq->nbytes - i, -64 - op->len); + in_r =min (areq->nbytes - i,64 - op->len); + in_r =min_t (size_t, mi.length - in_i, in_r);memcpy (op->buf + op->len, mi.addr + in_i, in_r); op->len += in_r; i += in_r;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 182/219 mac80211: consider QoS Null frames for STA_NULLFUNC_ACKED
In reply to Greg Kroah-HartmanFrom: Thomas Pedersen <[email protected]>
[ Upstream commit 08a5bdde3812993cb8eb7aa9124703df0de28e4b ]
Commit 7b6ddeaf27ec ("mac80211: use QoS NDP for AP probing") let STAs send QoS Null frames as PS triggers if the AP was a QoS STA. However, the mac80211 PS stack relies on an interface flag IEEE80211_STA_NULLFUNC_ACKED for determining trigger frame ACK, which was not being set for acked non-QoS Null frames. The effect is an inability to trigger hardware sleep via IEEE80211_CONF_PS since the QoS Null frame was seemingly never acked.
This bug only applies to drivers which set bothIEEE80211_HW_REPORTS_TX_ACK_STATUS andIEEE80211_HW_PS_NULLFUNC_STACK.
Detect the acked QoS Null frame to restore STA power save.
--- net/mac80211/status.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/status.c +2 -1
@@ -867,7 +867,8 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,I802_DEBUG_INC (local->dot11FailedCount); } -if (ieee80211_is_nullfunc (fc) &&ieee80211_has_pm (fc) && +if ((ieee80211_is_nullfunc (fc) ||ieee80211_is_qos_nullfunc (fc)) && +ieee80211_has_pm (fc) &&ieee80211_hw_check (&local->hw,REPORTS_TX_ACK_STATUS ) && !(info->flags &IEEE80211_TX_CTL_INJECTED ) && local->ps_sdata && !(local->scanning)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 183/219 crypto: vmx - Avoid weird build failures
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 4ee812f6143d78d8ba1399671d78c8d78bf2817c ]
In the vmx crypto Makefile we assign to a variable called TARGET and pass that to the aesp8-ppc.pl and ghashp8-ppc.pl scripts.
The variable is meant to describe what flavour of powerpc we're building for, eg. either 32 or 64-bit, and big or little endian.
Unfortunately TARGET is a fairly common name for a make variable, and if it happens that TARGET is specified as a command line parameter to make, the value specified on the command line will override our value.
In particular this can happen if the kernel Makefile is driven by an external Makefile that uses TARGET for something.
This leads to weird build failures, eg:
nonsense at /build/linux/drivers/crypto/vmx/ghashp8-ppc.pl line 45. /linux/drivers/crypto/vmx/Makefile:20: recipe for target 'drivers/crypto/vmx/ghashp8-ppc.S' failed
Which shows that we passed an empty value for $(TARGET) to the perl script, confirmed with make V=1:
perl /linux/drivers/crypto/vmx/ghashp8-ppc.pl > drivers/crypto/vmx/ghashp8-ppc.S
We can avoid this confusion by using override, to tell make that we don't want anything to override our variable, even a value specified on the command line. We can also use a less common name, given the script calls it "flavour", let's use that.
--- drivers/crypto/vmx/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/vmx/Makefile +3 -3
@@ -3,13 +3,13 @@ obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) -TARGET := linux-ppc64le +override flavour := linux-ppc64le else -TARGET := linux-ppc64 +override flavour := linux-ppc64 endif quiet_cmd_perl = PERL $@ - cmd_perl = $(PERL) $(<) $(TARGET) > $(@) + cmd_perl = $(PERL) $(<) $(flavour) > $(@) targets += aesp8-ppc.S ghashp8-ppc.S
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 184/219 libtraceevent: Fix memory leakage in copy_filter_type
In reply to Greg Kroah-HartmanFrom: Hewenliang <[email protected]>
[ Upstream commit 10992af6bf46a2048ad964985a5b77464e5563b1 ]
It is necessary to free the memory that we have allocated when error occurs.
--- tools/lib/traceevent/parse-filter.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
tools/lib/traceevent/parse-filter.c +7 -2
@@ -1475,8 +1475,10 @@ static int copy_filter_type(struct event_filter *filter,if (strcmp (str,"TRUE" ) ==0 ||strcmp (str,"FALSE" ) ==0 ) {/* Add trivial event */ arg =allocate_arg (); -if (arg ==NULL ) +if (arg ==NULL ) { +free (str);return -1 ; + } arg->type =FILTER_ARG_BOOLEAN ;if (strcmp (str,"TRUE" ) ==0 )
@@ -1485,8 +1487,11 @@ static int copy_filter_type(struct event_filter *filter, arg->boolean.value =0 ; filter_type =add_filter_type (filter, event->id); -if (filter_type ==NULL ) +if (filter_type ==NULL ) { +free (str); +free_arg (arg);return -1 ; + } filter_type->filter = arg;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 185/219 mips: fix build when "48 bits virtual memory" is enabled
In reply to Greg Kroah-HartmanFrom: Mike Rapoport <[email protected]>
[ Upstream commit 3ed6751bb8fa89c3014399bb0414348499ee202a ]
With CONFIG_MIPS_VA_BITS_48=y the build fails miserably:
CC arch/mips/kernel/asm-offsets.s
In file included from arch/mips/include/asm/pgtable.h:644,
from include/linux/mm.h:99,
from arch/mips/kernel/asm-offsets.c:15:include/asm-generic/pgtable.h:16:2: error: #error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
#error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
^~~~~include/asm-generic/pgtable.h:390:28: error: unknown type name 'p4d_t'; did you mean 'pmd_t'?
static inline int p4d_same(p4d_t p4d_a, p4d_t p4d_b)
^~~~~
pmd_t[ ... more such errors ... ]
scripts/Makefile.build:99: recipe for target 'arch/mips/kernel/asm-offsets.s' failed make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
This happens because when CONFIG_MIPS_VA_BITS_48 enables 4th level of the page tables, but neither pgtable-nop4d.h nor 5level-fixup.h are included to cope with the 5th level.
Replace #ifdef conditions around includes of the pgtable-nop{m,u}d.h with explicit CONFIG_PGTABLE_LEVELS and add include of 5level-fixup.h for the case when CONFIG_PGTABLE_LEVELS==4
--- arch/mips/include/asm/pgtable-64.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/mips/include/asm/pgtable-64.h +7 -2
@@ -18,10 +18,12 @@#include <asm/fixmap.h> #define __ARCH_USE_5LEVEL_HACK -#if defined(CONFIG_PAGE_SIZE_64KB ) && !defined(CONFIG_MIPS_VA_BITS_48 ) +#if CONFIG_PGTABLE_LEVELS ==2 #include <asm-generic/pgtable-nopmd.h> -#elif !(defined(CONFIG_PAGE_SIZE_4KB ) && defined(CONFIG_MIPS_VA_BITS_48 )) +#elif CONFIG_PGTABLE_LEVELS ==3 #include <asm-generic/pgtable-nopud.h> +#else +#include <asm-generic/5level-fixup.h> #endif /*
@@ -216,6 +218,9 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)return pgd_val (pgd); } +#define pgd_phys (pgd) virt_to_phys((void *)pgd_val(pgd)) +#define pgd_page (pgd) (pfn_to_page(pgd_phys(pgd) >> PAGE_SHIFT)) +static inline pud_t *pud_offset (pgd_t *pgd,unsigned long address) {return (pud_t *)pgd_page_vaddr (*pgd) +pud_index (address);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 186/219 drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2
In reply to Greg Kroah-HartmanFrom: Sam Bobroff <[email protected]>
[ Upstream commit 3d0e3ce52ce3eb4b9de3caf9c38dbb5a4d3e13c3 ]
The INTERRUPT_CNTL2 register expects a valid DMA address, but is currently set with a GPU MC address. This can cause problems on systems that detect the resulting DMA read from an invalid address (found on a Power8 guest).
Instead, use the DMA address of the dummy page because it will always be safe.
--- drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/si_ih.c +2 -1
@@ -62,7 +62,8 @@ static int si_ih_irq_init(struct amdgpu_device *adev)u64 wptr_off;si_ih_disable_interrupts (adev); -WREG32 (INTERRUPT_CNTL2 , adev->irq.ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , adev->dummy_page_addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL ); interrupt_cntl &= ~IH_DUMMY_RD_OVERRIDE ; interrupt_cntl &= ~IH_REQ_NONSNOOP_EN ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 187/219 net: phy: initialise phydev speed and duplex sanely
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit a5d66f810061e2dd70fb7a108dcd14e535bc639f ]
When a phydev is created, the speed and duplex are set to zero and -1 respectively, rather than using the predefined SPEED_UNKNOWN and DUPLEX_UNKNOWN constants.
There is a window at initialisation time where we may report link down using the 0/-1 values. Tidy this up and use the predefined constants, so debug doesn't complain with:
"Unsupported (update phy-core.c)/Unsupported (update phy-core.c)"
when the speed and duplex settings are printed.
--- drivers/net/phy/phy_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +2 -2
@@ -420,8 +420,8 @@ struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id, mdiodev->device_free = phy_mdio_device_free; mdiodev->device_remove = phy_mdio_device_remove; - dev->speed =0 ; - dev->duplex =-1 ; + dev->speed =SPEED_UNKNOWN ; + dev->duplex =DUPLEX_UNKNOWN ; dev->pause =0 ; dev->asym_pause =0 ; dev->link =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 188/219 btrfs: dont prematurely free work in reada_start_machine_worker()
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
[ Upstream commit e732fe95e4cad35fc1df278c23a32903341b08b3 ]
Currently, reada_start_machine_worker() frees the reada_machine_work and then calls __reada_start_machine() to do readahead. This is another potential instance of the bug in "btrfs: don't prematurely free work in run_ordered_work()".
There _might_ already be a deadlock here: reada_start_machine_worker() can depend on itself through stacked filesystems (__read_start_machine() -> reada_start_machine_dev() -> reada_tree_block_flagged() -> read_extent_buffer_pages() -> submit_one_bio() -> btree_submit_bio_hook() -> btrfs_map_bio() -> submit_stripe_bio() -> submit_bio() onto a loop device can trigger readahead on the lower filesystem).
Either way, let's fix it by freeing the work at the end.
--- fs/btrfs/reada.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/btrfs/reada.c +4 -6
@@ -720,21 +720,19 @@ static int reada_start_machine_dev(struct btrfs_device *dev)static void reada_start_machine_worker (struct btrfs_work *work) {struct reada_machine_work *rmw; -struct btrfs_fs_info *fs_info;int old_ioprio; rmw = container_of(work, struct reada_machine_work, work); - fs_info = rmw->fs_info; - -kfree (rmw); old_ioprio =IOPRIO_PRIO_VALUE (task_nice_ioclass (current),task_nice_ioprio (current));set_task_ioprio (current,BTRFS_IOPRIO_READA ); -__reada_start_machine (fs_info); +__reada_start_machine (rmw->fs_info);set_task_ioprio (current, old_ioprio); -atomic_dec (&fs_info->reada_works_cnt); +atomic_dec (&rmw->fs_info->reada_works_cnt); + +kfree (rmw); }static void __reada_start_machine (struct btrfs_fs_info *fs_info)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 189/219 btrfs: dont prematurely free work in scrub_missing_raid56_worker()
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
[ Upstream commit 57d4f0b863272ba04ba85f86bfdc0f976f0af91c ]
Currently, scrub_missing_raid56_worker() puts and potentially frees sblock (which embeds the work item) and then submits a bio through scrub_wr_submit(). This is another potential instance of the bug in "btrfs: don't prematurely free work in run_ordered_work()". Fix it by dropping the reference after we submit the bio.
--- fs/btrfs/scrub.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/btrfs/scrub.c +1 -2
@@ -2145,14 +2145,13 @@ static void scrub_missing_raid56_worker(struct btrfs_work *work)scrub_write_block_to_dev_replace (sblock); } -scrub_block_put (sblock); -if (sctx->is_dev_replace && sctx->flush_all_writes) {mutex_lock (&sctx->wr_lock);scrub_wr_submit (sctx);mutex_unlock (&sctx->wr_lock); } +scrub_block_put (sblock);scrub_pending_bio_dec (sctx); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 190/219 Revert "mmc: sdhci: Fix incorrect switch to HS mode"
In reply to Greg Kroah-HartmanFrom: Faiz Abbas <[email protected]>
commit 07bcc411567cb96f9d1fc84fff8d387118a2920d upstream.
This reverts commit c894e33ddc1910e14d6f2a2016f60ab613fd8b37.
This commit aims to treat SD High speed and SDR25 as the same while setting UHS Timings in HOST_CONTROL2 which leads to failures with some SD cards in AM65x. Revert this commit.
The issue this commit was trying to fix can be implemented in a platform specific callback instead of common sdhci code.
--- drivers/mmc/host/sdhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +1 -3
@@ -1713,9 +1713,7 @@ void sdhci_set_uhs_signaling(struct sdhc ctrl_2 |=SDHCI_CTRL_UHS_SDR104 ; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_SD_HS || - timing == MMC_TIMING_MMC_HS || - timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
Greg Kroah-Hartman
maintainerPATCH 191/219 mmc: mediatek: fix CMD_TA to 2 for MT8173 HS200/HS400 mode
In reply to Greg Kroah-HartmanFrom: Chaotian Jing <[email protected]>
commit 8f34e5bd7024d1ffebddd82d7318b1be17be9e9a upstream.
there is a chance that always get response CRC error after HS200 tuning, the reason is that need set CMD_TA to 2. this modification is only for MT8173.
--- drivers/mmc/host/mtk-sd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/host/mtk-sd.c +2 -0
@@ -228,6 +228,7 @@#define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29)/* RW */ #define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30)/* RW */ +#define MSDC_PATCH_BIT1_CMDTA (0x7 << 3)/* RW */ #define MSDC_PATCH_BIT1_STOP_DLY (0xf << 8)/* RW */ #define MSDC_PATCH_BIT2_CFGRESP (0x1 << 15)/* RW */
@@ -1673,6 +1674,7 @@ static int hs400_tune_response(struct mm/* select EMMC50 PAD CMD tune */ sdr_set_bits (host->base +PAD_CMD_TUNE ,BIT (0 )); +sdr_set_field (host->base +MSDC_PATCH_BIT1 ,MSDC_PATCH_BIT1_CMDTA ,2 );if (mmc->ios.timing ==MMC_TIMING_MMC_HS200 || mmc->ios.timing ==MMC_TIMING_UHS_SDR104 )
Greg Kroah-Hartman
maintainerPATCH 192/219 can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices
In reply to Greg Kroah-HartmanFrom: Xiaolong Huang <[email protected]>
commit da2311a6385c3b499da2ed5d9be59ce331fa93e9 upstream.
Uninitialized Kernel memory can leak to USB devices.
Fix this by using kzalloc() instead of kmalloc().
--- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +3 -3
@@ -608,7 +608,7 @@ static int kvaser_usb_leaf_simple_cmd_asstruct kvaser_cmd *cmd;int err; - cmd =kmalloc (sizeof (*cmd),GFP_ATOMIC ); + cmd =kzalloc (sizeof (*cmd),GFP_ATOMIC );if (!cmd)return -ENOMEM ;
@@ -1140,7 +1140,7 @@ static int kvaser_usb_leaf_set_opt_mode(struct kvaser_cmd *cmd;int rc; - cmd =kmalloc (sizeof (*cmd),GFP_KERNEL ); + cmd =kzalloc (sizeof (*cmd),GFP_KERNEL );if (!cmd)return -ENOMEM ;
@@ -1206,7 +1206,7 @@ static int kvaser_usb_leaf_flush_queue(sstruct kvaser_cmd *cmd;int rc; - cmd =kmalloc (sizeof (*cmd),GFP_KERNEL ); + cmd =kzalloc (sizeof (*cmd),GFP_KERNEL );if (!cmd)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 193/219 usb: xhci: Fix build warning seen with CONFIG_PM=n
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 6056a0f8ede27b296d10ef46f7f677cc9d715371 ]
The following build warning is seen if CONFIG_PM is disabled.
drivers/usb/host/xhci-pci.c:498:13: warning:
unused function 'xhci_pci_shutdown'
--- drivers/usb/host/xhci-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +1 -1
@@ -493,7 +493,6 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated) retval =xhci_resume (xhci, hibernated);return retval; } -#endif /* CONFIG_PM */ static void xhci_pci_shutdown (struct usb_hcd *hcd) {
@@ -506,6 +505,7 @@ static void xhci_pci_shutdown(struct usb_hcd *hcd)if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) pci_set_power_state(pdev, PCI_D3hot); } +#endif /* CONFIG_PM */ /*-------------------------------------------------------------------------*/
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 194/219 drm/amdgpu: fix uninitialized variable pasid_mapping_needed
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 17cf678a33c6196a3df4531fe5aec91384c9eeb5 ]
The boolean variable pasid_mapping_needed is not initialized and there are code paths that do not assign it any value before it is is read later. Fix this by initializing pasid_mapping_needed to false.
Addresses-Coverity: ("Uninitialized scalar variable")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -701,7 +701,7 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_ id->oa_size != job->oa_size);bool vm_flush_needed = job->vm_needs_flush;struct dma_fence *fence =NULL ; -bool pasid_mapping_needed; +bool pasid_mapping_needed = false;unsigned patch_offset =0 ;int r;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 195/219 s390/ftrace: fix endless recursion in function_graph tracer
In reply to Greg Kroah-HartmanFrom: Sven Schnelle <[email protected]>
[ Upstream commit 6feeee8efc53035c3195b02068b58ae947538aa4 ]
The following sequence triggers a kernel stack overflow on s390x:
mount -t tracefs tracefs /sys/kernel/tracing
cd /sys/kernel/tracing
echo function_graph > current_tracer
[crash]
This is because preempt_count_{add,sub} are in the list of traced functions, which can be demonstrated by:
echo preempt_count_add >set_ftrace_filter
echo function_graph > current_tracer
[crash]
The stack overflow happens because get_tod_clock_monotonic() gets called by ftrace but itself calls preempt_{disable,enable}(), which leads to a endless recursion. Fix this by using preempt_{disable,enable}_notrace().
--- arch/s390/include/asm/timex.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/include/asm/timex.h +2 -2
@@ -195,9 +195,9 @@ static inline unsigned long long get_tod_clock_monotonic(void) {unsigned long long tod; -preempt_disable (); +preempt_disable_notrace (); tod =get_tod_clock () - *(unsigned long long *) &tod_clock_base[1 ]; -preempt_enable (); +preempt_enable_notrace ();return tod; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 196/219 btrfs: return error pointer from alloc_test_extent_buffer
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b6293c821ea8fa2a631a2112cd86cd435effeb8b ]
Callers of alloc_test_extent_buffer have not correctly interpreted the return value as error pointer, as alloc_test_extent_buffer should behave as alloc_extent_buffer. The self-tests were unaffected but btrfs_find_create_tree_block could call both functions and that would cause problems up in the call chain.
--- fs/btrfs/extent_io.c | 6 ++++-- fs/btrfs/tests/free-space-tree-tests.c | 4 ++-- fs/btrfs/tests/qgroup-tests.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-)
fs/btrfs/extent_io.c +4 -2
@@ -4888,12 +4888,14 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,return eb; eb =alloc_dummy_extent_buffer (fs_info, start);if (!eb) -return NULL ; +return ERR_PTR (-ENOMEM ); eb->fs_info = fs_info; again: ret =radix_tree_preload (GFP_NOFS ); -if (ret) +if (ret) { + exists =ERR_PTR (ret); goto free_eb; + }spin_lock (&fs_info->buffer_lock); ret =radix_tree_insert (&fs_info->buffer_radix, start >>PAGE_SHIFT , eb);
fs/btrfs/tests/free-space-tree-tests.c +2 -2
@@ -462,9 +462,9 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, root->fs_info->tree_root = root; root->node =alloc_test_extent_buffer (root->fs_info, nodesize); -if (!root->node) { +if (IS_ERR (root->node)) {test_err ("couldn't allocate dummy buffer" ); - ret = -ENOMEM ; + ret =PTR_ERR (root->node); goto out; }btrfs_set_header_level (root->node,0 );
fs/btrfs/tests/qgroup-tests.c +2 -2
@@ -484,9 +484,9 @@ int btrfs_test_qgroups(u32 sectorsize, u32 nodesize)* *cough*backref walking code*cough* */ root->node =alloc_test_extent_buffer (root->fs_info, nodesize); -if (!root->node) { +if (IS_ERR (root->node)) {test_err ("couldn't allocate dummy buffer" ); - ret = -ENOMEM ; + ret =PTR_ERR (root->node); goto out; }btrfs_set_header_level (root->node,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 197/219 usbip: Fix receive error in vhci-hcd when using scatter-gather
In reply to Greg Kroah-HartmanFrom: Suwan Kim <[email protected]>
commit d986294ee55d719562b20aabe15a39bf8f863415 upstream.
When vhci uses SG and receives data whose size is smaller than SG buffer size, it tries to receive more data even if it acutally receives all the data from the server. If then, it erroneously adds error event and triggers connection shutdown.
vhci-hcd should check if it received all the data even if there are more SG entries left. So, check if it receivces all the data from the server in for_each_sg() loop.
--- drivers/usb/usbip/usbip_common.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/usbip/usbip_common.c +3 -0
@@ -727,6 +727,9 @@ int usbip_recv_xbuff(struct usbip_device copy -= recv; ret += recv; + +if (!copy) +break ; }if (ret != size)
Greg Kroah-Hartman
maintainerPATCH 198/219 usbip: Fix error path of vhci_recv_ret_submit()
In reply to Greg Kroah-HartmanFrom: Suwan Kim <[email protected]>
commit aabb5b833872524eaf28f52187e5987984982264 upstream.
If a transaction error happens in vhci_recv_ret_submit(), event handler closes connection and changes port status to kick hub_event. Then hub tries to flush the endpoint URBs, but that causes infinite loop between usb_hub_flush_endpoint() and vhci_urb_dequeue() because "vhci_priv" in vhci_urb_dequeue() was already released by vhci_recv_ret_submit() before a transmission error occurred. Thus, vhci_urb_dequeue() terminates early and usb_hub_flush_endpoint() continuously calls vhci_urb_dequeue().
The root cause of this issue is that vhci_recv_ret_submit() terminates early without giving back URB when transaction error occurs in vhci_recv_ret_submit(). That causes the error URB to still be linked at endpoint list without “vhci_priv".
So, in the case of transaction error in vhci_recv_ret_submit(), unlink URB from the endpoint, insert proper error code in urb->status and give back URB.
--- drivers/usb/usbip/vhci_rx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/usb/usbip/vhci_rx.c +9 -4
@@ -77,16 +77,21 @@ static void vhci_recv_ret_submit(structusbip_pack_pdu (pdu, urb,USBIP_RET_SUBMIT ,0 );/* recv transfer buffer */ -if (usbip_recv_xbuff (ud, urb) <0 ) -return ; +if (usbip_recv_xbuff (ud, urb) <0 ) { + urb->status = -EPROTO ; + goto error; + }/* recv iso_packet_descriptor */ -if (usbip_recv_iso (ud, urb) <0 ) -return ; +if (usbip_recv_iso (ud, urb) <0 ) { + urb->status = -EPROTO ; + goto error; + }/* restore the padding in iso packets */ usbip_pad_iso (ud, urb); +error:if (usbip_dbg_flag_vhci_rx)usbip_dump_urb (urb);
Greg Kroah-Hartman
maintainerPATCH 199/219 cpufreq: Avoid leaving stale IRQ work items during CPU offline
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 85572c2c4a45a541e880e087b5b17a48198b2416 upstream.
The scheduler code calling cpufreq_update_util() may run during CPU offline on the target CPU after the IRQ work lists have been flushed for it, so the target CPU should be prevented from running code that may queue up an IRQ work item on it at that point.
Unfortunately, that may not be the case if dvfs_possible_from_any_cpu is set for at least one cpufreq policy in the system, because that allows the CPU going offline to run the utilization update callback of the cpufreq governor on behalf of another (online) CPU in some cases.
If that happens, the cpufreq governor callback may queue up an IRQ work on the CPU running it, which is going offline, and the IRQ work may not be flushed after that point. Moreover, that IRQ work cannot be flushed until the "offlining" CPU goes back online, so if any other CPU calls irq_work_sync() to wait for the completion of that IRQ work, it will have to wait until the "offlining" CPU is back online and that may not happen forever. In particular, a system-wide deadlock may occur during CPU online as a result of that.
The failing scenario is as follows. CPU0 is the boot CPU, so it creates a cpufreq policy and becomes the "leader" of it (policy->cpu). It cannot go offline, because it is the boot CPU. Next, other CPUs join the cpufreq policy as they go online and they leave it when they go offline. The last CPU to go offline, say CPU3, may queue up an IRQ work while running the governor callback on behalf of CPU0 after leaving the cpufreq policy because of the dvfs_possible_from_any_cpu effect described above. Then, CPU0 is the only online CPU in the system and the stale IRQ work is still queued on CPU3. When, say, CPU1 goes back online, it will run irq_work_sync() to wait for that IRQ work to complete and so it will wait for CPU3 to go back online (which may never happen even in principle), but (worse yet) CPU0 is waiting for CPU1 at that point too and a system-wide deadlock occurs.
To address this problem notice that CPUs which cannot run cpufreq utilization update code for themselves (for example, because they have left the cpufreq policies that they belonged to), should also be prevented from running that code on behalf of the other CPUs that belong to a cpufreq policy with dvfs_possible_from_any_cpu set and so in that case the cpufreq_update_util_data pointer of the CPU running the code must not be NULL as well as for the CPU which is the target of the cpufreq utilization update in progress.
Accordingly, change cpufreq_this_cpu_can_update() into a regular function in kernel/sched/cpufreq.c (instead of a static inline in a header file) and make it check the cpufreq_update_util_data pointer of the local CPU if dvfs_possible_from_any_cpu is set for the target cpufreq policy.
Also update the schedutil governor to do the cpufreq_this_cpu_can_update() check in the non-fast-switch case too to avoid the stale IRQ work issues.
--- include/linux/cpufreq.h | 11 ----------- include/linux/sched/cpufreq.h | 3 +++ kernel/sched/cpufreq.c | 18 ++++++++++++++++++ kernel/sched/cpufreq_schedutil.c | 8 +++----- 4 files changed, 24 insertions(+), 16 deletions(-)
include/linux/cpufreq.h +0 -11
@@ -563,17 +563,6 @@ struct governor_attr { size_t count); }; -static inline bool cpufreq_this_cpu_can_update (struct cpufreq_policy *policy) -{ -/* -* Allow remote callbacks if: -* - dvfs_possible_from_any_cpu flag is set -* - the local and remote CPUs share cpufreq policy -*/ -return policy->dvfs_possible_from_any_cpu || -cpumask_test_cpu (smp_processor_id (), policy->cpus); -} -/********************************************************************* * FREQUENCY TABLE HELPERS * *********************************************************************/
include/linux/sched/cpufreq.h +3 -0
@@ -12,6 +12,8 @@#define SCHED_CPUFREQ_MIGRATION (1U << 1)#ifdef CONFIG_CPU_FREQ +struct cpufreq_policy ; +struct update_util_data {void (*func)(struct update_util_data *data,u64 time,unsigned int flags); };
@@ -20,6 +22,7 @@ void cpufreq_add_update_util_hook(int cpvoid (*func)(struct update_util_data *data,u64 time, unsigned int flags));void cpufreq_remove_update_util_hook (int cpu); +bool cpufreq_this_cpu_can_update (struct cpufreq_policy *policy);#endif /* CONFIG_CPU_FREQ */ #endif /* _LINUX_SCHED_CPUFREQ_H */
kernel/sched/cpufreq.c +18 -0
@@ -8,6 +8,8 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/cpufreq.h> +#include "sched.h" DEFINE_PER_CPU(struct update_util_data *, cpufreq_update_util_data);
@@ -60,3 +62,19 @@ void cpufreq_remove_update_util_hook(intrcu_assign_pointer (per_cpu (cpufreq_update_util_data, cpu),NULL ); }EXPORT_SYMBOL_GPL (cpufreq_remove_update_util_hook); + +/** +* cpufreq_this_cpu_can_update - Check if cpufreq policy can be updated. +* @policy: cpufreq policy to check. +* +* Return 'true' if: +* - the local and remote CPUs share @policy, +* - dvfs_possible_from_any_cpu is set in @policy and the local CPU is not going +* offline (in which case it is not expected to run cpufreq updates any more). +*/ +bool cpufreq_this_cpu_can_update (struct cpufreq_policy *policy) +{ +return cpumask_test_cpu (smp_processor_id (), policy->cpus) || + (policy->dvfs_possible_from_any_cpu && +rcu_dereference_sched (*this_cpu_ptr (&cpufreq_update_util_data))); +}
kernel/sched/cpufreq_schedutil.c +3 -5
@@ -83,12 +83,10 @@ static bool sugov_should_update_freq(str* by the hardware, as calculating the frequency is pointless if * we cannot in fact act on it. * -* For the slow switching platforms, the kthread is always scheduled on -* the right set of CPUs and any CPU can find the next frequency and -* schedule the kthread. +* This is needed on the slow switching platforms too to prevent CPUs +* going offline from leaving stale IRQ work items behind. */ -if (sg_policy->policy->fast_switch_enabled && - !cpufreq_this_cpu_can_update (sg_policy->policy)) +if (!cpufreq_this_cpu_can_update (sg_policy->policy))return false;if (unlikely (sg_policy->limits_changed)) {
Greg Kroah-Hartman
maintainerPATCH 200/219 USB: EHCI: Do not return -EPIPE when hub is disconnected
In reply to Greg Kroah-HartmanFrom: Erkka Talvitie <[email protected]>
commit 64cc3f12d1c7dd054a215bc1ff9cc2abcfe35832 upstream.
When disconnecting a USB hub that has some child device(s) connected to it (such as a USB mouse), then the stack tries to clear halt and reset device(s) which are _already_ physically disconnected.
The issue has been reproduced with:
CPU: IMX6D5EYM10AD or MCIMX6D5EYM10AE.
SW: U-Boot 2019.07 and kernel 4.19.40.
CPU: HP Proliant Microserver Gen8.
SW: Linux version 4.2.3-300.fc23.x86_64
In this situation there will be error bit for MMF active yet the CERR equals EHCI_TUNE_CERR + halt. Existing implementation interprets this as a stall [1] (chapter 8.4.5).
The possible conditions when the MMF will be active + halt can be found from [2] (Table 4-13).
Fix for the issue is to check whether MMF is active and PID Code is IN before checking for the stall. If these conditions are true then it is not a stall.
What happens after the fix is that when disconnecting a hub with attached device(s) the situation is not interpret as a stall.
[1] [https://www.usb.org/document-library/usb-20-specification, usb_20.pdf]
[2] [https://www.intel.com/content/dam/www/public/us/en/documents/
technical-specifications/ehci-specification-for-usb.pdf]
--- drivers/usb/host/ehci-q.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-q.c +12 -1
@@ -27,6 +27,10 @@/*-------------------------------------------------------------------------*/ +/* PID Codes that are used here, from EHCI specification, Table 3-16. */ +#define PID_CODE_IN 1 +#define PID_CODE_SETUP 2 +/* fill a qtd, returning how much of the buffer we were able to queue up */ static int
@@ -190,7 +194,7 @@ static int qtd_copy_status (int status = -EINPROGRESS ;/* count IN/OUT bytes, not SETUP (even short packets) */ -if (likely (QTD_PID (token) !=2 )) +if (likely (QTD_PID (token) !=PID_CODE_SETUP )) urb->actual_length += length -QTD_LENGTH (token);/* don't modify error codes */
@@ -206,6 +210,13 @@ static int qtd_copy_status (if (token &QTD_STS_BABBLE ) {/* FIXME "must" disable babbling device's port too */ status = -EOVERFLOW ; +/* +* When MMF is active and PID Code is IN, queue is halted. +* EHCI Specification, Table 4-13. +*/ + }else if ((token &QTD_STS_MMF ) && + (QTD_PID (token) ==PID_CODE_IN )) { + status = -EPROTO ;/* CERR nonzero + halt --> stall */ }else if (QTD_CERR (token)) { status = -EPIPE ;
Greg Kroah-Hartman
maintainerPATCH 201/219 intel_th: pci: Add Comet Lake PCH-V support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit e4de2a5d51f97a6e720a1c0911f93e2d8c2f1c08 upstream.
This adds Intel(R) Trace Hub PCI ID for Comet Lake PCH-V.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -181,6 +181,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Comet Lake PCH-V */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa3a6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Ice Lake NNPI */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x45c5 ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 202/219 intel_th: pci: Add Elkhart Lake SOC support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 88385866bab8d5e18c7f45d1023052c783572e03 upstream.
This adds support for Intel Trace Hub in Elkhart Lake.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -210,6 +210,11 @@ static const struct pci_device_id intel_ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4da6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Elkhart Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4b26), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Greg Kroah-Hartman
maintainerPATCH 203/219 platform/x86: hp-wmi: Make buffer for HPWMI_FEATURE2_QUERY 128 bytes
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 133b2acee3871ae6bf123b8fe34be14464aa3d2c upstream.
At least on the HP Envy x360 15-cp0xxx model the WMI interface for HPWMI_FEATURE2_QUERY requires an outsize of at least 128 bytes, otherwise it fails with an error code 5 (HPWMI_RET_INVALID_PARAMETERS):
Dec 06 00:59:38 kernel: hp_wmi: query 0xd returned error 0x5
We do not care about the contents of the buffer, we just want to know if the HPWMI_FEATURE2_QUERY command is supported.
This commits bumps the buffer size, fixing the error.
--- drivers/platform/x86/hp-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/hp-wmi.c +1 -1
@@ -313,7 +313,7 @@ static int __init hp_wmi_bios_2008_laterstatic int __init hp_wmi_bios_2009_later (void ) { -int state =0 ; +u8 state[128 ];int ret =hp_wmi_perform_query (HPWMI_FEATURE2_QUERY ,HPWMI_READ , &state,sizeof (state),sizeof (state));if (!ret)
Greg Kroah-Hartman
maintainerPATCH 204/219 staging: comedi: gsc_hpdi: check dma_alloc_coherent() return value
In reply to Greg Kroah-HartmanFrom: Ian Abbott <[email protected]>
commit ab42b48f32d4c766420c3499ee9c0289b7028182 upstream.
The "auto-attach" handler function gsc_hpdi_auto_attach() calls dma_alloc_coherent() in a loop to allocate some DMA data buffers, and also calls it to allocate a buffer for a DMA descriptor chain. However, it does not check the return value of any of these calls. Change gsc_hpdi_auto_attach() to return -ENOMEM if any of these dma_alloc_coherent() calls fail. This will result in the comedi core calling the "detach" handler gsc_hpdi_detach() as part of the clean-up, which will call gsc_hpdi_free_dma() to free any allocated DMA coherent memory buffers.
--- drivers/staging/comedi/drivers/gsc_hpdi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/staging/comedi/drivers/gsc_hpdi.c +10 -0
@@ -623,6 +623,11 @@ static int gsc_hpdi_auto_attach(struct cdma_alloc_coherent (&pcidev->dev,DMA_BUFFER_SIZE , &devpriv->dio_buffer_phys_addr[i],GFP_KERNEL ); +if (!devpriv->dio_buffer[i]) { +dev_warn (dev->class_dev, +"failed to allocate DMA buffer\n" ); +return -ENOMEM ; + } }/* allocate dma descriptors */ devpriv->dma_desc = dma_alloc_coherent(&pcidev->dev,
@@ -630,6 +635,11 @@ static int gsc_hpdi_auto_attach(struct cNUM_DMA_DESCRIPTORS , &devpriv->dma_desc_phys_addr, GFP_KERNEL); +if (!devpriv->dma_desc) { +dev_warn (dev->class_dev, +"failed to allocate DMA descriptors\n" ); +return -ENOMEM ; + }if (devpriv->dma_desc_phys_addr &0xf ) {dev_warn (dev->class_dev," dma descriptors not quad-word aligned (bug)\n" );
Greg Kroah-Hartman
maintainerPATCH 205/219 ext4: fix ext4_empty_dir() for directories with holes
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 64d4ce892383b2ad6d782e080d25502f91bf2a38 upstream.
Function ext4_empty_dir() doesn't correctly handle directories with holes and crashes on bh->b_data dereference when bh is NULL. Reorganize the loop to use 'offset' variable all the times instead of comparing pointers to current direntry with bh->b_data pointer. Also add more strict checking of '.' and '..' directory entries to avoid entering loop in possibly invalid state on corrupted filesystems.
--- fs/ext4/namei.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
fs/ext4/namei.c +18 -14
@@ -2693,7 +2693,7 @@ bool ext4_empty_dir(struct inode *inode) {unsigned int offset;struct buffer_head *bh; -struct ext4_dir_entry_2 *de, *de1; +struct ext4_dir_entry_2 *de;struct super_block *sb;if (ext4_has_inline_data (inode)) {
@@ -2718,19 +2718,25 @@ bool ext4_empty_dir(struct inode *inode)return true; de = (struct ext4_dir_entry_2 *) bh->b_data; - de1 =ext4_next_entry (de, sb->s_blocksize); -if (le32_to_cpu (de->inode) != inode->i_ino || -le32_to_cpu (de1->inode) ==0 || -strcmp ("." , de->name) ||strcmp (".." , de1->name)) { -ext4_warning_inode (inode,"directory missing '.' and/or '..'" ); +if (ext4_check_dir_entry (inode,NULL , de, bh, bh->b_data, bh->b_size, +0 ) || +le32_to_cpu (de->inode) != inode->i_ino ||strcmp ("." , de->name)) { +ext4_warning_inode (inode,"directory missing '.'" );brelse (bh);return true; } - offset =ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize) + -ext4_rec_len_from_disk (de1->rec_len, sb->s_blocksize); - de =ext4_next_entry (de1, sb->s_blocksize); + offset =ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize); + de =ext4_next_entry (de, sb->s_blocksize); +if (ext4_check_dir_entry (inode,NULL , de, bh, bh->b_data, bh->b_size, + offset) || +le32_to_cpu (de->inode) ==0 ||strcmp (".." , de->name)) { +ext4_warning_inode (inode,"directory missing '..'" ); +brelse (bh); +return true; + } + offset +=ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize);while (offset < inode->i_size) { -if ((void *) de >= (void *) (bh->b_data+sb->s_blocksize)) { +if (!(offset & (sb->s_blocksize -1 ))) {unsigned int lblock;brelse (bh); lblock = offset >>EXT4_BLOCK_SIZE_BITS (sb);
@@ -2741,12 +2747,11 @@ bool ext4_empty_dir(struct inode *inode) }if (IS_ERR (bh))return true; - de = (struct ext4_dir_entry_2 *) bh->b_data; } + de = (struct ext4_dir_entry_2 *) (bh->b_data + + (offset & (sb->s_blocksize -1 )));if (ext4_check_dir_entry (inode,NULL , de, bh, bh->b_data, bh->b_size, offset)) { - de = (struct ext4_dir_entry_2 *)(bh->b_data + - sb->s_blocksize); offset = (offset | (sb->s_blocksize -1 )) +1 ;continue ; }
@@ -2755,7 +2760,6 @@ bool ext4_empty_dir(struct inode *inode)return false; } offset +=ext4_rec_len_from_disk (de->rec_len, sb->s_blocksize); - de =ext4_next_entry (de, sb->s_blocksize); }brelse (bh);return true;
Greg Kroah-Hartman
maintainerPATCH 206/219 ext4: check for directory entries too close to block end
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 109ba779d6cca2d519c5dd624a3276d03e21948e upstream.
ext4_check_dir_entry() currently does not catch a case when a directory entry ends so close to the block end that the header of the next directory entry would not fit in the remaining space. This can lead to directory iteration code trying to access address beyond end of current buffer head leading to oops.
--- fs/ext4/dir.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/ext4/dir.c +5 -0
@@ -77,6 +77,11 @@ int __ext4_check_dir_entry(const char *f error_msg ="rec_len is too small for name_len" ; else if (unlikely(((char *) de - buf) + rlen > size)) error_msg ="directory entry overrun" ; + else if (unlikely(((char *) de - buf) + rlen > + size - EXT4_DIR_REC_LEN(1) && + ((char *) de - buf) + rlen != size)) { + error_msg ="directory entry too close to block end" ; + } else if (unlikely(le32_to_cpu(de->inode) > le32_to_cpu(EXT4_SB(dir->i_sb)->s_es->s_inodes_count))) error_msg ="inode out of bounds" ;
Greg Kroah-Hartman
maintainerPATCH 207/219 ext4: unlock on error in ext4_expand_extra_isize()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 7f420d64a08c1dcd65b27be82a27cf2bdb2e7847 upstream.
We need to unlock the xattr before returning on this error path.
--- fs/ext4/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ext4/inode.c +2 -2
@@ -6027,7 +6027,7 @@ int ext4_expand_extra_isize(struct inode error =ext4_journal_get_write_access (handle, iloc->bh);if (error) {brelse (iloc->bh); - goto out_stop; + goto out_unlock; } error = __ext4_expand_extra_isize(inode, new_extra_isize, iloc,
@@ -6037,8 +6037,8 @@ int ext4_expand_extra_isize(struct inodeif (!error) error = rc; +out_unlock:ext4_write_unlock_xattr (inode, &no_expand); -out_stop:ext4_journal_stop (handle);return error; }
Greg Kroah-Hartman
maintainerPATCH 208/219 KVM: arm64: Ensure params is initialised when looking up sys register
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 1ce74e96c2407df2b5867e5d45a70aacb8923c14 upstream.
Commit 4b927b94d5df ("KVM: arm/arm64: vgic: Introduce find_reg_by_id()") introduced 'find_reg_by_id()', which looks up a system register only if the 'id' index parameter identifies a valid system register. As part of the patch, existing callers of 'find_reg()' were ported over to the new interface, but this breaks 'index_to_sys_reg_desc()' in the case that the initial lookup in the vCPU target table fails because we will then call into 'find_reg()' for the system register table with an uninitialised 'param' as the key to the lookup.
GCC 10 is bright enough to spot this (amongst a tonne of false positives, but hey!):
| arch/arm64/kvm/sys_regs.c: In function ‘index_to_sys_reg_desc.part.0.isra’: | arch/arm64/kvm/sys_regs.c:983:33: warning: ‘params.Op2’ may be used uninitialized in this function [-Wmaybe-uninitialized] | 983 | (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2); | [...]
Revert the hunk of 4b927b94d5df which breaks 'index_to_sys_reg_desc()' so that the old behaviour of checking the index upfront is restored.
--- arch/arm64/kvm/sys_regs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm64/kvm/sys_regs.c +4 -1
@@ -2174,8 +2174,11 @@ static const struct sys_reg_desc *index_if ((id &KVM_REG_ARM_COPROC_MASK ) !=KVM_REG_ARM64_SYSREG )return NULL ; +if (!index_to_params (id, ¶ms)) +return NULL ; + table =get_target_table (vcpu->arch.target, true, &num); - r =find_reg_by_id (id, ¶ms, table, num); + r =find_reg (¶ms, table, num);if (!r) r =find_reg (¶ms, sys_reg_descs,ARRAY_SIZE (sys_reg_descs));
Greg Kroah-Hartman
maintainerPATCH 209/219 x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure()
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
commit 246ff09f89e54fdf740a8d496176c86743db3ec7 upstream.
... because interrupts are disabled that early and sending IPIs can deadlock:
BUG: sleeping function called from invalid context at kernel/sched/completion.c:99 in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 0, name: swapper/1 no locks held by swapper/1/0. irq event stamp: 0 hardirqs last enabled at (0): [<0000000000000000>] 0x0 hardirqs last disabled at (0): [<ffffffff8106dda9>] copy_process+0x8b9/0x1ca0 softirqs last enabled at (0): [<ffffffff8106dda9>] copy_process+0x8b9/0x1ca0 softirqs last disabled at (0): [<0000000000000000>] 0x0 Preemption disabled at: [<ffffffff8104703b>] start_secondary+0x3b/0x190 CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.5.0-rc2+ #1 Hardware name: GIGABYTE MZ01-CE1-00/MZ01-CE1-00, BIOS F02 08/29/2018 Call Trace: dump_stack ___might_sleep.cold.92 wait_for_completion ? generic_exec_single rdmsr_safe_on_cpu ? wrmsr_on_cpus mce_amd_feature_init mcheck_cpu_init identify_cpu identify_secondary_cpu smp_store_cpu_info start_secondary secondary_startup_64
The function smca_configure() is called only on the current CPU anyway, therefore replace rdmsr_safe_on_cpu() with atomic rdmsr_safe() and avoid the IPI.
[ bp: Update commit message. ]
--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mcheck/mce_amd.c +1 -1
@@ -231,7 +231,7 @@ static void smca_configure(unsigned intif (smca_banks[bank].hwid)return ; -if (rdmsr_safe_on_cpu (cpu,MSR_AMD64_SMCA_MCx_IPID (bank), &low, &high)) { +if (rdmsr_safe (MSR_AMD64_SMCA_MCx_IPID (bank), &low, &high)) {pr_warn ("Failed to read MCA_IPID for bank %d\n" , bank);return ; }
Greg Kroah-Hartman
maintainerPATCH 210/219 x86/MCE/AMD: Allow Reserved types to be overwritten in smca_banks[]
In reply to Greg Kroah-HartmanFrom: Yazen Ghannam <[email protected]>
commit 966af20929ac24360ba3fac5533eb2ab003747da upstream.
Each logical CPU in Scalable MCA systems controls a unique set of MCA banks in the system. These banks are not shared between CPUs. The bank types and ordering will be the same across CPUs on currently available systems.
However, some CPUs may see a bank as Reserved/Read-as-Zero (RAZ) while other CPUs do not. In this case, the bank seen as Reserved on one CPU is assumed to be the same type as the bank seen as a known type on another CPU.
In general, this occurs when the hardware represented by the MCA bank is disabled, e.g. disabled memory controllers on certain models, etc. The MCA bank is disabled in the hardware, so there is no possibility of getting an MCA/MCE from it even if it is assumed to have a known type.
For example:
Full system:
Bank | Type seen on CPU0 | Type seen on CPU1
------------------------------------------------
0 | LS | LS
1 | UMC | UMC
2 | CS | CS
System with hardware disabled:
Bank | Type seen on CPU0 | Type seen on CPU1
------------------------------------------------
0 | LS | LS
1 | UMC | RAZ
2 | CS | CS
For this reason, there is a single, global struct smca_banks[] that is initialized at boot time. This array is initialized on each CPU as it comes online. However, the array will not be updated if an entry already exists.
This works as expected when the first CPU (usually CPU0) has all possible MCA banks enabled. But if the first CPU has a subset, then it will save a "Reserved" type in smca_banks[]. Successive CPUs will then not be able to update smca_banks[] even if they encounter a known bank type.
This may result in unexpected behavior. Depending on the system configuration, a user may observe issues enumerating the MCA thresholding sysfs interface. The issues may be as trivial as sysfs entries not being available, or as severe as system hangs.
For example:
Bank | Type seen on CPU0 | Type seen on CPU1
------------------------------------------------
0 | LS | LS
1 | RAZ | UMC
2 | CS | CS
Extend the smca_banks[] entry check to return if the entry is a non-reserved type. Otherwise, continue so that CPUs that encounter a known bank type can update smca_banks[].
--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mcheck/mce_amd.c +1 -1
@@ -228,7 +228,7 @@ static void smca_configure(unsigned int }/* Return early if this bank was already initialized. */ -if (smca_banks[bank].hwid) +if (smca_banks[bank].hwid && smca_banks[bank].hwid->hwid_mcatype !=0 )return ;if (rdmsr_safe (MSR_AMD64_SMCA_MCx_IPID (bank), &low, &high)) {
Greg Kroah-Hartman
maintainerPATCH 211/219 powerpc/vcpu: Assume dedicated processors as non-preempt
In reply to Greg Kroah-HartmanFrom: Srikar Dronamraju <[email protected]>
commit 14c73bd344da60abaf7da3ea2e7733ddda35bbac upstream.
With commit 247f2f6f3c70 ("sched/core: Don't schedule threads on pre-empted vCPUs"), the scheduler avoids preempted vCPUs to schedule tasks on wakeup. This leads to wrong choice of CPU, which in-turn leads to larger wakeup latencies. Eventually, it leads to performance regression in latency sensitive benchmarks like soltp, schbench etc.
On Powerpc, vcpu_is_preempted() only looks at yield_count. If the yield_count is odd, the vCPU is assumed to be preempted. However yield_count is increased whenever the LPAR enters CEDE state (idle). So any CPU that has entered CEDE state is assumed to be preempted.
Even if vCPU of dedicated LPAR is preempted/donated, it should have right of first-use since they are supposed to own the vCPU.
On a Power9 System with 32 cores:
# lscpu Architecture: ppc64le Byte Order: Little Endian CPU(s): 128 On-line CPU(s) list: 0-127 Thread(s) per core: 8 Core(s) per socket: 1 Socket(s): 16 NUMA node(s): 2 Model: 2.2 (pvr 004e 0202) Model name: POWER9 (architected), altivec supported Hypervisor vendor: pHyp Virtualization type: para L1d cache: 32K L1i cache: 32K L2 cache: 512K L3 cache: 10240K NUMA node0 CPU(s): 0-63 NUMA node1 CPU(s): 64-127
# perf stat -a -r 5 ./schbench
v5.4 v5.4 + patch
Latency percentiles (usec) Latency percentiles (usec)
50.0000th: 45 50.0th: 45
75.0000th: 62 75.0th: 63
90.0000th: 71 90.0th: 74
95.0000th: 77 95.0th: 78
*99.0000th: 91 *99.0th: 82
99.5000th: 707 99.5th: 83
99.9000th: 6920 99.9th: 86
min=0, max=10048 min=0, max=96
Latency percentiles (usec) Latency percentiles (usec)
50.0000th: 45 50.0th: 46
75.0000th: 61 75.0th: 64
90.0000th: 72 90.0th: 75
95.0000th: 79 95.0th: 79
*99.0000th: 691 *99.0th: 83
99.5000th: 3972 99.5th: 85
99.9000th: 8368 99.9th: 91
min=0, max=16606 min=0, max=117
Latency percentiles (usec) Latency percentiles (usec)
50.0000th: 45 50.0th: 46
75.0000th: 61 75.0th: 64
90.0000th: 71 90.0th: 75
95.0000th: 77 95.0th: 79
*99.0000th: 106 *99.0th: 83
99.5000th: 2364 99.5th: 84
99.9000th: 7480 99.9th: 90
min=0, max=10001 min=0, max=95
Latency percentiles (usec) Latency percentiles (usec)
50.0000th: 45 50.0th: 47
75.0000th: 62 75.0th: 65
90.0000th: 72 90.0th: 75
95.0000th: 78 95.0th: 79
*99.0000th: 93 *99.0th: 84
99.5000th: 108 99.5th: 85
99.9000th: 6792 99.9th: 90
min=0, max=17681 min=0, max=117
Latency percentiles (usec) Latency percentiles (usec)
50.0000th: 46 50.0th: 45
75.0000th: 62 75.0th: 64
90.0000th: 73 90.0th: 75
95.0000th: 79 95.0th: 79
*99.0000th: 113 *99.0th: 82
99.5000th: 2724 99.5th: 83
99.9000th: 6184 99.9th: 93
min=0, max=9887 min=0, max=111Performance counter stats for 'system wide' (5 runs):
context-switches 43,373 ( +- 0.40% ) 44,597 ( +- 0.55% ) cpu-migrations 1,211 ( +- 5.04% ) 220 ( +- 6.23% ) page-faults 15,983 ( +- 5.21% ) 15,360 ( +- 3.38% )
Waiman Long suggested using static_keys.
--- arch/powerpc/include/asm/spinlock.h | 4 +++- arch/powerpc/platforms/pseries/setup.c | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/spinlock.h +3 -1
@@ -53,10 +53,12 @@#endif #ifdef CONFIG_PPC_PSERIES +DECLARE_STATIC_KEY_FALSE (shared_processor); +#define vcpu_is_preempted vcpu_is_preemptedstatic inline bool vcpu_is_preempted (int cpu) { -if (!firmware_has_feature (FW_FEATURE_SPLPAR )) +if (!static_branch_unlikely (&shared_processor))return false;return !!(be32_to_cpu (lppaca_of (cpu).yield_count) &1 ); }
arch/powerpc/platforms/pseries/setup.c +7 -0
@@ -75,6 +75,9 @@#include "pseries.h" #include "../../../../drivers/pci/pci.h" +DEFINE_STATIC_KEY_FALSE (shared_processor); +EXPORT_SYMBOL_GPL (shared_processor); +int CMO_PrPSP =-1 ;int CMO_SecPSP =-1 ;unsigned long CMO_PageSize = (ASM_CONST (1 ) <<IOMMU_PAGE_SHIFT_4K );
@@ -761,6 +764,10 @@ static void __init pSeries_setup_arch(voif (firmware_has_feature (FW_FEATURE_LPAR )) {vpa_init (boot_cpuid); + +if (lppaca_shared_proc (get_lppaca ())) +static_branch_enable (&shared_processor); + ppc_md.power_save = pseries_lpar_idle; ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;#ifdef CONFIG_PCI_IOV
Greg Kroah-Hartman
maintainerPATCH 212/219 powerpc/irq: fix stack overflow verification
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 099bc4812f09155da77eeb960a983470249c9ce1 upstream.
Before commit 0366a1c70b89 ("powerpc/irq: Run softirqs off the top of the irq stack"), check_stack_overflow() was called by do_IRQ(), before switching to the irq stack.
In that commit, do_IRQ() was renamed __do_irq(), and is now executing on the irq stack, so check_stack_overflow() has just become almost useless.
Move check_stack_overflow() call in do_IRQ() to do the check while still on the current stack.
--- arch/powerpc/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/irq.c +2 -2
@@ -634,8 +634,6 @@ void __do_irq(struct pt_regs *regs)trace_irq_entry (regs); -check_stack_overflow (); -/* * Query the platform PIC for the interrupt & ack it. *
@@ -667,6 +665,8 @@ void do_IRQ(struct pt_regs *regs) irqtp = hardirq_ctx[raw_smp_processor_id ()]; sirqtp = softirq_ctx[raw_smp_processor_id ()]; +check_stack_overflow (); +/* Already there ? */ if (unlikely (curtp == irqtp || curtp == sirqtp)) {__do_irq (regs);
Greg Kroah-Hartman
maintainerPATCH 213/219 mmc: sdhci-msm: Correct the offset and value for DDR_CONFIG register
In reply to Greg Kroah-HartmanFrom: Veerabhadrarao Badiganti <[email protected]>
commit fa56ac9792265354b565f28def7164e7d7db2b1e upstream.
The DDR_CONFIG register offset got updated after a specific minor version of sdcc V4. This offset change has not been properly taken care of while updating register changes for sdcc V5.
Correcting proper offset for this register.
Also updating this register value to reflect the recommended RCLK delay.
--- drivers/mmc/host/sdhci-msm.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/mmc/host/sdhci-msm.c +19 -9
@@ -108,7 +108,7 @@#define CORE_PWRSAVE_DLL BIT(3) -#define DDR_CONFIG_POR_VAL 0x80040853 +#define DDR_CONFIG_POR_VAL 0x80040873#define INVALID_TUNING_PHASE -1
@@ -157,8 +157,9 @@ struct sdhci_msm_offset {u32 core_ddr_200_cfg;u32 core_vendor_spec3;u32 core_dll_config_2; +u32 core_dll_config_3; +u32 core_ddr_config_old;/* Applicable to sdcc minor ver < 0x49 */ u32 core_ddr_config; -u32 core_ddr_config_2; };static const struct sdhci_msm_offset sdhci_msm_v5_offset = {
@@ -186,8 +187,8 @@ static const struct sdhci_msm_offset sdh .core_ddr_200_cfg = 0x224, .core_vendor_spec3 = 0x250, .core_dll_config_2 = 0x254, - .core_ddr_config = 0x258, - .core_ddr_config_2 = 0x25c, + .core_dll_config_3 = 0x258, + .core_ddr_config = 0x25c, };static const struct sdhci_msm_offset sdhci_msm_mci_offset = {
@@ -216,8 +217,8 @@ static const struct sdhci_msm_offset sdh .core_ddr_200_cfg = 0x184, .core_vendor_spec3 = 0x1b0, .core_dll_config_2 = 0x1b4, - .core_ddr_config = 0x1b8, - .core_ddr_config_2 = 0x1bc, + .core_ddr_config_old = 0x1b8, + .core_ddr_config = 0x1bc, };struct sdhci_msm_variant_ops {
@@ -260,6 +261,7 @@ struct sdhci_msm_host {const struct sdhci_msm_offset *offset;bool use_cdr;u32 transfer_mode; +bool updated_ddr_cfg; };static const struct sdhci_msm_offset *sdhci_priv_msm_offset (struct sdhci_host *host)
@@ -931,8 +933,10 @@ out:static int sdhci_msm_cm_dll_sdc4_calibration (struct sdhci_host *host) {struct mmc_host *mmc = host->mmc; -u32 dll_status, config; +u32 dll_status, config, ddr_cfg_offset;int ret; +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct sdhci_msm_host *msm_host =sdhci_pltfm_priv (pltfm_host);const struct sdhci_msm_offset *msm_offset =sdhci_priv_msm_offset (host);
@@ -945,8 +949,11 @@ static int sdhci_msm_cm_dll_sdc4_calibra* bootloaders. In the future, if this changes, then the desired * values will need to be programmed appropriately. */ -writel_relaxed (DDR_CONFIG_POR_VAL , host->ioaddr + - msm_offset->core_ddr_config); +if (msm_host->updated_ddr_cfg) + ddr_cfg_offset = msm_offset->core_ddr_config; +else + ddr_cfg_offset = msm_offset->core_ddr_config_old; +writel_relaxed (DDR_CONFIG_POR_VAL , host->ioaddr + ddr_cfg_offset);if (mmc->ios.enhanced_strobe) { config = readl_relaxed(host->ioaddr +
@@ -1862,6 +1869,9 @@ static int sdhci_msm_probe(struct platfo msm_offset->core_vendor_spec_capabilities0); } +if (core_major ==1 && core_minor >=0x49 ) + msm_host->updated_ddr_cfg = true; +/* * Power on reset state may trigger power irq if previous status of * PWRCTL was either BUS_ON or IO_HIGH_V. So before enabling pwr irq
Greg Kroah-Hartman
maintainerPATCH 214/219 mmc: sdhci-of-esdhc: Revert "mmc: sdhci-of-esdhc: add erratum A-009204 support"
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit 8b6dc6b2d60221e90703babbc141f063b8a07e72 upstream.
This reverts commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c.
First, the fix seems to be plain wrong, since the erratum suggests waiting 5ms before setting setting SYSCTL[RSTD], but this msleep() happens after the call of sdhci_reset() which is where that bit gets set (if SDHCI_RESET_DATA is in mask).
Second, walking the whole device tree to figure out if some node has a "fsl,p2020-esdhc" compatible string is hugely expensive - about 70 to 100 us on our mpc8309 board. Walking the device tree is done under a raw_spin_lock, so this is obviously really bad on an -rt system, and a waste of time on all.
In fact, since esdhc_reset() seems to get called around 100 times per second, that mpc8309 now spends 0.8% of its time determining that it is not a p2020. Whether those 100 calls/s are normal or due to some other bug or misconfiguration, regularly hitting a 100 us non-preemptible window is unacceptable.
--- drivers/mmc/host/sdhci-of-esdhc.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +0 -3
@@ -648,9 +648,6 @@ static void esdhc_reset(struct sdhci_hossdhci_writel (host, host->ier,SDHCI_INT_ENABLE );sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); -if (of_find_compatible_node (NULL ,NULL ,"fsl,p2020-esdhc" )) -mdelay (5 ); -if (mask &SDHCI_RESET_ALL ) { val =sdhci_readl (host,ESDHC_TBCTL ); val &= ~ESDHC_TB_EN ;
Greg Kroah-Hartman
maintainerPATCH 215/219 mmc: sdhci: Update the tuning failed messages to pr_debug level
In reply to Greg Kroah-HartmanFrom: Faiz Abbas <[email protected]>
commit 2c92dd20304f505b6ef43d206fff21bda8f1f0ae upstream.
Tuning support in DDR50 speed mode was added in SD Specifications Part1 Physical Layer Specification v3.01. Its not possible to distinguish between v3.00 and v3.01 from the SCR and that is why since commit 4324f6de6d2e ("mmc: core: enable CMD19 tuning for DDR50 mode") tuning failures are ignored in DDR50 speed mode.
Cards compatible with v3.00 don't respond to CMD19 in DDR50 and this error gets printed during enumeration and also if retune is triggered at any time during operation. Update the printk level to pr_debug so that these errors don't lead to false error reports.
--- drivers/mmc/host/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci.c +2 -2
@@ -2244,8 +2244,8 @@ static void __sdhci_execute_tuning(strucsdhci_send_tuning (host, opcode);if (!host->tuning_done) { -pr_info ("%s: Tuning timeout, falling back to fixed sampling clock\n" , -mmc_hostname (host->mmc)); +pr_debug ("%s: Tuning timeout, falling back to fixed sampling clock\n" , +mmc_hostname (host->mmc));sdhci_abort_tuning (host, opcode);return ; }
Re: [PATCH 4.19 215/219] mmc: sdhci: Update the tuning failed messages to pr_debug level
Quoted 10 lines · Greg Kroah-Hartman
From: Faiz Abbas <[email protected]>
commit
2c92dd20304f505b6ef43d206fff21bda8f1f0aeupstream.Tuning support in DDR50 speed mode was added in SD Specifications Part1 Physical Layer Specification v3.01. Its not possible to distinguish between v3.00 and v3.01 from the SCR and that is why since commit
4324f6de6d2e("mmc: core: enable CMD19 tuning for DDR50 mode") tuning failures are ignored in DDR50 speed mode.
Quoted 4 lines
Cards compatible with v3.00 don't respond to CMD19 in DDR50 and this error gets printed during enumeration and also if retune is triggered at any time during operation. Update the printk level to
pr_debugso that these errors don't lead to false error reports.
Well, downgrading level might be ok, but people will still see the message in dmesg.
drivers/mmc/host/sdhci.c static void __sdhci_execute_tuning(struc · line 2248
Quoted 9 lines
+++
b/drivers/mmc/host/sdhci.cdrivers/mmc/host/sdhci.c +2
-2@@ -2244,8 +2244,8 @@ static void __sdhci_execute_tuning(strucsdhci_send_tuning (host, opcode);if (!host->tuning_done) { -pr_info ("%s: Tuning timeout, falling back to fixed sampling clock\n" , -mmc_hostname (host->mmc)); +pr_debug ("%s: Tuning timeout, falling back to fixed sampling clock\n" , +mmc_hostname (host->mmc));
Maybe adding something like "(this is expected on SD cards implementing phy specification v3.00)" to the user-visible text would be even better?
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 216/219 mmc: sdhci-of-esdhc: fix P2020 errata handling
In reply to Greg Kroah-HartmanFrom: Yangbo Lu <[email protected]>
commit fe0acab448f68c3146235afe03fb932e242ec94c upstream.
Two previous patches introduced below quirks for P2020 platforms.
- SDHCI_QUIRK_RESET_AFTER_REQUEST
- SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
The patches made a mistake to add them in quirks2 of sdhci_host structure, while they were defined for quirks.
host->quirks2 |= SDHCI_QUIRK_RESET_AFTER_REQUEST; host->quirks2 |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
This patch is to fix them.
host->quirks |= SDHCI_QUIRK_RESET_AFTER_REQUEST; host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
--- drivers/mmc/host/sdhci-of-esdhc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +2 -2
@@ -923,8 +923,8 @@ static int sdhci_esdhc_probe(struct plat host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ ;if (of_find_compatible_node (NULL ,NULL ,"fsl,p2020-esdhc" )) { - host->quirks2 |=SDHCI_QUIRK_RESET_AFTER_REQUEST ; - host->quirks2 |=SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; + host->quirks |=SDHCI_QUIRK_RESET_AFTER_REQUEST ; + host->quirks |=SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; } if (of_device_is_compatible(np, "fsl,p5040-esdhc") ||
Greg Kroah-Hartman
maintainerPATCH 217/219 mmc: sdhci: Workaround broken command queuing on Intel GLK
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit bedf9fc01ff1f40cfd1a79ccacedd9f3cd8e652a upstream.
Command queuing has been reported broken on some Lenovo systems based on Intel GLK. This is likely a BIOS issue, so disable command queuing for Intel GLK if the BIOS vendor string is "LENOVO".
--- drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-core.c +9 -1
@@ -30,6 +30,7 @@#include <linux/mmc/slot-gpio.h> #include <linux/mmc/sdhci-pci-data.h> #include <linux/acpi.h> +#include <linux/dmi.h> #include "cqhci.h"
@@ -732,11 +733,18 @@ static int byt_emmc_probe_slot(struct sdreturn 0 ; } +static bool glk_broken_cqhci (struct sdhci_pci_slot *slot) +{ +return slot->chip->pdev->device ==PCI_DEVICE_ID_INTEL_GLK_EMMC && +dmi_match (DMI_BIOS_VENDOR ,"LENOVO" ); +} +static int glk_emmc_probe_slot (struct sdhci_pci_slot *slot) {int ret =byt_emmc_probe_slot (slot); - slot->host->mmc->caps2 |=MMC_CAP2_CQE ; +if (!glk_broken_cqhci (slot)) + slot->host->mmc->caps2 |=MMC_CAP2_CQE ;if (slot->chip->pdev->device !=PCI_DEVICE_ID_INTEL_GLK_EMMC ) { slot->host->mmc->caps2 |= MMC_CAP2_HS400_ES,
Greg Kroah-Hartman
maintainerPATCH 218/219 mmc: sdhci: Add a quirk for broken command queuing
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 75d27ea1abf7af3cc2cdec3513e74f52191605c8 upstream.
Command queuing has been reported broken on some systems based on Intel GLK. A separate patch disables command queuing in some cases.
This patch adds a quirk for broken command queuing, which enables users with problems to disable command queuing using sdhci module parameters for quirks.
--- drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 5 insertions(+)
drivers/mmc/host/sdhci.c +3 -0
@@ -3549,6 +3549,9 @@ int sdhci_setup_host(struct sdhci_host * mmc_hostname(mmc), host->version); } +if (host->quirks &SDHCI_QUIRK_BROKEN_CQE ) + mmc->caps2 &= ~MMC_CAP2_CQE ; +if (host->quirks &SDHCI_QUIRK_FORCE_DMA ) host->flags |=SDHCI_USE_SDMA ;else if (!(host->caps &SDHCI_CAN_DO_SDMA ))
drivers/mmc/host/sdhci.h +2 -0
@@ -391,6 +391,8 @@ struct sdhci_host {#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)/* Controller reports inverted write-protect state */ #define SDHCI_QUIRK_INVERTED_WRITE_PROTECT (1<<16) +/* Controller has unusable command queue engine */ +#define SDHCI_QUIRK_BROKEN_CQE (1<<17)/* Controller does not like fast PIO transfers */ #define SDHCI_QUIRK_PIO_NEEDS_DELAY (1<<18)/* Controller has to be forced to use block size of 2048 bytes */
Greg Kroah-Hartman
maintainerPATCH 219/219 nbd: fix shutdown and recv work deadlock v2
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
commit 1c05839aa973cfae8c3db964a21f9c0eef8fcc21 upstream.
This fixes a regression added with:
commit e9e006f5fcf2bab59149cb38a48a4817c1b538b4
Author: Mike Christie <[email protected]> Date: Sun Aug 4 14:10:06 2019 -0500
nbd: fix max number of supported devs
where we can deadlock during device shutdown. The problem occurs if the recv_work's nbd_config_put occurs after nbd_start_device_ioctl has returned and the userspace app has droppped its reference via closing the device and running nbd_release. The recv_work nbd_config_put call would then drop the refcount to zero and try to destroy the config which would try to do destroy_workqueue from the recv work.
This patch just has nbd_start_device_ioctl do a flush_workqueue when it wakes so we know after the ioctl returns running works have exited. This also fixes a possible race where we could try to reuse the device while old recv_works are still running.
--- drivers/block/nbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/nbd.c +3 -3
@@ -1247,10 +1247,10 @@ static int nbd_start_device_ioctl(structmutex_unlock (&nbd->config_lock); ret =wait_event_interruptible (config->recv_wq,atomic_read (&config->recv_threads) ==0 ); -if (ret) { +if (ret)sock_shutdown (nbd); -flush_workqueue (nbd->recv_workq); - } +flush_workqueue (nbd->recv_workq); +mutex_lock (&nbd->config_lock);nbd_bdev_reset (bdev);/* user requested, ignore socket errors */
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.92-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.19.92-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.19.y
git commit: 798b10a6009db6f4b1baf1b3f76b844b46bfee32
git describe: v4.19.91-220-g798b10a6009d
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.19-oe/build/v4.19.91-220-g798b10a6009d
No regressions (compared to build v4.19.91)
No fixes (compared to build v4.19.91)
Ran 24318 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* perf
* spectre-meltdown-checker-test
* ltp-fs-tests
* network-basic-tests
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* ssuite
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 141 fail: 15 Failed builds: i386:tools/perf <all mips> x86_64:tools/perf Qemu test results: total: 381 pass: 316 fail: 65
Failed tests:
<all mips>
<all ppc64_book3s_defconfig>
perf as with v4.14.y.
arch/mips/kernel/syscall.c:40:10: fatal error: asm/sync.h: No such file or directory
arch/powerpc/include/asm/spinlock.h:56:1: error: type defaults to ‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’ and similar errors.
The powerpc build problem is inherited from mainline and has not been fixed there as far as I can see. I guess that makes 4.19.y bug-for-bug "compatible" with mainline in that regard.
Guenter
Greg Kroah-Hartman
maintainerQuoted 17 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 141 fail: 15 Failed builds: i386:tools/perf <all mips> x86_64:tools/perf Qemu test results: total: 381 pass: 316 fail: 65
Quoted 7 lines
Failed tests:
<all mips>
<allppc64_book3s_defconfig>perf as with v4.14.y.
arch/mips/kernel/syscall.c:40:10: fatal error:asm/sync.h: No such file or directory
Ah, will go drop the offending patch and push out a -rc2 with both of these issues fixed.
Quoted 6 lines
arch/powerpc/include/asm/spinlock.h:56:1: error: type defaults to ‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’ and similar errors.The powerpc build problem is inherited from mainline and has not been fixed there as far as I can see. I guess that makes 4.19.y bug-for-bug "compatible" with mainline in that regard.
bug compatible is fun :(
greg k-h
Quoted 29 lines · Greg Kroah-Hartman
Quoted 17 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 141 fail: 15 Failed builds: i386:tools/perf <all mips> x86_64:tools/perf Qemu test results: total: 381 pass: 316 fail: 65Quoted 7 lines
Failed tests:
<all mips>
<allppc64_book3s_defconfig>perf as with v4.14.y.
arch/mips/kernel/syscall.c:40:10: fatal error:asm/sync.h: No such file or directoryAh, will go drop the offending patch and push out a -rc2 with both of these issues fixed.
Quoted 9 lines
Quoted 6 lines
arch/powerpc/include/asm/spinlock.h:56:1: error: type defaults to ‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’ and similar errors.The powerpc build problem is inherited from mainline and has not been fixed there as far as I can see. I guess that makes 4.19.y bug-for-bug "compatible" with mainline in that regard.
bug compatible is fun :(
Not really. It is a terrible idea and results in the opposite of what I would call a "stable" release.
Anyway, turns out the offending commit is 14c73bd344d ("powerpc/vcpu: Assume dedicated processors as non-preempt"), which uses static_branch_unlikely(). This function does not exist for ppc in v4.19.y and v5.4.y. Thus, the _impact_ of the error in v4.19.y and v5.4.y is the same as in mainline, but the _cause_ is different. Upstream commit 14c73bd344d should not have been applied to v4.19.y and v5.4.y and needs to be reverted from those branches.
Guenter
Greg Kroah-Hartman
maintainerQuoted 37 lines · Guenter Roeck
Quoted 36 lines · Greg Kroah-Hartman
Quoted 17 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 141 fail: 15 Failed builds: i386:tools/perf <all mips> x86_64:tools/perf Qemu test results: total: 381 pass: 316 fail: 65Quoted 7 lines
Failed tests:
<all mips>
<allppc64_book3s_defconfig>perf as with v4.14.y.
arch/mips/kernel/syscall.c:40:10: fatal error:asm/sync.h: No such file or directoryAh, will go drop the offending patch and push out a -rc2 with both of these issues fixed.
Quoted 6 lines
arch/powerpc/include/asm/spinlock.h:56:1: error: type defaults to ‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’ and similar errors.The powerpc build problem is inherited from mainline and has not been fixed there as far as I can see. I guess that makes 4.19.y bug-for-bug "compatible" with mainline in that regard.
Quoted 8 lines
Quoted 2 lines
bug compatible is fun :(
Not really. It is a terrible idea and results in the opposite of what I would call a "stable" release.
Anyway, turns out the offending commit is
14c73bd344d("powerpc/vcpu: Assume dedicated processors as non-preempt"), which usesstatic_branch_unlikely().
It does? I see:
+ if (lppaca_shared_proc(get_lppaca()))
+ static_branch_enable(&shared_processor);
Quoted 4 lines
This function does not exist for ppc in v4.19.y and v5.4.y. Thus, the _impact_ of the error in v4.19.y and v5.4.y is the same as in mainline, but the _cause_ is different. Upstream commit
14c73bd344dshould not have been applied to v4.19.y and v5.4.y and needs to be reverted from those branches.
I'll go revert this patch, but as it was marked for stable by the authors of the patch, as relevant back to 4.18, I would have hoped that they knew what they were doing :)
thanks,
greg k-h
Quoted 52 lines · Greg Kroah-Hartman
Quoted 37 lines · Guenter Roeck
Quoted 36 lines · Greg Kroah-Hartman
Quoted 17 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 141 fail: 15 Failed builds: i386:tools/perf <all mips> x86_64:tools/perf Qemu test results: total: 381 pass: 316 fail: 65Quoted 7 lines
Failed tests:
<all mips>
<allppc64_book3s_defconfig>perf as with v4.14.y.
arch/mips/kernel/syscall.c:40:10: fatal error:asm/sync.h: No such file or directoryAh, will go drop the offending patch and push out a -rc2 with both of these issues fixed.
Quoted 6 lines
arch/powerpc/include/asm/spinlock.h:56:1: error: type defaults to ‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’ and similar errors.The powerpc build problem is inherited from mainline and has not been fixed there as far as I can see. I guess that makes 4.19.y bug-for-bug "compatible" with mainline in that regard.
Quoted 8 lines
Quoted 2 lines
bug compatible is fun :(
Not really. It is a terrible idea and results in the opposite of what I would call a "stable" release.
Anyway, turns out the offending commit is
14c73bd344d("powerpc/vcpu: Assume dedicated processors as non-preempt"), which usesstatic_branch_unlikely().It does? I see:
(quoted diff) +2
-0+ if (lppaca_shared_proc(get_lppaca())) + static_branch_enable(&shared_processor);
Quoted 9 lines
Quoted 4 lines
This function does not exist for ppc in v4.19.y and v5.4.y. Thus, the _impact_ of the error in v4.19.y and v5.4.y is the same as in mainline, but the _cause_ is different. Upstream commit
14c73bd344dshould not have been applied to v4.19.y and v5.4.y and needs to be reverted from those branches.I'll go revert this patch, but as it was marked for stable by the authors of the patch, as relevant back to 4.18, I would have hoped that they knew what they were doing :)
I probably didn't have enough champagne last night when I wrote my previous e-mail. No, the problem is the same as with the upstream kernel, so feel free to drop the revert if you prefer "bug-for-bug compatibility". Given where we are, that is probably better than dropping the patch and re-applying it after its fix is available.
The underlying problem is that the offending patch introduces the use of jump label code into arch/powerpc/include/asm/spinlock.h without including linux/jump_label.h. Depending on the configuration, this results in the observed build errors.
Patches were submitted upstream to fix the problem, but the fix has not been applied to mainline, and I don't see a maintainer reaction. Maybe everyone is off for the holidays.
https://patchwork.ozlabs.org/patch/1215380/
https://patchwork.ozlabs.org/patch/1214954/
Guenter
Quoted 97 lines · Guenter Roeck
Quoted 4 lines · Greg Kroah-Hartman
Quoted 3 lines · Guenter Roeck
Quoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Guenter Roeck
On Sun, Dec 29, 2019 at 06:16:42PM +0100, Greg Kroah-Hartman
Quoted 1 line · wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
This is the start of the stable review cycle for the 4.19.92
release.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
There are 219 patches in this series, all will be posted as a
response
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
to this one. If anyone has any issues with these being applied,
please
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
Build results:
total: 156 pass: 141 fail: 15 Failed builds: i386:tools/perf <all mips> x86_64:tools/perf Qemu test results: total: 381 pass: 316 fail: 65Failed tests:
<all mips>
<allppc64_book3s_defconfig>Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
perf as with v4.14.y.
arch/mips/kernel/syscall.c:40:10: fatal error:asm/sync.h: No suchfile or directory
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Ah, will go drop the offending patch and push out a -rc2 with both
of
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
these issues fixed.
Quoted 1 line
arch/powerpc/include/asm/spinlock.h:56:1: error: type defaults to‘int’ in declaration of ‘DECLARE_STATIC_KEY_FALSE’
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
and similar errors.
The powerpc build problem is inherited from mainline and has not
been fixed
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
there as far as I can see. I guess that makes 4.19.y bug-for-bug
"compatible"
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
with mainline in that regard.
bug compatible is fun :(
Not really. It is a terrible idea and results in the opposite of
what I would
Quoted 3 lines
Quoted 3 lines
call a "stable" release.
Anyway, turns out the offending commit is
14c73bd344d("powerpc/vcpu: Assume
Quoted 1 line
Quoted 1 line
dedicated processors as non-preempt"), which uses
static_branch_unlikely().Quoted 7 lines
It does? I see:
(quoted diff) +2
-0+ if (lppaca_shared_proc(get_lppaca())) + static_branch_enable(&shared_processor);Quoted 2 lines
This function does not exist for ppc in v4.19.y and v5.4.y. Thus,
the _impact_
Quoted 1 line
Quoted 1 line
of the error in v4.19.y and v5.4.y is the same as in mainline, but
the _cause_
Quoted 1 line
Quoted 1 line
is different. Upstream commit
14c73bd344dshould not have beenapplied to
Quoted 4 lines
Quoted 1 line
v4.19.y and v5.4.y and needs to be reverted from those branches.
I'll go revert this patch, but as it was marked for stable by the authors of the patch, as relevant back to 4.18, I would have hoped
that
Quoted 2 lines
they knew what they were doing :)
I probably didn't have enough champagne last night when I wrote my previous e-mail.
No, the problem is the same as with the upstream kernel, so feel free to drop
the revert if you prefer "bug-for-bug compatibility". Given where we are, that
is probably better than dropping the patch and re-applying it after its fix
is available.The underlying problem is that the offending patch introduces the use of
jump label code intoarch/powerpc/include/asm/spinlock.hwithout includinglinux/jump_label.h. Depending on the configuration, this results in the observed
build errors.
Quoted 5 lines
Patches were submitted upstream to fix the problem, but the fix has not been
applied to mainline, and I don't see a maintainer reaction. Maybe everyone
is off for the holidays.
I am off for the "holidays". But I put the patch in my fixes branch a few days ago, I'll send a pull to Linus tomorrow.
cheers
Signature · 1 line
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
Greg Kroah-Hartman
maintainerQuoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.92-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.
I have pushed out a -rc2 to resolve some reported issues:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.92-rc2.gz
Jon Hunter
maintainerQuoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.92-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.
Quoted 5 lines
thanks,
greg k-h
-------------
All tests are passing for Tegra ...
Test results for stable-v4.19:
13 builds: 13 pass, 0 fail
22 boots: 22 pass, 0 fail
32 tests: 32 pass, 0 failLinux version: 4.19.92-rc1-g798b10a6009d
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
For -rc2:
Build results:
total: 156 pass: 156 fail: 0 Qemu test results: total: 381 pass: 376 fail: 5 Failed tests: ppc64:mac99:ppc64_book3s_defconfig:smp:initrd ppc64:mac99:ppc64_book3s_defconfig:smp:ide:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:sdhci:mmc:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:nvme:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:scsi[DC395]:rootfs
Bug-for-bug compatible with mainline. That makes me wonder if I should stop testing those ppc images instead of being annoyed by the failures. Thoughts ?
Guenter
Greg Kroah-Hartman
maintainerQuoted 22 lines · Guenter Roeck
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.92 release. There are 219 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Tue, 31 Dec 2019 16:17:25 +0000. Anything received after that time might be too late.
For -rc2:
Build results:
total: 156 pass: 156 fail: 0 Qemu test results: total: 381 pass: 376 fail: 5 Failed tests: ppc64:mac99:ppc64_book3s_defconfig:smp:initrd ppc64:mac99:ppc64_book3s_defconfig:smp:ide:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:sdhci:mmc:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:nvme:rootfs ppc64:mac99:ppc64_book3s_defconfig:smp:scsi[DC395]:rootfs
Quoted 3 lines
Bug-for-bug compatible with mainline. That makes me wonder if I should stop testing those ppc images instead of being annoyed by the failures. Thoughts ?
I think the ppc developers need to fix the issues. Or just mark the configuration as obsolete and remove it from mainline?
thanks,
greg k-h