5.13.2-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 269/800 media: venus: Rework error fail recover logic
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 4cba5473c5ce0f1389d316c5dc6f83a0259df5eb ]
The Venus code has a sort of watchdog that attempts to recover from IP errors, implemented as a delayed work job, which calls venus_sys_error_handler().
Right now, it has several issues:
1. It assumes that PM runtime resume never fails
2. It internally runs two while() loops that also assume that PM runtime will never fail to go idle:
while (pm_runtime_active(core->dev_dec) || pm_runtime_active(core->dev_enc)) msleep(10);
...
while (core->pmdomains[0] && pm_runtime_active(core->pmdomains[0])) usleep_range(1000, 1500);
3. It uses an OR to merge all return codes and then report to the user
4. If the hardware never recovers, it keeps running on every 10ms, flooding the syslog with 2 messages (so, up to 200 messages per second).
Rework the code, in order to prevent that, by:
1. check the return code from PM runtime resume;
2. don't let the while() loops run forever;
3. store the failed event;
4. use warn ratelimited when it fails to recover.
--- drivers/media/platform/qcom/venus/core.c | 60 +++++++++++++++++++----- 1 file changed, 47 insertions(+), 13 deletions(-)
drivers/media/platform/qcom/venus/core.c +47 -13
@@ -78,22 +78,32 @@ static const struct hfi_core_ops venus_core_ops = { .event_notify = venus_event_notify, }; +#define RPM_WAIT_FOR_IDLE_MAX_ATTEMPTS 10 +static void venus_sys_error_handler (struct work_struct *work) {struct venus_core *core = container_of(work, struct venus_core, work.work); -int ret =0 ; - -pm_runtime_get_sync (core->dev); +int ret, i, max_attempts =RPM_WAIT_FOR_IDLE_MAX_ATTEMPTS ; +const char *err_msg ="" ; +bool failed = false; + + ret =pm_runtime_get_sync (core->dev); +if (ret <0 ) { + err_msg ="resume runtime PM" ; + max_attempts =0 ; + failed = true; + }hfi_core_deinit (core, true); -dev_warn (core->dev,"system error has occurred, starting recovery!\n" ); -mutex_lock (&core->lock); -while (pm_runtime_active (core->dev_dec) ||pm_runtime_active (core->dev_enc)) +for (i =0 ; i < max_attempts; i++) { +if (!pm_runtime_active (core->dev_dec) && !pm_runtime_active (core->dev_enc)) +break ;msleep (10 ); + }venus_shutdown (core);
@@ -101,31 +111,55 @@ static void venus_sys_error_handler(struct work_struct *work)pm_runtime_put_sync (core->dev); -while (core->pmdomains[0 ] &&pm_runtime_active (core->pmdomains[0 ])) +for (i =0 ; i < max_attempts; i++) { +if (!core->pmdomains[0 ] || !pm_runtime_active (core->pmdomains[0 ])) +break ;usleep_range (1000 ,1500 ); + }hfi_reinit (core); -pm_runtime_get_sync (core->dev); + ret =pm_runtime_get_sync (core->dev); +if (ret <0 ) { + err_msg ="resume runtime PM" ; + failed = true; + } - ret |=venus_boot (core); - ret |=hfi_core_resume (core, true); + ret =venus_boot (core); +if (ret && !failed) { + err_msg ="boot Venus" ; + failed = true; + } + + ret =hfi_core_resume (core, true); +if (ret && !failed) { + err_msg ="resume HFI" ; + failed = true; + }enable_irq (core->irq);mutex_unlock (&core->lock); - ret |=hfi_core_init (core); + ret =hfi_core_init (core); +if (ret && !failed) { + err_msg ="init HFI" ; + failed = true; + }pm_runtime_put_sync (core->dev); -if (ret) { +if (failed) {disable_irq_nosync (core->irq); -dev_warn (core->dev,"recovery failed (%d)\n" , ret); +dev_warn_ratelimited (core->dev, +"System error has occurred, recovery failed to %s\n" , + err_msg);schedule_delayed_work (&core->work,msecs_to_jiffies (10 ));return ; } +dev_warn (core->dev,"system error has occurred (recovered)\n" ); +mutex_lock (&core->lock); core->sys_error = false;mutex_unlock (&core->lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 270/800 media: s5p_cec: decrement usage count if disabled
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 747bad54a677d8633ec14b39dfbeb859c821d7f2 ]
There's a bug at s5p_cec_adap_enable(): if called to disable the device, it should call pm_runtime_put() instead of pm_runtime_disable(), as the goal here is to decrement the usage_count and not to disable PM runtime.
--- drivers/media/cec/platform/s5p/s5p_cec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/cec/platform/s5p/s5p_cec.c +1 -1
@@ -54,7 +54,7 @@ static int s5p_cec_adap_enable(struct cec_adapter *adap, bool enable) }else {s5p_cec_mask_tx_interrupts (cec);s5p_cec_mask_rx_interrupts (cec); -pm_runtime_disable (cec->dev); +pm_runtime_put (cec->dev); }return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 271/800 media: i2c: ccs-core: return the right error code at suspend
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 6005a8e955e4e451e4bf6000affaab566d4cab5e ]
If pm_runtime resume logic fails, return the error code provided by it, instead of -EAGAIN, as, depending on what caused it to fail, it may not be something that would be recovered.
--- drivers/media/i2c/ccs/ccs-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ccs/ccs-core.c +1 -1
@@ -3093,7 +3093,7 @@ static int __maybe_unused ccs_suspend(struct device *dev)if (rval <0 ) {pm_runtime_put_noidle (dev); -return -EAGAIN ; +return rval; }if (sensor->streaming)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 272/800 media: hantro: do a PM resume earlier
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 892bb6ecead9b834ba7ad1d07513e9eba1baa3a4 ]
The device_run() first enables the clock and then
tries to resume PM runtime, checking for errors.
Well, if for some reason the pm_runtime can not resume, it would be better to detect it beforehand.
So, change the order inside device_run().
--- drivers/staging/media/hantro/hantro_drv.c | 33 +++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/staging/media/hantro/hantro_drv.c +22 -11
@@ -56,16 +56,12 @@ dma_addr_t hantro_get_ref(struct hantro_ctx *ctx, u64 ts)return hantro_get_dec_buf_addr (ctx, buf); } -static void hantro_job_finish (struct hantro_dev *vpu, -struct hantro_ctx *ctx, -enum vb2_buffer_state result) +static void hantro_job_finish_no_pm (struct hantro_dev *vpu, +struct hantro_ctx *ctx, +enum vb2_buffer_state result) {struct vb2_v4l2_buffer *src, *dst; -pm_runtime_mark_last_busy (vpu->dev); -pm_runtime_put_autosuspend (vpu->dev); -clk_bulk_disable (vpu->variant->num_clocks, vpu->clocks); - src =v4l2_m2m_next_src_buf (ctx->fh.m2m_ctx); dst =v4l2_m2m_next_dst_buf (ctx->fh.m2m_ctx);
@@ -81,6 +77,18 @@ static void hantro_job_finish(struct hantro_dev *vpu, result); } +static void hantro_job_finish (struct hantro_dev *vpu, +struct hantro_ctx *ctx, +enum vb2_buffer_state result) +{ +pm_runtime_mark_last_busy (vpu->dev); +pm_runtime_put_autosuspend (vpu->dev); + +clk_bulk_disable (vpu->variant->num_clocks, vpu->clocks); + +hantro_job_finish_no_pm (vpu, ctx, result); +} +void hantro_irq_done (struct hantro_dev *vpu,enum vb2_buffer_state result) {
@@ -152,12 +160,15 @@ static void device_run(void *priv) src =hantro_get_src_buf (ctx); dst =hantro_get_dst_buf (ctx); + ret =pm_runtime_get_sync (ctx->dev->dev); +if (ret <0 ) { +pm_runtime_put_noidle (ctx->dev->dev); + goto err_cancel_job; + } + ret =clk_bulk_enable (ctx->dev->variant->num_clocks, ctx->dev->clocks);if (ret) goto err_cancel_job; - ret =pm_runtime_get_sync (ctx->dev->dev); -if (ret <0 ) - goto err_cancel_job;v4l2_m2m_buf_copy_metadata (src, dst, true);
@@ -165,7 +176,7 @@ static void device_run(void *priv)return ; err_cancel_job: -hantro_job_finish (ctx->dev, ctx,VB2_BUF_STATE_ERROR ); +hantro_job_finish_no_pm (ctx->dev, ctx,VB2_BUF_STATE_ERROR ); }static struct v4l2_m2m_ops vpu_m2m_ops = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 273/800 crypto: ixp4xx - dma_unmap the correct address
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 9395c58fdddd79cdd3882132cdd04e8ac7ad525f ]
Testing ixp4xx_crypto with CONFIG_DMA_API_DEBUG lead to the following error:
DMA-API: platform ixp4xx_crypto.0: device driver tries to free DMA memory it has not allocated [device address=0x0000000000000000] [size=24 bytes]
This is due to dma_unmap using the wrong address.
--- drivers/crypto/ixp4xx_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/ixp4xx_crypto.c +1 -1
@@ -330,7 +330,7 @@ static void free_buf_chain(struct device *dev, struct buffer_desc *buf, buf1 = buf->next; phys1 = buf->phys_next; -dma_unmap_single (dev, buf->phys_next, buf->buf_len, buf->dir); +dma_unmap_single (dev, buf->phys_addr, buf->buf_len, buf->dir);dma_pool_free (buffer_pool, buf, phys); buf = buf1; phys = phys1;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 274/800 crypto: ixp4xx - update IV after requests
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit e8acf011f2e7e21a7e2fae47cbaa06598e533d40 ]
Crypto selftests fail on ixp4xx since it do not update IV after skcipher requests.
--- drivers/crypto/ixp4xx_crypto.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/crypto/ixp4xx_crypto.c +22 -0
@@ -149,6 +149,8 @@ struct crypt_ctl {struct ablk_ctx {struct buffer_desc *src;struct buffer_desc *dst; +u8 iv[MAX_IVLEN ]; +bool encrypt; };struct aead_ctx {
@@ -381,6 +383,20 @@ static void one_packet(dma_addr_t phys)case CTL_FLAG_PERFORM_ABLK : {struct skcipher_request *req = crypt->data.ablk_req;struct ablk_ctx *req_ctx =skcipher_request_ctx (req); +struct crypto_skcipher *tfm =crypto_skcipher_reqtfm (req); +unsigned int ivsize =crypto_skcipher_ivsize (tfm); +unsigned int offset; + +if (ivsize >0 ) { + offset = req->cryptlen - ivsize; +if (req_ctx->encrypt) { +scatterwalk_map_and_copy (req->iv, req->dst, + offset, ivsize,0 ); + }else { +memcpy (req->iv, req_ctx->iv, ivsize); +memzero_explicit (req_ctx->iv, ivsize); + } + }if (req_ctx->dst) {free_buf_chain (dev, req_ctx->dst, crypt->dst_buf);
@@ -876,6 +892,7 @@ static int ablk_perform(struct skcipher_request *req, int encrypt)struct ablk_ctx *req_ctx =skcipher_request_ctx (req);struct buffer_desc src_hook;struct device *dev = &pdev->dev; +unsigned int offset;gfp_t flags = req->base.flags &CRYPTO_TFM_REQ_MAY_SLEEP ?GFP_KERNEL :GFP_ATOMIC ;
@@ -885,6 +902,7 @@ static int ablk_perform(struct skcipher_request *req, int encrypt)return -EAGAIN ; dir = encrypt ? &ctx->encrypt : &ctx->decrypt; + req_ctx->encrypt = encrypt; crypt =get_crypt_desc ();if (!crypt)
@@ -900,6 +918,10 @@ static int ablk_perform(struct skcipher_request *req, int encrypt)BUG_ON (ivsize && !req->iv);memcpy (crypt->iv, req->iv, ivsize); +if (ivsize >0 && !encrypt) { + offset = req->cryptlen - ivsize; +scatterwalk_map_and_copy (req_ctx->iv, req->src, offset, ivsize,0 ); + }if (req->src != req->dst) {struct buffer_desc dst_hook; crypt->mode |=NPE_OP_NOT_IN_PLACE ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 275/800 crypto: ux500 - Fix error return code in hash_hw_final()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit b01360384009ab066940b45f34880991ea7ccbfb ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/crypto/ux500/hash/hash_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/ux500/hash/hash_core.c +1 -0
@@ -1011,6 +1011,7 @@ static int hash_hw_final(struct ahash_request *req) goto out; } }else if (req->nbytes ==0 && ctx->keylen >0 ) { + ret = -EPERM ;dev_err (device_data->dev,"%s: Empty message with keylength > 0, NOT supported\n" , __func__); goto out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 276/800 sata_highbank: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 4a24efa16e7db02306fb5db84518bb0a7ada5a46 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_highbank.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/ata/sata_highbank.c +4 -2
@@ -469,10 +469,12 @@ static int ahci_highbank_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) { +if (irq <0 ) {dev_err (dev,"no irq\n" ); -return -EINVAL ; +return irq; } +if (!irq) +return -EINVAL ; hpriv =devm_kzalloc (dev,sizeof (*hpriv),GFP_KERNEL );if (!hpriv) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 277/800 pata_rb532_cf: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 2d3a62fbae8e5badc2342388f65ab2191c209cc0 ]
The driver overrides the error codes returned by platform_get_irq() to -ENOENT, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/pata_rb532_cf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/ata/pata_rb532_cf.c +4 -2
@@ -115,10 +115,12 @@ static int rb532_pata_driver_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) { +if (irq <0 ) {dev_err (&pdev->dev,"no IRQ resource found\n" ); -return -ENOENT ; +return irq; } +if (!irq) +return -EINVAL ; gpiod =devm_gpiod_get (&pdev->dev,NULL ,GPIOD_IN );if (IS_ERR (gpiod)) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 278/800 media: I2C: change RST to "RSET" to fix multiple build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 8edcb5049ac29aa3c8acc5ef15dd4036543d747e ]
The use of an enum named 'RST' conflicts with a #define macro named 'RST' in arch/mips/include/asm/mach-rc32434/rb.h.
The MIPS use of RST was there first (AFAICT), so change the media/i2c/ uses of RST to be named 'RSET'.
'git grep -w RSET' does not report any naming conflicts with the new name.
This fixes multiple build errors:
arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token
15 | #define RST (1 << 15)
| ^
drivers/media/i2c/s5c73m3/s5c73m3.h:356:2: note: in expansion of macro 'RST'
356 | RST,
| ^~~../arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token
15 | #define RST (1 << 15)
| ^
../drivers/media/i2c/s5k6aa.c:180:2: note: in expansion of macro 'RST'
180 | RST,
| ^~~../arch/mips/include/asm/mach-rc32434/rb.h:15:14: error: expected identifier before '(' token
15 | #define RST (1 << 15)
| ^
../drivers/media/i2c/s5k5baf.c:238:2: note: in expansion of macro 'RST'
238 | RST,
| ^~~and some others that I have trimmed.
--- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 6 +++--- drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- drivers/media/i2c/s5k4ecgx.c | 10 +++++----- drivers/media/i2c/s5k5baf.c | 6 +++--- drivers/media/i2c/s5k6aa.c | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-)
drivers/media/i2c/s5c73m3/s5c73m3-core.c +3 -3
@@ -1386,7 +1386,7 @@ static int __s5c73m3_power_on(struct s5c73m3 *state)s5c73m3_gpio_deassert (state,STBY );usleep_range (100 ,200 ); -s5c73m3_gpio_deassert (state,RST ); +s5c73m3_gpio_deassert (state,RSET );usleep_range (50 ,100 );return 0 ;
@@ -1401,7 +1401,7 @@ static int __s5c73m3_power_off(struct s5c73m3 *state) {int i, ret; -if (s5c73m3_gpio_assert (state,RST )) +if (s5c73m3_gpio_assert (state,RSET ))usleep_range (10 ,50 );if (s5c73m3_gpio_assert (state,STBY ))
@@ -1606,7 +1606,7 @@ static int s5c73m3_get_platform_data(struct s5c73m3 *state) state->mclk_frequency = pdata->mclk_frequency; state->gpio[STBY ] = pdata->gpio_stby; - state->gpio[RST ] = pdata->gpio_reset; + state->gpio[RSET ] = pdata->gpio_reset;return 0 ; }
drivers/media/i2c/s5c73m3/s5c73m3.h +1 -1
@@ -353,7 +353,7 @@ struct s5c73m3_ctrls {enum s5c73m3_gpio_id {STBY , -RST , +RSET ,GPIO_NUM , };
drivers/media/i2c/s5k4ecgx.c +5 -5
@@ -173,7 +173,7 @@ static const char * const s5k4ecgx_supply_names[] = {enum s5k4ecgx_gpio_id {STBY , -RST , +RSET ,GPIO_NUM , };
@@ -476,7 +476,7 @@ static int __s5k4ecgx_power_on(struct s5k4ecgx *priv)if (s5k4ecgx_gpio_set_value (priv,STBY , priv->gpio[STBY ].level))usleep_range (30 ,50 ); -if (s5k4ecgx_gpio_set_value (priv,RST , priv->gpio[RST ].level)) +if (s5k4ecgx_gpio_set_value (priv,RSET , priv->gpio[RSET ].level))usleep_range (30 ,50 );return 0 ;
@@ -484,7 +484,7 @@ static int __s5k4ecgx_power_on(struct s5k4ecgx *priv)static int __s5k4ecgx_power_off (struct s5k4ecgx *priv) { -if (s5k4ecgx_gpio_set_value (priv,RST , !priv->gpio[RST ].level)) +if (s5k4ecgx_gpio_set_value (priv,RSET , !priv->gpio[RSET ].level))usleep_range (30 ,50 );if (s5k4ecgx_gpio_set_value (priv,STBY , !priv->gpio[STBY ].level))
@@ -872,7 +872,7 @@ static int s5k4ecgx_config_gpios(struct s5k4ecgx *priv,int ret; priv->gpio[STBY ].gpio = -EINVAL ; - priv->gpio[RST ].gpio = -EINVAL ; + priv->gpio[RSET ].gpio = -EINVAL ; ret =s5k4ecgx_config_gpio (gpio->gpio, gpio->level,"S5K4ECGX_STBY" );
@@ -891,7 +891,7 @@ static int s5k4ecgx_config_gpios(struct s5k4ecgx *priv,s5k4ecgx_free_gpios (priv);return ret; } - priv->gpio[RST ] = *gpio; + priv->gpio[RSET ] = *gpio;if (gpio_is_valid (gpio->gpio))gpio_set_value (gpio->gpio,0 );
drivers/media/i2c/s5k5baf.c +3 -3
@@ -235,7 +235,7 @@ struct s5k5baf_gpio {enum s5k5baf_gpio_id {STBY , -RST , +RSET ,NUM_GPIOS , };
@@ -969,7 +969,7 @@ static int s5k5baf_power_on(struct s5k5baf *state)s5k5baf_gpio_deassert (state,STBY );usleep_range (50 ,100 ); -s5k5baf_gpio_deassert (state,RST ); +s5k5baf_gpio_deassert (state,RSET );return 0 ; err_reg_dis:
@@ -987,7 +987,7 @@ static int s5k5baf_power_off(struct s5k5baf *state) state->apply_cfg =0 ; state->apply_crop =0 ; -s5k5baf_gpio_assert (state,RST ); +s5k5baf_gpio_assert (state,RSET );s5k5baf_gpio_assert (state,STBY );if (!IS_ERR (state->clock))
drivers/media/i2c/s5k6aa.c +5 -5
@@ -177,7 +177,7 @@ static const char * const s5k6aa_supply_names[] = {enum s5k6aa_gpio_id {STBY , -RST , +RSET ,GPIO_NUM , };
@@ -841,7 +841,7 @@ static int __s5k6aa_power_on(struct s5k6aa *s5k6aa) ret = s5k6aa->s_power (1 );usleep_range (4000 ,5000 ); -if (s5k6aa_gpio_deassert (s5k6aa,RST )) +if (s5k6aa_gpio_deassert (s5k6aa,RSET ))msleep (20 );return ret;
@@ -851,7 +851,7 @@ static int __s5k6aa_power_off(struct s5k6aa *s5k6aa) {int ret; -if (s5k6aa_gpio_assert (s5k6aa,RST )) +if (s5k6aa_gpio_assert (s5k6aa,RSET ))usleep_range (100 ,150 );if (s5k6aa->s_power) {
@@ -1510,7 +1510,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa,int ret; s5k6aa->gpio[STBY ].gpio = -EINVAL ; - s5k6aa->gpio[RST ].gpio = -EINVAL ; + s5k6aa->gpio[RSET ].gpio = -EINVAL ; gpio = &pdata->gpio_stby;if (gpio_is_valid (gpio->gpio)) {
@@ -1533,7 +1533,7 @@ static int s5k6aa_configure_gpios(struct s5k6aa *s5k6aa,if (ret <0 )return ret; - s5k6aa->gpio[RST ] = *gpio; + s5k6aa->gpio[RSET ] = *gpio; }return 0 ;
Signature · 9 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 279/800 sched/uclamp: Fix wrong implementation of cpu.uclamp.min
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 0c18f2ecfcc274a4bcc1d122f79ebd4001c3b445 ]
cpu.uclamp.min is a protection as described in cgroup-v2 Resource Distribution Model
Documentation/admin-guide/cgroup-v2.rst
which means we try our best to preserve the minimum performance point of tasks in this group. See full description of cpu.uclamp.min in the cgroup-v2.rst.
But the current implementation makes it a limit, which is not what was intended.
For example:
tg->cpu.uclamp.min = 20% p0->uclamp[UCLAMP_MIN] = 0 p1->uclamp[UCLAMP_MIN] = 50% Previous Behavior (limit): p0->effective_uclamp = 0 p1->effective_uclamp = 20% New Behavior (Protection): p0->effective_uclamp = 20% p1->effective_uclamp = 50%
Which is inline with how protections should work.
With this change the cgroup and per-task behaviors are the same, as expected.
Additionally, we remove the confusing relationship between cgroup and !user_defined flag.
We don't want for example RT tasks that are boosted by default to max to change their boost value when they attach to a cgroup. If a cgroup wants to limit the max performance point of tasks attached to it, then cpu.uclamp.max must be set accordingly.
Or if they want to set different boost value based on cgroup, then sysctl_sched_util_clamp_min_rt_default must be used to NOT boost to max and set the right cpu.uclamp.min for each group to let the RT tasks obtain the desired boost value when attached to that group.
As it stands the dependency on !user_defined flag adds an extra layer of complexity that is not required now cpu.uclamp.min behaves properly as a protection.
The propagation model of effective cpu.uclamp.min in child cgroups as implemented by cpu_util_update_eff() is still correct. The parent protection sets an upper limit of what the child cgroups will effectively get.
--- kernel/sched/core.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
kernel/sched/core.c +17 -4
@@ -1067,7 +1067,6 @@ uclamp_tg_restrict(struct task_struct *p, enum uclamp_id clamp_id) {struct uclamp_se uc_req = p->uclamp_req[clamp_id];#ifdef CONFIG_UCLAMP_TASK_GROUP -struct uclamp_se uc_max;/* * Tasks in autogroups or root task group will be
@@ -1078,9 +1077,23 @@ uclamp_tg_restrict(struct task_struct *p, enum uclamp_id clamp_id)if (task_group (p) == &root_task_group)return uc_req; - uc_max =task_group (p)->uclamp[clamp_id]; -if (uc_req.value > uc_max.value || !uc_req.user_defined) -return uc_max; +switch (clamp_id) { +case UCLAMP_MIN : { +struct uclamp_se uc_min =task_group (p)->uclamp[clamp_id]; +if (uc_req.value < uc_min.value) +return uc_min; +break ; + } +case UCLAMP_MAX : { +struct uclamp_se uc_max =task_group (p)->uclamp[clamp_id]; +if (uc_req.value > uc_max.value) +return uc_max; +break ; + } +default : +WARN_ON_ONCE (1 ); +break ; + }#endif return uc_req;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 280/800 sched/uclamp: Fix locking around cpu_util_update_eff()
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 93b73858701fd01de26a4a874eb95f9b7156fd4b ]
cpu_cgroup_css_online() calls cpu_util_update_eff() without holding the uclamp_mutex or rcu_read_lock() like other call sites, which is a mistake.
The uclamp_mutex is required to protect against concurrent reads and writes that could update the cgroup hierarchy.
The rcu_read_lock() is required to traverse the cgroup data structures in cpu_util_update_eff().
Surround the caller with the required locks and add some asserts to better document the dependency in cpu_util_update_eff().
--- kernel/sched/core.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/sched/core.c +7 -0
@@ -8702,7 +8702,11 @@ static int cpu_cgroup_css_online(struct cgroup_subsys_state *css)#ifdef CONFIG_UCLAMP_TASK_GROUP /* Propagate the effective uclamp value for the new group */ +mutex_lock (&uclamp_mutex); +rcu_read_lock ();cpu_util_update_eff (css); +rcu_read_unlock (); +mutex_unlock (&uclamp_mutex);#endif return 0 ;
@@ -8792,6 +8796,9 @@ static void cpu_util_update_eff(struct cgroup_subsys_state *css)enum uclamp_id clamp_id;unsigned int clamps; +lockdep_assert_held (&uclamp_mutex); +SCHED_WARN_ON (!rcu_read_lock_held ()); +css_for_each_descendant_pre (css, top_css) { uc_parent =css_tg (css)->parent ?css_tg (css)->parent->uclamp :NULL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 281/800 kbuild: Fix objtool dependency for OBJECT_FILES_NON_STANDARD_<obj> := n
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit 8852c552402979508fdc395ae07aa8761aa46045 ]
"OBJECT_FILES_NON_STANDARD_vma.o := n" has a dependency bug. When objtool source is updated, the affected object doesn't get re-analyzed by objtool.
Peter's new variable-sized jump label feature relies on objtool rewriting the object file. Otherwise the system can fail to boot. That effectively upgrades this minor dependency issue to a major bug.
The problem is that variables in prerequisites are expanded early, during the read-in phase. The '$(objtool_dep)' variable indirectly uses '$@', which isn't yet available when the target prerequisites are evaluated.
Use '.SECONDEXPANSION:' which causes '$(objtool_dep)' to be expanded in a later phase, after the target-specific '$@' variable has been defined.
--- scripts/Makefile.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/Makefile.build +3 -2
@@ -268,7 +268,8 @@ define rule_as_o_S endef # Built-in and composite module parts -$(obj)/%.o: $(src)/%.c $(recordmcount_source) $(objtool_dep) FORCE +.SECONDEXPANSION: +$(obj)/%.o: $(src)/%.c $(recordmcount_source) $$(objtool_dep) FORCE $(call if_changed_rule,cc_o_c) $(call cmd,force_checksrc)
@@ -349,7 +350,7 @@ cmd_modversions_S = \ fi endif -$(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE +$(obj)/%.o: $(src)/%.S $$(objtool_dep) FORCE $(call if_changed_rule,as_o_S) targets += $(filter-out $(subdir-builtin), $(real-obj-y))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 282/800 pata_octeon_cf: avoid WARN_ON() in ata_host_activate()
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit bfc1f378c8953e68ccdbfe0a8c20748427488b80 ]
Iff platform_get_irq() fails (or returns IRQ0) and thus the polling mode has to be used, ata_host_activate() hits the WARN_ON() due to 'irq_handler' parameter being non-NULL if the polling mode is selected. Let's only set the pointer to the driver's IRQ handler if platform_get_irq() returns a valid IRQ # -- this should avoid the unnecessary WARN_ON()...
--- drivers/ata/pata_octeon_cf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ata/pata_octeon_cf.c +3 -2
@@ -898,10 +898,11 @@ static int octeon_cf_probe(struct platform_device *pdev)return -EINVAL ; } - irq_handler = octeon_cf_interrupt; i =platform_get_irq (dma_dev,0 ); -if (i >0 ) +if (i >0 ) { irq = i; + irq_handler = octeon_cf_interrupt; + } }of_node_put (dma_node); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 283/800 evm: fix writing <securityfs>/evm overflow
In reply to Greg Kroah-HartmanFrom: Mimi Zohar <[email protected]>
[ Upstream commit 49219d9b8785ba712575c40e48ce0f7461254626 ]
EVM_SETUP_COMPLETE is defined as 0x80000000, which is larger than INT_MAX. The "-fno-strict-overflow" compiler option properly prevents signaling EVM that the EVM policy setup is complete. Define and read an unsigned int.
--- security/integrity/evm/evm_secfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
security/integrity/evm/evm_secfs.c +3 -2
@@ -66,12 +66,13 @@ static ssize_t evm_read_key(struct file *filp, char __user *buf,static ssize_t evm_write_key (struct file *file,const char __user *buf,size_t count,loff_t *ppos) { -int i, ret; +unsigned int i; +int ret;if (!capable (CAP_SYS_ADMIN ) || (evm_initialized &EVM_SETUP_COMPLETE ))return -EPERM ; - ret =kstrtoint_from_user (buf, count,0 , &i); + ret =kstrtouint_from_user (buf, count,0 , &i);if (ret)return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 284/800 crypto: testmgr - fix initialization of secret_size
In reply to Greg Kroah-HartmanFrom: Hui Tang <[email protected]>
[ Upstream commit 2d016672528a592ada5188e53ac746e1b8b7a978 ]
Actual data length of the 'secret' is not equal to the 'secret_size'.
Since the 'curve_id' has removed in the 'secret', the 'secret_size' should subtract the length of the 'curve_id'.
--- crypto/testmgr.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
crypto/testmgr.h +4 -4
@@ -2718,7 +2718,7 @@ static const struct kpp_testvec ecdh_p192_tv_template[] = {"\xf4\x57\xcc\x4f\x1f\x4e\x31\xcc" "\xe3\x40\x60\xc8\x06\x93\xc6\x2e" "\x99\x80\x81\x28\xaf\xc5\x51\x74", - .secret_size = 32, + .secret_size = 30, .b_public_size = 48, .expected_a_public_size =48 , .expected_ss_size = 24
@@ -2764,7 +2764,7 @@ static const struct kpp_testvec ecdh_p256_tv_template[] = {"\x9f\x4a\x38\xcc\xc0\x2c\x49\x2f" "\xb1\x32\xbb\xaf\x22\x61\xda\xcb" "\x6f\xdb\xa9\xaa\xfc\x77\x81\xf3", - .secret_size = 40, + .secret_size = 38, .b_public_size = 64, .expected_a_public_size =64 , .expected_ss_size = 32
@@ -2802,8 +2802,8 @@ static const struct kpp_testvec ecdh_p256_tv_template[] = {"\x37\x08\xcc\x40\x5e\x7a\xfd\x6a" "\x6a\x02\x6e\x41\x87\x68\x38\x77" "\xfa\xa9\x44\x43\x2d\xef\x09\xdf", - .secret_size = 8, - .b_secret_size = 40, + .secret_size = 6, + .b_secret_size = 38, .b_public_size = 64, .expected_a_public_size = 64, .expected_ss_size = 32,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 285/800 crypto: hisilicon/hpre - fix unmapping invalid dma address
In reply to Greg Kroah-HartmanFrom: Hui Tang <[email protected]>
[ Upstream commit 0b0553b701f830d820ba9026e5799c24e400a4b5 ]
Currently, an invalid dma address may be unmapped when calling 'xx_data_clr_all' in error path, so check dma address of sqe in/out if initialized before calling 'dma_free_coherent' or 'dma_unmap_single'.
--- drivers/crypto/hisilicon/hpre/hpre_crypto.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/crypto/hisilicon/hpre/hpre_crypto.c +18 -0
@@ -298,6 +298,8 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx,dma_addr_t tmp; tmp =le64_to_cpu (sqe->in); +if (unlikely (dma_mapping_error (dev, tmp))) +return ;if (src) {if (req->src)
@@ -307,6 +309,8 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx, } tmp =le64_to_cpu (sqe->out); +if (unlikely (dma_mapping_error (dev, tmp))) +return ;if (req->dst) {if (dst)
@@ -524,6 +528,8 @@ static int hpre_msg_request_set(struct hpre_ctx *ctx, void *req, bool is_rsa) msg->key =cpu_to_le64 (ctx->dh.dma_xa_p); } + msg->in =cpu_to_le64 (DMA_MAPPING_ERROR ); + msg->out =cpu_to_le64 (DMA_MAPPING_ERROR ); msg->dw0 |=cpu_to_le32 (0x1 <<HPRE_SQE_DONE_SHIFT ); msg->task_len1 = (ctx->key_sz >>HPRE_BITS_2_BYTES_SHIFT ) -1 ; h_req->ctx = ctx;
@@ -1372,11 +1378,15 @@ static void hpre_ecdh_hw_data_clr_all(struct hpre_ctx *ctx,dma_addr_t dma; dma =le64_to_cpu (sqe->in); +if (unlikely (dma_mapping_error (dev, dma))) +return ;if (src && req->src)dma_free_coherent (dev, ctx->key_sz <<2 , req->src, dma); dma =le64_to_cpu (sqe->out); +if (unlikely (dma_mapping_error (dev, dma))) +return ;if (req->dst)dma_free_coherent (dev, ctx->key_sz <<1 , req->dst, dma);
@@ -1431,6 +1441,8 @@ static int hpre_ecdh_msg_request_set(struct hpre_ctx *ctx, h_req->areq.ecdh = req; msg = &h_req->req;memset (msg,0 ,sizeof (*msg)); + msg->in =cpu_to_le64 (DMA_MAPPING_ERROR ); + msg->out =cpu_to_le64 (DMA_MAPPING_ERROR ); msg->key =cpu_to_le64 (ctx->ecdh.dma_p); msg->dw0 |=cpu_to_le32 (0x1U <<HPRE_SQE_DONE_SHIFT );
@@ -1667,11 +1679,15 @@ static void hpre_curve25519_hw_data_clr_all(struct hpre_ctx *ctx,dma_addr_t dma; dma =le64_to_cpu (sqe->in); +if (unlikely (dma_mapping_error (dev, dma))) +return ;if (src && req->src)dma_free_coherent (dev, ctx->key_sz, req->src, dma); dma =le64_to_cpu (sqe->out); +if (unlikely (dma_mapping_error (dev, dma))) +return ;if (req->dst)dma_free_coherent (dev, ctx->key_sz, req->dst, dma);
@@ -1722,6 +1738,8 @@ static int hpre_curve25519_msg_request_set(struct hpre_ctx *ctx, h_req->areq.curve25519 = req; msg = &h_req->req;memset (msg,0 ,sizeof (*msg)); + msg->in =cpu_to_le64 (DMA_MAPPING_ERROR ); + msg->out =cpu_to_le64 (DMA_MAPPING_ERROR ); msg->key =cpu_to_le64 (ctx->curve25519.dma_p); msg->dw0 |=cpu_to_le32 (0x1U <<HPRE_SQE_DONE_SHIFT );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 286/800 x86/elf: Use _BITUL() macro in UAPI headers
In reply to Greg Kroah-HartmanFrom: Joe Richey <[email protected]>
[ Upstream commit d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050 ]
Replace BIT() in x86's UAPI header with _BITUL(). BIT() is not defined in the UAPI headers and its usage may cause userspace build errors.
--- arch/x86/include/uapi/asm/hwcap2.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/include/uapi/asm/hwcap2.h +4 -2
@@ -2,10 +2,12 @@#ifndef _ASM_X86_HWCAP2_H#define _ASM_X86_HWCAP2_H +#include <linux/const.h> +/* MONITOR/MWAIT enabled in Ring 3 */ -#define HWCAP2_RING3MWAIT (1 << 0) +#define HWCAP2_RING3MWAIT _BITUL(0)/* Kernel allows FSGSBASE instructions available in Ring 3 */ -#define HWCAP2_FSGSBASE BIT(1) +#define HWCAP2_FSGSBASE _BITUL(1)#endif
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 287/800 crypto: sa2ul - Fix leaks on failure paths with sa_dma_init()
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
[ Upstream commit 4c0716ee1d973f6504d13f0e8d4d10350c85ad37 ]
The sa_dma_init() function doesn't release the requested dma channels on all failure paths. Any failure in this function also ends up leaking the dma pool created in sa_init_mem() in the sa_ul_probe() function. Fix all of these issues.
--- drivers/crypto/sa2ul.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/crypto/sa2ul.c +12 -9
@@ -2300,9 +2300,9 @@ static int sa_dma_init(struct sa_crypto_data *dd) dd->dma_rx2 =dma_request_chan (dd->dev,"rx2" );if (IS_ERR (dd->dma_rx2)) { -dma_release_channel (dd->dma_rx1); -return dev_err_probe (dd->dev,PTR_ERR (dd->dma_rx2), -"Unable to request rx2 DMA channel\n" ); + ret =dev_err_probe (dd->dev,PTR_ERR (dd->dma_rx2), +"Unable to request rx2 DMA channel\n" ); + goto err_dma_rx2; } dd->dma_tx =dma_request_chan (dd->dev,"tx" );
@@ -2323,28 +2323,31 @@ static int sa_dma_init(struct sa_crypto_data *dd)if (ret) {dev_err (dd->dev,"can't configure IN dmaengine slave: %d\n" , ret); -return ret; + goto err_dma_config; } ret =dmaengine_slave_config (dd->dma_rx2, &cfg);if (ret) {dev_err (dd->dev,"can't configure IN dmaengine slave: %d\n" , ret); -return ret; + goto err_dma_config; } ret =dmaengine_slave_config (dd->dma_tx, &cfg);if (ret) {dev_err (dd->dev,"can't configure OUT dmaengine slave: %d\n" , ret); -return ret; + goto err_dma_config; }return 0 ; +err_dma_config: +dma_release_channel (dd->dma_tx); err_dma_tx: -dma_release_channel (dd->dma_rx1);dma_release_channel (dd->dma_rx2); +err_dma_rx2: +dma_release_channel (dd->dma_rx1);return ret; }
@@ -2414,7 +2417,7 @@ static int sa_ul_probe(struct platform_device *pdev)sa_init_mem (dev_data); ret =sa_dma_init (dev_data);if (ret) - goto disable_pm_runtime; + goto destroy_dma_pool; match =of_match_node (of_match, dev->of_node);if (!match) {
@@ -2454,9 +2457,9 @@ release_dma:dma_release_channel (dev_data->dma_rx1);dma_release_channel (dev_data->dma_tx); +destroy_dma_pool:dma_pool_destroy (dev_data->sc_pool); -disable_pm_runtime:pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 288/800 crypto: sa2ul - Fix pm_runtime enable in sa_ul_probe()
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
[ Upstream commit 5c8552325e013cbdabc443cd1f1b4d03c4a2e64e ]
The pm_runtime APIs added first in commit 7694b6ca649f ("crypto: sa2ul - Add crypto driver") are not unwound properly and was fixed up partially in commit 13343badae09 ("crypto: sa2ul - Fix PM reference leak in sa_ul_probe()"). This fixed up the pm_runtime usage count but not the state. Fix this properly.
--- drivers/crypto/sa2ul.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/sa2ul.c +1 -0
@@ -2411,6 +2411,7 @@ static int sa_ul_probe(struct platform_device *pdev)if (ret <0 ) {dev_err (&pdev->dev,"%s: failed to get sync: %d\n" , __func__, ret); +pm_runtime_disable (dev);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 289/800 crypto: sa2ul - Use of_device_get_match_data() helper
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
[ Upstream commit d699c5d0bd811e48de72aeeb8e3872c63e957745 ]
Simplify the probe function by using the of_device_get_match_data() helper instead of open coding. The logic is also moved up to fix the missing pm_runtime cleanup in case of a match failure.
--- drivers/crypto/sa2ul.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/crypto/sa2ul.c +4 -8
@@ -2388,7 +2388,6 @@ MODULE_DEVICE_TABLE(of, of_match);static int sa_ul_probe (struct platform_device *pdev) { -const struct of_device_id *match;struct device *dev = &pdev->dev;struct device_node *node = dev->of_node;struct resource *res;
@@ -2400,6 +2399,10 @@ static int sa_ul_probe(struct platform_device *pdev)if (!dev_data)return -ENOMEM ; + dev_data->match_data =of_device_get_match_data (dev); +if (!dev_data->match_data) +return -ENODEV ; + sa_k3_dev = dev; dev_data->dev = dev; dev_data->pdev = pdev;
@@ -2420,13 +2423,6 @@ static int sa_ul_probe(struct platform_device *pdev)if (ret) goto destroy_dma_pool; - match =of_match_node (of_match, dev->of_node); -if (!match) { -dev_err (dev,"No compatible match found\n" ); -return -ENODEV ; - } - dev_data->match_data = match->data; -spin_lock_init (&dev_data->scid_lock); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); saul_base =devm_ioremap_resource (dev, res);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 290/800 crypto: ccp - Fix a resource leak in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit a6f8e68e238a15bb15f1726b35c695136c64eaba ]
If an error occurs after calling 'sp_get_irqs()', 'sp_free_irqs()' must be called as already done in the error handling path.
--- drivers/crypto/ccp/sp-pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/crypto/ccp/sp-pci.c +4 -2
@@ -222,7 +222,7 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (ret) {dev_err (dev,"dma_set_mask_and_coherent failed (%d)\n" , ret); - goto e_err; + goto free_irqs; } }
@@ -230,10 +230,12 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) ret =sp_init (sp);if (ret) - goto e_err; + goto free_irqs;return 0 ; +free_irqs: +sp_free_irqs (sp); e_err:dev_notice (dev,"initialization failed\n" );return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 291/800 media: rc: i2c: Fix an error message
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 9c87ae1a0dbeb5794957421157fd266d38a869b4 ]
'ret' is known to be 1 here. In fact 'i' is expected instead. Store the return value of 'i2c_master_recv()' in 'ret' so that the error message print the correct error code.
--- drivers/media/i2c/ir-kbd-i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ir-kbd-i2c.c +2 -2
@@ -678,8 +678,8 @@ static int zilog_tx(struct rc_dev *rcdev, unsigned int *txbuf, goto out_unlock; } - i =i2c_master_recv (ir->tx_c, buf,1 ); -if (i !=1 ) { + ret =i2c_master_recv (ir->tx_c, buf,1 ); +if (ret !=1 ) {dev_err (&ir->rc->dev,"i2c_master_recv failed with %d\n" , ret); ret = -EIO ; goto out_unlock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 292/800 regulator: bd71815: add select to fix build
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 5ba3747dbc9ade2d22a8f5bff3c928cb41d35030 ]
Mend the Kconfig for REGULATOR_BD71815 to prevent build errors:
riscv32-linux-ld: drivers/regulator/bd71815-regulator.o: in function `.L0 ':
regulator.c:289: undefined reference to `rohm_regulator_set_dvs_levels'
riscv32-linux-ld: drivers/regulator/bd71815-regulator.c:370: undefined reference to `rohm_regulator_set_dvs_levels'
--- drivers/regulator/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/Kconfig +1 -0
@@ -207,6 +207,7 @@ config REGULATOR_BD70528 config REGULATOR_BD71815 tristate "ROHM BD71815 Power Regulator" depends on MFD_ROHM_BD71828 + select REGULATOR_ROHM help This driver supports voltage regulators on ROHM BD71815 PMIC. This will enable support for the software controllable buck
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 293/800 pata_ep93xx: fix deferred probing
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit 5c8121262484d99bffb598f39a0df445cecd8efb ]
The driver overrides the error codes returned by platform_get_irq() to -ENXIO, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Propagate the error code upstream, as it should have been done from the start...
--- drivers/ata/pata_ep93xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_ep93xx.c +1 -1
@@ -928,7 +928,7 @@ static int ep93xx_pata_probe(struct platform_device *pdev)/* INT[3] (IRQ_EP93XX_EXT3) line connected as pull down */ irq =platform_get_irq (pdev,0 );if (irq <0 ) { - err = -ENXIO ; + err = irq; goto err_rel_gpio; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 294/800 locking/lockdep: Reduce LOCKDEP dependency list
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b8e00abe7d9fe21dd13609e2e3a707e38902b105 ]
Some arches (um, sparc64, riscv, xtensa) cause a Kconfig warning for LOCKDEP.
These arch-es select LOCKDEP_SUPPORT but they are not listed as one of the arch-es that LOCKDEP depends on.
Since (16) arch-es define the Kconfig symbol LOCKDEP_SUPPORT if they intend to have LOCKDEP support, replace the awkward list of arch-es that LOCKDEP depends on with the LOCKDEP_SUPPORT symbol.
But wait. LOCKDEP_SUPPORT is included in LOCK_DEBUGGING_SUPPORT, which is already a dependency here, so LOCKDEP_SUPPORT is redundant and not needed.
That leaves the FRAME_POINTER dependency, but it is part of an expression like this:
depends on (A && B) && (FRAME_POINTER || B')
where B' is a dependency of B so if B is true then B' is true and the value of FRAME_POINTER does not matter. Thus we can also delete the FRAME_POINTER dependency.
Fixes this kconfig warning: (for um, sparc64, riscv, xtensa)
WARNING: unmet direct dependencies detected for LOCKDEP
Depends on [n]: DEBUG_KERNEL [=y] && LOCK_DEBUGGING_SUPPORT [=y] && (FRAME_POINTER [=n] || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86) Selected by [y]:
- PROVE_LOCKING [=y] && DEBUG_KERNEL [=y] && LOCK_DEBUGGING_SUPPORT [=y]
- LOCK_STAT [=y] && DEBUG_KERNEL [=y] && LOCK_DEBUGGING_SUPPORT [=y]
- DEBUG_LOCK_ALLOC [=y] && DEBUG_KERNEL [=y] && LOCK_DEBUGGING_SUPPORT [=y]
--- lib/Kconfig.debug | 1 - 1 file changed, 1 deletion(-)
lib/Kconfig.debug +0 -1
@@ -1372,7 +1372,6 @@ config LOCKDEP bool depends on DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT select STACKTRACE - depends on FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86 select KALLSYMS select KALLSYMS_ALL
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 295/800 sched: Dont defer CPU pick to migration_cpu_stop()
In reply to Greg Kroah-HartmanFrom: Valentin Schneider <[email protected]>
[ Upstream commit 475ea6c60279e9f2ddf7e4cf2648cd8ae0608361 ]
Will reported that the 'XXX __migrate_task() can fail' in migration_cpu_stop() can happen, and it *is* sort of a big deal. Looking at it some more, one will note there is a glaring hole in the deferred CPU selection:
(w/ CONFIG_CPUSET=n, so that the affinity mask passed via taskset doesn't get AND'd with cpu_online_mask)
$ taskset -pc 0-2 $PID
# offline CPUs 3-4
$ taskset -pc 3-5 $PID
`\
$PID may stay on 0-2 due to the cpumask_any_distribute() picking an
offline CPU and __migrate_task() refusing to do anything due to
cpu_is_allowed().set_cpus_allowed_ptr() goes to some length to pick a dest_cpu that matches the right constraints vs affinity and the online/active state of the CPUs. Reuse that instead of discarding it in the affine_move_task() case.
--- kernel/sched/core.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
kernel/sched/core.c +12 -8
@@ -1929,7 +1929,6 @@ static int migration_cpu_stop(void *data)struct migration_arg *arg = data;struct set_affinity_pending *pending = arg->pending;struct task_struct *p = arg->task; -int dest_cpu = arg->dest_cpu;struct rq *rq =this_rq ();bool complete = false;struct rq_flags rf;
@@ -1967,19 +1966,15 @@ static int migration_cpu_stop(void *data)if (pending) { p->migration_pending =NULL ; complete = true; - } -if (dest_cpu <0 ) {if (cpumask_test_cpu (task_cpu (p), &p->cpus_mask)) goto out; - - dest_cpu =cpumask_any_distribute (&p->cpus_mask); }if (task_on_rq_queued (p)) - rq =__migrate_task (rq, &rf, p, dest_cpu); + rq =__migrate_task (rq, &rf, p, arg->dest_cpu);else - p->wake_cpu = dest_cpu; + p->wake_cpu = arg->dest_cpu;/* * XXX __migrate_task() can fail, at which point we might end
@@ -2262,7 +2257,7 @@ static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flaginit_completion (&my_pending.done); my_pending.arg = (struct migration_arg ) { .task = p, - .dest_cpu =-1 ,/* any */ + .dest_cpu = dest_cpu, .pending = &my_pending, };
@@ -2270,6 +2265,15 @@ static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flag }else { pending = p->migration_pending;refcount_inc (&pending->refs); +/* +* Affinity has changed, but we've already installed a +* pending. migration_cpu_stop() *must* see this, else +* we risk a completion of the pending despite having a +* task on a disallowed CPU. +* +* Serialized by p->pi_lock, so this is safe. +*/ + pending->arg.dest_cpu = dest_cpu; } } pending = p->migration_pending;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 296/800 media: ipu3-cio2: Fix reference counting when looping over ACPI devices
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 2cb2705cf7ffe41dc5bd81290e4241bfb7f031cc ]
When we continue, due to device is disabled, loop we have to drop reference count. When we have an array full of devices we have to also drop the reference count. Note, in this case the cio2_bridge_unregister_sensors() is called by the caller.
--- drivers/media/pci/intel/ipu3/cio2-bridge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/media/pci/intel/ipu3/cio2-bridge.c +5 -5
@@ -173,14 +173,15 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,int ret;for_each_acpi_dev_match (adev, cfg->hid,NULL ,-1 ) { -if (!adev->status.enabled) +if (!adev->status.enabled) { +acpi_dev_put (adev);continue ; + }if (bridge->n_sensors >=CIO2_NUM_PORTS ) { +acpi_dev_put (adev);dev_err (&cio2->dev,"Exceeded available CIO2 ports\n" ); -cio2_bridge_unregister_sensors (bridge); - ret = -EINVAL ; - goto err_out; +return -EINVAL ; } sensor = &bridge->sensors[bridge->n_sensors];
@@ -228,7 +229,6 @@ err_free_swnodes:software_node_unregister_nodes (sensor->swnodes); err_put_adev:acpi_dev_put (sensor->adev); -err_out:return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 297/800 media: venus: hfi_cmds: Fix conceal color property
In reply to Greg Kroah-HartmanFrom: Stanimir Varbanov <[email protected]>
[ Upstream commit 6e2202ca1ee034920b029124151754aec67b61ba ]
The conceal color property used for Venus v4 and v6 has the same payload structure. But currently v4 follow down to payload structure for v1. Correct this by moving set_property to v4.
--- drivers/media/platform/qcom/venus/hfi_cmds.c | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/media/platform/qcom/venus/hfi_cmds.c +11 -11
@@ -1226,6 +1226,17 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size +=sizeof (u32) +sizeof (*hdr10);break ; } +case HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR : { +struct hfi_conceal_color_v4 *color = prop_data; +u32 *in = pdata; + + color->conceal_color_8bit = *in &0xff ; + color->conceal_color_8bit |= ((*in >>10 ) &0xff ) <<8 ; + color->conceal_color_8bit |= ((*in >>20 ) &0xff ) <<16 ; + color->conceal_color_10bit = *in; + pkt->shdr.hdr.size +=sizeof (u32) +sizeof (*color); +break ; + }case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE :case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER :
@@ -1279,17 +1290,6 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size +=sizeof (u32) +sizeof (*cq);break ; } -case HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR : { -struct hfi_conceal_color_v4 *color = prop_data; -u32 *in = pdata; - - color->conceal_color_8bit = *in &0xff ; - color->conceal_color_8bit |= ((*in >>10 ) &0xff ) <<8 ; - color->conceal_color_8bit |= ((*in >>20 ) &0xff ) <<16 ; - color->conceal_color_10bit = *in; - pkt->shdr.hdr.size +=sizeof (u32) +sizeof (*color); -break ; - }default :return pkt_session_set_property_4xx (pkt, cookie, ptype, pdata); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 298/800 media: rkvdec: Fix .buf_prepare
In reply to Greg Kroah-HartmanFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit ba1ed4ae760a81caf39f54232e089d95157a0dba ]
The driver should only set the payload on .buf_prepare if the buffer is CAPTURE type. If an OUTPUT buffer has a zero bytesused set by userspace then v4l2-core will set it to buffer length.
If we overwrite bytesused for OUTPUT buffers, too, then vb2_get_plane_payload() will return incorrect value which might be then written to hw registers by the driver in rkvdec-h264.c.
[Changed the comment and used V4L2_TYPE_IS_CAPTURE macro]
--- drivers/staging/media/rkvdec/rkvdec.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/staging/media/rkvdec/rkvdec.c +9 -1
@@ -481,7 +481,15 @@ static int rkvdec_buf_prepare(struct vb2_buffer *vb)if (vb2_plane_size (vb, i) < sizeimage)return -EINVAL ; } -vb2_set_plane_payload (vb,0 , f->fmt.pix_mp.plane_fmt[0 ].sizeimage); + +/* +* Buffer's bytesused must be written by driver for CAPTURE buffers. +* (for OUTPUT buffers, if userspace passes 0 bytesused, v4l2-core sets +* it to buffer length). +*/ +if (V4L2_TYPE_IS_CAPTURE (vq->type)) +vb2_set_plane_payload (vb,0 , f->fmt.pix_mp.plane_fmt[0 ].sizeimage); +return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 299/800 media: exynos4-is: Fix a use after free in isp_video_release
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
[ Upstream commit 01fe904c9afd26e79c1f73aa0ca2e3d785e5e319 ]
In isp_video_release, file->private_data is freed via _vb2_fop_release()->v4l2_fh_release(). But the freed file->private_data is still used in v4l2_fh_is_singular_file() ->v4l2_fh_is_singular(file->private_data), which is a use after free bug.
My patch uses a variable 'is_singular_file' to avoid the uaf.
v3: https://lore.kernel.org/patchwork/patch/1419058/
--- drivers/media/platform/exynos4-is/fimc-isp-video.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/exynos4-is/fimc-isp-video.c +5 -2
@@ -305,17 +305,20 @@ static int isp_video_release(struct file *file)struct fimc_is_video *ivc = &isp->video_capture;struct media_entity *entity = &ivc->ve.vdev.entity;struct media_device *mdev = entity->graph_obj.mdev; +bool is_singular_file;mutex_lock (&isp->video_lock); -if (v4l2_fh_is_singular_file (file) && ivc->streaming) { + is_singular_file =v4l2_fh_is_singular_file (file); + +if (is_singular_file && ivc->streaming) {media_pipeline_stop (entity); ivc->streaming =0 ; }_vb2_fop_release (file,NULL ); -if (v4l2_fh_is_singular_file (file)) { +if (is_singular_file) {fimc_pipeline_call (&ivc->ve, close);mutex_lock (&mdev->graph_mutex);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 300/800 media: au0828: fix a NULL vs IS_ERR() check
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8f2e452730d2bcd59fe05246f0e19a4c52e0012d ]
The media_device_usb_allocate() function returns error pointers when it's enabled and something goes wrong. It can return NULL as well, but only if CONFIG_MEDIA_CONTROLLER is disabled so that doesn't apply here.
--- drivers/media/usb/au0828/au0828-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/au0828/au0828-core.c +2 -2
@@ -199,8 +199,8 @@ static int au0828_media_device_init(struct au0828_dev *dev,struct media_device *mdev; mdev =media_device_usb_allocate (udev,KBUILD_MODNAME ,THIS_MODULE ); -if (!mdev) -return -ENOMEM ; +if (IS_ERR (mdev)) +return PTR_ERR (mdev); dev->media_dev = mdev;#endif
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 301/800 media: tc358743: Fix error return code in tc358743_probe_of()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit a6b1e7093f0a099571fc8836ab4a589633f956a8 ]
When the CSI bps per lane is not in the valid range, an appropriate error code -EINVAL should be returned. However, we currently do not explicitly assign this error code to 'ret'. As a result, 0 was incorrectly returned.
--- drivers/media/i2c/tc358743.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/tc358743.c +1 -0
@@ -1974,6 +1974,7 @@ static int tc358743_probe_of(struct tc358743_state *state) bps_pr_lane =2 * endpoint.link_frequencies[0 ];if (bps_pr_lane <62500000U || bps_pr_lane >1000000000U ) {dev_err (dev,"unsupported bps per lane: %u bps\n" , bps_pr_lane); + ret = -EINVAL ; goto disable_clk; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 302/800 media: vicodec: Use _BITUL() macro in UAPI headers
In reply to Greg Kroah-HartmanFrom: Joe Richey <[email protected]>
[ Upstream commit ce67eaca95f8ab5c6aae41a10adfe9a6e8efa58c ]
Replace BIT() in v4l2's UPAI header with _BITUL(). BIT() is not defined in the UAPI headers and its usage may cause userspace build errors.
--- include/uapi/linux/v4l2-controls.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
include/uapi/linux/v4l2-controls.h +12 -11
@@ -50,6 +50,7 @@#ifndef __LINUX_V4L2_CONTROLS_H#define __LINUX_V4L2_CONTROLS_H +#include <linux/const.h> #include <linux/types.h> /* Control classes */
@@ -1602,30 +1603,30 @@ struct v4l2_ctrl_h264_decode_params {#define V4L2_FWHT_VERSION 3/* Set if this is an interlaced format */ -#define V4L2_FWHT_FL_IS_INTERLACED BIT(0) +#define V4L2_FWHT_FL_IS_INTERLACED _BITUL(0)/* Set if this is a bottom-first (NTSC) interlaced format */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIRST BIT(1) +#define V4L2_FWHT_FL_IS_BOTTOM_FIRST _BITUL(1)/* Set if each 'frame' contains just one field */ -#define V4L2_FWHT_FL_IS_ALTERNATE BIT(2) +#define V4L2_FWHT_FL_IS_ALTERNATE _BITUL(2)/* * If V4L2_FWHT_FL_IS_ALTERNATE was set, then this is set if this * 'frame' is the bottom field, else it is the top field. */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIELD BIT(3) +#define V4L2_FWHT_FL_IS_BOTTOM_FIELD _BITUL(3)/* Set if the Y' plane is uncompressed */ -#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED BIT(4) +#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED _BITUL(4)/* Set if the Cb plane is uncompressed */ -#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED BIT(5) +#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED _BITUL(5)/* Set if the Cr plane is uncompressed */ -#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED BIT(6) +#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED _BITUL(6)/* Set if the chroma plane is full height, if cleared it is half height */ -#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT BIT(7) +#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT _BITUL(7)/* Set if the chroma plane is full width, if cleared it is half width */ -#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH BIT(8) +#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH _BITUL(8)/* Set if the alpha plane is uncompressed */ -#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED BIT(9) +#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED _BITUL(9)/* Set if this is an I Frame */ -#define V4L2_FWHT_FL_I_FRAME BIT(10) +#define V4L2_FWHT_FL_I_FRAME _BITUL(10)/* A 4-values flag - the number of components - 1 */ #define V4L2_FWHT_FL_COMPONENTS_NUM_MSK GENMASK(18, 16)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 303/800 media: gspca/gl860: fix zero-length control requests
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 8ed339f23d41e21660a389adf2e7b2966d457ff6 ]
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Control transfers without a data stage are treated as OUT requests by the USB stack and should be using usb_sndctrlpipe(). Failing to do so will now trigger a warning.
Fix the gl860_RTx() helper so that zero-length control reads fail with an error message instead. Note that there are no current callers that would trigger this.
--- drivers/media/usb/gspca/gl860/gl860.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/usb/gspca/gl860/gl860.c +2 -2
@@ -561,8 +561,8 @@ int gl860_RTx(struct gspca_dev *gspca_dev, len, 400 + 200 * (len > 1));memcpy (pdata, gspca_dev->usb_buf, len); }else { - r =usb_control_msg (udev,usb_rcvctrlpipe (udev,0 ), - req, pref, val, index,NULL , len,400 ); +gspca_err (gspca_dev,"zero-length read request\n" ); + r = -EINVAL ; } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 304/800 regulator: fan53555: Fix missing slew_reg/mask/shift settings for FAN53526
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit 30b38b805b36c03db3703ef62397111c783b5f3b ]
The di->slew_reg/di->slew_mask/di->slew_shift was not set in current code, fix it.
--- drivers/regulator/fan53555.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/regulator/fan53555.c +3 -0
@@ -293,6 +293,9 @@ static int fan53526_voltages_setup_fairchild(struct fan53555_device_info *di)return -EINVAL ; } + di->slew_reg =FAN53555_CONTROL ; + di->slew_mask =CTL_SLEW_MASK ; + di->slew_shift =CTL_SLEW_SHIFT ; di->vsel_count =FAN53526_NVOLTAGES ;return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 305/800 drivers/perf: hisi: Fix data source control
In reply to Greg Kroah-HartmanFrom: Shaokun Zhang <[email protected]>
[ Upstream commit 814be609baae62aaa6c02fa6f3ad66cff32a6d15 ]
'Data source' is a new function for HHA PMU and config / clear interface was wrong by mistake. 'HHA_DATSRC_CTRL' register is mainly used for data source configuration, if we enable bit0 as driver, it will go on count the event and we didn't check it carefully. So fix the issue and do as the initial purpose.
--- drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/perf/hisilicon/hisi_uncore_hha_pmu.c +2 -2
@@ -90,7 +90,7 @@ static void hisi_hha_pmu_config_ds(struct perf_event *event) val =readl (hha_pmu->base +HHA_DATSRC_CTRL ); val |=HHA_DATSRC_SKT_EN ; -writel (ds_skt, hha_pmu->base +HHA_DATSRC_CTRL ); +writel (val, hha_pmu->base +HHA_DATSRC_CTRL ); } }
@@ -104,7 +104,7 @@ static void hisi_hha_pmu_clear_ds(struct perf_event *event) val =readl (hha_pmu->base +HHA_DATSRC_CTRL ); val &= ~HHA_DATSRC_SKT_EN ; -writel (ds_skt, hha_pmu->base +HHA_DATSRC_CTRL ); +writel (val, hha_pmu->base +HHA_DATSRC_CTRL ); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 306/800 m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit c1367ee016e3550745315fb9a2dd1e4ce02cdcf6 ]
Since the code for ATARI_KBD_CORE does not use drivers/input/keyboard/ code, just move ATARI_KBD_CORE to arch/m68k/Kconfig.machine to remove the dependency on INPUT_KEYBOARD.
Removes this kconfig warning:
WARNING: unmet direct dependencies detected for ATARI_KBD_CORE
Depends on [n]: !UML && INPUT [=y] && INPUT_KEYBOARD [=n] Selected by [y]:
- MOUSE_ATARI [=y] && !UML && INPUT [=y] && INPUT_MOUSE [=y] && ATARI [=y]
--- arch/m68k/Kconfig.machine | 3 +++ drivers/input/keyboard/Kconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/m68k/Kconfig.machine +3 -0
@@ -25,6 +25,9 @@ config ATARI this kernel on an Atari, say Y here and browse the material available in <file:Documentation/m68k>; otherwise say N. +config ATARI_KBD_CORE + bool + config MAC bool "Macintosh support" depends on MMU
drivers/input/keyboard/Kconfig +0 -3
@@ -67,9 +67,6 @@ config KEYBOARD_AMIGA To compile this driver as a module, choose M here: the module will be called amikbd. -config ATARI_KBD_CORE - bool - config KEYBOARD_APPLESPI tristate "Apple SPI keyboard and trackpad" depends on ACPI && EFI
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 307/800 media: siano: Fix out-of-bounds warnings in smscore_load_firmware_family2()
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 13dfead49db07225335d4f587a560a2210391a1a ]
Rename struct sms_msg_data4 to sms_msg_data5 and increase the size of its msg_data array from 4 to 5 elements. Notice that at some point the 5th element of msg_data is being accessed in function smscore_load_firmware_family2():
1006 trigger_msg->msg_data[4] = 4; /* Task ID */
Also, there is no need for the object _trigger_msg_ of type struct sms_msg_data *, when _msg_ can be used, directly. Notice that msg_data in struct sms_msg_data is a one-element array, which causes multiple out-of-bounds warnings when accessing beyond its first element in function smscore_load_firmware_family2():
992 struct sms_msg_data *trigger_msg =
993 (struct sms_msg_data *) msg;
994
995 pr_debug("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ\n");
996 SMS_INIT_MSG(&msg->x_msg_header,
997 MSG_SMS_SWDOWNLOAD_TRIGGER_REQ, 998 sizeof(struct sms_msg_hdr) + 999 sizeof(u32) * 5); 1000 1001 trigger_msg->msg_data[0] = firmware->start_address; 1002 /* Entry point */ 1003 trigger_msg->msg_data[1] = 6; /* Priority */ 1004 trigger_msg->msg_data[2] = 0x200; /* Stack size */ 1005 trigger_msg->msg_data[3] = 0; /* Parameter */ 1006 trigger_msg->msg_data[4] = 4; /* Task ID */
even when enough dynamic memory is allocated for _msg_:
929 /* PAGE_SIZE buffer shall be enough and dma aligned */
930 msg = kmalloc(PAGE_SIZE, GFP_KERNEL | coredev->gfp_buf_flags);
but as _msg_ is casted to (struct sms_msg_data *):
992 struct sms_msg_data *trigger_msg =
993 (struct sms_msg_data *) msg;
the out-of-bounds warnings are actually valid and should be addressed.
Fix this by declaring object _msg_ of type struct sms_msg_data5 *, which contains a 5-elements array, instead of just 4. And use _msg_ directly, instead of creating object trigger_msg.
This helps with the ongoing efforts to enable -Warray-bounds by fixing the following warnings:
CC [M] drivers/media/common/siano/smscoreapi.odrivers/media/common/siano/smscoreapi.c: In function ‘smscore_load_firmware_family2’:drivers/media/common/siano/smscoreapi.c:1003:24: warning: array subscript 1 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1003 | trigger_msg->msg_data[1] = 6; /* Priority */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~
drivers/media/common/siano/smscoreapi.c:1004:24: warning: array subscript 2 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1004 | trigger_msg->msg_data[2] = 0x200; /* Stack size */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~
drivers/media/common/siano/smscoreapi.c:1005:24: warning: array subscript 3 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1005 | trigger_msg->msg_data[3] = 0; /* Parameter */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~
drivers/media/common/siano/smscoreapi.c:1006:24: warning: array subscript 4 is above array bounds of ‘u32[1]’ {aka ‘unsigned int[1]’} [-Warray-bounds]
1006 | trigger_msg->msg_data[4] = 4; /* Task ID */
| ~~~~~~~~~~~~~~~~~~~~~^~~
In file included from drivers/media/common/siano/smscoreapi.c:12:
drivers/media/common/siano/smscoreapi.h:619:6: note: while referencing ‘msg_data’
619 | u32 msg_data[1];
| ^~~~~~~~--- drivers/media/common/siano/smscoreapi.c | 22 +++++++++------------- drivers/media/common/siano/smscoreapi.h | 4 ++-- 2 files changed, 11 insertions(+), 15 deletions(-)
drivers/media/common/siano/smscoreapi.c +9 -13
@@ -908,7 +908,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, void *buffer, size_t size) {struct sms_firmware *firmware = (struct sms_firmware *) buffer; -struct sms_msg_data4 *msg; +struct sms_msg_data5 *msg;u32 mem_address, calc_checksum =0 ;u32 i, *ptr;u8 *payload = firmware->payload;
@@ -989,24 +989,20 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, goto exit_fw_download;if (coredev->mode ==DEVICE_MODE_NONE ) { -struct sms_msg_data *trigger_msg = - (struct sms_msg_data *) msg; -pr_debug ("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ\n" );SMS_INIT_MSG (&msg->x_msg_header,MSG_SMS_SWDOWNLOAD_TRIGGER_REQ , -sizeof (struct sms_msg_hdr ) + -sizeof (u32) *5 ); +sizeof (*msg)); - trigger_msg->msg_data[0 ] = firmware->start_address; + msg->msg_data[0 ] = firmware->start_address;/* Entry point */ - trigger_msg->msg_data[1 ] =6 ;/* Priority */ - trigger_msg->msg_data[2 ] =0x200 ;/* Stack size */ - trigger_msg->msg_data[3 ] =0 ;/* Parameter */ - trigger_msg->msg_data[4 ] =4 ;/* Task ID */ + msg->msg_data[1 ] =6 ;/* Priority */ + msg->msg_data[2 ] =0x200 ;/* Stack size */ + msg->msg_data[3 ] =0 ;/* Parameter */ + msg->msg_data[4 ] =4 ;/* Task ID */ - rc =smscore_sendrequest_and_wait (coredev, trigger_msg, - trigger_msg->x_msg_header.msg_length, + rc =smscore_sendrequest_and_wait (coredev, msg, + msg->x_msg_header.msg_length, &coredev->trigger_done); }else { SMS_INIT_MSG(&msg->x_msg_header, MSG_SW_RELOAD_EXEC_REQ,
drivers/media/common/siano/smscoreapi.h +2 -2
@@ -624,9 +624,9 @@ struct sms_msg_data2 {u32 msg_data[2 ]; }; -struct sms_msg_data4 { +struct sms_msg_data5 {struct sms_msg_hdr x_msg_header; -u32 msg_data[4 ]; +u32 msg_data[5 ]; };struct sms_data_download {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 308/800 regulator: fan53880: Fix vsel_mask setting for FAN53880_BUCK
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit 2e11737a772b95c6587df73f216eec1762431432 ]
According to the datasheet:
REGISTER DETAILS − 0x02 BUCK, BUCK_OUT is BIT0 ~ BIT7.
So vsel_mask for FAN53880_BUCK should be 0xFF.
--- drivers/regulator/fan53880.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/fan53880.c +1 -1
@@ -79,7 +79,7 @@ static const struct regulator_desc fan53880_regulators[] = { .n_linear_ranges = 2, .n_voltages = 0xf8, .vsel_reg = FAN53880_BUCKVOUT, - .vsel_mask = 0x7f, + .vsel_mask = 0xff, .enable_reg = FAN53880_ENABLE, .enable_mask = 0x10, .enable_time = 480,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 309/800 crypto: nitrox - fix unchecked variable in nitrox_register_interrupts
In reply to Greg Kroah-HartmanFrom: Tong Tiangen <[email protected]>
[ Upstream commit 57c126661f50b884d3812e7db6e00f2e778eccfb ]
Function nitrox_register_interrupts leaves variable 'nr_vecs' unchecked, which would be use as kcalloc parameter later.
--- drivers/crypto/cavium/nitrox/nitrox_isr.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/cavium/nitrox/nitrox_isr.c +4 -0
@@ -307,6 +307,10 @@ int nitrox_register_interrupts(struct nitrox_device *ndev)* Entry 192: NPS_CORE_INT_ACTIVE */ nr_vecs =pci_msix_vec_count (pdev); +if (nr_vecs <0 ) { +dev_err (DEV (ndev),"Error in getting vec count %d\n" , nr_vecs); +return nr_vecs; + }/* Enable MSI-X */ ret =pci_alloc_irq_vectors (pdev, nr_vecs, nr_vecs,PCI_IRQ_MSIX );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 310/800 crypto: omap-sham - Fix PM reference leak in omap sham ops
In reply to Greg Kroah-HartmanFrom: Zhang Qilong <[email protected]>
[ Upstream commit ca323b2c61ec321eb9f2179a405b9c34cdb4f553 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- drivers/crypto/omap-sham.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/omap-sham.c +2 -2
@@ -372,7 +372,7 @@ static int omap_sham_hw_init(struct omap_sham_dev *dd) {int err; - err =pm_runtime_get_sync (dd->dev); + err =pm_runtime_resume_and_get (dd->dev);if (err <0 ) {dev_err (dd->dev,"failed to get sync: %d\n" , err);return err;
@@ -2244,7 +2244,7 @@ static int omap_sham_suspend(struct device *dev)static int omap_sham_resume (struct device *dev) { -int err =pm_runtime_get_sync (dev); +int err =pm_runtime_resume_and_get (dev);if (err <0 ) {dev_err (dev,"failed to get sync: %d\n" , err);return err;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 311/800 crypto: x86/curve25519 - fix cpu feature checking logic in mod_exit
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 1b82435d17774f3eaab35dce239d354548aa9da2 ]
In curve25519_mod_init() the curve25519_alg will be registered only when (X86_FEATURE_BMI2 && X86_FEATURE_ADX). But in curve25519_mod_exit() it still checks (X86_FEATURE_BMI2 || X86_FEATURE_ADX) when do crypto unregister. This will trigger a BUG_ON in crypto_unregister_alg() as alg->cra_refcnt is 0 if the cpu only supports one of X86_FEATURE_BMI2 and X86_FEATURE_ADX.
--- arch/x86/crypto/curve25519-x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/crypto/curve25519-x86_64.c +1 -1
@@ -1500,7 +1500,7 @@ static int __init curve25519_mod_init(void) static void __exit curve25519_mod_exit(void) {if (IS_REACHABLE (CONFIG_CRYPTO_KPP ) && - (boot_cpu_has (X86_FEATURE_BMI2 ) ||boot_cpu_has (X86_FEATURE_ADX ))) +static_branch_likely (&curve25519_use_bmi2_adx))crypto_unregister_kpp (&curve25519_alg); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 312/800 crypto: sm2 - fix a memory leak in sm2
In reply to Greg Kroah-HartmanFrom: Hongbo Li <[email protected]>
[ Upstream commit 5cd259ca5d466f65ffd21e2e2fa00fb648a8c555 ]
SM2 module alloc ec->Q in sm2_set_pub_key(), when doing alg test in test_akcipher_one(), it will set public key for every test vector, and don't free ec->Q. This will cause a memory leak.
This patch alloc ec->Q in sm2_ec_ctx_init().
--- crypto/sm2.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
crypto/sm2.c +10 -14
@@ -79,10 +79,17 @@ static int sm2_ec_ctx_init(struct mpi_ec_ctx *ec) goto free; rc = -ENOMEM ; + + ec->Q =mpi_point_new (0 ); +if (!ec->Q) + goto free; +/* mpi_ec_setup_elliptic_curve */ ec->G =mpi_point_new (0 ); -if (!ec->G) +if (!ec->G) { +mpi_point_release (ec->Q); goto free; + }mpi_set (ec->G->x, x);mpi_set (ec->G->y, y);
@@ -91,6 +98,7 @@ static int sm2_ec_ctx_init(struct mpi_ec_ctx *ec) rc = -EINVAL ; ec->n =mpi_scanval (ecp->n);if (!ec->n) { +mpi_point_release (ec->Q);mpi_point_release (ec->G); goto free; }
@@ -386,27 +394,15 @@ static int sm2_set_pub_key(struct crypto_akcipher *tfm,MPI a;int rc; - ec->Q =mpi_point_new (0 ); -if (!ec->Q) -return -ENOMEM ; -/* include the uncompressed flag '0x04' */ - rc = -ENOMEM ; a =mpi_read_raw_data (key, keylen);if (!a) - goto error; +return -ENOMEM ;mpi_normalize (a); rc =sm2_ecc_os2ec (ec->Q, a);mpi_free (a); -if (rc) - goto error; - -return 0 ; -error: -mpi_point_release (ec->Q); - ec->Q =NULL ;return rc; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 313/800 mmc: usdhi6rol0: fix error return code in usdhi6_probe()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit 2f9ae69e5267f53e89e296fccee291975a85f0eb ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/mmc/host/usdhi6rol0.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/usdhi6rol0.c +1 -0
@@ -1801,6 +1801,7 @@ static int usdhi6_probe(struct platform_device *pdev) version =usdhi6_read (host,USDHI6_VERSION );if ((version &0xfff ) !=0xa0d ) { + ret = -EPERM ;dev_err (dev,"Version not recognized %x\n" , version); goto e_clk_off; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 314/800 arm64/mm: Fix ttbr0 values stored in struct thread_info for software-pan
In reply to Greg Kroah-HartmanFrom: Anshuman Khandual <[email protected]>
[ Upstream commit 9163f01130304fab1f74683d7d44632da7bda637 ]
When using CONFIG_ARM64_SW_TTBR0_PAN, a task's thread_info::ttbr0 must be the TTBR0_EL1 value used to run userspace. With 52-bit PAs, the PA must be packed into the TTBR using phys_to_ttbr(), but we forget to do this in some of the SW PAN code. Thus, if the value is installed into TTBR0_EL1 (as may happen in the uaccess routines), this could result in UNPREDICTABLE behaviour.
Since hardware with 52-bit PA support almost certainly has HW PAN, which will be used in preference, this shouldn't be a practical issue, but let's fix this for consistency.
--- arch/arm64/include/asm/mmu_context.h | 4 ++-- arch/arm64/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/mmu_context.h +2 -2
@@ -177,9 +177,9 @@ static inline void update_saved_ttbr0(struct task_struct *tsk,return ;if (mm == &init_mm) - ttbr =__pa_symbol (reserved_pg_dir); + ttbr =phys_to_ttbr (__pa_symbol (reserved_pg_dir));else - ttbr =virt_to_phys (mm->pgd) |ASID (mm) <<48 ; + ttbr =phys_to_ttbr (virt_to_phys (mm->pgd)) |ASID (mm) <<48 ;WRITE_ONCE (task_thread_info (tsk)->ttbr0, ttbr); }
arch/arm64/kernel/setup.c +1 -1
@@ -381,7 +381,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)* faults in case uaccess_enable() is inadvertently called by the init * thread. */ - init_task.thread_info.ttbr0 =__pa_symbol (reserved_pg_dir); + init_task.thread_info.ttbr0 =phys_to_ttbr (__pa_symbol (reserved_pg_dir));#endif if (boot_args[1 ] || boot_args[2 ] || boot_args[3 ]) {
Signature · 9 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 315/800 media: v4l2-core: ignore native time32 ioctls on 64-bit
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit c344f07aa1b4ba38ca8fabe407a2afe2f436323c ]
Syzbot found that passing ioctl command 0xc0505609 into a 64-bit kernel from a 32-bit process causes uninitialized kernel memory to get passed to drivers instead of the user space data:
BUG: KMSAN: uninit-value in check_array_args drivers/media/v4l2-core/v4l2-ioctl.c:3041 [inline] BUG: KMSAN: uninit-value in video_usercopy+0x1631/0x3d30 drivers/media/v4l2-core/v4l2-ioctl.c:3315 CPU: 0 PID: 19595 Comm: syz-executor.4 Not tainted 5.11.0-rc7-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:79 [inline] dump_stack+0x21c/0x280 lib/dump_stack.c:120 kmsan_report+0xfb/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x5f/0xa0 mm/kmsan/kmsan_instr.c:197 check_array_args drivers/media/v4l2-core/v4l2-ioctl.c:3041 [inline] video_usercopy+0x1631/0x3d30 drivers/media/v4l2-core/v4l2-ioctl.c:3315 video_ioctl2+0x9f/0xb0 drivers/media/v4l2-core/v4l2-ioctl.c:3391 v4l2_ioctl+0x255/0x290 drivers/media/v4l2-core/v4l2-dev.c:360 v4l2_compat_ioctl32+0x2c6/0x370 drivers/media/v4l2-core/v4l2-compat-ioctl32.c:1248 __do_compat_sys_ioctl fs/ioctl.c:842 [inline] __se_compat_sys_ioctl+0x53d/0x1100 fs/ioctl.c:793 __ia32_compat_sys_ioctl+0x4a/0x70 fs/ioctl.c:793 do_syscall_32_irqs_on arch/x86/entry/common.c:79 [inline] __do_fast_syscall_32+0x102/0x160 arch/x86/entry/common.c:141 do_fast_syscall_32+0x6a/0xc0 arch/x86/entry/common.c:166 do_SYSENTER_32+0x73/0x90 arch/x86/entry/common.c:209 entry_SYSENTER_compat_after_hwframe+0x4d/0x5c
The time32 commands are defined but were never meant to be called on 64-bit machines, as those have always used time64 interfaces. I missed this in my patch that introduced the time64 handling on 32-bit platforms.
The problem in this case is the mismatch of one function checking for the numeric value of the command and another function checking for the type of process (native vs compat) instead, with the result being that for this combination, nothing gets copied into the buffer at all.
Avoid this by only trying to convert the time32 commands when running on a 32-bit kernel where these are defined in a meaningful way.
[hverkuil: fix 3 warnings: switch with no cases]
--- drivers/media/v4l2-core/v4l2-ioctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/media/v4l2-core/v4l2-ioctl.c +6 -6
@@ -3072,8 +3072,8 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,static unsigned int video_translate_cmd (unsigned int cmd) { +#if !defined(CONFIG_64BIT ) && defined(CONFIG_COMPAT_32BIT_TIME )switch (cmd) { -#ifdef CONFIG_COMPAT_32BIT_TIME case VIDIOC_DQEVENT_TIME32 :return VIDIOC_DQEVENT ;case VIDIOC_QUERYBUF_TIME32 :
@@ -3084,8 +3084,8 @@ static unsigned int video_translate_cmd(unsigned int cmd)return VIDIOC_DQBUF ;case VIDIOC_PREPARE_BUF_TIME32 : return VIDIOC_PREPARE_BUF; -#endif } +#endif if (in_compat_syscall ())return v4l2_compat_translate_cmd (cmd);
@@ -3126,8 +3126,8 @@ static int video_get_user(void __user *arg, void *parg, }else if (in_compat_syscall ()) { err =v4l2_compat_get_user (arg, parg, cmd); }else { +#if !defined(CONFIG_64BIT ) && defined(CONFIG_COMPAT_32BIT_TIME )switch (cmd) { -#ifdef CONFIG_COMPAT_32BIT_TIME case VIDIOC_QUERYBUF_TIME32 :case VIDIOC_QBUF_TIME32 :case VIDIOC_DQBUF_TIME32 :
@@ -3155,8 +3155,8 @@ static int video_get_user(void __user *arg, void *parg, };break ; } -#endif } +#endif }/* zero out anything we don't copy from userspace */
@@ -3181,8 +3181,8 @@ static int video_put_user(void __user *arg, void *parg,if (in_compat_syscall ())return v4l2_compat_put_user (arg, parg, cmd); +#if !defined(CONFIG_64BIT ) && defined(CONFIG_COMPAT_32BIT_TIME )switch (cmd) { -#ifdef CONFIG_COMPAT_32BIT_TIME case VIDIOC_DQEVENT_TIME32 : {struct v4l2_event *ev = parg;struct v4l2_event_time32 ev32;
@@ -3230,8 +3230,8 @@ static int video_put_user(void __user *arg, void *parg,return -EFAULT ; break; } -#endif } +#endif return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 316/800 media: subdev: remove VIDIOC_DQEVENT_TIME32 handling
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 765ba251d2522e2a0daa2f0793fd0f0ce34816ec ]
Converting the VIDIOC_DQEVENT_TIME32/VIDIOC_DQEVENT32/ VIDIOC_DQEVENT32_TIME32 arguments to the canonical form is done in common code, but for some reason I ended up adding another conversion helper to subdev_do_ioctl() as well. I must have concluded that this does not go through the common conversion, but it has done that since the ioctl handler was first added.
I assume this one is harmless as there should be no way to arrive here from user space if CONFIG_COMPAT_32BIT_TIME is set, but since it is dead code, it should just get removed.
On a 64-bit architecture, as well as a 32-bit architecture without CONFIG_COMPAT_32BIT_TIME, handling this command is a mistake, and the kernel should return an error.
--- drivers/media/v4l2-core/v4l2-subdev.c | 24 ------------------------ 1 file changed, 24 deletions(-)
drivers/media/v4l2-core/v4l2-subdev.c +0 -24
@@ -428,30 +428,6 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)return v4l2_event_dequeue (vfh, arg, file->f_flags &O_NONBLOCK ); -case VIDIOC_DQEVENT_TIME32 : { -struct v4l2_event_time32 *ev32 = arg; -struct v4l2_event ev = { }; - -if (!(sd->flags &V4L2_SUBDEV_FL_HAS_EVENTS )) -return -ENOIOCTLCMD ; - - rval =v4l2_event_dequeue (vfh, &ev, file->f_flags &O_NONBLOCK ); - - *ev32 = (struct v4l2_event_time32 ) { - .type = ev.type, - .pending = ev.pending, - .sequence = ev.sequence, - .timestamp.tv_sec = ev.timestamp.tv_sec, - .timestamp.tv_nsec = ev.timestamp.tv_nsec, - .id = ev.id, - }; - -memcpy (&ev32->u, &ev.u,sizeof (ev.u)); -memcpy (&ev32->reserved, &ev.reserved,sizeof (ev.reserved)); - -return rval; - } -case VIDIOC_SUBSCRIBE_EVENT :return v4l2_subdev_call (sd, core, subscribe_event, vfh, arg);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 317/800 media: s5p-g2d: Fix a memory leak on ctx->fh.m2m_ctx
In reply to Greg Kroah-HartmanFrom: Dillon Min <[email protected]>
[ Upstream commit 5d11e6aad1811ea293ee2996cec9124f7fccb661 ]
The m2m_ctx resources was allocated by v4l2_m2m_ctx_init() in g2d_open() should be freed from g2d_release() when it's not used.
Fix it
--- drivers/media/platform/s5p-g2d/g2d.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/s5p-g2d/g2d.c +3 -0
@@ -276,6 +276,9 @@ static int g2d_release(struct file *file)struct g2d_dev *dev =video_drvdata (file);struct g2d_ctx *ctx =fh2ctx (file->private_data); +mutex_lock (&dev->mutex); +v4l2_m2m_ctx_release (ctx->fh.m2m_ctx); +mutex_unlock (&dev->mutex);v4l2_ctrl_handler_free (&ctx->ctrl_handler);v4l2_fh_del (&ctx->fh);v4l2_fh_exit (&ctx->fh);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 318/800 media: i2c: rdacm21: Fix OV10640 powerup
In reply to Greg Kroah-HartmanFrom: Jacopo Mondi <[email protected]>
[ Upstream commit ff75332b260cd33cc19000fdb5d256d9db4470d1 ]
The OV10640 image sensor powerdown signal is controlled by the first line of the OV490 GPIO pad #1, but the pad #0 identifier OV490_GPIO_OUTPUT_VALUE0 was erroneously used. As a result the image sensor powerdown signal was never asserted but was left floating and kept high by an internal pull-up resistor, causing sporadic failures during the image sensor startup phase.
Fix this by using the correct GPIO pad identifier and wait the mandatory 1.5 millisecond delay after the powerup lane is asserted. The reset delay is not characterized in the chip manual if not as "255 XVCLK + initialization". Wait for at least 3 milliseconds to guarantee the SCCB bus is available.
While at it also fix the reset sequence, as the reset line was released before the powerdown one, and the line was not cycled.
This commit fixes a sporadic start-up error triggered by a failure to read the OV10640 chip ID:
rdacm21 8-0054: OV10640 ID mismatch: (0x01)
--- drivers/media/i2c/rdacm21.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/i2c/rdacm21.c +8 -2
@@ -333,13 +333,19 @@ static int ov10640_initialize(struct rdacm21_device *dev) {u8 val; -/* Power-up OV10640 by setting RESETB and PWDNB pins high. */ +/* Enable GPIO0#0 (reset) and GPIO1#0 (pwdn) as output lines. */ ov490_write_reg (dev,OV490_GPIO_SEL0 ,OV490_GPIO0 );ov490_write_reg (dev,OV490_GPIO_SEL1 ,OV490_SPWDN0 );ov490_write_reg (dev,OV490_GPIO_DIRECTION0 ,OV490_GPIO0 );ov490_write_reg (dev,OV490_GPIO_DIRECTION1 ,OV490_SPWDN0 ); + +/* Power up OV10640 and then reset it. */ +ov490_write_reg (dev,OV490_GPIO_OUTPUT_VALUE1 ,OV490_SPWDN0 ); +usleep_range (1500 ,3000 ); + +ov490_write_reg (dev,OV490_GPIO_OUTPUT_VALUE0 ,0x00 ); +usleep_range (1500 ,3000 );ov490_write_reg (dev,OV490_GPIO_OUTPUT_VALUE0 ,OV490_GPIO0 ); -ov490_write_reg (dev,OV490_GPIO_OUTPUT_VALUE0 ,OV490_SPWDN0 );usleep_range (3000 ,5000 );/* Read OV10640 ID to test communications. */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 319/800 media: i2c: rdacm21: Power up OV10640 before OV490
In reply to Greg Kroah-HartmanFrom: Jacopo Mondi <[email protected]>
[ Upstream commit 2b821698dc73c00719e3dc367db712f727bbda85 ]
The current RDACM21 initialization routine powers up the OV10640 image sensor after the OV490 ISP. The ISP is programmed with a firmware loaded from an embedded serial flash that (most probably) tries to interact and program also the image sensor connected to the ISP.
As described in commit "media: i2c: rdacm21: Fix OV10640 powerup" the image sensor powerdown signal is kept high by an internal pull up resistor and occasionally fails to startup correctly if the powerdown line is not asserted explicitly. Failures in the OV10640 startup causes the OV490 firmware to fail to boot correctly resulting in the camera module initialization to fail consequentially.
Fix this by powering up the OV10640 image sensor before testing the OV490 firmware boot completion, by splitting the ov10640_initialize() function in an ov10640_power_up() one and an ov10640_check_id() one.
Also make sure the OV10640 identification procedure gives enough time to the image sensor to resume after the programming phase performed by the OV490 firmware by repeating the ID read procedure.
This commit fixes a sporadic start-up error triggered by a failure to detect the OV490 firmware boot completion:
rdacm21 8-0054: Timeout waiting for firmware boot
[hverkuil: fixed two typos in commit log]
--- drivers/media/i2c/rdacm21.c | 46 ++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 14 deletions(-)
drivers/media/i2c/rdacm21.c +32 -14
@@ -69,6 +69,7 @@#define OV490_ISP_VSIZE_LOW 0x80820062#define OV490_ISP_VSIZE_HIGH 0x80820063 +#define OV10640_PID_TIMEOUT 20#define OV10640_ID_HIGH 0xa6#define OV10640_CHIP_ID 0x300a#define OV10640_PIXEL_RATE 55000000
@@ -329,10 +330,8 @@ static const struct v4l2_subdev_ops rdacm21_subdev_ops = { .pad = &rdacm21_subdev_pad_ops, }; -static int ov10640_initialize (struct rdacm21_device *dev) +static void ov10640_power_up (struct rdacm21_device *dev) { -u8 val; -/* Enable GPIO0#0 (reset) and GPIO1#0 (pwdn) as output lines. */ ov490_write_reg (dev,OV490_GPIO_SEL0 ,OV490_GPIO0 );ov490_write_reg (dev,OV490_GPIO_SEL1 ,OV490_SPWDN0 );
@@ -347,18 +346,35 @@ static int ov10640_initialize(struct rdacm21_device *dev)usleep_range (1500 ,3000 );ov490_write_reg (dev,OV490_GPIO_OUTPUT_VALUE0 ,OV490_GPIO0 );usleep_range (3000 ,5000 ); +} -/* Read OV10640 ID to test communications. */ -ov490_write_reg (dev,OV490_SCCB_SLAVE0_DIR ,OV490_SCCB_SLAVE_READ ); -ov490_write_reg (dev,OV490_SCCB_SLAVE0_ADDR_HIGH ,OV10640_CHIP_ID >>8 ); -ov490_write_reg (dev,OV490_SCCB_SLAVE0_ADDR_LOW ,OV10640_CHIP_ID &0xff ); - -/* Trigger SCCB slave transaction and give it some time to complete. */ -ov490_write_reg (dev,OV490_HOST_CMD ,OV490_HOST_CMD_TRIGGER ); -usleep_range (1000 ,1500 ); +static int ov10640_check_id (struct rdacm21_device *dev) +{ +unsigned int i; +u8 val; -ov490_read_reg (dev,OV490_SCCB_SLAVE0_DIR , &val); -if (val !=OV10640_ID_HIGH ) { +/* Read OV10640 ID to test communications. */ +for (i =0 ; i <OV10640_PID_TIMEOUT ; ++i) { +ov490_write_reg (dev,OV490_SCCB_SLAVE0_DIR , +OV490_SCCB_SLAVE_READ ); +ov490_write_reg (dev,OV490_SCCB_SLAVE0_ADDR_HIGH , +OV10640_CHIP_ID >>8 ); +ov490_write_reg (dev,OV490_SCCB_SLAVE0_ADDR_LOW , +OV10640_CHIP_ID &0xff ); + +/* +* Trigger SCCB slave transaction and give it some time +* to complete. +*/ +ov490_write_reg (dev,OV490_HOST_CMD ,OV490_HOST_CMD_TRIGGER ); +usleep_range (1000 ,1500 ); + +ov490_read_reg (dev,OV490_SCCB_SLAVE0_DIR , &val); +if (val ==OV10640_ID_HIGH ) +break ; +usleep_range (1000 ,1500 ); + } +if (i ==OV10640_PID_TIMEOUT ) {dev_err (dev->dev,"OV10640 ID mismatch: (0x%02x)\n" , val);return -ENODEV ; }
@@ -374,6 +390,8 @@ static int ov490_initialize(struct rdacm21_device *dev)unsigned int i;int ret; +ov10640_power_up (dev); +/* * Read OV490 Id to test communications. Give it up to 40msec to * exit from reset.
@@ -411,7 +429,7 @@ static int ov490_initialize(struct rdacm21_device *dev)return -ENODEV ; } - ret =ov10640_initialize (dev); + ret =ov10640_check_id (dev);if (ret)return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 320/800 hwmon: (pmbus/bpa-rs600) Handle Vin readings >= 256V
In reply to Greg Kroah-HartmanFrom: Chris Packham <[email protected]>
[ Upstream commit 6e9ef8ca687e69e9d4cc89033d98e06350b0f3e0 ]
The BPA-RS600 doesn't follow the PMBus spec for linear data. Specifically it treats the mantissa as an unsigned 11-bit value instead of a two's complement 11-bit value. At this point it's unclear whether this only affects Vin or if Pin/Pout1 are affected as well. Erring on the side of caution only Vin is dealt with here.
--- drivers/hwmon/pmbus/bpa-rs600.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/hwmon/pmbus/bpa-rs600.c +29 -0
@@ -46,6 +46,32 @@ static int bpa_rs600_read_byte_data(struct i2c_client *client, int page, int regreturn ret; } +/* +* The BPA-RS600 violates the PMBus spec. Specifically it treats the +* mantissa as unsigned. Deal with this here to allow the PMBus core +* to work with correctly encoded data. +*/ +static int bpa_rs600_read_vin (struct i2c_client *client) +{ +int ret, exponent, mantissa; + + ret =pmbus_read_word_data (client,0 ,0xff ,PMBUS_READ_VIN ); +if (ret <0 ) +return ret; + +if (ret &BIT (10 )) { + exponent = ret >>11 ; + mantissa = ret &0x7ff ; + + exponent++; + mantissa >>=1 ; + + ret = (exponent <<11 ) | mantissa; + } + +return ret; +} +static int bpa_rs600_read_word_data (struct i2c_client *client,int page,int phase,int reg) {int ret;
@@ -85,6 +111,9 @@ static int bpa_rs600_read_word_data(struct i2c_client *client, int page, int pha/* These commands return data but it is invalid/un-documented */ ret = -ENXIO ;break ; +case PMBUS_READ_VIN : + ret =bpa_rs600_read_vin (client); +break ;default :if (reg >=PMBUS_VIRT_BASE ) ret = -ENXIO ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 321/800 hwmon: (lm70) Revert "hwmon: (lm70) Add support for ACPI"
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit ac61c8aae446b9c0fe18981fe721d4a43e283ad6 ]
This reverts commit b58bd4c6dfe709646ed9efcbba2a70643f9bc873.
None of the ACPI IDs introduced with the reverted patch is a valid ACPI device ID. Any ACPI users of this driver are advised to use PRP0001 and a devicetree-compatible device identification.
--- drivers/hwmon/lm70.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-)
drivers/hwmon/lm70.c +1 -25
@@ -22,10 +22,10 @@#include <linux/hwmon.h> #include <linux/mutex.h> #include <linux/mod_devicetable.h> +#include <linux/of.h> #include <linux/property.h> #include <linux/spi/spi.h> #include <linux/slab.h> -#include <linux/acpi.h> #define DRVNAME "lm70"
@@ -148,29 +148,6 @@ static const struct of_device_id lm70_of_ids[] = {MODULE_DEVICE_TABLE (of, lm70_of_ids);#endif -#ifdef CONFIG_ACPI -static const struct acpi_device_id lm70_acpi_ids[] = { - { - .id ="LM000070" , - .driver_data =LM70_CHIP_LM70 , - }, - { - .id ="TMP00121" , - .driver_data =LM70_CHIP_TMP121 , - }, - { - .id ="LM000071" , - .driver_data =LM70_CHIP_LM71 , - }, - { - .id ="LM000074" , - .driver_data =LM70_CHIP_LM74 , - }, - {}, -}; -MODULE_DEVICE_TABLE (acpi, lm70_acpi_ids); -#endif -static int lm70_probe (struct spi_device *spi) {struct device *hwmon_dev;
@@ -217,7 +194,6 @@ static struct spi_driver lm70_driver = { .driver = { .name = "lm70", .of_match_table = of_match_ptr(lm70_of_ids), - .acpi_match_table = ACPI_PTR(lm70_acpi_ids), }, .id_table = lm70_ids, .probe = lm70_probe,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 322/800 hwmon: (max31722) Remove non-standard ACPI device IDs
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 97387c2f06bcfd79d04a848d35517b32ee6dca7c ]
Valid Maxim Integrated ACPI device IDs would start with MXIM, not with MAX1. On top of that, ACPI device IDs reflecting chip names are almost always invalid.
Remove the invalid ACPI IDs.
--- drivers/hwmon/max31722.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/hwmon/max31722.c +0 -9
@@ -6,7 +6,6 @@* Copyright (c) 2016, Intel Corporation. */ -#include <linux/acpi.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> #include <linux/kernel.h>
@@ -133,20 +132,12 @@ static const struct spi_device_id max31722_spi_id[] = { {"max31723", 0}, {} }; - -static const struct acpi_device_id __maybe_unused max31722_acpi_id[] = { - {"MAX31722" ,0 }, - {"MAX31723" ,0 }, - {} -}; -MODULE_DEVICE_TABLE (spi, max31722_spi_id);static struct spi_driver max31722_driver = { .driver = { .name ="max31722" , .pm = &max31722_pm_ops, - .acpi_match_table =ACPI_PTR (max31722_acpi_id), }, .probe = max31722_probe, .remove = max31722_remove,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 323/800 hwmon: (max31790) Fix fan speed reporting for fan7..12
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit cbbf244f0515af3472084f22b6213121b4a63835 ]
Fans 7..12 do not have their own set of configuration registers. So far the code ignored that and read beyond the end of the configuration register range to get the tachometer period. This resulted in more or less random fan speed values for those fans.
The datasheet is quite vague when it comes to defining the tachometer period for fans 7..12. Experiments confirm that the period is the same for both fans associated with a given set of configuration registers.
--- drivers/hwmon/max31790.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/max31790.c +1 -1
@@ -171,7 +171,7 @@ static int max31790_read_fan(struct device *dev, u32 attr, int channel,switch (attr) {case hwmon_fan_input: - sr =get_tach_period (data->fan_dynamics[channel]); + sr =get_tach_period (data->fan_dynamics[channel %NR_CHANNEL ]); rpm =RPM_FROM_REG (data->tach[channel], sr); *val = rpm;return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 324/800 KVM: nVMX: Add a return code to vmx_complete_nested_posted_interrupt
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit 650293c3de6b042c4a2e87b2bc678efcff3843e8 ]
No functional change intended.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/nested.c +6 -6
@@ -3682,7 +3682,7 @@ void nested_mark_vmcs12_pages_dirty(struct kvm_vcpu *vcpu) } } -static void vmx_complete_nested_posted_interrupt (struct kvm_vcpu *vcpu) +static int vmx_complete_nested_posted_interrupt (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);int max_irr;
@@ -3690,17 +3690,17 @@ static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)u16 status;if (!vmx->nested.pi_desc || !vmx->nested.pi_pending) -return ; +return 0 ; vmx->nested.pi_pending = false;if (!pi_test_and_clear_on (vmx->nested.pi_desc)) -return ; +return 0 ; max_irr =find_last_bit ((unsigned long *)vmx->nested.pi_desc->pir,256 );if (max_irr !=256 ) { vapic_page = vmx->nested.virtual_apic_map.hva;if (!vapic_page) -return ; +return 0 ;__kvm_apic_update_irr (vmx->nested.pi_desc->pir, vapic_page, &max_irr);
@@ -3713,6 +3713,7 @@ static void vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu) }nested_mark_vmcs12_pages_dirty (vcpu); +return 0 ; } static void nested_vmx_inject_exception_vmexit(struct kvm_vcpu *vcpu,
@@ -3887,8 +3888,7 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu) } no_vmexit: -vmx_complete_nested_posted_interrupt (vcpu); -return 0 ; +return vmx_complete_nested_posted_interrupt (vcpu); }static u32 vmx_get_preemption_timer_value (struct kvm_vcpu *vcpu)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 325/800 KVM: nVMX: Sync all PGDs on nested transition with shadow paging
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 07ffaf343e34b555c9e7ea39a9c81c439a706f13 ]
Trigger a full TLB flush on behalf of the guest on nested VM-Enter and VM-Exit when VPID is disabled for L2. kvm_mmu_new_pgd() syncs only the current PGD, which can theoretically leave stale, unsync'd entries in a previous guest PGD, which could be consumed if L2 is allowed to load CR3 with PCID_NOFLUSH=1.
Rename KVM_REQ_HV_TLB_FLUSH to KVM_REQ_TLB_FLUSH_GUEST so that it can be utilized for its obvious purpose of emulating a guest TLB flush.
Note, there is no change the actual TLB flush executed by KVM, even though the fast PGD switch uses KVM_REQ_TLB_FLUSH_CURRENT. When VPID is disabled for L2, vpid02 is guaranteed to be '0', and thus nested_get_vpid02() will return the VPID that is shared by L1 and L2.
Generate the request outside of kvm_mmu_new_pgd(), as getting the common helper to correctly identify which requested is needed is quite painful. E.g. using KVM_REQ_TLB_FLUSH_GUEST when nested EPT is in play is wrong as a TLB flush from the L1 kernel's perspective does not invalidate EPT mappings. And, by using KVM_REQ_TLB_FLUSH_GUEST, nVMX can do future simplification by moving the logic into nested_vmx_transition_tlb_flush().
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/hyperv.c | 2 +- arch/x86/kvm/vmx/nested.c | 17 ++++++++++++----- arch/x86/kvm/x86.c | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -85,7 +85,7 @@#define KVM_REQ_APICV_UPDATE \ KVM_ARCH_REQ_FLAGS(25, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_TLB_FLUSH_CURRENT KVM_ARCH_REQ(26) -#define KVM_REQ_HV_TLB_FLUSH \ +#define KVM_REQ_TLB_FLUSH_GUEST \ KVM_ARCH_REQ_FLAGS(27, KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_APF_READY KVM_ARCH_REQ(28)#define KVM_REQ_MSR_FILTER_CHANGED KVM_ARCH_REQ(29)
arch/x86/kvm/hyperv.c +1 -1
@@ -1704,7 +1704,7 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *vcpu, u64 ingpa, u16 rep_cnt, bool* vcpu->arch.cr3 may not be up-to-date for running vCPUs so we can't * analyze it here, flush TLB regardless of the specified address space. */ -kvm_make_vcpus_request_mask (kvm,KVM_REQ_HV_TLB_FLUSH , +kvm_make_vcpus_request_mask (kvm,KVM_REQ_TLB_FLUSH_GUEST ,NULL , vcpu_mask, &hv_vcpu->tlb_flush); ret_success:
arch/x86/kvm/vmx/nested.c +12 -5
@@ -1127,12 +1127,19 @@ static int nested_vmx_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, bool ne/* * Unconditionally skip the TLB flush on fast CR3 switch, all TLB -* flushes are handled by nested_vmx_transition_tlb_flush(). See -* nested_vmx_transition_mmu_sync for details on skipping the MMU sync. +* flushes are handled by nested_vmx_transition_tlb_flush(). */ -if (!nested_ept) -kvm_mmu_new_pgd (vcpu, cr3, true, - !nested_vmx_transition_mmu_sync (vcpu)); +if (!nested_ept) { +kvm_mmu_new_pgd (vcpu, cr3, true, true); + +/* +* A TLB flush on VM-Enter/VM-Exit flushes all linear mappings +* across all PCIDs, i.e. all PGDs need to be synchronized. +* See nested_vmx_transition_mmu_sync() for more details. +*/ +if (nested_vmx_transition_mmu_sync (vcpu)) +kvm_make_request (KVM_REQ_TLB_FLUSH_GUEST , vcpu); + } vcpu->arch.cr3 = cr3;kvm_register_mark_available (vcpu,VCPU_EXREG_CR3 );
arch/x86/kvm/x86.c +1 -1
@@ -9171,7 +9171,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) }if (kvm_check_request (KVM_REQ_TLB_FLUSH_CURRENT , vcpu))kvm_vcpu_flush_tlb_current (vcpu); -if (kvm_check_request (KVM_REQ_HV_TLB_FLUSH , vcpu)) +if (kvm_check_request (KVM_REQ_TLB_FLUSH_GUEST , vcpu))kvm_vcpu_flush_tlb_guest (vcpu);if (kvm_check_request (KVM_REQ_REPORT_TPR_ACCESS , vcpu)) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 326/800 KVM: nVMX: Ensure 64-bit shift when checking VMFUNC bitmap
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 0e75225dfa4c5d5d51291f54a3d2d5895bad38da ]
Use BIT_ULL() instead of an open-coded shift to check whether or not a function is enabled in L1's VMFUNC bitmap. This is a benign bug as KVM supports only bit 0, and will fail VM-Enter if any other bits are set, i.e. bits 63:32 are guaranteed to be zero.
Note, "function" is bounded by hardware as VMFUNC will #UD before taking a VM-Exit if the function is greater than 63.
Before:
if ((vmcs12->vm_function_control & (1 << function)) == 0)
0x000000000001a916 <+118>: mov $0x1,%eax
0x000000000001a91b <+123>: shl %cl,%eax
0x000000000001a91d <+125>: cltq
0x000000000001a91f <+127>: and 0x128(%rbx),%rax
After:
if (!(vmcs12->vm_function_control & BIT_ULL(function & 63)))
0x000000000001a955 <+117>: mov 0x128(%rbx),%rdx
0x000000000001a95c <+124>: bt %rax,%rdx
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/nested.c +1 -1
@@ -5540,7 +5540,7 @@ static int handle_vmfunc(struct kvm_vcpu *vcpu) } vmcs12 =get_vmcs12 (vcpu); -if ((vmcs12->vm_function_control & (1 << function)) ==0 ) +if (!(vmcs12->vm_function_control &BIT_ULL (function))) goto fail;switch (function) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 327/800 KVM: nVMX: Dont clobber nested MMUs A/D status on EPTP switch
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 272b0a998d084e7667284bdd2d0c675c6a2d11de ]
Drop bogus logic that incorrectly clobbers the accessed/dirty enabling status of the nested MMU on an EPTP switch. When nested EPT is enabled, walk_mmu points at L2's _legacy_ page tables, not L1's EPT for L2.
This is likely a benign bug, as mmu->ept_ad is never consumed (since the MMU is not a nested EPT MMU), and stuffing mmu_role.base.ad_disabled will never propagate into future shadow pages since the nested MMU isn't used to map anything, just to walk L2's page tables.
Note, KVM also does a full MMU reload, i.e. the guest_mmu will be recreated using the new EPTP, and thus any change in A/D enabling will be properly recognized in the relevant MMU.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 7 ------- 1 file changed, 7 deletions(-)
arch/x86/kvm/vmx/nested.c +0 -7
@@ -5488,8 +5488,6 @@ static int nested_vmx_eptp_switching(struct kvm_vcpu *vcpu, {u32 index =kvm_rcx_read (vcpu);u64 new_eptp; -bool accessed_dirty; -struct kvm_mmu *mmu = vcpu->arch.walk_mmu;if (!nested_cpu_has_eptp_switching (vmcs12) || !nested_cpu_has_ept (vmcs12))
@@ -5498,13 +5496,10 @@ static int nested_vmx_eptp_switching(struct kvm_vcpu *vcpu,if (index >=VMFUNC_EPTP_ENTRIES )return 1 ; -if (kvm_vcpu_read_guest_page (vcpu, vmcs12->eptp_list_address >>PAGE_SHIFT , &new_eptp, index *8 ,8 ))return 1 ; - accessed_dirty = !!(new_eptp &VMX_EPTP_AD_ENABLE_BIT ); -/* * If the (L2) guest does a vmfunc to the currently * active ept pointer, we don't have to do anything else
@@ -5513,8 +5508,6 @@ static int nested_vmx_eptp_switching(struct kvm_vcpu *vcpu,if (!nested_vmx_check_eptp (vcpu, new_eptp))return 1 ; - mmu->ept_ad = accessed_dirty; - mmu->mmu_role.base.ad_disabled = !accessed_dirty; vmcs12->ept_pointer = new_eptp;kvm_make_request (KVM_REQ_MMU_RELOAD , vcpu);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 328/800 KVM: x86/mmu: Fix return value in tdp_mmu_map_handle_target_level()
In reply to Greg Kroah-HartmanFrom: Kai Huang <[email protected]>
[ Upstream commit 57a3e96d6d17ae5ac9861ef34af024a627f1c3bb ]
Currently tdp_mmu_map_handle_target_level() returns 0, which is RET_PF_RETRY, when page fault is actually fixed. This makes kvm_tdp_mmu_map() also return RET_PF_RETRY in this case, instead of RET_PF_FIXED. Fix by initializing ret to RET_PF_FIXED.
Note that kvm_mmu_page_fault() resumes guest on both RET_PF_RETRY and RET_PF_FIXED, which means in practice returning the two won't make difference, so this fix alone won't be necessary for stable tree.
Message-Id: <f9e8956223a586cd28c090879a8ff40f5eb6d609.1623717884.git.kai.huang@intel.com>
--- arch/x86/kvm/mmu/tdp_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/mmu/tdp_mmu.c +1 -1
@@ -912,7 +912,7 @@ static int tdp_mmu_map_handle_target_level(struct kvm_vcpu *vcpu, int write, kvm_pfn_t pfn, bool prefault) {u64 new_spte; -int ret =0 ; +int ret =RET_PF_FIXED ;int make_spte_ret =0 ;if (unlikely (is_noslot_pfn (pfn)))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 329/800 KVM: x86/mmu: Fix pf_fixed count in tdp_mmu_map_handle_target_level()
In reply to Greg Kroah-HartmanFrom: Kai Huang <[email protected]>
[ Upstream commit 857f84743e4b78500afae010d866675642e18e90 ]
Currently pf_fixed is not increased when prefault is true. This is not correct, since prefault here really means "async page fault completed". In that case, the original page fault from the guest was morphed into as async page fault and pf_fixed was not increased. So when prefault indicates async page fault is completed, pf_fixed should be increased.
Additionally, currently pf_fixed is also increased even when page fault is spurious, while legacy MMU increases pf_fixed when page fault returns RET_PF_EMULATE or RET_PF_FIXED.
To fix above two issues, change to increase pf_fixed when return value is not RET_PF_SPURIOUS (RET_PF_RETRY has already been ruled out by reaching here).
More information:
https://lore.kernel.org/kvm/[email protected]/T/#mbb5f8083e58a2cd262231512b9211cbe70fc3bd5
Message-Id: <2ea8b7f5d4f03c99b32bc56fc982e1e4e3d3fc6b.1623717884.git.kai.huang@intel.com>
--- arch/x86/kvm/mmu/tdp_mmu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/kvm/mmu/tdp_mmu.c +5 -1
@@ -949,7 +949,11 @@ static int tdp_mmu_map_handle_target_level(struct kvm_vcpu *vcpu, int write, rcu_dereference(iter->sptep)); } -if (!prefault) +/* +* Increase pf_fixed in both RET_PF_EMULATE and RET_PF_FIXED to be +* consistent with legacy MMU behavior. +*/ +if (ret !=RET_PF_SPURIOUS ) vcpu->stat.pf_fixed++;return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 330/800 perf/arm-cmn: Fix invalid pointer when access dtc object sharing the same IRQ number
In reply to Greg Kroah-HartmanFrom: Tuan Phan <[email protected]>
[ Upstream commit 4e16f283edc289820e9b2d6f617ed8e514ee8396 ]
When multiple dtcs share the same IRQ number, the irq_friend which used to refer to dtc object gets calculated incorrect which leads to invalid pointer.
--- drivers/perf/arm-cmn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/perf/arm-cmn.c +1 -1
@@ -1212,7 +1212,7 @@ static int arm_cmn_init_irqs(struct arm_cmn *cmn) irq = cmn->dtc[i].irq;for (j = i; j--; ) {if (cmn->dtc[j].irq == irq) { - cmn->dtc[j].irq_friend = j - i; + cmn->dtc[j].irq_friend = i - j; goto next; } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 331/800 KVM: arm64: Dont zero the cycle count register when PMCR_EL0.P is set
In reply to Greg Kroah-HartmanFrom: Alexandru Elisei <[email protected]>
[ Upstream commit 2a71fabf6a1bc9162a84e18d6ab991230ca4d588 ]
According to ARM DDI 0487G.a, page D13-3895, setting the PMCR_EL0.P bit to 1 has the following effect:
"Reset all event counters accessible in the current Exception level, not including PMCCNTR_EL0, to zero."
Similar behaviour is described for AArch32 on page G8-7022. Make it so.
--- arch/arm64/kvm/pmu-emul.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kvm/pmu-emul.c +1 -0
@@ -578,6 +578,7 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val)kvm_pmu_set_counter_value (vcpu,ARMV8_PMU_CYCLE_IDX ,0 );if (val &ARMV8_PMU_PMCR_P ) { + mask &= ~BIT (ARMV8_PMU_CYCLE_IDX );for_each_set_bit (i, &mask,32 )kvm_pmu_set_counter_value (vcpu, i,0 ); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 332/800 regulator: hi655x: Fix pass wrong pointer to config.driver_data
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit 61eb1b24f9e4f4e0725aa5f8164a932c933f3339 ]
Current code sets config.driver_data to a zero initialized regulator which is obviously wrong. Fix it.
--- drivers/regulator/hi655x-regulator.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/regulator/hi655x-regulator.c +5 -11
@@ -72,7 +72,7 @@ enum hi655x_regulator_id {static int hi655x_is_enabled (struct regulator_dev *rdev) {unsigned int value =0 ; -struct hi655x_regulator *regulator =rdev_get_drvdata (rdev); +const struct hi655x_regulator *regulator =rdev_get_drvdata (rdev);regmap_read (rdev->regmap, regulator->status_reg, &value);return (value & rdev->desc->enable_mask);
@@ -80,7 +80,7 @@ static int hi655x_is_enabled(struct regulator_dev *rdev)static int hi655x_disable (struct regulator_dev *rdev) { -struct hi655x_regulator *regulator =rdev_get_drvdata (rdev); +const struct hi655x_regulator *regulator =rdev_get_drvdata (rdev);return regmap_write (rdev->regmap, regulator->disable_reg, rdev->desc->enable_mask);
@@ -169,7 +169,6 @@ static const struct hi655x_regulator regulators[] = {static int hi655x_regulator_probe (struct platform_device *pdev) {unsigned int i; -struct hi655x_regulator *regulator;struct hi655x_pmic *pmic;struct regulator_config config = { };struct regulator_dev *rdev;
@@ -180,22 +179,17 @@ static int hi655x_regulator_probe(struct platform_device *pdev)return -ENODEV ; } - regulator =devm_kzalloc (&pdev->dev,sizeof (*regulator),GFP_KERNEL ); -if (!regulator) -return -ENOMEM ; - -platform_set_drvdata (pdev, regulator); - config.dev = pdev->dev.parent; config.regmap = pmic->regmap; - config.driver_data = regulator;for (i =0 ; i <ARRAY_SIZE (regulators); i++) { + config.driver_data = (void *) ®ulators[i]; + rdev =devm_regulator_register (&pdev->dev, ®ulators[i].rdesc, &config);if (IS_ERR (rdev)) {dev_err (&pdev->dev,"failed to register regulator %s\n" , - regulator->rdesc.name); + regulators[i].rdesc.name);return PTR_ERR (rdev); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 333/800 regulator: qcom-rpmh: Add terminator at the end of pm7325x_vreg_data[] array
In reply to Greg Kroah-HartmanFrom: Bhupesh Sharma <[email protected]>
[ Upstream commit f26cdadad729743888eb4ac2c17eac3cf845b493 ]
Add missing terminator(s) at the end of pm7325x_vreg_data[] array instances.
--- drivers/regulator/qcom-rpmh-regulator.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/regulator/qcom-rpmh-regulator.c +2 -0
@@ -1070,6 +1070,7 @@ static const struct rpmh_vreg_init_data pm7325_vreg_data[] = {RPMH_VREG ("ldo17" ,"ldo%s17" , &pmic5_pldo_lv,"vdd-l11-l17-l18-l19" ),RPMH_VREG ("ldo18" ,"ldo%s18" , &pmic5_pldo_lv,"vdd-l11-l17-l18-l19" ), RPMH_VREG("ldo19", "ldo%s19", &pmic5_pldo_lv, "vdd-l11-l17-l18-l19"), + {} }; static const struct rpmh_vreg_init_data pmr735a_vreg_data[] = {
@@ -1083,6 +1084,7 @@ static const struct rpmh_vreg_init_data pmr735a_vreg_data[] = {RPMH_VREG ("ldo5" ,"ldo%s5" , &pmic5_nldo,"vdd-l5-l6" ),RPMH_VREG ("ldo6" ,"ldo%s6" , &pmic5_nldo,"vdd-l5-l6" ), RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-bob"), + {} };static int rpmh_regulator_probe (struct platform_device *pdev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 334/800 regulator: hi6421v600: Fix setting idle mode
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit 57c045bc727001c43b6a65adb0418aa7b3e6dbd0 ]
commit db27f8294cd7 changed eco_mode << (ffs(sreg->eco_mode_mask) - 1) to sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1) which is wrong. Fix it by simply set val = sreg->eco_mode_mask.
In additional, sreg->eco_mode_mask can be 0 (LDO3, LDO33, LDO34). Return -EINVAL if idle mode is not supported when sreg->eco_mode_mask is 0.
While at it, also use unsigned int for reg_val/val which is the expected type for regmap_read and regmap_update_bits.
--- drivers/regulator/hi6421v600-regulator.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/regulator/hi6421v600-regulator.c +6 -3
@@ -129,7 +129,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) {struct hi6421_spmi_reg_info *sreg =rdev_get_drvdata (rdev);struct hi6421_spmi_pmic *pmic = sreg->pmic; -u32 reg_val; +unsigned int reg_val;regmap_read (pmic->regmap, rdev->desc->enable_reg, ®_val);
@@ -144,14 +144,17 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, {struct hi6421_spmi_reg_info *sreg =rdev_get_drvdata (rdev);struct hi6421_spmi_pmic *pmic = sreg->pmic; -u32 val; +unsigned int val;switch (mode) {case REGULATOR_MODE_NORMAL : val =0 ;break ;case REGULATOR_MODE_IDLE : - val = sreg->eco_mode_mask << (ffs (sreg->eco_mode_mask) -1 ); +if (!sreg->eco_mode_mask) +return -EINVAL ; + + val = sreg->eco_mode_mask;break ;default :return -EINVAL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 335/800 regulator: bd9576: Fix the driver name in id table
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
[ Upstream commit e71e7d3df7eb712fc29b609bd712a63d60b81b5f ]
Driver name was changed in MFD cell:
https://lore.kernel.org/lkml/560b9748094392493ebf7af11b6cc558776c4fd5.1613031055.git.matti.vaittinen@fi.rohmeurope.com/
Fix the ID table to match this.
--- drivers/regulator/bd9576-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/bd9576-regulator.c +2 -2
@@ -312,8 +312,8 @@ static int bd957x_probe(struct platform_device *pdev) }static const struct platform_device_id bd957x_pmic_id[] = { - {"bd9573-pmic" ,ROHM_CHIP_TYPE_BD9573 }, - {"bd9576-pmic" ,ROHM_CHIP_TYPE_BD9576 }, + {"bd9573-regulator" ,ROHM_CHIP_TYPE_BD9573 }, + {"bd9576-regulator" ,ROHM_CHIP_TYPE_BD9576 }, { }, };MODULE_DEVICE_TABLE (platform, bd957x_pmic_id);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 336/800 btrfs: clear log tree recovering status if starting transaction fails
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
[ Upstream commit 1aeb6b563aea18cd55c73cf666d1d3245a00f08c ]
When a log recovery is in progress, lots of operations have to take that into account, so we keep this status per tree during the operation. Long time ago error handling revamp patch 79787eaab461 ("btrfs: replace many BUG_ONs with proper error handling") removed clearing of the status in an error branch. Add it back as was intended in e02119d5a7b4 ("Btrfs:
Add a write ahead tree log to optimize synchronous operations").
There are probably no visible effects, log replay is done only during mount and if it fails all structures are cleared so the stale status won't be kept.
--- fs/btrfs/tree-log.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/tree-log.c +1 -0
@@ -6371,6 +6371,7 @@ next: error:if (wc.trans)btrfs_end_transaction (wc.trans); +clear_bit (BTRFS_FS_LOG_RECOVERING , &fs_info->flags);btrfs_free_path (path);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 337/800 x86/sev: Make sure IRQs are disabled while GHCB is active
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
[ Upstream commit d187f217335dba2b49fc9002aab2004e04acddee ]
The #VC handler only cares about IRQs being disabled while the GHCB is active, as it must not be interrupted by something which could cause another #VC while it holds the GHCB (NMI is the exception for which the backup GHCB exits).
Make sure nothing interrupts the code path while the GHCB is active by making sure that callers of __sev_{get,put}_ghcb() have disabled interrupts upfront.
[ bp: Massage commit message. ]
--- arch/x86/kernel/sev.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
arch/x86/kernel/sev.c +22 -12
@@ -12,7 +12,6 @@#include <linux/sched/debug.h> /* For show_regs() */ #include <linux/percpu-defs.h> #include <linux/mem_encrypt.h> -#include <linux/lockdep.h> #include <linux/printk.h> #include <linux/mm_types.h> #include <linux/set_memory.h>
@@ -192,11 +191,19 @@ void noinstr __sev_es_ist_exit(void)this_cpu_write (cpu_tss_rw.x86_tss.ist[IST_INDEX_VC ], *(unsigned long *)ist); } -static __always_inline struct ghcb *sev_es_get_ghcb(struct ghcb_state *state) +/* +* Nothing shall interrupt this code path while holding the per-CPU +* GHCB. The backup GHCB is only for NMIs interrupting this path. +* +* Callers must disable local interrupts around it. +*/ +static noinstr struct ghcb *__sev_get_ghcb(struct ghcb_state *state) {struct sev_es_runtime_data *data;struct ghcb *ghcb; +WARN_ON (!irqs_disabled ()); + data =this_cpu_read (runtime_data); ghcb = &data->ghcb_page;
@@ -213,7 +220,9 @@ static __always_inline struct ghcb *sev_es_get_ghcb(struct ghcb_state *state) data->ghcb_active = false; data->backup_ghcb_active = false; +instrumentation_begin ();panic ("Unable to handle #VC exception! GHCB and Backup GHCB are already in use" ); +instrumentation_end (); }/* Mark backup_ghcb active before writing to it */
@@ -479,11 +488,13 @@ static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt/* Include code shared with pre-decompression boot stage */ #include "sev-shared.c" -static __always_inline void sev_es_put_ghcb(struct ghcb_state *state) +static noinstr void __sev_put_ghcb(struct ghcb_state *state) {struct sev_es_runtime_data *data;struct ghcb *ghcb; +WARN_ON (!irqs_disabled ()); + data =this_cpu_read (runtime_data); ghcb = &data->ghcb_page;
@@ -507,7 +518,7 @@ void noinstr __sev_es_nmi_complete(void)struct ghcb_state state;struct ghcb *ghcb; - ghcb =sev_es_get_ghcb (&state); + ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb);ghcb_set_sw_exit_code (ghcb,SVM_VMGEXIT_NMI_COMPLETE );
@@ -517,7 +528,7 @@ void noinstr __sev_es_nmi_complete(void)sev_es_wr_ghcb_msr (__pa_nodebug (ghcb));VMGEXIT (); -sev_es_put_ghcb (&state); +__sev_put_ghcb (&state); }static u64 get_jump_table_addr (void )
@@ -529,7 +540,7 @@ static u64 get_jump_table_addr(void)local_irq_save (flags); - ghcb =sev_es_get_ghcb (&state); + ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb);ghcb_set_sw_exit_code (ghcb,SVM_VMGEXIT_AP_JUMP_TABLE );
@@ -543,7 +554,7 @@ static u64 get_jump_table_addr(void) ghcb_sw_exit_info_2_is_valid(ghcb)) ret = ghcb->save.sw_exit_info_2; -sev_es_put_ghcb (&state); +__sev_put_ghcb (&state);local_irq_restore (flags);
@@ -668,7 +679,7 @@ static void sev_es_ap_hlt_loop(void)struct ghcb_state state;struct ghcb *ghcb; - ghcb =sev_es_get_ghcb (&state); + ghcb =__sev_get_ghcb (&state);while (true) {vc_ghcb_invalidate (ghcb);
@@ -685,7 +696,7 @@ static void sev_es_ap_hlt_loop(void)break ; } -sev_es_put_ghcb (&state); +__sev_put_ghcb (&state); }/*
@@ -1344,7 +1355,6 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication) } irq_state =irqentry_nmi_enter (regs); -lockdep_assert_irqs_disabled ();instrumentation_begin ();/*
@@ -1353,7 +1363,7 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication)* keep the IRQs disabled to protect us against concurrent TLB flushes. */ - ghcb =sev_es_get_ghcb (&state); + ghcb =__sev_get_ghcb (&state);vc_ghcb_invalidate (ghcb); result =vc_init_em_ctxt (&ctxt, regs, error_code);
@@ -1361,7 +1371,7 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication)if (result ==ES_OK ) result =vc_handle_exitcode (&ctxt, ghcb, error_code); -sev_es_put_ghcb (&state); +__sev_put_ghcb (&state);/* Done - now check the result */ switch (result) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 338/800 x86/sev: Split up runtime #VC handler for correct state tracking
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
[ Upstream commit be1a5408868af341f61f93c191b5e346ee88c82a ]
Split up the #VC handler code into a from-user and a from-kernel part. This allows clean and correct state tracking, as the #VC handler needs to enter NMI-state when raised from kernel mode and plain IRQ state when raised from user-mode.
--- arch/x86/entry/entry_64.S | 4 +- arch/x86/include/asm/idtentry.h | 29 +++---- arch/x86/kernel/sev.c | 148 +++++++++++++++++--------------- 3 files changed, 91 insertions(+), 90 deletions(-)
arch/x86/entry/entry_64.S +2 -2
@@ -506,7 +506,7 @@ SYM_CODE_START(\asmsym) movq %rsp, %rdi /* pt_regs pointer */ - call \cfunc + call kernel_\cfunc /* * No need to switch back to the IST stack. The current stack is either
@@ -517,7 +517,7 @@ SYM_CODE_START(\asmsym) /* Switch to the regular task stack */ .Lfrom_usermode_switch_stack_\@: - idtentry_body safe_stack_\cfunc, has_error_code=1 + idtentry_body user_\cfunc, has_error_code=1 _ASM_NOKPROBE(\asmsym) SYM_CODE_END(\asmsym)
arch/x86/include/asm/idtentry.h +10 -19
@@ -312,8 +312,8 @@ static __always_inline void __##func(struct pt_regs *regs)*/ #define DECLARE_IDTENTRY_VC (vector, func) \ DECLARE_IDTENTRY_RAW_ERRORCODE(vector, func); \ - __visible noinstr void ist_##func(struct pt_regs *regs, unsigned long error_code); \ - __visible noinstr void safe_stack_##func(struct pt_regs *regs, unsigned long error_code) + __visible noinstr void kernel_##func(struct pt_regs *regs, unsigned long error_code); \ + __visible noinstr void user_##func(struct pt_regs *regs, unsigned long error_code)/** * DEFINE_IDTENTRY_IST - Emit code for IST entry points
@@ -355,33 +355,24 @@ static __always_inline void __##func(struct pt_regs *regs)DEFINE_IDTENTRY_RAW_ERRORCODE (func)/** -* DEFINE_IDTENTRY_VC_SAFE_STACK - Emit code for VMM communication handler -which runs on a safe stack. +* DEFINE_IDTENTRY_VC_KERNEL - Emit code for VMM communication handler +when raised from kernel mode * @func: Function name of the entry point * * Maps to DEFINE_IDTENTRY_RAW_ERRORCODE */ -#define DEFINE_IDTENTRY_VC_SAFE_STACK (func) \ - DEFINE_IDTENTRY_RAW_ERRORCODE(safe_stack_##func) +#define DEFINE_IDTENTRY_VC_KERNEL (func) \ + DEFINE_IDTENTRY_RAW_ERRORCODE(kernel_##func)/** -* DEFINE_IDTENTRY_VC_IST - Emit code for VMM communication handler -which runs on the VC fall-back stack +* DEFINE_IDTENTRY_VC_USER - Emit code for VMM communication handler +when raised from user mode * @func: Function name of the entry point * * Maps to DEFINE_IDTENTRY_RAW_ERRORCODE */ -#define DEFINE_IDTENTRY_VC_IST (func) \ - DEFINE_IDTENTRY_RAW_ERRORCODE(ist_##func) - -/** -* DEFINE_IDTENTRY_VC - Emit code for VMM communication handler -* @func: Function name of the entry point -* -* Maps to DEFINE_IDTENTRY_RAW_ERRORCODE -*/ -#define DEFINE_IDTENTRY_VC (func) \ - DEFINE_IDTENTRY_RAW_ERRORCODE(func) +#define DEFINE_IDTENTRY_VC_USER (func) \ + DEFINE_IDTENTRY_RAW_ERRORCODE(user_##func)#else /* CONFIG_X86_64 */
arch/x86/kernel/sev.c +79 -69
203 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 339/800 sched/rt: Fix RT utilization tracking during policy change
In reply to Greg Kroah-HartmanFrom: Vincent Donnefort <[email protected]>
[ Upstream commit fecfcbc288e9f4923f40fd23ca78a6acdc7fdf6c ]
RT keeps track of the utilization on a per-rq basis with the structure avg_rt. This utilization is updated during task_tick_rt(), put_prev_task_rt() and set_next_task_rt(). However, when the current running task changes its policy, set_next_task_rt() which would usually take care of updating the utilization when the rq starts running RT tasks, will not see a such change, leaving the avg_rt structure outdated. When that very same task will be dequeued later, put_prev_task_rt() will then update the utilization, based on a wrong last_update_time, leading to a huge spike in the RT utilization signal.
The signal would eventually recover from this issue after few ms. Even if no RT tasks are run, avg_rt is also updated in __update_blocked_others(). But as the CPU capacity depends partly on the avg_rt, this issue has nonetheless a significant impact on the scheduler.
Fix this issue by ensuring a load update when a running task changes its policy to RT.
--- kernel/sched/rt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
kernel/sched/rt.c +12 -5
@@ -2331,13 +2331,20 @@ void __init init_sched_rt_class(void)static void switched_to_rt (struct rq *rq,struct task_struct *p) {/* -* If we are already running, then there's nothing -* that needs to be done. But if we are not running -* we may need to preempt the current running task. -* If that current running task is also an RT task +* If we are running, update the avg_rt tracking, as the running time +* will now on be accounted into the latter. +*/ +if (task_current (rq, p)) { +update_rt_rq_load_avg (rq_clock_pelt (rq), rq,0 ); +return ; + } + +/* +* If we are not running we may need to preempt the current +* running task. If that current running task is also an RT task * then see if we can move to another run queue. */ -if (task_on_rq_queued (p) && rq->curr != p) { +if (task_on_rq_queued (p)) {#ifdef CONFIG_SMP if (p->nr_cpus_allowed >1 && rq->rt.overloaded)rt_queue_push_tasks (rq);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 340/800 sched/rt: Fix Deadline utilization tracking during policy change
In reply to Greg Kroah-HartmanFrom: Vincent Donnefort <[email protected]>
[ Upstream commit d7d607096ae6d378b4e92d49946d22739c047d4c ]
DL keeps track of the utilization on a per-rq basis with the structure avg_dl. This utilization is updated during task_tick_dl(), put_prev_task_dl() and set_next_task_dl(). However, when the current running task changes its policy, set_next_task_dl() which would usually take care of updating the utilization when the rq starts running DL tasks, will not see a such change, leaving the avg_dl structure outdated. When that very same task will be dequeued later, put_prev_task_dl() will then update the utilization, based on a wrong last_update_time, leading to a huge spike in the DL utilization signal.
The signal would eventually recover from this issue after few ms. Even if no DL tasks are run, avg_dl is also updated in __update_blocked_others(). But as the CPU capacity depends partly on the avg_dl, this issue has nonetheless a significant impact on the scheduler.
Fix this issue by ensuring a load update when a running task changes its policy to DL.
--- kernel/sched/deadline.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sched/deadline.c +2 -0
@@ -2486,6 +2486,8 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)check_preempt_curr_dl (rq, p,0 ); elseresched_curr (rq ); + }else { +update_dl_rq_load_avg (rq_clock_pelt (rq), rq,0 ); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 341/800 sched/uclamp: Fix uclamp_tg_restrict()
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 0213b7083e81f4acd69db32cb72eb4e5f220329a ]
Now cpu.uclamp.min acts as a protection, we need to make sure that the uclamp request of the task is within the allowed range of the cgroup, that is it is clamp()'ed correctly by tg->uclamp[UCLAMP_MIN] and tg->uclamp[UCLAMP_MAX].
As reported by Xuewen [1] we can have some corner cases where there's inversion between uclamp requested by task (p) and the uclamp values of the taskgroup it's attached to (tg). Following table demonstrates 2 corner cases:
| p | tg | effective -----------+-----+------+----------- CASE 1 -----------+-----+------+----------- uclamp_min | 60% | 0% | 60% -----------+-----+------+----------- uclamp_max | 80% | 50% | 50% -----------+-----+------+----------- CASE 2 -----------+-----+------+----------- uclamp_min | 0% | 30% | 30% -----------+-----+------+----------- uclamp_max | 20% | 50% | 20% -----------+-----+------+-----------
With this fix we get:
| p | tg | effective -----------+-----+------+----------- CASE 1 -----------+-----+------+----------- uclamp_min | 60% | 0% | 50% -----------+-----+------+----------- uclamp_max | 80% | 50% | 50% -----------+-----+------+----------- CASE 2 -----------+-----+------+----------- uclamp_min | 0% | 30% | 30% -----------+-----+------+----------- uclamp_max | 20% | 50% | 30% -----------+-----+------+-----------
Additionally uclamp_update_active_tasks() must now unconditionally update both UCLAMP_MIN/MAX because changing the tg's UCLAMP_MAX for instance could have an impact on the effective UCLAMP_MIN of the tasks.
| p | tg | effective -----------+-----+------+----------- old -----------+-----+------+----------- uclamp_min | 60% | 0% | 50% -----------+-----+------+----------- uclamp_max | 80% | 50% | 50% -----------+-----+------+----------- *new* -----------+-----+------+----------- uclamp_min | 60% | 0% | *60%* -----------+-----+------+----------- uclamp_max | 80% |*70%* | *70%* -----------+-----+------+-----------
[1] https://lore.kernel.org/lkml/CAB8ipk_a6VFNjiEnHRHkUMBKbA+qzPQvhtNjJ_YNzQhqV_o8Zw@mail.gmail.com/
--- kernel/sched/core.c | 49 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 31 deletions(-)
kernel/sched/core.c +18 -31
@@ -1065,8 +1065,10 @@ static void uclamp_sync_util_min_rt_default(void)static inline struct uclamp_se uclamp_tg_restrict (struct task_struct *p,enum uclamp_id clamp_id) { +/* Copy by value as we could modify it */ struct uclamp_se uc_req = p->uclamp_req[clamp_id];#ifdef CONFIG_UCLAMP_TASK_GROUP +unsigned int tg_min, tg_max, value;/* * Tasks in autogroups or root task group will be
@@ -1077,23 +1079,11 @@ uclamp_tg_restrict(struct task_struct *p, enum uclamp_id clamp_id)if (task_group (p) == &root_task_group)return uc_req; -switch (clamp_id) { -case UCLAMP_MIN : { -struct uclamp_se uc_min =task_group (p)->uclamp[clamp_id]; -if (uc_req.value < uc_min.value) -return uc_min; -break ; - } -case UCLAMP_MAX : { -struct uclamp_se uc_max =task_group (p)->uclamp[clamp_id]; -if (uc_req.value > uc_max.value) -return uc_max; -break ; - } -default : -WARN_ON_ONCE (1 ); -break ; - } + tg_min =task_group (p)->uclamp[UCLAMP_MIN ].value; + tg_max =task_group (p)->uclamp[UCLAMP_MAX ].value; + value = uc_req.value; + value =clamp (value, tg_min, tg_max); +uclamp_se_set (&uc_req, value, false);#endif return uc_req;
@@ -1292,8 +1282,9 @@ static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) }static inline void -uclamp_update_active (struct task_struct *p,enum uclamp_id clamp_id) +uclamp_update_active (struct task_struct *p) { +enum uclamp_id clamp_id;struct rq_flags rf;struct rq *rq;
@@ -1313,9 +1304,11 @@ uclamp_update_active(struct task_struct *p, enum uclamp_id clamp_id)* affecting a valid clamp bucket, the next time it's enqueued, * it will already see the updated clamp bucket value. */ -if (p->uclamp[clamp_id].active) { -uclamp_rq_dec_id (rq, p, clamp_id); -uclamp_rq_inc_id (rq, p, clamp_id); +for_each_clamp_id (clamp_id) { +if (p->uclamp[clamp_id].active) { +uclamp_rq_dec_id (rq, p, clamp_id); +uclamp_rq_inc_id (rq, p, clamp_id); + } }task_rq_unlock (rq, p, &rf);
@@ -1323,20 +1316,14 @@ uclamp_update_active(struct task_struct *p, enum uclamp_id clamp_id)#ifdef CONFIG_UCLAMP_TASK_GROUP static inline void -uclamp_update_active_tasks (struct cgroup_subsys_state *css, -unsigned int clamps) +uclamp_update_active_tasks (struct cgroup_subsys_state *css) { -enum uclamp_id clamp_id;struct css_task_iter it;struct task_struct *p;css_task_iter_start (css,0 , &it); -while ((p =css_task_iter_next (&it))) { -for_each_clamp_id (clamp_id) { -if ((0x1 << clamp_id) & clamps) -uclamp_update_active (p, clamp_id); - } - } +while ((p =css_task_iter_next (&it))) +uclamp_update_active (p);css_task_iter_end (&it); }
@@ -8835,7 +8822,7 @@ static void cpu_util_update_eff(struct cgroup_subsys_state *css) }/* Immediately update descendants RUNNABLE tasks */ -uclamp_update_active_tasks (css, clamps); +uclamp_update_active_tasks (css); } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 342/800 lockdep: Fix wait-type for empty stack
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit f8b298cc39f0619544c607eaef09fd0b2afd10f3 ]
Even the very first lock can violate the wait-context check, consider the various IRQ contexts.
--- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/locking/lockdep.c +1 -1
@@ -4693,7 +4693,7 @@ static int check_wait_context(struct task_struct *curr, struct held_lock *next)u8 curr_inner;int depth; -if (!curr->lockdep_depth || !next_inner || next->trylock) +if (!next_inner || next->trylock)return 0 ;if (!next_outer)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 343/800 lockdep/selftests: Fix selftests vs PROVE_RAW_LOCK_NESTING
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit c0c2c0dad6a06e0c05e9a52d65f932bd54364c97 ]
When PROVE_RAW_LOCK_NESTING=y many of the selftests FAILED because HARDIRQ context is out-of-bounds for spinlocks. Instead make the default hardware context the threaded hardirq context, which preserves the old locking rules.
The wait-type specific locking selftests will have a non-threaded HARDIRQ variant.
--- lib/locking-selftest.c | 1 + 1 file changed, 1 insertion(+)
lib/locking-selftest.c +1 -0
@@ -194,6 +194,7 @@ static void init_shared_classes(void)#define HARDIRQ_ENTER () \ local_irq_disable(); \ __irq_enter(); \ + lockdep_hardirq_threaded(); \ WARN_ON(!in_irq());#define HARDIRQ_EXIT () \
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 344/800 x86/sev: Use "SEV: " prefix for messages from sev.c
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
[ Upstream commit 8d9d46bbf3b6b7ff8edcac33603ab45c29e0e07f ]
The source file has been renamed froms sev-es.c to sev.c, but the messages are still prefixed with "SEV-ES: ". Change that to "SEV: " to make it consistent.
--- arch/x86/kernel/sev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/sev.c +1 -1
@@ -7,7 +7,7 @@* Author: Joerg Roedel <[email protected]> */ -#define pr_fmt (fmt) "SEV-ES: " fmt +#define pr_fmt (fmt) "SEV: " fmt#include <linux/sched/debug.h> /* For show_regs() */ #include <linux/percpu-defs.h>
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 345/800 spi: spi-sun6i: Fix chipselect/clock bug
In reply to Greg Kroah-HartmanFrom: Mirko Vogt <mirko-dev|[email protected]>
[ Upstream commit 0d7993b234c9fad8cb6bec6adfaa74694ba85ecb ]
The current sun6i SPI implementation initializes the transfer too early, resulting in SCK going high before the transfer. When using an additional (gpio) chipselect with sun6i, the chipselect is asserted at a time when clock is high, making the SPI transfer fail.
This is due to SUN6I_GBL_CTL_BUS_ENABLE being written into SUN6I_GBL_CTL_REG at an early stage. Moving that to the transfer function, hence, right before the transfer starts, mitigates that problem.
--- drivers/spi/spi-sun6i.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/spi/spi-sun6i.c +5 -1
@@ -379,6 +379,10 @@ static int sun6i_spi_transfer_one(struct spi_master *master, }sun6i_spi_write (sspi,SUN6I_CLK_CTL_REG , reg); +/* Finally enable the bus - doing so before might raise SCK to HIGH */ + reg =sun6i_spi_read (sspi,SUN6I_GBL_CTL_REG ); + reg |=SUN6I_GBL_CTL_BUS_ENABLE ; +sun6i_spi_write (sspi,SUN6I_GBL_CTL_REG , reg);/* Setup the transfer now... */ if (sspi->tx_buf)
@@ -504,7 +508,7 @@ static int sun6i_spi_runtime_resume(struct device *dev) }sun6i_spi_write (sspi,SUN6I_GBL_CTL_REG , -SUN6I_GBL_CTL_BUS_ENABLE |SUN6I_GBL_CTL_MASTER |SUN6I_GBL_CTL_TP ); +SUN6I_GBL_CTL_MASTER |SUN6I_GBL_CTL_TP );return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 346/800 perf: Fix task context PMU for Hetero
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 012669c740e6e2afa8bdb95394d06676f933dd2d ]
On HETEROGENEOUS hardware (ARM big.Little, Intel Alderlake etc.) each CPU might have a different hardware PMU. Since each such PMU is represented by a different struct pmu, but we only have a single HW task context.
That means that the task context needs to switch PMU type when it switches CPUs.
Not doing this means that ctx->pmu calls (pmu_{dis,en}able(), {start,commit,cancel}_txn() etc.) are called against the wrong PMU and things will go wobbly.
--- kernel/events/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/events/core.c +8 -1
@@ -3821,9 +3821,16 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx, struct task_struct *task) {struct perf_cpu_context *cpuctx; -struct pmu *pmu = ctx->pmu; +struct pmu *pmu; cpuctx =__get_cpu_context (ctx); + +/* +* HACK: for HETEROGENEOUS the task context might have switched to a +* different PMU, force (re)set the context, +*/ + pmu = ctx->pmu = cpuctx->ctx.pmu; +if (cpuctx->task_ctx == ctx) {if (cpuctx->sched_cb_usage)__perf_pmu_sched_task (cpuctx, true);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 347/800 crypto: nx - Fix RCU warning in nx842_OF_upd_status
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 2a96726bd0ccde4f12b9b9a9f61f7b1ac5af7e10 ]
The function nx842_OF_upd_status triggers a sparse RCU warning when it directly dereferences the RCU-protected devdata. This appears to be an accident as there was another variable of the same name that was passed in from the caller.
After it was removed (because the main purpose of using it, to update the status member was itself removed) the global variable unintenionally stood in as its replacement.
This patch restores the devdata parameter.
--- drivers/crypto/nx/nx-842-pseries.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/nx/nx-842-pseries.c +5 -3
@@ -538,13 +538,15 @@ static int nx842_OF_set_defaults(struct nx842_devdata *devdata)* The status field indicates if the device is enabled when the status * is 'okay'. Otherwise the device driver will be disabled. * -* @prop - struct property point containing the maxsyncop for the update +* @devdata: struct nx842_devdata to use for dev_info +* @prop: struct property point containing the maxsyncop for the update * * Returns: * 0 - Device is available * -ENODEV - Device is not available */ -static int nx842_OF_upd_status (struct property *prop) +static int nx842_OF_upd_status (struct nx842_devdata *devdata, +struct property *prop) {const char *status = (const char *)prop->value;
@@ -758,7 +760,7 @@ static int nx842_OF_upd(struct property *new_prop) goto out;/* Perform property updates */ - ret =nx842_OF_upd_status (status); + ret =nx842_OF_upd_status (new_devdata, status);if (ret) goto error_out;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 348/800 objtool: Dont make .altinstructions writable
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit e31694e0a7a709293319475d8001e05e31f2178c ]
When objtool creates the .altinstructions section, it sets the SHF_WRITE flag to make the section writable -- unless the section had already been previously created by the kernel. The mismatch between kernel-created and objtool-created section flags can cause failures with external tooling (kpatch-build). And the section doesn't need to be writable anyway.
Make the section flags consistent with the kernel's.
--- tools/objtool/arch/x86/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/arch/x86/decode.c +1 -1
@@ -684,7 +684,7 @@ static int elf_add_alternative(struct elf *elf, sec =find_section_by_name (elf,".altinstructions" );if (!sec) { sec =elf_create_section (elf,".altinstructions" , -SHF_WRITE , size,0 ); +SHF_ALLOC , size,0 );if (!sec) {WARN_ELF ("elf_create_section" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 349/800 psi: Fix race between psi_trigger_create/destroy
In reply to Greg Kroah-HartmanFrom: Zhaoyang Huang <[email protected]>
[ Upstream commit 8f91efd870ea5d8bc10b0fcc9740db51cd4c0c83 ]
Race detected between psi_trigger_destroy/create as shown below, which cause panic by accessing invalid psi_system->poll_wait->wait_queue_entry and psi_system->poll_timer->entry->next. Under this modification, the race window is removed by initialising poll_wait and poll_timer in group_init which are executed only once at beginning.
psi_trigger_destroy() psi_trigger_create()
mutex_lock(trigger_lock);
rcu_assign_pointer(poll_task, NULL);
mutex_unlock(trigger_lock);
mutex_lock(trigger_lock);
if (!rcu_access_pointer(group->poll_task)) {
timer_setup(poll_timer, poll_timer_fn, 0);
rcu_assign_pointer(poll_task, task);
}
mutex_unlock(trigger_lock); synchronize_rcu();
del_timer_sync(poll_timer); <-- poll_timer has been reinitialized by
psi_trigger_create()So, trigger_lock/RCU correctly protects destruction of group->poll_task but misses this race affecting poll_timer and poll_wait.
--- kernel/sched/psi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/sched/psi.c +6 -6
@@ -182,6 +182,8 @@ struct psi_group psi_system = {static void psi_avgs_work (struct work_struct *work); +static void poll_timer_fn (struct timer_list *t); +static void group_init (struct psi_group *group) {int cpu;
@@ -201,6 +203,8 @@ static void group_init(struct psi_group *group)memset (group->polling_total,0 ,sizeof (group->polling_total)); group->polling_next_update =ULLONG_MAX ; group->polling_until =0 ; +init_waitqueue_head (&group->poll_wait); +timer_setup (&group->poll_timer, poll_timer_fn,0 );rcu_assign_pointer (group->poll_task,NULL ); }
@@ -1157,9 +1161,7 @@ struct psi_trigger *psi_trigger_create(struct psi_group *group,return ERR_CAST (task); }atomic_set (&group->poll_wakeup,0 ); -init_waitqueue_head (&group->poll_wait);wake_up_process (task); -timer_setup (&group->poll_timer, poll_timer_fn,0 );rcu_assign_pointer (group->poll_task, task); }
@@ -1211,6 +1213,7 @@ static void psi_trigger_destroy(struct kref *ref) group->poll_task, lockdep_is_held(&group->trigger_lock));rcu_assign_pointer (group->poll_task,NULL ); +del_timer (&group->poll_timer); } }
@@ -1223,17 +1226,14 @@ static void psi_trigger_destroy(struct kref *ref)*/ synchronize_rcu ();/* -* Destroy the kworker after releasing trigger_lock to prevent a +* Stop kthread 'psimon' after releasing trigger_lock to prevent a * deadlock while waiting for psi_poll_work to acquire trigger_lock */ if (task_to_destroy) {/* * After the RCU grace period has expired, the worker * can no longer be found through group->poll_task. -* But it might have been already scheduled before -* that - deschedule it cleanly before destroying it. */ -del_timer_sync (&group->poll_timer);kthread_stop (task_to_destroy); }kfree (t);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 350/800 KVM: selftests: fix triple fault if ept=0 in dirty_log_test
In reply to Greg Kroah-HartmanFrom: Hou Wenlong <[email protected]>
[ Upstream commit e5830fb13b8cad5e3bdf84f0f7a3dcb4f4d9bcbb ]
Commit 22f232d134e1 ("KVM: selftests: x86: Set supported CPUIDs on default VM") moved vcpu_set_cpuid into vm_create_with_vcpus, but dirty_log_test doesn't use it to create vm. So vcpu's CPUIDs is not set, the guest's pa_bits in kvm would be smaller than the value queried by userspace.
However, the dirty track memory slot is in the highest GPA, the reserved bits in gpte would be set with wrong pa_bits. For shadow paging, page fault would fail in permission_fault and be injected into guest. Since guest doesn't have idt, it finally leads to vm_exit for triple fault.
Move vcpu_set_cpuid into vm_vcpu_add_default to set supported CPUIDs on default vcpu, since almost all tests need it.
Message-Id: <411ea2173f89abce56fc1fca5af913ed9c5a89c9.1624351343.git.houwenlong93@linux.alibaba.com>
--- tools/testing/selftests/kvm/lib/kvm_util.c | 4 ---- tools/testing/selftests/kvm/lib/x86_64/processor.c | 3 +++ tools/testing/selftests/kvm/steal_time.c | 2 -- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +0 -4
@@ -375,10 +375,6 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,uint32_t vcpuid = vcpuids ? vcpuids[i] : i;vm_vcpu_add_default (vm, vcpuid, guest_code); - -#ifdef __x86_64__ -vcpu_set_cpuid (vm, vcpuid,kvm_get_supported_cpuid ()); -#endif }return vm;
tools/testing/selftests/kvm/lib/x86_64/processor.c +3 -0
@@ -600,6 +600,9 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)/* Setup the MP state */ mp_state.mp_state =0 ;vcpu_set_mp_state (vm, vcpuid, &mp_state); + +/* Setup supported CPUIDs */ +vcpu_set_cpuid (vm, vcpuid,kvm_get_supported_cpuid ()); }/*
tools/testing/selftests/kvm/steal_time.c +0 -2
@@ -73,8 +73,6 @@ static void steal_time_init(struct kvm_vm *vm)for (i =0 ; i <NR_VCPUS ; ++i) {int ret; -vcpu_set_cpuid (vm, i,kvm_get_supported_cpuid ()); -/* ST_GPA_BASE is identity mapped */ st_gva[i] = (void *)(ST_GPA_BASE + i *STEAL_TIME_SIZE );sync_global_to_guest (vm, st_gva[i]);
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +0 -2
@@ -106,8 +106,6 @@ static void add_x86_vcpu(struct kvm_vm *vm, uint32_t vcpuid, bool bsp_code)vm_vcpu_add_default (vm, vcpuid, guest_bsp_vcpu); elsevm_vcpu_add_default (vm ,vcpuid ,guest_not_bsp_vcpu ); - -vcpu_set_cpuid (vm, vcpuid,kvm_get_supported_cpuid ()); }static void run_vm_bsp (uint32_t bsp_vcpu)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 351/800 KVM: selftests: Remove errant asm/barrier.h include to fix arm64 build
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit ecc3a92c6f4953c134a9590c762755e6593f507c ]
Drop an unnecessary include of asm/barrier.h from dirty_log_test.c to allow the test to build on arm64. arm64, s390, and x86 all build cleanly without the include (PPC and MIPS aren't supported in KVM's selftests).
arm64's barrier.h includes linux/kasan-checks.h, which is not copied into tools/.
In file included from ../../../../tools/include/asm/barrier.h:8,
from dirty_log_test.c:19:
.../arm64/include/asm/barrier.h:12:10: fatal error: linux/kasan-checks.h: No such file or directory 12 | #include <linux/kasan-checks.h>
| ^~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Message-Id: <[email protected]>
--- tools/testing/selftests/kvm/dirty_log_test.c | 1 - 1 file changed, 1 deletion(-)
tools/testing/selftests/kvm/dirty_log_test.c +0 -1
@@ -16,7 +16,6 @@#include <errno.h> #include <linux/bitmap.h> #include <linux/bitops.h> -#include <asm/barrier.h> #include <linux/atomic.h> #include "kvm_util.h"
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 352/800 media: video-mux: Skip dangling endpoints
In reply to Greg Kroah-HartmanFrom: Philipp Zabel <[email protected]>
[ Upstream commit 95778c2d0979618e3349b1d2324ec282a5a6adbf ]
i.MX6 device tree include files contain dangling endpoints for the board device tree writers' convenience. These are still included in many existing device trees.
Treat dangling endpoints as non-existent to support them.
--- drivers/media/platform/video-mux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/media/platform/video-mux.c +9 -1
@@ -362,7 +362,7 @@ static int video_mux_async_register(struct video_mux *vmux,for (i =0 ; i < num_input_pads; i++) {struct v4l2_async_subdev *asd; -struct fwnode_handle *ep; +struct fwnode_handle *ep, *remote_ep; ep = fwnode_graph_get_endpoint_by_id( dev_fwnode(vmux->subdev.dev), i, 0,
@@ -370,6 +370,14 @@ static int video_mux_async_register(struct video_mux *vmux,if (!ep)continue ; +/* Skip dangling endpoints for backwards compatibility */ + remote_ep =fwnode_graph_get_remote_endpoint (ep); +if (!remote_ep) { +fwnode_handle_put (ep); +continue ; + } +fwnode_handle_put (remote_ep); + asd =v4l2_async_notifier_add_fwnode_remote_subdev ( &vmux->notifier, ep, struct v4l2_async_subdev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 353/800 media: mtk-vpu: on suspend, read/write regs only if vpu is running
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit 11420749c6b4b237361750de3d5b5579175f8622 ]
If the vpu is not running, we should not rely on VPU_IDLE_REG value. In this case, the suspend cb should only unprepare the clock. This fixes a system-wide suspend to ram failure:
[ 273.073363] PM: suspend entry (deep) [ 273.410502] mtk-msdc 11230000.mmc: phase: [map:ffffffff] [maxlen:32] [final:10] [ 273.455926] Filesystems sync: 0.378 seconds [ 273.589707] Freezing user space processes ... (elapsed 0.003 seconds) done. [ 273.600104] OOM killer disabled. [ 273.603409] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done. [ 273.613361] mwifiex_sdio mmc2:0001:1: None of the WOWLAN triggers enabled [ 274.784952] mtk_vpu 10020000.vpu: vpu idle timeout [ 274.789764] PM: dpm_run_callback(): platform_pm_suspend+0x0/0x70 returns -5 [ 274.796740] mtk_vpu 10020000.vpu: PM: failed to suspend: error -5 [ 274.802842] PM: Some devices failed to suspend, or early wake event detected [ 275.426489] OOM killer enabled. [ 275.429718] Restarting tasks ... [ 275.435765] done. [ 275.447510] PM: suspend exit
--- drivers/media/platform/mtk-vpu/mtk_vpu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/mtk-vpu/mtk_vpu.c +6 -0
@@ -987,6 +987,12 @@ static int mtk_vpu_suspend(struct device *dev)return ret; } +if (!vpu_running (vpu)) { +vpu_clock_disable (vpu); +clk_unprepare (vpu->clk); +return 0 ; + } +mutex_lock (&vpu->vpu_mutex);/* disable vpu timer interrupt */ vpu_cfg_writel(vpu, vpu_cfg_readl(vpu, VPU_INT_STATUS) | VPU_IDLE_STATE,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 354/800 media: s5p-mfc: Fix display delay control creation
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 61c6f04a988e420a1fc5e8e81cf9aebf142a7bd6 ]
v4l2_ctrl_new_std() fails if the caller provides no 'step' parameter for integer control, so define it to fix following error:
s5p_mfc_dec_ctrls_setup:1166: Adding control (1) failed
--- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +1 -0
@@ -172,6 +172,7 @@ static struct mfc_control controls[] = { .type = V4L2_CTRL_TYPE_INTEGER, .minimum = 0, .maximum = 16383, + .step = 1, .default_value = 0, }, {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 355/800 EDAC/aspeed: Use proper format string for printing resource
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 2e2f16d5cdb33e5f6fc53b7ad66c9f456d5f2950 ]
On ARMv7, resource_size_t can be 64-bit, which breaks printing it as %x:
drivers/edac/aspeed_edac.c: In function 'init_csrows':
drivers/edac/aspeed_edac.c:257:28: error: format '%x' expects argument of \
type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long \
long unsigned int'} [-Werror=format=]
257 | dev_dbg(mci->pdev, "dt: /memory node resources: first page \
r.start=0x%x, resource_size=0x%x, PAGE_SHIFT macro=0x%x\n",Use the special %pR format string to pretty-print the entire resource instead.
--- drivers/edac/aspeed_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/aspeed_edac.c +2 -2
@@ -254,8 +254,8 @@ static int init_csrows(struct mem_ctl_info *mci)return rc; } -dev_dbg (mci->pdev,"dt: /memory node resources: first page r.start=0x%x, resource_size=0x%x, PAGE_SHIFT macro=0x%x\n" , - r.start,resource_size (&r),PAGE_SHIFT ); +dev_dbg (mci->pdev,"dt: /memory node resources: first page %pR, PAGE_SHIFT macro=0x%x\n" , + &r,PAGE_SHIFT ); csrow->first_page = r.start >>PAGE_SHIFT ; nr_pages =resource_size (&r) >>PAGE_SHIFT ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 356/800 PM / devfreq: Add missing error code in devfreq_add_device()
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 18b380ed61f892ed06838d1f1a5124d966292ed3 ]
Set err code in the error path before jumping to the end of the function.
--- drivers/devfreq/devfreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/devfreq/devfreq.c +1 -0
@@ -823,6 +823,7 @@ struct devfreq *devfreq_add_device(struct device *dev,if (devfreq->profile->timer <0 || devfreq->profile->timer >=DEVFREQ_TIMER_NUM ) {mutex_unlock (&devfreq->lock); + err = -EINVAL ; goto err_dev; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 357/800 ACPI: PM / fan: Put fan device IDs into separate header file
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit b9370dceabb7841c5e65ce4ee4405b9db5231fc4 ]
The ACPI fan device IDs are shared between the fan driver and the device power management code. The former is modular, so it needs to include the table of device IDs for module autoloading and the latter needs that list to avoid attaching the generic ACPI PM domain to fan devices (which doesn't make sense) possibly before the fan driver module is loaded.
Unfortunately, that requires the list of fan device IDs to be updated in two places which is prone to mistakes, so put it into a symbol definition in a separate header file so there is only one copy of it in case it needs to be updated again in the future.
--- drivers/acpi/device_pm.c | 6 ++---- drivers/acpi/fan.c | 7 +++---- drivers/acpi/fan.h | 13 +++++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 drivers/acpi/fan.h
drivers/acpi/device_pm.c +2 -4
@@ -20,6 +20,7 @@#include <linux/pm_runtime.h> #include <linux/suspend.h> +#include "fan.h" #include "internal.h" /**
@@ -1310,10 +1311,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)* with the generic ACPI PM domain. */ static const struct acpi_device_id special_pm_ids[] = { - {"PNP0C0B" , },/* Generic ACPI fan */ - {"INT3404" , },/* Fan */ - {"INTC1044" , },/* Fan for Tiger Lake generation */ - {"INTC1048" , },/* Fan for Alder Lake generation */ +ACPI_FAN_DEVICE_IDS , {} };struct acpi_device *adev =ACPI_COMPANION (dev);
drivers/acpi/fan.c +3 -4
@@ -16,6 +16,8 @@#include <linux/platform_device.h> #include <linux/sort.h> +#include "fan.h" +MODULE_AUTHOR ("Paul Diefenbaugh" );MODULE_DESCRIPTION ("ACPI Fan Driver" );MODULE_LICENSE ("GPL" );
@@ -24,10 +26,7 @@ static int acpi_fan_probe(struct platform_device *pdev);static int acpi_fan_remove (struct platform_device *pdev);static const struct acpi_device_id fan_device_ids[] = { - {"PNP0C0B" ,0 }, - {"INT3404" ,0 }, - {"INTC1044" ,0 }, - {"INTC1048" ,0 }, +ACPI_FAN_DEVICE_IDS , {"" ,0 }, };MODULE_DEVICE_TABLE (acpi, fan_device_ids);
drivers/acpi/fan.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* +* ACPI fan device IDs are shared between the fan driver and the device power +* management code. +* +* Add new device IDs before the generic ACPI fan one. +*/ +#define ACPI_FAN_DEVICE_IDS \ + {"INT3404", },/* Fan */ \ + {"INTC1044", }, /* Fan for Tiger Lake generation */ \ + {"INTC1048", }, /* Fan for Alder Lake generation */ \ + {"PNP0C0B", } /* Generic ACPI fan */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 358/800 block: avoid double io accounting for flush request
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 84da7acc3ba53af26f15c4b0ada446127b7a7836 ]
For flush request, rq->end_io() may be called two times, one is from timeout handling(blk_mq_check_expired()), another is from normal completion(__blk_mq_end_request()).
Move blk_account_io_flush() after flush_rq->ref drops to zero, so io accounting can be done just once for flush request.
--- block/blk-flush.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/blk-flush.c +1 -2
@@ -219,8 +219,6 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)unsigned long flags =0 ;struct blk_flush_queue *fq =blk_get_flush_queue (q, flush_rq->mq_ctx); -blk_account_io_flush (flush_rq); -/* release the tag's ownership to the req cloned from */ spin_lock_irqsave (&fq->mq_flush_lock, flags);
@@ -230,6 +228,7 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error)return ; } +blk_account_io_flush (flush_rq);/* * Flush request has to be marked as IDLE when it is really ended * because its .end_io() is called from timeout code path too for
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 359/800 x86/hyperv: fix logical processor creation
In reply to Greg Kroah-HartmanFrom: Praveen Kumar <[email protected]>
[ Upstream commit 450605c28d571eddca39a65fdbc1338add44c6d9 ]
Microsoft Hypervisor expects the logical processor index to be the same as CPU's index during logical processor creation. Using cpu_physical_id confuses hypervisor's scheduler. That causes the root partition not boot when core scheduler is used.
This patch removes the call to cpu_physical_id and uses the CPU index directly for bringing up logical processor. This scheme works for both classic scheduler and core scheduler.
--- arch/x86/kernel/cpu/mshyperv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mshyperv.c +1 -1
@@ -236,7 +236,7 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus)for_each_present_cpu (i) {if (i ==0 )continue ; - ret =hv_call_add_logical_proc (numa_cpu_node (i), i,cpu_physical_id (i)); + ret =hv_call_add_logical_proc (numa_cpu_node (i), i, i);BUG_ON (ret); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 360/800 nvme-pci: look for StorageD3Enable on companion ACPI device instead
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit e21e0243e7b0f1c2a21d21f4d115f7b37175772a ]
The documentation around the StorageD3Enable property hints that it should be made on the PCI device. This is where newer AMD systems set the property and it's required for S0i3 support.
So rather than look for nodes of the root port only present on Intel systems, switch to the companion ACPI device for all systems. David Box from Intel indicated this should work on Intel as well.
--- drivers/nvme/host/pci.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/nvme/host/pci.c +1 -23
@@ -2831,10 +2831,7 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)#ifdef CONFIG_ACPI static bool nvme_acpi_storage_d3 (struct pci_dev *dev) { -struct acpi_device *adev; -struct pci_dev *root; -acpi_handle handle; -acpi_status status; +struct acpi_device *adev =ACPI_COMPANION (&dev->dev);u8 val;/*
@@ -2842,28 +2839,9 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev)* must use D3 to support deep platform power savings during * suspend-to-idle. */ - root =pcie_find_root_port (dev); -if (!root) -return false; - adev =ACPI_COMPANION (&root->dev);if (!adev)return false; - -/* -* The property is defined in the PXSX device for South complex ports -* and in the PEGP device for North complex ports. -*/ - status =acpi_get_handle (adev->handle,"PXSX" , &handle); -if (ACPI_FAILURE (status)) { - status =acpi_get_handle (adev->handle,"PEGP" , &handle); -if (ACPI_FAILURE (status)) -return false; - } - -if (acpi_bus_get_device (handle, &adev)) -return false; -if (fwnode_property_read_u8 (acpi_fwnode_handle (adev),"StorageD3Enable" , &val))return false;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 361/800 ACPI: tables: FPDT: Add missing acpi_put_table() in acpi_init_fpdt()
In reply to Greg Kroah-HartmanFrom: Jing Xiangfeng <[email protected]>
[ Upstream commit dd9eaa23e72572d4f1c03f2e5d2e14a5b5793e79 ]
acpi_init_fpdt() forgets to call acpi_put_table() in an error path.
Add the missing function call to fix it.
--- drivers/acpi/acpi_fpdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/acpi_fpdt.c +3 -1
@@ -240,8 +240,10 @@ static int __init acpi_init_fpdt(void)return 0 ; fpdt_kobj =kobject_create_and_add ("fpdt" , acpi_kobj); -if (!fpdt_kobj) +if (!fpdt_kobj) { +acpi_put_table (header);return -ENOMEM ; + }while (offset < header->length) { subtable = (void *)header + offset;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 362/800 ACPI: sysfs: Fix a buffer overrun problem with description_show()
In reply to Greg Kroah-HartmanFrom: Krzysztof Wilczyński <[email protected]>
[ Upstream commit 888be6067b97132c3992866bbcf647572253ab3f ]
Currently, a device description can be obtained using ACPI, if the _STR method exists for a particular device, and then exposed to the userspace via a sysfs object as a string value.
If the _STR method is available for a given device then the data (usually a Unicode string) is read and stored in a buffer (of the ACPI_TYPE_BUFFER type) with a pointer to said buffer cached in the struct acpi_device_pnp for later access.
The description_show() function is responsible for exposing the device description to the userspace via a corresponding sysfs object and internally calls the utf16s_to_utf8s() function with a pointer to the buffer that contains the Unicode string so that it can be converted from UTF16 encoding to UTF8 and thus allowing for the value to be safely stored and later displayed.
When invoking the utf16s_to_utf8s() function, the description_show() function also sets a limit of the data that can be saved into a provided buffer as a result of the character conversion to be a total of PAGE_SIZE, and upon completion, the utf16s_to_utf8s() function returns an integer value denoting the number of bytes that have been written into the provided buffer.
Following the execution of the utf16s_to_utf8s() a newline character will be added at the end of the resulting buffer so that when the value is read in the userspace through the sysfs object then it would include newline making it more accessible when working with the sysfs file system in the shell, etc. Normally, this wouldn't be a problem, but if the function utf16s_to_utf8s() happens to return the number of bytes written to be precisely PAGE_SIZE, then we would overrun the buffer and write the newline character outside the allotted space which can have undefined consequences or result in a failure.
To fix this buffer overrun, ensure that there always is enough space left for the newline character to be safely appended.
--- drivers/acpi/device_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/device_sysfs.c +1 -1
@@ -448,7 +448,7 @@ static ssize_t description_show(struct device *dev, (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer, acpi_dev->pnp.str_obj->buffer.length,UTF16_LITTLE_ENDIAN , buf, - PAGE_SIZE); + PAGE_SIZE - 1); buf[result++] ='\n' ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 363/800 mark pstore-blk as broken
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit d07f3b081ee632268786601f55e1334d1f68b997 ]
pstore-blk just pokes directly into the pagecache for the block device without going through the file operations for that by faking up it's own file operations that do not match the block device ones.
As this breaks the control of the block layer of it's page cache, and even now just works by accident only the best thing is to just disable this driver.
--- fs/pstore/Kconfig | 1 + 1 file changed, 1 insertion(+)
fs/pstore/Kconfig +1 -0
@@ -173,6 +173,7 @@ config PSTORE_BLK tristate "Log panic/oops to a block device" depends on PSTORE depends on BLOCK + depends on BROKEN select PSTORE_ZONE default n help
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 364/800 md: revert io stats accounting
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit ad3fc798800fb7ca04c1dfc439dba946818048d8 ]
The commit 41d2d848e5c0 ("md: improve io stats accounting") could cause double fault problem per the report [1], and also it is not correct to change ->bi_end_io if md don't own it, so let's revert it.
And io stats accounting will be replemented in later commits.
[1]. https://lore.kernel.org/linux-raid/[email protected]/T/#t
--- drivers/md/md.c | 45 --------------------------------------------- drivers/md/md.h | 1 - 2 files changed, 46 deletions(-)
drivers/md/md.c +0 -45
@@ -441,30 +441,6 @@ check_suspended: }EXPORT_SYMBOL (md_handle_request); -struct md_io { -struct mddev *mddev; -bio_end_io_t *orig_bi_end_io; -void *orig_bi_private; -struct block_device *orig_bi_bdev; -unsigned long start_time; -}; - -static void md_end_io (struct bio *bio) -{ -struct md_io *md_io = bio->bi_private; -struct mddev *mddev = md_io->mddev; - -bio_end_io_acct_remapped (bio, md_io->start_time, md_io->orig_bi_bdev); - - bio->bi_end_io = md_io->orig_bi_end_io; - bio->bi_private = md_io->orig_bi_private; - -mempool_free (md_io, &mddev->md_io_pool); - -if (bio->bi_end_io) - bio->bi_end_io (bio); -} -static blk_qc_t md_submit_bio (struct bio *bio) {const int rw =bio_data_dir (bio);
@@ -489,21 +465,6 @@ static blk_qc_t md_submit_bio(struct bio *bio)return BLK_QC_T_NONE ; } -if (bio->bi_end_io != md_end_io) { -struct md_io *md_io; - - md_io =mempool_alloc (&mddev->md_io_pool,GFP_NOIO ); - md_io->mddev = mddev; - md_io->orig_bi_end_io = bio->bi_end_io; - md_io->orig_bi_private = bio->bi_private; - md_io->orig_bi_bdev = bio->bi_bdev; - - bio->bi_end_io = md_end_io; - bio->bi_private = md_io; - - md_io->start_time =bio_start_io_acct (bio); - } -/* bio could be mergeable after passing to underlayer */ bio->bi_opf &= ~REQ_NOMERGE ;
@@ -5608,7 +5569,6 @@ static void md_free(struct kobject *ko)bioset_exit (&mddev->bio_set);bioset_exit (&mddev->sync_set); -mempool_exit (&mddev->md_io_pool);kfree (mddev); }
@@ -5705,11 +5665,6 @@ static int md_alloc(dev_t dev, char *name)*/ mddev->hold_active =UNTIL_STOP ; - error =mempool_init_kmalloc_pool (&mddev->md_io_pool,BIO_POOL_SIZE , -sizeof (struct md_io )); -if (error) - goto abort; - error = -ENOMEM ; mddev->queue =blk_alloc_queue (NUMA_NO_NODE );if (!mddev->queue)
drivers/md/md.h +0 -1
@@ -487,7 +487,6 @@ struct mddev {struct bio_set sync_set;/* for sync operations like * metadata and bitmap writes */ -mempool_t md_io_pool;/* Generic flush handling. * The last to finish preflush schedules a worker to submit
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 365/800 HID: surface-hid: Fix get-report request
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
[ Upstream commit 2b2bcc76e2ffbaff7e6ec1c62cb9c10881dc70cd ]
Getting a report (e.g. feature report) from a device requires us to send a request indicating which report we want to retrieve and then waiting for the corresponding response containing that report. We already provide the response structure to the request call, but the request isn't marked as a request that expects a response. Thus the request returns before we receive the response and the response buffer indicates a zero length response due to that.
This essentially means that the get-report calls are broken and will always indicate that a report of length zero has been read.
Fix this by appropriately marking the request.
--- drivers/hid/surface-hid/surface_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/surface-hid/surface_hid.c +1 -1
@@ -143,7 +143,7 @@ static int ssam_hid_get_raw_report(struct surface_hid_device *shid, u8 rprt_id, rqst.target_id = shid->uid.target; rqst.instance_id = shid->uid.instance; rqst.command_id =SURFACE_HID_CID_GET_FEATURE_REPORT ; - rqst.flags =0 ; + rqst.flags =SSAM_REQUEST_HAS_RESPONSE ; rqst.length =sizeof (rprt_id); rqst.payload = &rprt_id;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 366/800 clocksource/drivers/timer-ti-dm: Save and restore timer TIOCP_CFG
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 9517c577f9f722270584cfb1a7b4e1354e408658 ]
As we are using cpu_pm to save and restore context, we must also save and restore the timer sysconfig register TIOCP_CFG. This is needed because we are not calling PM runtime functions at all with cpu_pm.
--- drivers/clocksource/timer-ti-dm.c | 6 ++++++ include/clocksource/timer-ti-dm.h | 1 + 2 files changed, 7 insertions(+)
drivers/clocksource/timer-ti-dm.c +6 -0
@@ -78,6 +78,9 @@ static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg,static void omap_timer_restore_context (struct omap_dm_timer *timer) { +__omap_dm_timer_write (timer,OMAP_TIMER_OCP_CFG_OFFSET , + timer->context.ocp_cfg,0 ); +omap_dm_timer_write_reg (timer,OMAP_TIMER_WAKEUP_EN_REG , timer->context.twer); omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG,
@@ -95,6 +98,9 @@ static void omap_timer_restore_context(struct omap_dm_timer *timer)static void omap_timer_save_context (struct omap_dm_timer *timer) { + timer->context.ocp_cfg = +__omap_dm_timer_read (timer,OMAP_TIMER_OCP_CFG_OFFSET ,0 ); + timer->context.tclr =omap_dm_timer_read_reg (timer,OMAP_TIMER_CTRL_REG ); timer->context.twer =
include/clocksource/timer-ti-dm.h +1 -0
@@ -74,6 +74,7 @@#define OMAP_TIMER_ERRATA_I103_I767 0x80000000struct timer_regs { +u32 ocp_cfg;u32 tidr;u32 tier;u32 twer;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 367/800 nvme-tcp: fix error codes in nvme_tcp_setup_ctrl()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 522af60cb2f8e3658bda1902fb7f200dcf888a5c ]
These error paths currently return success but they should return -EOPNOTSUPP.
--- drivers/nvme/host/tcp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/tcp.c +2 -0
@@ -1973,11 +1973,13 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)return ret;if (ctrl->icdoff) { + ret = -EOPNOTSUPP ;dev_err (ctrl->device,"icdoff is not supported!\n" ); goto destroy_admin; }if (!(ctrl->sgls & ((1 <<0 ) | (1 <<1 )))) { + ret = -EOPNOTSUPP ;dev_err (ctrl->device,"Mandatory sgls are not supported!\n" ); goto destroy_admin; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 368/800 extcon: extcon-max8997: Fix IRQ freeing at error path
In reply to Greg Kroah-HartmanFrom: Matti Vaittinen <[email protected]>
[ Upstream commit 610bdc04830a864115e6928fc944f1171dfff6f3 ]
If reading MAX8997_MUIC_REG_STATUS1 fails at probe the driver exits without freeing the requested IRQs.
Free the IRQs prior returning if reading the status fails.
--- drivers/extcon/extcon-max8997.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/extcon/extcon-max8997.c +1 -1
@@ -733,7 +733,7 @@ static int max8997_muic_probe(struct platform_device *pdev) 2, info->status);if (ret) {dev_err (info->dev,"failed to read MUIC register\n" ); -return ret; + goto err_irq; } cable_type =max8997_muic_get_cable_type (info,MAX8997_CABLE_GROUP_ADC , &attached);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 369/800 ACPI: APEI: fix synchronous external aborts in user-mode
In reply to Greg Kroah-HartmanFrom: Xiaofei Tan <[email protected]>
[ Upstream commit ccb5ecdc2ddeaff744ee075b54cdff8a689e8fa7 ]
Before commit 8fcc4ae6faf8 ("arm64: acpi: Make apei_claim_sea() synchronise with APEI's irq work"), do_sea() would unconditionally signal the affected task from the arch code. Since that change, the GHES driver sends the signals.
This exposes a problem as errors the GHES driver doesn't understand or doesn't handle effectively are silently ignored. It will cause the errors get taken again, and circulate endlessly. User-space task get stuck in this loop.
Existing firmware on Kunpeng9xx systems reports cache errors with the 'ARM Processor Error' CPER records.
Do memory failure handling for ARM Processor Error Section just like for Memory Error Section.
--- drivers/acpi/apei/ghes.c | 81 +++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 17 deletions(-)
drivers/acpi/apei/ghes.c +64 -17
@@ -441,28 +441,35 @@ static void ghes_kick_task_work(struct callback_head *head)gen_pool_free (ghes_estatus_pool, (unsigned long )estatus_node, node_len); } -static bool ghes_handle_memory_failure (struct acpi_hest_generic_data *gdata, -int sev) +static bool ghes_do_memory_failure (u64 physical_addr,int flags) {unsigned long pfn; -int flags =-1 ; -int sec_sev =ghes_severity (gdata->error_severity); -struct cper_sec_mem_err *mem_err =acpi_hest_get_payload (gdata);if (!IS_ENABLED (CONFIG_ACPI_APEI_MEMORY_FAILURE ))return false; -if (!(mem_err->validation_bits &CPER_MEM_VALID_PA )) -return false; - - pfn = mem_err->physical_addr >>PAGE_SHIFT ; + pfn =PHYS_PFN (physical_addr);if (!pfn_valid (pfn)) { pr_warn_ratelimited(FW_WARN GHES_PFX"Invalid address in generic error data: %#llx\n" , - mem_err->physical_addr); + physical_addr);return false; } +memory_failure_queue (pfn, flags); +return true; +} + +static bool ghes_handle_memory_failure (struct acpi_hest_generic_data *gdata, +int sev) +{ +int flags =-1 ; +int sec_sev =ghes_severity (gdata->error_severity); +struct cper_sec_mem_err *mem_err =acpi_hest_get_payload (gdata); + +if (!(mem_err->validation_bits &CPER_MEM_VALID_PA )) +return false; +/* iff following two events can be handled properly by now */ if (sec_sev ==GHES_SEV_CORRECTED && (gdata->flags &CPER_SEC_ERROR_THRESHOLD_EXCEEDED ))
@@ -470,14 +477,56 @@ static bool ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata,if (sev ==GHES_SEV_RECOVERABLE && sec_sev ==GHES_SEV_RECOVERABLE ) flags =0 ; -if (flags !=-1 ) { -memory_failure_queue (pfn, flags); -return true; - } +if (flags !=-1 ) +return ghes_do_memory_failure (mem_err->physical_addr, flags);return false; } +static bool ghes_handle_arm_hw_error (struct acpi_hest_generic_data *gdata,int sev) +{ +struct cper_sec_proc_arm *err =acpi_hest_get_payload (gdata); +bool queued = false; +int sec_sev, i; +char *p; + +log_arm_hw_error (err); + + sec_sev =ghes_severity (gdata->error_severity); +if (sev !=GHES_SEV_RECOVERABLE || sec_sev !=GHES_SEV_RECOVERABLE ) +return false; + + p = (char *)(err +1 ); +for (i =0 ; i < err->err_info_num; i++) { +struct cper_arm_err_info *err_info = (struct cper_arm_err_info *)p; +bool is_cache = (err_info->type ==CPER_ARM_CACHE_ERROR ); +bool has_pa = (err_info->validation_bits &CPER_ARM_INFO_VALID_PHYSICAL_ADDR ); +const char *error_type ="unknown error" ; + +/* +* The field (err_info->error_info & BIT(26)) is fixed to set to +* 1 in some old firmware of HiSilicon Kunpeng920. We assume that +* firmware won't mix corrected errors in an uncorrected section, +* and don't filter out 'corrected' error here. +*/ +if (is_cache && has_pa) { + queued =ghes_do_memory_failure (err_info->physical_fault_addr,0 ); + p += err_info->length; +continue ; + } + +if (err_info->type <ARRAY_SIZE (cper_proc_error_type_strs)) + error_type = cper_proc_error_type_strs[err_info->type]; + + pr_warn_ratelimited(FW_WARN GHES_PFX +"Unhandled processor error type: %s\n" , + error_type); + p += err_info->length; + } + +return queued; +} +/* * PCIe AER errors need to be sent to the AER driver for reporting and * recovery. The GHES severities map to the following AER severities and
@@ -605,9 +654,7 @@ static bool ghes_do_proc(struct ghes *ghes,ghes_handle_aer (gdata); }else if (guid_equal (sec_type, &CPER_SEC_PROC_ARM )) { -struct cper_sec_proc_arm *err =acpi_hest_get_payload (gdata); - -log_arm_hw_error (err); + queued =ghes_handle_arm_hw_error (gdata, sev); }else {void *err =acpi_hest_get_payload (gdata);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 370/800 EDAC/igen6: fix core dependency
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 0a9ece9ba154dd6205709108180952c55e630833 ]
igen6_edac needs mce_register()/unregister() functions, so it should depend on X86_MCE (or X86_MCE_INTEL).
That change prevents these build errors:
ld: drivers/edac/igen6_edac.o: in function `igen6_remove':
igen6_edac.c:(.text+0x494): undefined reference to `mce_unregister_decode_chain'
ld: drivers/edac/igen6_edac.o: in function `igen6_probe':
igen6_edac.c:(.text+0xf5b): undefined reference to `mce_register_decode_chain'
--- drivers/edac/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/edac/Kconfig +2 -1
@@ -270,7 +270,8 @@ config EDAC_PND2 config EDAC_IGEN6 tristate "Intel client SoC Integrated MC" - depends on PCI && X86_64 && PCI_MMCONFIG && ARCH_HAVE_NMI_SAFE_CMPXCHG + depends on PCI && PCI_MMCONFIG && ARCH_HAVE_NMI_SAFE_CMPXCHG + depends on X64_64 && X86_MCE_INTEL help Support for error detection and correction on the Intel client SoC Integrated Memory Controller using In-Band ECC IP.
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 371/800 blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
[ Upstream commit 1d0903d61e9645c6330b94247b96dd873dfc11c8 ]
Now that we disable wbt by simply zero out rwb->wb_normal in wbt_disable_default() when switch elevator to bfq, but it's not safe because it will become false positive if we change queue depth. If it become false positive between wbt_wait() and wbt_track() when submit write request, it will lead to drop rqw->inflight to -1 in wbt_done(), which will end up trigger IO hung. Fix this issue by introduce a new state which mean the wbt was disabled.
--- block/blk-wbt.c | 5 +++-- block/blk-wbt.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
block/blk-wbt.c +3 -2
@@ -77,7 +77,8 @@ enum {static inline bool rwb_enabled (struct rq_wb *rwb) { -return rwb && rwb->wb_normal !=0 ; +return rwb && rwb->enable_state !=WBT_STATE_OFF_DEFAULT && + rwb->wb_normal !=0 ; }static void wb_timestamp (struct rq_wb *rwb,unsigned long *var)
@@ -702,7 +703,7 @@ void wbt_disable_default(struct request_queue *q) rwb =RQWB (rqos);if (rwb->enable_state ==WBT_STATE_ON_DEFAULT ) {blk_stat_deactivate (rwb->cb); - rwb->wb_normal =0 ; + rwb->enable_state =WBT_STATE_OFF_DEFAULT ; } }EXPORT_SYMBOL_GPL (wbt_disable_default);
block/blk-wbt.h +1 -0
@@ -34,6 +34,7 @@ enum {enum {WBT_STATE_ON_DEFAULT =1 ,WBT_STATE_ON_MANUAL =2 , +WBT_STATE_OFF_DEFAULT };struct rq_wb {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 372/800 blk-wbt: make sure throttle is enabled properly
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
[ Upstream commit 76a8040817b4b9c69b53f9b326987fa891b4082a ]
After commit a79050434b45 ("blk-rq-qos: refactor out common elements of blk-wbt"), if throttle was disabled by wbt_disable_default(), we could not enable again, fix this by set enable_state back to WBT_STATE_ON_DEFAULT.
--- block/blk-wbt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
block/blk-wbt.c +5 -1
@@ -637,9 +637,13 @@ void wbt_set_write_cache(struct request_queue *q, bool write_cache_on)void wbt_enable_default (struct request_queue *q) {struct rq_qos *rqos =wbt_rq_qos (q); +/* Throttling already enabled? */ -if (rqos) +if (rqos) { +if (RQWB (rqos)->enable_state ==WBT_STATE_OFF_DEFAULT ) +RQWB (rqos)->enable_state =WBT_STATE_ON_DEFAULT ;return ; + }/* Queue not registered? Maybe shutting down... */ if (!blk_queue_registered (q))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 373/800 block, bfq: avoid delayed merge of async queues
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit bd3664b362381c4c1473753ebedf0ab242a60d1d ]
Since commit 430a67f9d616 ("block, bfq: merge bursts of newly-created queues"), BFQ may schedule a merge between a newly created sync bfq_queue, say Q2, and the last sync bfq_queue created, say Q1. To this goal, BFQ stores the address of Q1 in the field bic->stable_merge_bfqq of the bic associated with Q2. So, when the time for the possible merge arrives, BFQ knows which bfq_queue to merge Q2 with. In particular, BFQ checks for possible merges on request arrivals.
Yet the same bic may also be associated with an async bfq_queue, say Q3. So, if a request for Q3 arrives, then the above check may happen to be executed while the bfq_queue at hand is Q3, instead of Q2. In this case, Q1 happens to be merged with an async bfq_queue. This is not only a conceptual mistake, because async queues are to be kept out of queue merging, but also a bug that leads to inconsistent states.
This commits simply filters async queues out of delayed merges.
--- block/bfq-iosched.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
block/bfq-iosched.c +7 -1
@@ -2703,7 +2703,13 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,* costly and complicated. */ if (unlikely (!bfqd->nonrot_with_queueing)) { -if (bic->stable_merge_bfqq && +/* +* Make sure also that bfqq is sync, because +* bic->stable_merge_bfqq may point to some queue (for +* stable merging) also if bic is associated with a +* sync queue, but this bfqq is async +*/ +if (bfq_bfqq_sync (bfqq) && bic->stable_merge_bfqq && !bfq_bfqq_just_created (bfqq) &&time_is_before_jiffies (bfqq->split_time +msecs_to_jiffies (200 ))) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 374/800 block, bfq: reset waker pointer with shared queues
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit 9a2ac41b13c573703d6689f51f3e27dd658324be ]
Commit 85686d0dc194 ("block, bfq: keep shared queues out of the waker mechanism") leaves shared bfq_queues out of the waker-detection mechanism. It attains this goal by not updating the pointer last_completed_rq_bfqq, if the last request completed belongs to a shared bfq_queue (so that the pointer will not point to the shared bfq_queue).
Yet this has a side effect: the pointer last_completed_rq_bfqq keeps pointing, deceptively, to a bfq_queue that actually is not the last one to have had a request completed. As a consequence, such a bfq_queue may deceptively be considered as a waker of some bfq_queue, even of some shared bfq_queue.
To address this issue, reset last_completed_rq_bfqq if the last request completed belongs to a shared queue.
--- block/bfq-iosched.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
block/bfq-iosched.c +4 -2
@@ -6143,11 +6143,13 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd)* of other queues. But a false waker will unjustly steal * bandwidth to its supposedly woken queue. So considering * also shared queues in the waking mechanism may cause more -* control troubles than throughput benefits. Then do not set -* last_completed_rq_bfqq to bfqq if bfqq is a shared queue. +* control troubles than throughput benefits. Then reset +* last_completed_rq_bfqq if bfqq is a shared queue. */ if (!bfq_bfqq_coop (bfqq)) bfqd->last_completed_rq_bfqq = bfqq; +else + bfqd->last_completed_rq_bfqq =NULL ;/* * If we are waiting to discover whether the request pattern
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 375/800 ACPI: bgrt: Fix CFI violation
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit f37ccf8fce155d08ae2a4fb3db677911ced0c21a ]
clang's Control Flow Integrity requires that every indirect call has a valid target, which is based on the type of the function pointer. The *_show() functions in this file are written as if they will be called from dev_attr_show(); however, they will be called from sysfs_kf_seq_show() because the files were created by sysfs_create_group() and the sysfs ops are based on kobj_sysfs_ops because of kobject_add_and_create(). Because the *_show() functions do not match the type of the show() member in struct kobj_attribute, there is a CFI violation.
$ cat /sys/firmware/acpi/bgrt/{status,type,version,{x,y}offset}}
1
0
1
522
307$ dmesg | grep "CFI failure" [ 267.761825] CFI failure (target: type_show.d5e1ad21498a5fd14edbc5c320906598.cfi_jt+0x0/0x8): [ 267.762246] CFI failure (target: xoffset_show.d5e1ad21498a5fd14edbc5c320906598.cfi_jt+0x0/0x8): [ 267.762584] CFI failure (target: status_show.d5e1ad21498a5fd14edbc5c320906598.cfi_jt+0x0/0x8): [ 267.762973] CFI failure (target: yoffset_show.d5e1ad21498a5fd14edbc5c320906598.cfi_jt+0x0/0x8): [ 267.763330] CFI failure (target: version_show.d5e1ad21498a5fd14edbc5c320906598.cfi_jt+0x0/0x8):
Convert these functions to the type of the show() member in struct kobj_attribute so that there is no more CFI violation. Because these functions are all so similar, combine them into a macro.
--- drivers/acpi/bgrt.c | 57 ++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 39 deletions(-)
drivers/acpi/bgrt.c +18 -39
@@ -15,40 +15,19 @@static void *bgrt_image;static struct kobject *bgrt_kobj; -static ssize_t version_show (struct device *dev, -struct device_attribute *attr,char *buf) -{ -return snprintf (buf,PAGE_SIZE ,"%d\n" , bgrt_tab.version); -} -static DEVICE_ATTR_RO (version); - -static ssize_t status_show (struct device *dev, -struct device_attribute *attr,char *buf) -{ -return snprintf (buf,PAGE_SIZE ,"%d\n" , bgrt_tab.status); -} -static DEVICE_ATTR_RO (status); - -static ssize_t type_show (struct device *dev, -struct device_attribute *attr,char *buf) -{ -return snprintf (buf,PAGE_SIZE ,"%d\n" , bgrt_tab.image_type); -} -static DEVICE_ATTR_RO (type); - -static ssize_t xoffset_show (struct device *dev, -struct device_attribute *attr,char *buf) -{ -return snprintf (buf,PAGE_SIZE ,"%d\n" , bgrt_tab.image_offset_x); -} -static DEVICE_ATTR_RO (xoffset); - -static ssize_t yoffset_show (struct device *dev, -struct device_attribute *attr,char *buf) -{ -return snprintf (buf,PAGE_SIZE ,"%d\n" , bgrt_tab.image_offset_y); -} -static DEVICE_ATTR_RO (yoffset); +#define BGRT_SHOW (_name, _member) \ + static ssize_t _name##_show(struct kobject *kobj, \ + struct kobj_attribute *attr, char *buf) \ + { \ + return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab._member); \ + } \ + struct kobj_attribute bgrt_attr_##_name = __ATTR_RO(_name) + +BGRT_SHOW (version, version); +BGRT_SHOW (status, status); +BGRT_SHOW (type, image_type); +BGRT_SHOW (xoffset, image_offset_x); +BGRT_SHOW (yoffset, image_offset_y);static ssize_t image_read (struct file *file,struct kobject *kobj,struct bin_attribute *attr,char *buf,loff_t off,size_t count)
@@ -60,11 +39,11 @@ static ssize_t image_read(struct file *file, struct kobject *kobj, static BIN_ATTR_RO(image, 0); /* size gets filled in later */static struct attribute *bgrt_attributes[] = { - &dev_attr_version.attr, - &dev_attr_status.attr, - &dev_attr_type.attr, - &dev_attr_xoffset.attr, - &dev_attr_yoffset.attr, + &bgrt_attr_version.attr, + &bgrt_attr_status.attr, + &bgrt_attr_type.attr, + &bgrt_attr_xoffset.attr, + &bgrt_attr_yoffset.attr,NULL , };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 376/800 cpufreq: Make cpufreq_online() call driver->offline() on errors
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 3b7180573c250eb6e2a7eec54ae91f27472332ea ]
In the CPU removal path the ->offline() callback provided by the driver is always invoked before ->exit(), but in the cpufreq_online() error path it is not, so ->exit() is expected to somehow know the context in which it has been called and act accordingly.
That is less than straightforward, so make cpufreq_online() invoke the driver's ->offline() callback, if present, on errors before ->exit() too.
This only potentially affects intel_pstate.
--- drivers/cpufreq/cpufreq.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +10 -1
@@ -1367,9 +1367,14 @@ static int cpufreq_online(unsigned int cpu) goto out_free_policy; } +/* +* The initialization has succeeded and the policy is online. +* If there is a problem with its frequency table, take it +* offline and drop it. +*/ ret =cpufreq_table_validate_and_sort (policy);if (ret) - goto out_exit_policy; + goto out_offline_policy;/* related_cpus should at least include policy->cpus. */ cpumask_copy (policy->related_cpus, policy->cpus);
@@ -1515,6 +1520,10 @@ out_destroy_policy:up_write (&policy->rwsem); +out_offline_policy: +if (cpufreq_driver->offline) + cpufreq_driver->offline (policy); + out_exit_policy:if (cpufreq_driver->exit) cpufreq_driver->exit (policy);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 377/800 PM / devfreq: passive: Fix get_target_freq when not using required-opp
In reply to Greg Kroah-HartmanFrom: Chanwoo Choi <[email protected]>
[ Upstream commit 8c37d01e1a86073d15ea7084390fba58d9a1665f ]
The 86ad9a24f21e ("PM / devfreq: Add required OPPs support to passive governor") supported the required-opp property for using devfreq passive governor. But, 86ad9a24f21e has caused the problem on use-case when required-opp is not used such as exynos-bus.c devfreq driver. So that fix the get_target_freq of passive governor for supporting the case of when required-opp is not used.
--- drivers/devfreq/governor_passive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/devfreq/governor_passive.c +2 -1
@@ -65,7 +65,7 @@ static int devfreq_passive_get_target_freq(struct devfreq *devfreq,dev_pm_opp_put (p_opp);if (IS_ERR (opp)) -return PTR_ERR (opp); + goto no_required_opp; *freq =dev_pm_opp_get_freq (opp);dev_pm_opp_put (opp);
@@ -73,6 +73,7 @@ static int devfreq_passive_get_target_freq(struct devfreq *devfreq,return 0 ; } +no_required_opp:/* * Get the OPP table's index of decided frequency by governor * of parent device.
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 378/800 block: fix trace completion for chained bio
In reply to Greg Kroah-HartmanFrom: Edward Hsieh <[email protected]>
[ Upstream commit 60b6a7e6a0f4382cd689f9afdac816964fec2921 ]
For chained bio, trace_block_bio_complete in bio_endio is currently called only by the parent bio once upon all chained bio completed. However, the sector and size for the parent bio are modified in bio_split. Therefore, the size and sector of the complete events might not match the queue events in blktrace.
The original fix of bio completion trace <fbbaf700e7b1> ("block: trace completion of all bios.") wants multiple complete events to correspond to one queue event but missed this.
The issue can be reproduced by md/raid5 read with bio cross chunks.
To fix, move trace completion into the loop for every chained bio to call.
--- block/bio.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
block/bio.c +6 -7
@@ -1375,8 +1375,7 @@ static inline bool bio_remaining_done(struct bio *bio)* * bio_endio() can be called several times on a bio that has been chained * using bio_chain(). The ->bi_end_io() function will only be called the -* last time. At this point the BLK_TA_COMPLETE tracing event will be -* generated if BIO_TRACE_COMPLETION is set. +* last time. **/ void bio_endio (struct bio *bio) {
@@ -1389,6 +1388,11 @@ again:if (bio->bi_bdev)rq_qos_done_bio (bio->bi_bdev->bd_disk->queue, bio); +if (bio->bi_bdev &&bio_flagged (bio,BIO_TRACE_COMPLETION )) { +trace_block_bio_complete (bio->bi_bdev->bd_disk->queue, bio); +bio_clear_flag (bio,BIO_TRACE_COMPLETION ); + } +/* * Need to have a real endio function for chained bios, otherwise * various corner cases will break (like stacking block devices that
@@ -1402,11 +1406,6 @@ again: goto again; } -if (bio->bi_bdev &&bio_flagged (bio,BIO_TRACE_COMPLETION )) { -trace_block_bio_complete (bio->bi_bdev->bd_disk->queue, bio); -bio_clear_flag (bio,BIO_TRACE_COMPLETION ); - } -blk_throtl_bio_endio (bio);/* release cgroup info */ bio_uninit (bio);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 379/800 blk-mq: update hctx->dispatch_busy in case of real scheduler
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit cb9516be7708a2a18ec0a19fe3a225b5b3bc92c7 ]
Commit 6e6fcbc27e77 ("blk-mq: support batching dispatch in case of io") starts to support io batching submission by using hctx->dispatch_busy.
However, blk_mq_update_dispatch_busy() isn't changed to update hctx->dispatch_busy in that commit, so fix the issue by updating hctx->dispatch_busy in case of real scheduler.
--- block/blk-mq.c | 3 --- 1 file changed, 3 deletions(-)
block/blk-mq.c +0 -3
@@ -1224,9 +1224,6 @@ static void blk_mq_update_dispatch_busy(struct blk_mq_hw_ctx *hctx, bool busy) {unsigned int ewma; -if (hctx->queue->elevator) -return ; - ewma = hctx->dispatch_busy;if (!ewma && !busy)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 380/800 ocfs2: fix snprintf() checking
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 54e948c60cc843b6e84dc44496edc91f51d2a28e ]
The snprintf() function returns the number of bytes which would have been printed if the buffer was large enough. In other words it can return ">= remain" but this code assumes it returns "== remain".
The run time impact of this bug is not very severe. The next iteration through the loop would trigger a WARN() when we pass a negative limit to snprintf(). We would then return success instead of -E2BIG.
The kernel implementation of snprintf() will never return negatives so there is no need to check and I have deleted that dead code.
--- fs/ocfs2/filecheck.c | 6 +----- fs/ocfs2/stackglue.c | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-)
fs/ocfs2/filecheck.c +1 -5
@@ -326,11 +326,7 @@ static ssize_t ocfs2_filecheck_attr_show(struct kobject *kobj, ret =snprintf (buf + total, remain,"%lu\t\t%u\t%s\n" , p->fe_ino, p->fe_done,ocfs2_filecheck_error (p->fe_status)); -if (ret <0 ) { - total = ret; -break ; - } -if (ret == remain) { +if (ret >= remain) {/* snprintf() didn't fit */ total = -E2BIG ;break ;
fs/ocfs2/stackglue.c +2 -6
@@ -500,11 +500,7 @@ static ssize_t ocfs2_loaded_cluster_plugins_show(struct kobject *kobj,list_for_each_entry (p, &ocfs2_stack_list, sp_list) { ret =snprintf (buf, remain,"%s\n" , p->sp_name); -if (ret <0 ) { - total = ret; -break ; - } -if (ret == remain) { +if (ret >= remain) {/* snprintf() didn't fit */ total = -E2BIG ;break ;
@@ -531,7 +527,7 @@ static ssize_t ocfs2_active_cluster_plugin_show(struct kobject *kobj,if (active_stack) { ret =snprintf (buf,PAGE_SIZE ,"%s\n" , active_stack->sp_name); -if (ret ==PAGE_SIZE ) +if (ret >=PAGE_SIZE ) ret = -E2BIG ; }spin_unlock (&ocfs2_stack_lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 381/800 dax: fix ENOMEM handling in grab_mapping_entry()
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 1a14e3779dd58c16b30e56558146e5cc850ba8b0 ]
grab_mapping_entry() has a bug in handling of ENOMEM condition. Suppose we have a PMD entry at index i which we are downgrading to a PTE entry. grab_mapping_entry() will set pmd_downgrade to true, lock the entry, clear the entry in xarray, and decrement mapping->nrpages. The it will call:
entry = dax_make_entry(pfn_to_pfn_t(0), flags); dax_lock_entry(xas, entry);
which inserts new PTE entry into xarray. However this may fail allocating the new node. We handle this by:
if (xas_nomem(xas, mapping_gfp_mask(mapping) & ~__GFP_HIGHMEM)) goto retry;
however pmd_downgrade stays set to true even though 'entry' returned from get_unlocked_entry() will be NULL now. And we will go again through the downgrade branch. This is mostly harmless except that mapping->nrpages is decremented again and we temporarily have an invalid entry stored in xarray. Fix the problem by setting pmd_downgrade to false each time we lookup the entry we work with so that it matches the entry we found.
--- fs/dax.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/dax.c +2 -1
@@ -488,10 +488,11 @@ static void *grab_mapping_entry(struct xa_state *xas, struct address_space *mapping, unsigned int order) {unsigned long index = xas->xa_index; -bool pmd_downgrade = false;/* splitting PMD entry into PTE entries? */ +bool pmd_downgrade;/* splitting PMD entry into PTE entries? */ void *entry; retry: + pmd_downgrade = false;xas_lock_irq (xas); entry =get_unlocked_entry (xas, order);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 382/800 mm/debug_vm_pgtable: ensure THP availability via has_transparent_hugepage()
In reply to Greg Kroah-HartmanFrom: Anshuman Khandual <[email protected]>
[ Upstream commit 65ac1a60a57e2c55f2ac37f27095f6b012295e81 ]
On certain platforms, THP support could not just be validated via the build option CONFIG_TRANSPARENT_HUGEPAGE. Instead has_transparent_hugepage() also needs to be called upon to verify THP runtime support. Otherwise the debug test will just run into unusable THP helpers like in the case of a 4K hash config on powerpc platform [1]. This just moves all pfn_pmd() and pfn_pud() after THP runtime validation with has_transparent_hugepage() which prevents the mentioned problem.
[1] https://bugzilla.kernel.org/show_bug.cgi?id=213069
--- mm/debug_vm_pgtable.c | 63 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 12 deletions(-)
mm/debug_vm_pgtable.c +51 -12
@@ -146,13 +146,14 @@ static void __init pte_savedwrite_tests(unsigned long pfn, pgprot_t prot)static void __init pmd_basic_tests (unsigned long pfn,int idx) {pgprot_t prot = protection_map[idx]; -pmd_t pmd =pfn_pmd (pfn, prot);unsigned long val = idx, *ptr = &val; +pmd_t pmd;if (!has_transparent_hugepage ())return ;pr_debug ("Validating PMD basic (%pGv)\n" , ptr); + pmd =pfn_pmd (pfn, prot);/* * This test needs to be executed after the given page table entry
@@ -185,7 +186,7 @@ static void __init pmd_advanced_tests(struct mm_struct *mm, unsigned long pfn, unsigned long vaddr, pgprot_t prot, pgtable_t pgtable) { - pmd_t pmd = pfn_pmd(pfn, prot); + pmd_t pmd;if (!has_transparent_hugepage ())return ;
@@ -232,9 +233,14 @@ static void __init pmd_advanced_tests(struct mm_struct *mm,static void __init pmd_leaf_tests (unsigned long pfn,pgprot_t prot) { -pmd_t pmd =pfn_pmd (pfn, prot); +pmd_t pmd; + +if (!has_transparent_hugepage ()) +return ;pr_debug ("Validating PMD leaf\n" ); + pmd =pfn_pmd (pfn, prot); +/* * PMD based THP is a leaf entry. */
@@ -267,12 +273,16 @@ static void __init pmd_huge_tests(pmd_t *pmdp, unsigned long pfn, pgprot_t prot)static void __init pmd_savedwrite_tests (unsigned long pfn,pgprot_t prot) { -pmd_t pmd =pfn_pmd (pfn, prot); +pmd_t pmd;if (!IS_ENABLED (CONFIG_NUMA_BALANCING ))return ; +if (!has_transparent_hugepage ()) +return ; +pr_debug ("Validating PMD saved write\n" ); + pmd =pfn_pmd (pfn, prot);WARN_ON (!pmd_savedwrite (pmd_mk_savedwrite (pmd_clear_savedwrite (pmd))));WARN_ON (pmd_savedwrite (pmd_clear_savedwrite (pmd_mk_savedwrite (pmd)))); }
@@ -281,13 +291,14 @@ static void __init pmd_savedwrite_tests(unsigned long pfn, pgprot_t prot)static void __init pud_basic_tests (struct mm_struct *mm,unsigned long pfn,int idx) {pgprot_t prot = protection_map[idx]; -pud_t pud =pfn_pud (pfn, prot);unsigned long val = idx, *ptr = &val; +pud_t pud;if (!has_transparent_hugepage ())return ;pr_debug ("Validating PUD basic (%pGv)\n" , ptr); + pud =pfn_pud (pfn, prot);/* * This test needs to be executed after the given page table entry
@@ -323,7 +334,7 @@ static void __init pud_advanced_tests(struct mm_struct *mm, unsigned long pfn, unsigned long vaddr, pgprot_t prot) { - pud_t pud = pfn_pud(pfn, prot); + pud_t pud;if (!has_transparent_hugepage ())return ;
@@ -332,6 +343,7 @@ static void __init pud_advanced_tests(struct mm_struct *mm,/* Align the address wrt HPAGE_PUD_SIZE */ vaddr &=HPAGE_PUD_MASK ; + pud =pfn_pud (pfn, prot);set_pud_at (mm, vaddr, pudp, pud);pudp_set_wrprotect (mm, vaddr, pudp); pud =READ_ONCE (*pudp);
@@ -370,9 +382,13 @@ static void __init pud_advanced_tests(struct mm_struct *mm,static void __init pud_leaf_tests (unsigned long pfn,pgprot_t prot) { -pud_t pud =pfn_pud (pfn, prot); +pud_t pud; + +if (!has_transparent_hugepage ()) +return ;pr_debug ("Validating PUD leaf\n" ); + pud =pfn_pud (pfn, prot);/* * PUD based THP is a leaf entry. */
@@ -654,12 +670,16 @@ static void __init pte_protnone_tests(unsigned long pfn, pgprot_t prot)#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void __init pmd_protnone_tests (unsigned long pfn,pgprot_t prot) { -pmd_t pmd =pmd_mkhuge (pfn_pmd (pfn, prot)); +pmd_t pmd;if (!IS_ENABLED (CONFIG_NUMA_BALANCING ))return ; +if (!has_transparent_hugepage ()) +return ; +pr_debug ("Validating PMD protnone\n" ); + pmd =pmd_mkhuge (pfn_pmd (pfn, prot));WARN_ON (!pmd_protnone (pmd));WARN_ON (!pmd_present (pmd)); }
@@ -679,18 +699,26 @@ static void __init pte_devmap_tests(unsigned long pfn, pgprot_t prot)#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void __init pmd_devmap_tests (unsigned long pfn,pgprot_t prot) { -pmd_t pmd =pfn_pmd (pfn, prot); +pmd_t pmd; + +if (!has_transparent_hugepage ()) +return ;pr_debug ("Validating PMD devmap\n" ); + pmd =pfn_pmd (pfn, prot);WARN_ON (!pmd_devmap (pmd_mkdevmap (pmd))); }#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD static void __init pud_devmap_tests (unsigned long pfn,pgprot_t prot) { -pud_t pud =pfn_pud (pfn, prot); +pud_t pud; + +if (!has_transparent_hugepage ()) +return ;pr_debug ("Validating PUD devmap\n" ); + pud =pfn_pud (pfn, prot);WARN_ON (!pud_devmap (pud_mkdevmap (pud))); }#else /* !CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD */
@@ -733,25 +761,33 @@ static void __init pte_swap_soft_dirty_tests(unsigned long pfn, pgprot_t prot)#ifdef CONFIG_TRANSPARENT_HUGEPAGE static void __init pmd_soft_dirty_tests (unsigned long pfn,pgprot_t prot) { -pmd_t pmd =pfn_pmd (pfn, prot); +pmd_t pmd;if (!IS_ENABLED (CONFIG_MEM_SOFT_DIRTY ))return ; +if (!has_transparent_hugepage ()) +return ; +pr_debug ("Validating PMD soft dirty\n" ); + pmd =pfn_pmd (pfn, prot);WARN_ON (!pmd_soft_dirty (pmd_mksoft_dirty (pmd)));WARN_ON (pmd_soft_dirty (pmd_clear_soft_dirty (pmd))); }static void __init pmd_swap_soft_dirty_tests (unsigned long pfn,pgprot_t prot) { -pmd_t pmd =pfn_pmd (pfn, prot); +pmd_t pmd;if (!IS_ENABLED (CONFIG_MEM_SOFT_DIRTY ) || !IS_ENABLED (CONFIG_ARCH_ENABLE_THP_MIGRATION ))return ; +if (!has_transparent_hugepage ()) +return ; +pr_debug ("Validating PMD swap soft dirty\n" ); + pmd =pfn_pmd (pfn, prot);WARN_ON (!pmd_swp_soft_dirty (pmd_swp_mksoft_dirty (pmd)));WARN_ON (pmd_swp_soft_dirty (pmd_swp_clear_soft_dirty (pmd))); }
@@ -780,6 +816,9 @@ static void __init pmd_swap_tests(unsigned long pfn, pgprot_t prot)swp_entry_t swp;pmd_t pmd; +if (!has_transparent_hugepage ()) +return ; +pr_debug ("Validating PMD swap\n" ); pmd =pfn_pmd (pfn, prot); swp =__pmd_to_swp_entry (pmd);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 383/800 mm: mmap_lock: use local locks instead of disabling preemption
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit 832b50725373e8c46781b7d4db104ec9cf564a6b ]
mmap_lock will explicitly disable/enable preemption upon manipulating its local CPU variables. This is to be expected, but in this case, it doesn't play well with PREEMPT_RT. The preemption disabled code section also takes a spin-lock. Spin-locks in RT systems will try to schedule, which is exactly what we're trying to avoid.
To mitigate this, convert the explicit preemption handling to local_locks. Which are RT aware, and will disable migration instead of preemption when PREEMPT_RT=y.
The faulty call trace looks like the following:
__mmap_lock_do_trace_*()
preempt_disable()
get_mm_memcg_path()
cgroup_path()
kernfs_path_from_node()
spin_lock_irqsave() /* Scheduling while atomic! */--- mm/mmap_lock.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
mm/mmap_lock.c +22 -11
@@ -11,6 +11,7 @@#include <linux/rcupdate.h> #include <linux/smp.h> #include <linux/trace_events.h> +#include <linux/local_lock.h> EXPORT_TRACEPOINT_SYMBOL (mmap_lock_start_locking);EXPORT_TRACEPOINT_SYMBOL (mmap_lock_acquire_returned);
@@ -39,21 +40,30 @@ static int reg_refcount; /* Protected by reg_lock. */*/ #define CONTEXT_COUNT 4 -static DEFINE_PER_CPU(char __rcu *, memcg_path_buf); +struct memcg_path { +local_lock_t lock; +char __rcu *buf; +local_t buf_idx; +}; +static DEFINE_PER_CPU(struct memcg_path, memcg_paths) = { + .lock =INIT_LOCAL_LOCK (lock), + .buf_idx =LOCAL_INIT (0 ), +}; +static char **tmp_bufs; -static DEFINE_PER_CPU(int, memcg_path_buf_idx);/* Called with reg_lock held. */ static void free_memcg_path_bufs (void ) { +struct memcg_path *memcg_path;int cpu;char **old = tmp_bufs;for_each_possible_cpu (cpu) { - *(old++) =rcu_dereference_protected ( -per_cpu (memcg_path_buf, cpu), + memcg_path =per_cpu_ptr (&memcg_paths, cpu); + *(old++) =rcu_dereference_protected (memcg_path->buf,lockdep_is_held (®_lock)); -rcu_assign_pointer (per_cpu (memcg_path_buf, cpu),NULL ); +rcu_assign_pointer (memcg_path->buf,NULL ); }/* Wait for inflight memcg_path_buf users to finish. */
@@ -88,7 +98,7 @@ int trace_mmap_lock_reg(void) new =kmalloc (MEMCG_PATH_BUF_SIZE *CONTEXT_COUNT ,GFP_KERNEL );if (new ==NULL ) goto out_fail_free; -rcu_assign_pointer (per_cpu (memcg_path_buf, cpu), new); +rcu_assign_pointer (per_cpu_ptr (&memcg_paths, cpu)->buf, new);/* Don't need to wait for inflights, they'd have gotten NULL. */ }
@@ -122,23 +132,24 @@ out:static inline char *get_memcg_path_buf (void ) { +struct memcg_path *memcg_path =this_cpu_ptr (&memcg_paths);char *buf;int idx;rcu_read_lock (); - buf =rcu_dereference (*this_cpu_ptr (&memcg_path_buf)); + buf =rcu_dereference (memcg_path->buf);if (buf ==NULL ) {rcu_read_unlock ();return NULL ; } - idx =this_cpu_add_return (memcg_path_buf_idx,MEMCG_PATH_BUF_SIZE ) - + idx =local_add_return (MEMCG_PATH_BUF_SIZE , &memcg_path->buf_idx) -MEMCG_PATH_BUF_SIZE ;return &buf[idx]; }static inline void put_memcg_path_buf (void ) { -this_cpu_sub (memcg_path_buf_idx,MEMCG_PATH_BUF_SIZE ); +local_sub (MEMCG_PATH_BUF_SIZE , &this_cpu_ptr (&memcg_paths)->buf_idx);rcu_read_unlock (); }
@@ -179,14 +190,14 @@ out:#define TRACE_MMAP_LOCK_EVENT (type, mm, ...) \ do { \ const char *memcg_path; \ - preempt_disable(); \ + local_lock(&memcg_paths.lock); \ memcg_path = get_mm_memcg_path(mm); \ trace_mmap_lock_##type(mm, \ memcg_path != NULL ? memcg_path : "", \ ##__VA_ARGS__); \ if (likely(memcg_path != NULL)) \ put_memcg_path_buf(); \ - preempt_enable(); \ + local_unlock(&memcg_paths.lock); \ } while (0)#else /* !CONFIG_MEMCG */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 384/800 swap: fix do_swap_page() race with swapoff
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit 2799e77529c2a25492a4395db93996e3dacd762d ]
When I was investigating the swap code, I found the below possible race window:
CPU 1 CPU 2
----- -----do_swap_page
if (data_race(si->flags & SWP_SYNCHRONOUS_IO)
swap_readpage
if (data_race(sis->flags & SWP_FS_OPS)) {
swapoff
..
p->swap_file = NULL;
..
struct file *swap_file = sis->swap_file;
struct address_space *mapping = swap_file->f_mapping;[oops!]Note that for the pages that are swapped in through swap cache, this isn't an issue. Because the page is locked, and the swap entry will be marked with SWAP_HAS_CACHE, so swapoff() can not proceed until the page has been unlocked.
Fix this race by using get/put_swap_device() to guard against concurrent swapoff.
--- include/linux/swap.h | 9 +++++++++ mm/memory.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)
include/linux/swap.h +9 -0
@@ -526,6 +526,15 @@ static inline struct swap_info_struct *swp_swap_info(swp_entry_t entry)return NULL ; } +static inline struct swap_info_struct *get_swap_device (swp_entry_t entry) +{ +return NULL ; +} + +static inline void put_swap_device (struct swap_info_struct *si) +{ +} +#define swap_address_space (entry) (NULL)#define get_nr_swap_pages () 0L#define total_swap_pages 0L
mm/memory.c +9 -2
@@ -3353,6 +3353,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct page *page =NULL , *swapcache; +struct swap_info_struct *si =NULL ;swp_entry_t entry;pte_t pte;int locked;
@@ -3380,14 +3381,16 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) goto out; } +/* Prevent swapoff from happening to us. */ + si =get_swap_device (entry); +if (unlikely (!si)) + goto out;delayacct_set_flag (current,DELAYACCT_PF_SWAPIN ); page =lookup_swap_cache (entry, vma, vmf->address); swapcache = page;if (!page) { -struct swap_info_struct *si =swp_swap_info (entry); -if (data_race (si->flags &SWP_SYNCHRONOUS_IO ) &&__swap_count (entry) ==1 ) {/* skip swapcache */
@@ -3556,6 +3559,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) unlock:pte_unmap_unlock (vmf->pte, vmf->ptl); out: +if (si) +put_swap_device (si);return ret; out_nomap:pte_unmap_unlock (vmf->pte, vmf->ptl);
@@ -3567,6 +3572,8 @@ out_release:unlock_page (swapcache);put_page (swapcache); } +if (si) +put_swap_device (si);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 385/800 mm/shmem: fix shmem_swapin() race with swapoff
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit 2efa33fc7f6ec94a3a538c1a264273c889be2b36 ]
When I was investigating the swap code, I found the below possible race window:
CPU 1 CPU 2
----- -----shmem_swapin
swap_cluster_readahead
if (likely(si->flags & (SWP_BLKDEV | SWP_FS_OPS))) {
swapoff
..
si->swap_file = NULL;
..
struct inode *inode = si->swap_file->f_mapping->host;[oops!]Close this race window by using get/put_swap_device() to guard against concurrent swapoff.
--- mm/shmem.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
mm/shmem.c +13 -1
@@ -1696,7 +1696,8 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,struct address_space *mapping = inode->i_mapping;struct shmem_inode_info *info =SHMEM_I (inode);struct mm_struct *charge_mm = vma ? vma->vm_mm : current->mm; -struct page *page; +struct swap_info_struct *si; +struct page *page =NULL ;swp_entry_t swap;int error;
@@ -1704,6 +1705,12 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, swap =radix_to_swp_entry (*pagep); *pagep =NULL ; +/* Prevent swapoff from happening to us. */ + si =get_swap_device (swap); +if (!si) { + error =EINVAL ; + goto failed; + }/* Look it up and read it in.. */ page =lookup_swap_cache (swap,NULL ,0 );if (!page) {
@@ -1765,6 +1772,8 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,swap_free (swap); *pagep = page; +if (si) +put_swap_device (si);return 0 ; failed:if (!shmem_confirm_swap (mapping, index, swap))
@@ -1775,6 +1784,9 @@ unlock:put_page (page); } +if (si) +put_swap_device (si); +return error; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 386/800 mm: memcg/slab: properly set up gfp flags for objcg pointer array
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 41eb5df1cbc9b302fc263ad7c9f38cfc38b4df61 ]
Patch series "mm: memcg/slab: Fix objcg pointer array handling problem", v4.
Since the merging of the new slab memory controller in v5.9, the page structure stores a pointer to objcg pointer array for slab pages. When the slab has no used objects, it can be freed in free_slab() which will call kfree() to free the objcg pointer array in memcg_alloc_page_obj_cgroups(). If it happens that the objcg pointer array is the last used object in its slab, that slab may then be freed which may caused kfree() to be called again.
With the right workload, the slab cache may be set up in a way that allows the recursive kfree() calling loop to nest deep enough to cause a kernel stack overflow and panic the system. In fact, we have a reproducer that can cause kernel stack overflow on a s390 system involving kmalloc-rcl-256 and kmalloc-rcl-128 slabs with the following kfree() loop recursively called 74 times:
[ 285.520739] [<000000000ec432fc>] kfree+0x4bc/0x560 [ 285.520740] [<000000000ec43466>] __free_slab+0xc6/0x228 [ 285.520741] [<000000000ec41fc2>] __slab_free+0x3c2/0x3e0 [ 285.520742] [<000000000ec432fc>] kfree+0x4bc/0x560 : While investigating this issue, I
also found an issue on the allocation side. If the objcg pointer array happen to come from the same slab or a circular dependency linkage is formed with multiple slabs, those affected slabs can never be freed again.
This patch series addresses these two issues by introducing a new set of kmalloc-cg-<n> caches split from kmalloc-<n> caches. The new set will only contain non-reclaimable and non-dma objects that are accounted in memory cgroups whereas the old set are now for unaccounted objects only. By making this split, all the objcg pointer arrays will come from the kmalloc-<n> caches, but those caches will never hold any objcg pointer array. As a result, deeply nested kfree() call and the unfreeable slab problems are now gone.
This patch (of 4):
Since the merging of the new slab memory controller in v5.9, the page structure may store a pointer to obj_cgroup pointer array for slab pages. Currently, only the __GFP_ACCOUNT bit is masked off. However, the array is not readily reclaimable and doesn't need to come from the DMA buffer. So those GFP bits should be masked off as well.
Do the flag bit clearing at memcg_alloc_page_obj_cgroups() to make sure that it is consistently applied no matter where it is called.
--- mm/memcontrol.c | 8 ++++++++ mm/slab.h | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)
mm/memcontrol.c +8 -0
@@ -2739,6 +2739,13 @@ retry: }#ifdef CONFIG_MEMCG_KMEM +/* +* The allocated objcg pointers array is not accounted directly. +* Moreover, it should not come from DMA buffer and is not readily +* reclaimable. So those GFP bits should be masked off. +*/ +#define OBJCGS_CLEAR_MASK (__GFP_DMA | __GFP_RECLAIMABLE | __GFP_ACCOUNT) +int memcg_alloc_page_obj_cgroups (struct page *page,struct kmem_cache *s,gfp_t gfp,bool new_page) {
@@ -2746,6 +2753,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s,unsigned long memcg_data;void *vec; + gfp &= ~OBJCGS_CLEAR_MASK ; vec =kcalloc_node (objects,sizeof (struct obj_cgroup *), gfp,page_to_nid (page));if (!vec)
mm/slab.h +0 -1
@@ -309,7 +309,6 @@ static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s,if (!memcg_kmem_enabled () || !objcg)return ; - flags &= ~__GFP_ACCOUNT;for (i =0 ; i < size; i++) {if (likely (p[i])) { page =virt_to_head_page (p[i]);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 387/800 mm/page_alloc: fix counting of managed_pages
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
[ Upstream commit f7ec104458e00d27a190348ac3a513f3df3699a4 ]
commit f63661566fad ("mm/page_alloc.c: clear out zone->lowmem_reserve[] if the zone is empty") clears out zone->lowmem_reserve[] if zone is empty. But when zone is not empty and sysctl_lowmem_reserve_ratio[i] is set to zero, zone_managed_pages(zone) is not counted in the managed_pages either. This is inconsistent with the description of lowmem_reserve, so fix it.
--- mm/page_alloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
mm/page_alloc.c +6 -6
@@ -8087,14 +8087,14 @@ static void setup_per_zone_lowmem_reserve(void)unsigned long managed_pages =0 ;for (j = i +1 ; j <MAX_NR_ZONES ; j++) { -if (clear) { - zone->lowmem_reserve[j] =0 ; - }else { -struct zone *upper_zone = &pgdat->node_zones[j]; +struct zone *upper_zone = &pgdat->node_zones[j]; + + managed_pages +=zone_managed_pages (upper_zone); - managed_pages +=zone_managed_pages (upper_zone); +if (clear) + zone->lowmem_reserve[j] =0 ; +else zone->lowmem_reserve[j] = managed_pages / ratio; - } } } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 388/800 xfrm: xfrm_state_mtu should return at least 1280 for ipv6
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit b515d2637276a3810d6595e10ab02c13bfd0b63a ]
Jianwen reported that IPv6 Interoperability tests are failing in an IPsec case where one of the links between the IPsec peers has an MTU of 1280. The peer generates a packet larger than this MTU, the router replies with a "Packet too big" message indicating an MTU of 1280. When the peer tries to send another large packet, xfrm_state_mtu returns 1280 - ipsec_overhead, which causes ip6_setup_cork to fail with EINVAL.
We can fix this by forcing xfrm_state_mtu to return IPV6_MIN_MTU when IPv6 is used. After going through IPsec, the packet will then be fragmented to obey the actual network's PMTU, just before leaving the host.
Currently, TFC padding is capped to PMTU - overhead to avoid
fragementation: after padding and encapsulation, we still fit within the PMTU. That behavior is preserved in this patch.
--- include/net/xfrm.h | 1 + net/ipv4/esp4.c | 2 +- net/ipv6/esp6.c | 2 +- net/xfrm/xfrm_state.c | 14 ++++++++++++-- 4 files changed, 15 insertions(+), 4 deletions(-)
include/net/xfrm.h +1 -0
@@ -1546,6 +1546,7 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si);void xfrm_spd_getinfo (struct net *net,struct xfrmk_spdinfo *si);u32 xfrm_replay_seqhi (struct xfrm_state *x,__be32 net_seq);int xfrm_init_replay (struct xfrm_state *x); +u32 __xfrm_state_mtu (struct xfrm_state *x,int mtu);u32 xfrm_state_mtu (struct xfrm_state *x,int mtu);int __xfrm_init_state (struct xfrm_state *x,bool init_replay,bool offload);int xfrm_init_state (struct xfrm_state *x);
net/ipv4/esp4.c +1 -1
@@ -673,7 +673,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst (skb);u32 padto; - padto =min (x->tfcpad,xfrm_state_mtu (x, dst->child_mtu_cached)); + padto =min (x->tfcpad,__xfrm_state_mtu (x, dst->child_mtu_cached));if (skb->len < padto) esp.tfclen = padto - skb->len; }
net/ipv6/esp6.c +1 -1
@@ -708,7 +708,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst (skb);u32 padto; - padto =min (x->tfcpad,xfrm_state_mtu (x, dst->child_mtu_cached)); + padto =min (x->tfcpad,__xfrm_state_mtu (x, dst->child_mtu_cached));if (skb->len < padto) esp.tfclen = padto - skb->len; }
net/xfrm/xfrm_state.c +12 -2
@@ -2518,7 +2518,7 @@ void xfrm_state_delete_tunnel(struct xfrm_state *x) }EXPORT_SYMBOL (xfrm_state_delete_tunnel); -u32 xfrm_state_mtu (struct xfrm_state *x,int mtu) +u32 __xfrm_state_mtu (struct xfrm_state *x,int mtu) {const struct xfrm_type *type =READ_ONCE (x->type);struct crypto_aead *aead;
@@ -2549,7 +2549,17 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu)return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - net_adj) & ~(blksize -1 )) + net_adj -2 ; } -EXPORT_SYMBOL_GPL (xfrm_state_mtu); +EXPORT_SYMBOL_GPL (__xfrm_state_mtu); + +u32 xfrm_state_mtu (struct xfrm_state *x,int mtu) +{ + mtu =__xfrm_state_mtu (x, mtu); + +if (x->props.family ==AF_INET6 && mtu <IPV6_MIN_MTU ) +return IPV6_MIN_MTU ; + +return mtu; +}int __xfrm_init_state (struct xfrm_state *x,bool init_replay,bool offload) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 389/800 drm/bridge/sii8620: fix dependency on extcon
In reply to Greg Kroah-HartmanFrom: Robert Foss <[email protected]>
[ Upstream commit 08319adbdde15ef7cee1970336f63461254baa2a ]
The DRM_SIL_SII8620 kconfig has a weak imply dependency on EXTCON, which causes issues when sii8620 is built as a builtin and EXTCON is built as a module.
The symptoms are 'undefined reference' errors caused by the symbols in EXTCON not being available to the sii8620 driver.
--- drivers/gpu/drm/bridge/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/Kconfig +1 -1
@@ -172,7 +172,7 @@ config DRM_SIL_SII8620 tristate "Silicon Image SII8620 HDMI/MHL bridge" depends on OF select DRM_KMS_HELPER - imply EXTCON + select EXTCON depends on RC_CORE || !RC_CORE help Silicon Image SII8620 HDMI/MHL bridge chip driver.
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 390/800 drm/bridge: Fix the stop condition of drm_bridge_chain_pre_enable()
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit bab5cca7e609952b069a550e39fe4893149fb658 ]
The drm_bridge_chain_pre_enable() is not the proper opposite of drm_bridge_chain_post_disable(). It continues along the chain to _before_ the starting bridge. Let's fix that.
--- drivers/gpu/drm/drm_bridge.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_bridge.c +3 -0
@@ -522,6 +522,9 @@ void drm_bridge_chain_pre_enable(struct drm_bridge *bridge)list_for_each_entry_reverse (iter, &encoder->bridge_chain, chain_node) {if (iter->funcs->pre_enable) iter->funcs->pre_enable (iter); + +if (iter == bridge) +break ; } }EXPORT_SYMBOL (drm_bridge_chain_pre_enable);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 391/800 drm/amd/dc: Fix a missing check bug in dm_dp_mst_detect()
In reply to Greg Kroah-HartmanFrom: Yingjie Wang <[email protected]>
[ Upstream commit 655c0ed19772d92c9665ed08bdc5202acc096dda ]
In dm_dp_mst_detect(), We should check whether or not @connector has been unregistered from userspace. If the connector is unregistered, we should return disconnected status.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -0
@@ -278,6 +278,9 @@ dm_dp_mst_detect(struct drm_connector *connector,struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector);struct amdgpu_dm_connector *master = aconnector->mst_port; +if (drm_connector_is_unregistered (connector)) +return connector_status_disconnected; +return drm_dp_mst_detect_port (connector, ctx, &master->mst_mgr, aconnector->port); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 392/800 drm/ast: Fix missing conversions to managed API
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 9ea172a9a3f4a7c5e876469509fc18ddefc7d49d ]
The commit 7cbb93d89838 ("drm/ast: Use managed pci functions") converted a few PCI accessors to the managed API and dropped the manual pci_iounmap() calls, but it seems to have forgotten converting pci_iomap() to the managed one. It resulted in the leftover resources after the driver unbind. Let's fix them.
--- drivers/gpu/drm/ast/ast_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_main.c +2 -2
@@ -413,7 +413,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,pci_set_drvdata (pdev, dev); - ast->regs =pci_iomap (pdev,1 ,0 ); + ast->regs =pcim_iomap (pdev,1 ,0 );if (!ast->regs)return ERR_PTR (-EIO );
@@ -429,7 +429,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,/* "map" IO regs if the above hasn't done so already */ if (!ast->ioregs) { - ast->ioregs =pci_iomap (pdev,2 ,0 ); + ast->ioregs =pcim_iomap (pdev,2 ,0 );if (!ast->ioregs)return ERR_PTR (-EIO ); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 393/800 drm/bridge: anx7625: Fix power on delay
In reply to Greg Kroah-HartmanFrom: Hsin-Yi Wang <[email protected]>
[ Upstream commit 1fcf24fb07e254ca69001ab14adc8cf567127c44 ]
Quoted 1 line
From anx7625 spec, the delay between powering on power supplies and gpio
should be larger than 10ms.
--- drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +1 -1
@@ -893,7 +893,7 @@ static void anx7625_power_on(struct anx7625_data *ctx)usleep_range (2000 ,2100 ); } -usleep_range (4000 ,4100 ); +usleep_range (11000 ,12000 );/* Power on pin enable */ gpiod_set_value (ctx->pdata.gpio_p_on,1 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 394/800 drm/bridge: fix LONTIUM_LT8912B dependencies
In reply to Greg Kroah-HartmanFrom: Adrien Grassein <[email protected]>
[ Upstream commit 660729e494b6ee64feb97b41f3092c32a41c7dae ]
LONTIUM_LT8912B uses "drm_display_mode_to_videomode" from DRM framework that needs VIDEOMODE_HELPERS to be enabled.
--- drivers/gpu/drm/bridge/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/Kconfig +1 -0
@@ -68,6 +68,7 @@ config DRM_LONTIUM_LT8912B select DRM_KMS_HELPER select DRM_MIPI_DSI select REGMAP_I2C + select VIDEOMODE_HELPERS help Driver for Lontium LT8912B DSI to HDMI bridge chip driver.
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 395/800 video: fbdev: imxfb: Fix an error message
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 767d724a160eb1cd00c86fb8c2e21fa1ab3c37ac ]
'ret' is known to be 0 here.
No error code is available, so just remove it from the error message.
--- drivers/video/fbdev/imxfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/imxfb.c +1 -1
@@ -992,7 +992,7 @@ static int imxfb_probe(struct platform_device *pdev) info->screen_buffer =dma_alloc_wc (&pdev->dev, fbi->map_size, &fbi->map_dma,GFP_KERNEL );if (!info->screen_buffer) { -dev_err (&pdev->dev,"Failed to allocate video RAM: %d\n" , ret); +dev_err (&pdev->dev,"Failed to allocate video RAM\n" ); ret = -ENOMEM ; goto failed_map; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 396/800 drm/imx: ipuv3-plane: do not advertise YUV formats on planes without CSC
In reply to Greg Kroah-HartmanFrom: Philipp Zabel <[email protected]>
[ Upstream commit 06841148c570832d4d247b0f6befc1922a84120b ]
Only planes that are displayed via the Display Processor (DP) path support color space conversion. Limit formats on planes that are shown via the direct Display Controller (DC) path to RGB.
--- drivers/gpu/drm/imx/ipuv3-plane.c | 41 ++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-)
drivers/gpu/drm/imx/ipuv3-plane.c +37 -4
@@ -35,7 +35,7 @@ static inline struct ipu_plane *to_ipu_plane(struct drm_plane *p) return container_of(p, struct ipu_plane, base); } -static const uint32_t ipu_plane_formats[] = { +static const uint32_t ipu_plane_all_formats[] = {DRM_FORMAT_ARGB1555 ,DRM_FORMAT_XRGB1555 ,DRM_FORMAT_ABGR1555 ,
@@ -72,6 +72,31 @@ static const uint32_t ipu_plane_formats[] = { DRM_FORMAT_BGRX8888_A8, }; +static const uint32_t ipu_plane_rgb_formats[] = { +DRM_FORMAT_ARGB1555 , +DRM_FORMAT_XRGB1555 , +DRM_FORMAT_ABGR1555 , +DRM_FORMAT_XBGR1555 , +DRM_FORMAT_RGBA5551 , +DRM_FORMAT_BGRA5551 , +DRM_FORMAT_ARGB4444 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGBA8888 , +DRM_FORMAT_RGBX8888 , +DRM_FORMAT_BGRA8888 , +DRM_FORMAT_BGRX8888 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_RGB565_A8 , +DRM_FORMAT_BGR565_A8 , +DRM_FORMAT_RGB888_A8 , +DRM_FORMAT_BGR888_A8 , +DRM_FORMAT_RGBX8888_A8 , +DRM_FORMAT_BGRX8888_A8 , +}; +static const uint64_t ipu_format_modifiers[] = {DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID
@@ -830,16 +855,24 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,struct ipu_plane *ipu_plane;const uint64_t *modifiers = ipu_format_modifiers;unsigned int zpos = (type ==DRM_PLANE_TYPE_PRIMARY ) ?0 :1 ; +unsigned int format_count; +const uint32_t *formats;int ret;DRM_DEBUG_KMS ("channel %d, dp flow %d, possible_crtcs=0x%x\n" , dma, dp, possible_crtcs); +if (dp ==IPU_DP_FLOW_SYNC_BG || dp ==IPU_DP_FLOW_SYNC_FG ) { + formats = ipu_plane_all_formats; + format_count =ARRAY_SIZE (ipu_plane_all_formats); + }else { + formats = ipu_plane_rgb_formats; + format_count =ARRAY_SIZE (ipu_plane_rgb_formats); + } ipu_plane = drmm_universal_plane_alloc(dev, struct ipu_plane, base, possible_crtcs, &ipu_plane_funcs, - ipu_plane_formats, -ARRAY_SIZE (ipu_plane_formats), - modifiers, type,NULL ); + formats, format_count, modifiers, + type,NULL );if (IS_ERR (ipu_plane)) {DRM_ERROR ("failed to allocate and initialize %s plane\n" , zpos ?"overlay" :"primary" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 397/800 drm/imx: ipuv3-plane: fix PRG modifiers after drm managed resource conversion
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit 17b9a94656fe19aef3647c4f93d93be51697ceb1 ]
The conversion to drm managed resources introduced two bugs: the plane is now always initialized with the linear-only list, while the list with the Vivante GPU modifiers should have been used when the PRG/PRE engines are present. This masked another issue, as ipu_plane_format_mod_supported() is now called before the private plane data is set up, so if a non-linear modifier is supplied in the plane modifier list, we run into a NULL pointer dereference checking for the PRG presence. To fix this just remove the check from this function, as we know that it will only be called with a non-linear modifier, if the plane init code has already determined that the PRG/PRE is present.
--- drivers/gpu/drm/imx/ipuv3-plane.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/imx/ipuv3-plane.c +9 -7
@@ -345,10 +345,11 @@ static bool ipu_plane_format_mod_supported(struct drm_plane *plane,if (modifier ==DRM_FORMAT_MOD_LINEAR )return true; -/* without a PRG there are no supported modifiers */ -if (!ipu_prg_present (ipu)) -return false; - +/* +* Without a PRG the possible modifiers list only includes the linear +* modifier, so we always take the early return from this function and +* only end up here if the PRG is present. +*/ return ipu_prg_format_supported (ipu, format, modifier); }
@@ -869,6 +870,10 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu, formats = ipu_plane_rgb_formats; format_count =ARRAY_SIZE (ipu_plane_rgb_formats); } + +if (ipu_prg_present (ipu)) + modifiers = pre_format_modifiers; + ipu_plane = drmm_universal_plane_alloc(dev, struct ipu_plane, base, possible_crtcs, &ipu_plane_funcs, formats, format_count, modifiers,
@@ -883,9 +888,6 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu, ipu_plane->dma = dma; ipu_plane->dp_flow = dp; -if (ipu_prg_present (ipu)) - modifiers = pre_format_modifiers; -drm_plane_helper_add (&ipu_plane->base, &ipu_plane_helper_funcs);if (dp ==IPU_DP_FLOW_SYNC_BG || dp ==IPU_DP_FLOW_SYNC_FG )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 398/800 rtnetlink: avoid RCU read lock when holding RTNL
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit a100243d95a60d74ae9bb9df1f5f2192e9aed6a7 ]
When we call af_ops->set_link_af() we hold a RCU read lock as we retrieve af_ops from the RCU protected list, but this is unnecessary because we already hold RTNL lock, which is the writer lock for protecting rtnl_af_ops, so it is safer than RCU read lock. Similar for af_ops->validate_link_af().
This was not a problem until we begin to take mutex lock down the path of ->set_link_af() in __ipv6_dev_mc_dec() recently. We can just drop the RCU read lock there and assert RTNL lock.
--- net/core/rtnetlink.c | 26 +++++++------------------- net/ipv4/devinet.c | 4 ++-- 2 files changed, 9 insertions(+), 21 deletions(-)
net/core/rtnetlink.c +7 -19
@@ -543,7 +543,9 @@ static const struct rtnl_af_ops *rtnl_af_lookup(const int family) {const struct rtnl_af_ops *ops; -list_for_each_entry_rcu (ops, &rtnl_af_ops, list) { +ASSERT_RTNL (); + +list_for_each_entry (ops, &rtnl_af_ops, list) {if (ops->family == family)return ops; }
@@ -2274,27 +2276,18 @@ static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])nla_for_each_nested (af, tb[IFLA_AF_SPEC ], rem) {const struct rtnl_af_ops *af_ops; -rcu_read_lock (); af_ops =rtnl_af_lookup (nla_type (af)); -if (!af_ops) { -rcu_read_unlock (); +if (!af_ops)return -EAFNOSUPPORT ; - } -if (!af_ops->set_link_af) { -rcu_read_unlock (); +if (!af_ops->set_link_af)return -EOPNOTSUPP ; - }if (af_ops->validate_link_af) { err = af_ops->validate_link_af (dev, af); -if (err <0 ) { -rcu_read_unlock (); +if (err <0 )return err; - } } - -rcu_read_unlock (); } }
@@ -2868,17 +2861,12 @@ static int do_setlink(const struct sk_buff *skb,nla_for_each_nested (af, tb[IFLA_AF_SPEC ], rem) {const struct rtnl_af_ops *af_ops; -rcu_read_lock (); -BUG_ON (!(af_ops =rtnl_af_lookup (nla_type (af)))); err = af_ops->set_link_af (dev, af, extack); -if (err <0 ) { -rcu_read_unlock (); +if (err <0 ) goto errout; - } -rcu_read_unlock (); status |=DO_SETLINK_NOTIFY ; } }
net/ipv4/devinet.c +2 -2
@@ -1955,7 +1955,7 @@ static int inet_validate_link_af(const struct net_device *dev,struct nlattr *a, *tb[IFLA_INET_MAX +1 ];int err, rem; -if (dev && !__in_dev_get_rcu (dev)) +if (dev && !__in_dev_get_rtnl (dev))return -EAFNOSUPPORT ; err = nla_parse_nested_deprecated(tb, IFLA_INET_MAX, nla,
@@ -1981,7 +1981,7 @@ static int inet_validate_link_af(const struct net_device *dev,static int inet_set_link_af (struct net_device *dev,const struct nlattr *nla,struct netlink_ext_ack *extack) { -struct in_device *in_dev =__in_dev_get_rcu (dev); +struct in_device *in_dev =__in_dev_get_rtnl (dev);struct nlattr *a, *tb[IFLA_INET_MAX +1 ];int rem;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 399/800 net: mvpp2: Put fwnode in error case during ->probe()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 71f0891c84dfdc448736082ab0a00acd29853896 ]
In each iteration fwnode_for_each_available_child_node() bumps a reference counting of a loop variable followed by dropping in on a next iteration,
Since in error case the loop is broken, we have to drop a reference count by ourselves. Do it for port_fwnode in error case during ->probe().
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +2 -0
@@ -7588,6 +7588,8 @@ static int mvpp2_probe(struct platform_device *pdev)return 0 ; err_port_probe: +fwnode_handle_put (port_fwnode); + i =0 ;fwnode_for_each_available_child_node (fwnode, port_fwnode) {if (priv->port_list[i])
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 400/800 net: pch_gbe: Propagate error from devm_gpio_request_one()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 9e3617a7b84512bf96c04f9cf82d1a7257d33794 ]
If GPIO controller is not available yet we need to defer the probe of GBE until provider will become available.
While here, drop GPIOF_EXPORT because it's deprecated and may not be available.
--- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +7 -3
@@ -2532,9 +2532,13 @@ static int pch_gbe_probe(struct pci_dev *pdev, adapter->pdev = pdev; adapter->hw.back = adapter; adapter->hw.reg =pcim_iomap_table (pdev)[PCH_GBE_PCI_BAR ]; + adapter->pdata = (struct pch_gbe_privdata *)pci_id->driver_data; -if (adapter->pdata && adapter->pdata->platform_init) - adapter->pdata->platform_init (pdev); +if (adapter->pdata && adapter->pdata->platform_init) { + ret = adapter->pdata->platform_init (pdev); +if (ret) + goto err_free_netdev; + } adapter->ptp_pdev = pci_get_domain_bus_and_slot(pci_domain_nr(adapter->pdev->bus),
@@ -2629,7 +2633,7 @@ err_free_netdev:*/ static int pch_gbe_minnow_platform_init (struct pci_dev *pdev) { -unsigned long flags =GPIOF_DIR_OUT |GPIOF_INIT_HIGH |GPIOF_EXPORT ; +unsigned long flags =GPIOF_OUT_INIT_HIGH ;unsigned gpio =MINNOW_PHY_RESET_GPIO ;int ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 401/800 pinctrl: renesas: r8a7796: Add missing bias for PRESET# pin
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2cee31cd49733e89dfedf4f68a56839fc2e42040 ]
R-Car Gen3 Hardware Manual Errata for Rev. 0.52 of Nov 30, 2016, added the configuration bit for bias pull-down control for the PRESET# pin on R-Car M3-W. Add driver support for controlling pull-down on this pin.
--- drivers/pinctrl/renesas/pfc-r8a7796.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/renesas/pfc-r8a7796.c +2 -1
@@ -67,6 +67,7 @@PIN_NOGP_CFG (QSPI1_MOSI_IO0 ,"QSPI1_MOSI_IO0" , fn,CFG_FLAGS ), \PIN_NOGP_CFG (QSPI1_SPCLK ,"QSPI1_SPCLK" , fn,CFG_FLAGS ), \PIN_NOGP_CFG (QSPI1_SSL ,"QSPI1_SSL" , fn,CFG_FLAGS ), \ +PIN_NOGP_CFG (PRESET_N ,"PRESET#" , fn,SH_PFC_PIN_CFG_PULL_DOWN ),\PIN_NOGP_CFG (RPC_INT_N ,"RPC_INT#" , fn,CFG_FLAGS ), \PIN_NOGP_CFG (RPC_RESET_N ,"RPC_RESET#" , fn,CFG_FLAGS ), \ PIN_NOGP_CFG(RPC_WP_N, "RPC_WP#", fn, CFG_FLAGS), \
@@ -6218,7 +6219,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { [ 4] = RCAR_GP_PIN(6, 29), /* USB30_OVC */ [ 5] = RCAR_GP_PIN(6, 30), /* GP6_30 */ [ 6] = RCAR_GP_PIN(6, 31), /* GP6_31 */ - [ 7] = SH_PFC_PIN_NONE, + [ 7] = PIN_PRESET_N, /* PRESET# */ [ 8] = SH_PFC_PIN_NONE, [ 9] = SH_PFC_PIN_NONE, [10] = SH_PFC_PIN_NONE,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 402/800 pinctrl: renesas: r8a77990: JTAG pins do not have pull-down capabilities
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 702a5fa2fe4d7e7f28fed92a170b540acfff9d34 ]
Hence remove the SH_PFC_PIN_CFG_PULL_DOWN flags from their pin descriptions.
--- drivers/pinctrl/renesas/pfc-r8a77990.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/renesas/pfc-r8a77990.c +4 -4
@@ -53,10 +53,10 @@PIN_NOGP_CFG (FSCLKST_N ,"FSCLKST_N" , fn,CFG_FLAGS ), \PIN_NOGP_CFG (MLB_REF ,"MLB_REF" , fn,CFG_FLAGS ), \PIN_NOGP_CFG (PRESETOUT_N ,"PRESETOUT_N" , fn,CFG_FLAGS ), \ -PIN_NOGP_CFG (TCK ,"TCK" , fn,CFG_FLAGS ), \ -PIN_NOGP_CFG (TDI ,"TDI" , fn,CFG_FLAGS ), \ -PIN_NOGP_CFG (TMS ,"TMS" , fn,CFG_FLAGS ), \ -PIN_NOGP_CFG (TRST_N ,"TRST_N" , fn,CFG_FLAGS ) +PIN_NOGP_CFG (TCK ,"TCK" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ +PIN_NOGP_CFG (TDI ,"TDI" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ +PIN_NOGP_CFG (TMS ,"TMS" , fn,SH_PFC_PIN_CFG_PULL_UP ), \ +PIN_NOGP_CFG (TRST_N ,"TRST_N" , fn,SH_PFC_PIN_CFG_PULL_UP )/* * F_() : just information
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 403/800 RDMA/hns: Remove the condition of light load for posting DWQE
In reply to Greg Kroah-HartmanFrom: Yixian Liu <[email protected]>
[ Upstream commit 591f762b2750c628df9412d1c795b56e83a34b3e ]
Even in the case of heavy load, direct WQE can still be posted. The hardware will decide whether to drop the DWQE or not. Thus, the limit needs to be removed.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -2
@@ -791,8 +791,7 @@ out: qp->sq.head += nreq; qp->next_sge = sge_idx; -if (nreq ==1 && qp->sq.head == qp->sq.tail +1 && - (qp->en_flags &HNS_ROCE_QP_CAP_DIRECT_WQE )) +if (nreq ==1 && (qp->en_flags &HNS_ROCE_QP_CAP_DIRECT_WQE ))write_dwqe (hr_dev, qp, wqe);else update_sq_db (hr_dev, qp);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 404/800 drm/vmwgfx: Mark a surface gpu-dirty after the SVGA3dCmdDXGenMips command
In reply to Greg Kroah-HartmanFrom: Thomas Hellstrom <[email protected]>
[ Upstream commit 75156a887b6cea6e09d83ec19f4ebfd7c86265f0 ]
The SVGA3dCmdDXGenMips command uses a shader-resource view to access the underlying surface. Normally accesses using that view-type are not dirtying the underlying surface, but that particular command is an exception.
Mark the surface gpu-dirty after a SVGA3dCmdDXGenMips command has been submitted.
This fixes the piglit getteximage-formats test run with SVGA_FORCE_COHERENT=1
--- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +16 -4
@@ -2763,12 +2763,24 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv, {VMW_DECLARE_CMD_VAR (*cmd, SVGA3dCmdDXGenMips) =container_of (header,typeof (*cmd), header); -struct vmw_resource *ret; +struct vmw_resource *view; +struct vmw_res_cache_entry *rcache; - ret =vmw_view_id_val_add (sw_context, vmw_view_sr, - cmd->body.shaderResourceViewId); + view =vmw_view_id_val_add (sw_context, vmw_view_sr, + cmd->body.shaderResourceViewId); +if (IS_ERR (view)) +return PTR_ERR (view); -return PTR_ERR_OR_ZERO (ret); +/* +* Normally the shader-resource view is not gpu-dirtying, but for +* this particular command it is... +* So mark the last looked-up surface, which is the surface +* the view points to, gpu-dirty. +*/ + rcache = &sw_context->res_cache[vmw_res_surface]; +vmw_validation_res_set_dirty (sw_context->ctx, rcache->private, +VMW_RES_DIRTY_SET ); +return 0 ; }/**
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 405/800 drm/vmwgfx: Fix cpu updates of coherent multisample surfaces
In reply to Greg Kroah-HartmanFrom: Thomas Hellstrom <[email protected]>
[ Upstream commit 88509f698c4e38e287e016e86a0445547824135c ]
In cases where the dirty linear memory range spans multiple sample sheets in a surface, the dirty surface region is incorrectly computed. To do this correctly and in an optimized fashion we would have to compute the dirty region of each sample sheet and compute the union of those regions.
But assuming that cpu writing to a multisample surface is rather a corner case than a common case, just set the dirty region to the full surface.
This fixes OpenGL piglit errors with SVGA_FORCE_COHERENT=1 and the piglit test:
fbo-depthstencil blit default_fb -samples=2 -auto
--- .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 8 ++++++-- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/device_include/svga3d_surfacedefs.h +6 -2
@@ -1467,6 +1467,7 @@ struct svga3dsurface_cache {/** * struct svga3dsurface_loc - Surface location +* @sheet: The multisample sheet. * @sub_resource: Surface subresource. Defined as layer * num_mip_levels + * mip_level. * @x: X coordinate.
@@ -1474,6 +1475,7 @@ struct svga3dsurface_cache {* @z: Z coordinate. */ struct svga3dsurface_loc { +u32 sheet;u32 sub_resource;u32 x, y, z; };
@@ -1566,8 +1568,8 @@ svga3dsurface_get_loc(const struct svga3dsurface_cache *cache,u32 layer;int i; -if (offset >= cache->sheet_bytes) - offset %= cache->sheet_bytes; + loc->sheet = offset / cache->sheet_bytes; + offset -= loc->sheet * cache->sheet_bytes; layer = offset / cache->mip_chain_bytes; offset -= layer * cache->mip_chain_bytes;
@@ -1631,6 +1633,7 @@ svga3dsurface_min_loc(const struct svga3dsurface_cache *cache,u32 sub_resource, struct svga3dsurface_loc *loc) { + loc->sheet = 0; loc->sub_resource = sub_resource; loc->x = loc->y = loc->z =0 ; }
@@ -1652,6 +1655,7 @@ svga3dsurface_max_loc(const struct svga3dsurface_cache *cache,const struct drm_vmw_size *size;u32 mip; + loc->sheet =0 ; loc->sub_resource = sub_resource +1 ; mip = sub_resource % cache->num_mip_levels; size = &cache->mip[mip].size;
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +13 -0
@@ -1804,6 +1804,19 @@ static void vmw_surface_tex_dirty_range_add(struct vmw_resource *res,svga3dsurface_get_loc (cache, &loc2, end -1 );svga3dsurface_inc_loc (cache, &loc2); +if (loc1.sheet != loc2.sheet) { +u32 sub_res; + +/* +* Multiple multisample sheets. To do this in an optimized +* fashion, compute the dirty region for each sheet and the +* resulting union. Since this is not a common case, just dirty +* the whole surface. +*/ +for (sub_res =0 ; sub_res < dirty->num_subres; ++sub_res) +vmw_subres_dirty_full (dirty, sub_res); +return ; + }if (loc1.sub_resource +1 == loc2.sub_resource) {/* Dirty range covers a single sub-resource */ vmw_subres_dirty_add (dirty, &loc1, &loc2);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 406/800 libbpf: Fix ELF symbol visibility update logic
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 247b8634e6446dbc8024685f803290501cba226f ]
Fix silly bug in updating ELF symbol's visibility.
--- tools/lib/bpf/linker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/linker.c +1 -1
@@ -1780,7 +1780,7 @@ static void sym_update_visibility(Elf64_Sym *sym, int sym_vis)/* libelf doesn't provide setters for ST_VISIBILITY, * but it is stored in the lower 2 bits of st_other */ - sym->st_other &=0x03 ; + sym->st_other &= ~0x03 ; sym->st_other |= sym_vis; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 407/800 drm/i915: Merge fix for "drm: Switch to %p4cc format modifier"
In reply to Greg Kroah-HartmanFrom: Stephen Rothwell <[email protected]>
[ Upstream commit e3c2f1870af43fc95f6fe141537f5142c5fe4717 ]
--- drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/skl_universal_plane.c +2 -4
@@ -1082,7 +1082,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);const struct drm_framebuffer *fb = plane_state->hw.fb;unsigned int rotation = plane_state->hw.rotation; -struct drm_format_name_buf format_name;if (!fb)return 0 ;
@@ -1130,9 +1129,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,case DRM_FORMAT_XVYU12_16161616 :case DRM_FORMAT_XVYU16161616 :drm_dbg_kms (&dev_priv->drm, -"Unsupported pixel format %s for 90/270!\n" , -drm_get_format_name (fb->format->format, - &format_name)); +"Unsupported pixel format %p4cc for 90/270!\n" , + &fb->format->format);return -EINVAL ;default :break ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 408/800 net: qrtr: ns: Fix error return code in qrtr_ns_init()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit a49e72b3bda73d36664a084e47da9727a31b8095 ]
Fix to return a negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function.
--- net/qrtr/ns.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/qrtr/ns.c +3 -1
@@ -775,8 +775,10 @@ int qrtr_ns_init(void) } qrtr_ns.workqueue =alloc_workqueue ("qrtr_ns_handler" ,WQ_UNBOUND ,1 ); -if (!qrtr_ns.workqueue) +if (!qrtr_ns.workqueue) { + ret = -ENOMEM ; goto err_sock; + } qrtr_ns.sock->sk->sk_data_ready = qrtr_ns_data_ready;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 409/800 clk: meson: g12a: fix gp0 and hifi ranges
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit bc794f8c56abddf709f1f84fcb2a3c9e7d9cc9b4 ]
While some SoC samples are able to lock with a PLL factor of 55, others samples can't. ATM, a minimum of 60 appears to work on all the samples I have tried.
Even with 60, it sometimes takes a long time for the PLL to eventually lock. The documentation says that the minimum rate of these PLLs DCO should be 3GHz, a factor of 125. Let's use that to be on the safe side.
With factor range changed, the PLL seems to lock quickly (enough) so far. It is still unclear if the range was the only reason for the delay.
--- drivers/clk/meson/g12a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/g12a.c +1 -1
@@ -1603,7 +1603,7 @@ static struct clk_regmap g12b_cpub_clk_trace = { };static const struct pll_mult_range g12a_gp0_pll_mult_range = { - .min =55 , + .min =125 , .max =255 , };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 410/800 drm/amd/display: fix potential gpu reset deadlock
In reply to Greg Kroah-HartmanFrom: Roman Li <[email protected]>
[ Upstream commit cf8b92a75646735136053ce51107bfa8cfc23191 ]
[Why]
In gpu reset dc_lock acquired in dm_suspend(). Asynchronously handle_hpd_rx_irq can also be called through amdgpu_dm_irq_suspend->flush_work, which also tries to acquire dc_lock. That causes a deadlock.
[How]
Check if amdgpu executing reset before acquiring dc_lock.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -2
@@ -2726,13 +2726,15 @@ static void handle_hpd_rx_irq(void *param) } } -mutex_lock (&adev->dm.dc_lock); +if (!amdgpu_in_reset (adev)) +mutex_lock (&adev->dm.dc_lock);#ifdef CONFIG_DRM_AMD_DC_HDCP result =dc_link_handle_hpd_rx_irq (dc_link, &hpd_irq_data,NULL );#else result =dc_link_handle_hpd_rx_irq (dc_link,NULL ,NULL );#endif -mutex_unlock (&adev->dm.dc_lock); +if (!amdgpu_in_reset (adev)) +mutex_unlock (&adev->dm.dc_lock); out:if (result && !is_mst_root_connector) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 411/800 drm/amd/display: Avoid HPD IRQ in GPU reset state
In reply to Greg Kroah-HartmanFrom: Zhan Liu <[email protected]>
[ Upstream commit 509b9a5b4865dee723296f143695a7774fc96c4a ]
[Why]
If GPU is in reset state, force enabling link will cause unexpected behaviour.
[How]
Avoid handling HPD IRQ when GPU is in reset state.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -2726,15 +2726,15 @@ static void handle_hpd_rx_irq(void *param) } } -if (!amdgpu_in_reset (adev)) +if (!amdgpu_in_reset (adev)) {mutex_lock (&adev->dm.dc_lock);#ifdef CONFIG_DRM_AMD_DC_HDCP result =dc_link_handle_hpd_rx_irq (dc_link, &hpd_irq_data,NULL );#else result =dc_link_handle_hpd_rx_irq (dc_link,NULL ,NULL );#endif -if (!amdgpu_in_reset (adev))mutex_unlock (&adev->dm.dc_lock); + } out:if (result && !is_mst_root_connector) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 412/800 drm/amd/display: take dc_lock in short pulse handler only
In reply to Greg Kroah-HartmanFrom: Aurabindo Pillai <[email protected]>
[ Upstream commit d2aa1356834d845ffdac0d8c01b58aa60d1bdc65 ]
[Why]
Conditions that end up modifying the global dc state must be locked. However, during mst allocate payload sequence, lock is already taken. With StarTech 1.2 DP hub, we get an HPD RX interrupt for a reason other than to indicate down reply availability right after sending payload allocation. The handler again takes dc lock before calling the dc's HPD RX handler. Due to this contention, the DRM thread which waits for MST down reply never gets a chance to finish its waiting successfully and ends up timing out. Once the lock is released, the hpd rx handler fires and goes ahead to read from the MST HUB, but now its too late and the HUB doesnt lightup all displays since DRM lacks error handling when payload allocation fails.
[How]
Take lock only if there is a change in link status or if automated test pattern bit is set. The latter fixes the null pointer dereference when running certain DP Link Layer Compliance test.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +++++++++++++++++-- .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 ++++ 3 files changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +17 -2
@@ -28,6 +28,7 @@#include "dm_services_types.h" #include "dc.h" +#include "dc_link_dp.h" #include "dc/inc/core_types.h" #include "dal_asic_id.h" #include "dmub/dmub_srv.h"
@@ -2696,6 +2697,7 @@ static void handle_hpd_rx_irq(void *param)enum dc_connection_type new_connection_type = dc_connection_none;struct amdgpu_device *adev =drm_to_adev (dev);union hpd_irq_data hpd_irq_data; +bool lock_flag =0 ;memset (&hpd_irq_data,0 ,sizeof (hpd_irq_data));
@@ -2726,15 +2728,28 @@ static void handle_hpd_rx_irq(void *param) } } -if (!amdgpu_in_reset (adev)) { +/* +* TODO: We need the lock to avoid touching DC state while it's being +* modified during automated compliance testing, or when link loss +* happens. While this should be split into subhandlers and proper +* interfaces to avoid having to conditionally lock like this in the +* outer layer, we need this workaround temporarily to allow MST +* lightup in some scenarios to avoid timeout. +*/ +if (!amdgpu_in_reset (adev) && + (hpd_rx_irq_check_link_loss_status (dc_link, &hpd_irq_data) || + hpd_irq_data.bytes.device_service_irq.bits.AUTOMATED_TEST)) {mutex_lock (&adev->dm.dc_lock); + lock_flag =1 ; + } +#ifdef CONFIG_DRM_AMD_DC_HDCP result =dc_link_handle_hpd_rx_irq (dc_link, &hpd_irq_data,NULL );#else result =dc_link_handle_hpd_rx_irq (dc_link,NULL ,NULL );#endif +if (!amdgpu_in_reset (adev) && lock_flag)mutex_unlock (&adev->dm.dc_lock); - } out:if (result && !is_mst_root_connector) {
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -1
@@ -1976,7 +1976,7 @@ enum dc_status read_hpd_rx_irq_data(return retval; } -static bool hpd_rx_irq_check_link_loss_status ( +bool hpd_rx_irq_check_link_loss_status (struct dc_link *link,union hpd_irq_data *hpd_irq_dpcd_data) {
drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h +4 -0
@@ -67,6 +67,10 @@ bool perform_link_training_with_retries(struct pipe_ctx *pipe_ctx, enum signal_type signal); +bool hpd_rx_irq_check_link_loss_status ( +struct dc_link *link, +union hpd_irq_data *hpd_irq_dpcd_data); +bool is_mst_supported (struct dc_link *link);bool detect_dp_sink_caps (struct dc_link *link);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 413/800 net: ftgmac100: add missing error return code in ftgmac100_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 52af13a41489d7bbc1932d17583eff6e5fffc820 ]
The variables will be free on path err_phy_connect, it should return error code, or it will cause double free when calling ftgmac100_remove().
--- drivers/net/ethernet/faraday/ftgmac100.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/faraday/ftgmac100.c +5 -1
@@ -1830,14 +1830,17 @@ static int ftgmac100_probe(struct platform_device *pdev)if (np &&of_get_property (np,"use-ncsi" ,NULL )) {if (!IS_ENABLED (CONFIG_NET_NCSI )) {dev_err (&pdev->dev,"NCSI stack not enabled\n" ); + err = -EINVAL ; goto err_phy_connect; }dev_info (&pdev->dev,"Using NCSI interface\n" ); priv->use_ncsi = true; priv->ndev =ncsi_register_dev (netdev, ftgmac100_ncsi_handler); -if (!priv->ndev) +if (!priv->ndev) { + err = -EINVAL ; goto err_phy_connect; + } }else if (np &&of_get_property (np,"phy-handle" ,NULL )) {struct phy_device *phy;
@@ -1856,6 +1859,7 @@ static int ftgmac100_probe(struct platform_device *pdev) &ftgmac100_adjust_link);if (!phy) {dev_err (&pdev->dev,"Failed to connect to phy\n" ); + err = -EINVAL ; goto err_phy_connect; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 414/800 clk: rockchip: fix rk3568 cpll clk gate bits
In reply to Greg Kroah-HartmanFrom: Peter Geis <[email protected]>
[ Upstream commit 2f3877d609e7951ef96d24979eb9d163f1f004f8 ]
The cpll clk gate bits had an ordering issue. This led to the loss of the boot sdmmc controller when the gmac was shut down with:ip link set eth0 down
as the cpll_100m was shut off instead of the cpll_62p5. cpll_62p5, cpll_50m, cpll_25m were all off by one with cpll_100m misplaced.
--- drivers/clk/rockchip/clk-rk3568.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/rockchip/clk-rk3568.c +5 -5
@@ -454,17 +454,17 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {COMPOSITE_NOMUX (CPLL_125M ,"cpll_125m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (80 ),0 ,5 ,DFLAGS ,RK3568_CLKGATE_CON (35 ),10 ,GFLAGS ), +COMPOSITE_NOMUX (CPLL_100M ,"cpll_100m" ,"cpll" ,CLK_IGNORE_UNUSED , +RK3568_CLKSEL_CON (82 ),0 ,5 ,DFLAGS , +RK3568_CLKGATE_CON (35 ),11 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_62P5M ,"cpll_62p5" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (80 ),8 ,5 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),11 ,GFLAGS ), +RK3568_CLKGATE_CON (35 ),12 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_50M ,"cpll_50m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (81 ),0 ,5 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),12 ,GFLAGS ), +RK3568_CLKGATE_CON (35 ),13 ,GFLAGS ),COMPOSITE_NOMUX (CPLL_25M ,"cpll_25m" ,"cpll" ,CLK_IGNORE_UNUSED ,RK3568_CLKSEL_CON (81 ),8 ,6 ,DFLAGS , -RK3568_CLKGATE_CON (35 ),13 ,GFLAGS ), -COMPOSITE_NOMUX (CPLL_100M ,"cpll_100m" ,"cpll" ,CLK_IGNORE_UNUSED , -RK3568_CLKSEL_CON (82 ),0 ,5 ,DFLAGS ,RK3568_CLKGATE_CON (35 ),14 ,GFLAGS ), COMPOSITE_NOMUX(0, "clk_osc0_div_750k", "xin24m", CLK_IGNORE_UNUSED, RK3568_CLKSEL_CON(82), 8, 6, DFLAGS,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 415/800 clk: sunxi-ng: v3s: fix incorrect postdivider on pll-audio
In reply to Greg Kroah-HartmanFrom: Tobias Schramm <[email protected]>
[ Upstream commit 47e4dc4e63e1dcb8eec01c4214bcefc248eb72ed ]
Commit 46060be6d840 ("clk: sunxi-ng: v3s: use sigma-delta modulation for audio-pll") changed the audio pll on the Allwinner V3s and V3 SoCs to use sigma-delta modulation. In the process the declaration of fixed postdivider providing "pll-audio" was adjusted to provide the desired clock rates from the now sigma-delta modulated pll.
However, while the divider used for calculations by the clock framework was adjusted the actual divider programmed into the hardware in sun8i_v3_v3s_ccu_init was left at "divide by four". This broke the "pll-audio" clock, now only providing quater the expected clock rate. It would in general be desirable to program the postdivider for "pll-audio" to four, such that a broader range of frequencies were available on the pll outputs. But the clock for the integrated codec "ac-dig" does not feature a mux that allows to select from all pll outputs as it is just a simple clock gate connected to "pll-audio". Thus we need to set the postdivider to one to be able to provide the 22.5792MHz and 24.576MHz rates required by the internal sun4i codec.
This patches fixes the incorrect clock rate by forcing the postdivider to one in sun8i_v3_v3s_ccu_init.
--- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +2 -2
@@ -817,10 +817,10 @@ static void __init sun8i_v3_v3s_ccu_init(struct device_node *node,return ; } -/* Force the PLL-Audio-1x divider to 4 */ +/* Force the PLL-Audio-1x divider to 1 */ val =readl (reg +SUN8I_V3S_PLL_AUDIO_REG ); val &= ~GENMASK (19 ,16 ); -writel (val | (3 <<16 ), reg +SUN8I_V3S_PLL_AUDIO_REG ); +writel (val, reg +SUN8I_V3S_PLL_AUDIO_REG );sunxi_ccu_probe (node, reg, ccu_desc); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 416/800 drm/vc4: crtc: Pass the drm_atomic_state to config_pv
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit c6883985d46319e0d4f159de8932b09ff93e877d ]
The vc4_crtc_config_pv will need to access the drm_atomic_state structure and its only parent function, vc4_crtc_atomic_enable already has access to it. Let's pass it as a parameter.
--- drivers/gpu/drm/vc4/vc4_crtc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_crtc.c +4 -4
@@ -305,7 +305,7 @@ static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc)CRTC_WRITE (PV_CONTROL ,CRTC_READ (PV_CONTROL ) |PV_CONTROL_FIFO_CLR ); } -static void vc4_crtc_config_pv (struct drm_crtc *crtc) +static void vc4_crtc_config_pv (struct drm_crtc *crtc,struct drm_atomic_state *state) {struct drm_device *dev = crtc->dev;struct vc4_dev *vc4 =to_vc4_dev (dev);
@@ -313,8 +313,8 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)struct vc4_encoder *vc4_encoder =to_vc4_encoder (encoder);struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc);const struct vc4_pv_data *pv_data =vc4_crtc_to_vc4_pv_data (vc4_crtc); -struct drm_crtc_state *state = crtc->state; -struct drm_display_mode *mode = &state->adjusted_mode; +struct drm_crtc_state *crtc_state = crtc->state; +struct drm_display_mode *mode = &crtc_state->adjusted_mode;bool interlace = mode->flags &DRM_MODE_FLAG_INTERLACE ;u32 pixel_rep = (mode->flags &DRM_MODE_FLAG_DBLCLK ) ?2 :1 ; bool is_dsi = (vc4_encoder->type == VC4_ENCODER_TYPE_DSI0 ||
@@ -539,7 +539,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,if (vc4_encoder->pre_crtc_configure) vc4_encoder->pre_crtc_configure (encoder, state); -vc4_crtc_config_pv (crtc); +vc4_crtc_config_pv (crtc, state);CRTC_WRITE (PV_CONTROL ,CRTC_READ (PV_CONTROL ) |PV_CONTROL_EN );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 417/800 drm/vc4: crtc: Fix vc4_get_crtc_encoder logic
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 5a184d959d5a5a66b377cb5cd4c95a80388e0c88 ]
The vc4_get_crtc_encoder function currently only works when the connector->state->crtc pointer is set, which is only true when the connector is currently enabled.
However, we use it as part of the disable path as well, and our lookup will fail in that case, resulting in it returning a null pointer we can't act on.
We can access the connector that used to be connected to that crtc though using the old connector state in the disable path.
Since we want to support both the enable and disable path, we can support it by passing the state accessor variant as a function pointer, together with the atomic state.
--- drivers/gpu/drm/vc4/vc4_crtc.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/gpu/drm/vc4/vc4_crtc.c +16 -5
@@ -279,14 +279,22 @@ static u32 vc4_crtc_get_fifo_full_level_bits(struct vc4_crtc *vc4_crtc,* allows drivers to push pixels to more than one encoder from the * same CRTC. */ -static struct drm_encoder *vc4_get_crtc_encoder (struct drm_crtc *crtc) +static struct drm_encoder *vc4_get_crtc_encoder (struct drm_crtc *crtc, +struct drm_atomic_state *state, +struct drm_connector_state *(*get_state)(struct drm_atomic_state *state, +struct drm_connector *connector)) {struct drm_connector *connector;struct drm_connector_list_iter conn_iter;drm_connector_list_iter_begin (crtc->dev, &conn_iter);drm_for_each_connector_iter (connector, &conn_iter) { -if (connector->state->crtc == crtc) { +struct drm_connector_state *conn_state =get_state (state, connector); + +if (!conn_state) +continue ; + +if (conn_state->crtc == crtc) {drm_connector_list_iter_end (&conn_iter);return connector->encoder; }
@@ -309,7 +317,8 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_atomic_state *s {struct drm_device *dev = crtc->dev;struct vc4_dev *vc4 =to_vc4_dev (dev); -struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc); +struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc, state, + drm_atomic_get_new_connector_state);struct vc4_encoder *vc4_encoder =to_vc4_encoder (encoder);struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc);const struct vc4_pv_data *pv_data =vc4_crtc_to_vc4_pv_data (vc4_crtc);
@@ -424,7 +433,8 @@ static int vc4_crtc_disable(struct drm_crtc *crtc, struct drm_atomic_state *state, unsigned int channel) { -struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc); +struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc, state, + drm_atomic_get_old_connector_state);struct vc4_encoder *vc4_encoder =to_vc4_encoder (encoder);struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc);struct drm_device *dev = crtc->dev;
@@ -524,7 +534,8 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc, {struct drm_device *dev = crtc->dev;struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc); -struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc); +struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc, state, + drm_atomic_get_new_connector_state);struct vc4_encoder *vc4_encoder =to_vc4_encoder (encoder);require_hvs_enabled (dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 418/800 drm/vc4: crtc: Lookup the encoder from the register at boot
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit b601c16b7ba8f3bb7a7e773b238da6b63657fa1d ]
At boot, we can't rely on the vc4_get_crtc_encoder since we don't have a state yet and thus will not be able to figure out which connector is attached to our CRTC.
However, we have a muxing bit in the CRTC register we can use to get the encoder currently connected to the pixelvalve. We can thus read that register, lookup the associated register through the vc4_pv_data structure, and then pass it to vc4_crtc_disable so that we can perform the proper operations.
--- drivers/gpu/drm/vc4/vc4_crtc.c | 38 ++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_crtc.c +34 -4
@@ -430,11 +430,10 @@ static void require_hvs_enabled(struct drm_device *dev) }static int vc4_crtc_disable (struct drm_crtc *crtc, +struct drm_encoder *encoder,struct drm_atomic_state *state,unsigned int channel) { -struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc, state, - drm_atomic_get_old_connector_state);struct vc4_encoder *vc4_encoder =to_vc4_encoder (encoder);struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc);struct drm_device *dev = crtc->dev;
@@ -475,10 +474,29 @@ static int vc4_crtc_disable(struct drm_crtc *crtc,return 0 ; } +static struct drm_encoder *vc4_crtc_get_encoder_by_type (struct drm_crtc *crtc, +enum vc4_encoder_type type) +{ +struct drm_encoder *encoder; + +drm_for_each_encoder (encoder, crtc->dev) { +struct vc4_encoder *vc4_encoder =to_vc4_encoder (encoder); + +if (vc4_encoder->type == type) +return encoder; + } + +return NULL ; +} +int vc4_crtc_disable_at_boot (struct drm_crtc *crtc) {struct drm_device *drm = crtc->dev;struct vc4_crtc *vc4_crtc =to_vc4_crtc (crtc); +enum vc4_encoder_type encoder_type; +const struct vc4_pv_data *pv_data; +struct drm_encoder *encoder; +unsigned encoder_sel;int channel; if (!(of_device_is_compatible(vc4_crtc->pdev->dev.of_node,
@@ -497,7 +515,17 @@ int vc4_crtc_disable_at_boot(struct drm_crtc *crtc)if (channel <0 )return 0 ; -return vc4_crtc_disable (crtc,NULL , channel); + encoder_sel =VC4_GET_FIELD (CRTC_READ (PV_CONTROL ),PV_CONTROL_CLK_SELECT ); +if (WARN_ON (encoder_sel !=0 )) +return 0 ; + + pv_data =vc4_crtc_to_vc4_pv_data (vc4_crtc); + encoder_type = pv_data->encoder_types[encoder_sel]; + encoder =vc4_crtc_get_encoder_by_type (crtc, encoder_type); +if (WARN_ON (!encoder)) +return 0 ; + +return vc4_crtc_disable (crtc, encoder,NULL , channel); } static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -506,6 +534,8 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,struct drm_crtc_state *old_state =drm_atomic_get_old_crtc_state (state, crtc);struct vc4_crtc_state *old_vc4_state =to_vc4_crtc_state (old_state); +struct drm_encoder *encoder =vc4_get_crtc_encoder (crtc, state, + drm_atomic_get_old_connector_state);struct drm_device *dev = crtc->dev;require_hvs_enabled (dev);
@@ -513,7 +543,7 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc,/* Disable vblank irq handling before crtc is disabled. */ drm_crtc_vblank_off (crtc); -vc4_crtc_disable (crtc, state, old_vc4_state->assigned_channel); +vc4_crtc_disable (crtc, encoder, state, old_vc4_state->assigned_channel);/* * Make sure we issue a vblank event after disabling the CRTC if
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 419/800 drm: rockchip: set alpha_en to 0 if it is not used
In reply to Greg Kroah-HartmanFrom: Alex Bee <[email protected]>
[ Upstream commit 046e0db975695540c9d9898cdbf0b60533d28afb ]
alpha_en should be set to 0 if it is not used, i.e. to disable alpha blending if it was enabled before and should be disabled now.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +1 -0
@@ -1022,6 +1022,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,VOP_WIN_SET (vop, win, alpha_en,1 ); }else {VOP_WIN_SET (vop, win, src_alpha_ctl,SRC_ALPHA_EN (0 )); +VOP_WIN_SET (vop, win, alpha_en,0 ); }VOP_WIN_SET (vop, win, enable,1 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 420/800 drm/rockchip: cdn-dp-core: add missing clk_disable_unprepare() on error in cdn_dp_grf_write()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ae41d925c75b53798f289c69ee8d9f7d36432f6d ]
After calling clk_prepare_enable(), clk_disable_unprepare() need be called when calling regmap_write() failed.
--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/cdn-dp-core.c +1 -0
@@ -73,6 +73,7 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp, ret =regmap_write (dp->grf, reg, val);if (ret) {DRM_DEV_ERROR (dp->dev,"Could not write to GRF: %d\n" , ret); +clk_disable_unprepare (dp->grf_clk);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 421/800 drm/rockchip: dsi: move all lane config except LCDC mux to bind()
In reply to Greg Kroah-HartmanFrom: Thomas Hebb <[email protected]>
[ Upstream commit 43c2de1002d2b70fb5941fa14e97a34e3dc214d4 ]
When we first enable the DSI encoder, we currently program some per-chip configuration that we look up in rk3399_chip_data based on the device tree compatible we match. This data configures various parameters of the MIPI lanes, including on RK3399 whether DSI1 is slaved to DSI0 in a dual-mode configuration. It also selects which LCDC (i.e. VOP) to scan out from.
This causes a problem in RK3399 dual-mode configurations, though: panel prepare() callbacks run before the encoder gets enabled and expect to be able to write commands to the DSI bus, but the bus isn't fully functional until the lane and master/slave configuration have been programmed. As a result, dual-mode panels (and possibly others too) fail to turn on when the rockchipdrm driver is initially loaded.
Because the LCDC mux is the only thing we don't know until enable time (and is the only thing that can ever change), we can actually move most of the initialization to bind() and get it out of the way early. That's what this change does. (Rockchip's 4.4 BSP kernel does it in mode_set(), which also avoids the issue, but bind() seems like the more correct place to me.)
Tested on a Google Scarlet board (Acer Chromebook Tab 10), which has a Kingdisplay KD097D04 dual-mode panel. Prior to this change, the panel's backlight would turn on but no image would appear when initially loading rockchipdrm. If I kept rockchipdrm loaded and reloaded the panel driver, it would come on. With this change, the panel successfully turns on during initial rockchipdrm load as expected.
--- .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-)
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +28 -8
@@ -692,13 +692,8 @@ static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_rockchip_phy_ops = { .get_timing = dw_mipi_dsi_phy_get_timing, }; -static void dw_mipi_dsi_rockchip_config (struct dw_mipi_dsi_rockchip *dsi, -int mux) +static void dw_mipi_dsi_rockchip_config (struct dw_mipi_dsi_rockchip *dsi) { -if (dsi->cdata->lcdsel_grf_reg) -regmap_write (dsi->grf_regmap, dsi->cdata->lcdsel_grf_reg, - mux ? dsi->cdata->lcdsel_lit : dsi->cdata->lcdsel_big); -if (dsi->cdata->lanecfg1_grf_reg)regmap_write (dsi->grf_regmap, dsi->cdata->lanecfg1_grf_reg, dsi->cdata->lanecfg1);
@@ -712,6 +707,13 @@ static void dw_mipi_dsi_rockchip_config(struct dw_mipi_dsi_rockchip *dsi, dsi->cdata->enable); } +static void dw_mipi_dsi_rockchip_set_lcdsel (struct dw_mipi_dsi_rockchip *dsi, +int mux) +{ +regmap_write (dsi->grf_regmap, dsi->cdata->lcdsel_grf_reg, + mux ? dsi->cdata->lcdsel_lit : dsi->cdata->lcdsel_big); +} + static int dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state,
@@ -767,9 +769,9 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder)return ; } -dw_mipi_dsi_rockchip_config (dsi, mux); +dw_mipi_dsi_rockchip_set_lcdsel (dsi, mux);if (dsi->slave) -dw_mipi_dsi_rockchip_config (dsi->slave, mux); +dw_mipi_dsi_rockchip_set_lcdsel (dsi->slave, mux);clk_disable_unprepare (dsi->grf_clk); }
@@ -923,6 +925,24 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev,return ret; } +/* +* With the GRF clock running, write lane and dual-mode configurations +* that won't change immediately. If we waited until enable() to do +* this, things like panel preparation would not be able to send +* commands over DSI. +*/ + ret =clk_prepare_enable (dsi->grf_clk); +if (ret) { +DRM_DEV_ERROR (dsi->dev,"Failed to enable grf_clk: %d\n" , ret); +return ret; + } + +dw_mipi_dsi_rockchip_config (dsi); +if (dsi->slave) +dw_mipi_dsi_rockchip_config (dsi->slave); + +clk_disable_unprepare (dsi->grf_clk); + ret =rockchip_dsi_drm_create_encoder (dsi, drm_dev);if (ret) {DRM_DEV_ERROR (dev,"Failed to create drm encoder\n" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 422/800 drm/rockchip: lvds: Fix an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3dfa159f6b0c054eb63673fbf643a5f2cc862e63 ]
'ret' is know to be 0 a this point. Checking the return value of 'phy_init()' and 'phy_set_mode()' was intended instead.
So add the missing assignments.
--- drivers/gpu/drm/rockchip/rockchip_lvds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/rockchip/rockchip_lvds.c +2 -2
@@ -499,11 +499,11 @@ static int px30_lvds_probe(struct platform_device *pdev,if (IS_ERR (lvds->dphy))return PTR_ERR (lvds->dphy); -phy_init (lvds->dphy); + ret =phy_init (lvds->dphy);if (ret)return ret; -phy_set_mode (lvds->dphy,PHY_MODE_LVDS ); + ret =phy_set_mode (lvds->dphy,PHY_MODE_LVDS );if (ret)return ret;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 423/800 drm/rockchip: cdn-dp: fix sign extension on an int multiply for a u64 result
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit ce0cb93a5adb283f577cd4661f511047b5e39028 ]
The variable bit_per_pix is a u8 and is promoted in the multiplication to an int type and then sign extended to a u64. If the result of the int multiplication is greater than 0x7fffffff then the upper 32 bits will be set to 1 as a result of the sign extension. Avoid this by casting tu_size_reg to u64 to avoid sign extension and also a potential overflow.
--- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-reg.c +1 -1
@@ -658,7 +658,7 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)*/ do { tu_size_reg += 2; - symbol = tu_size_reg * mode->clock * bit_per_pix; + symbol = (u64)tu_size_reg * mode->clock * bit_per_pix; do_div(symbol, dp->max_lanes * link_rate * 8); rem = do_div(symbol, 1000); if (tu_size_reg > 64) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 424/800 mptcp: fix pr_debug in mptcp_token_new_connect
In reply to Greg Kroah-HartmanFrom: Jianguo Wu <[email protected]>
[ Upstream commit 2f1af441fd5dd5caf0807bb19ce9bbf9325ce534 ]
After commit 2c5ebd001d4f ("mptcp: refactor token container"), pr_debug() is called before mptcp_crypto_key_gen_sha() in mptcp_token_new_connect(), so the output local_key, token and idsn are 0, like:
MPTCP: ssk=00000000f6b3c4a2, local_key=0, token=0, idsn=0
Move pr_debug() after mptcp_crypto_key_gen_sha().
--- net/mptcp/token.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/mptcp/token.c +3 -3
@@ -156,9 +156,6 @@ int mptcp_token_new_connect(struct sock *sk)int retries =TOKEN_MAX_RETRIES ;struct token_bucket *bucket; -pr_debug ("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n" , - sk, subflow->local_key, subflow->token, subflow->idsn); - again:mptcp_crypto_key_gen_sha (&subflow->local_key, &subflow->token, &subflow->idsn);
@@ -172,6 +169,9 @@ again: goto again; } +pr_debug ("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n" , + sk, subflow->local_key, subflow->token, subflow->idsn); +WRITE_ONCE (msk->token, subflow->token);__sk_nulls_add_node_rcu ((struct sock *)msk, &bucket->msk_chain); bucket->chain_len++;
Signature · 1 line
2.30.2