crypto: skcipher - Fix -Wstringop-truncation warnings
Subsystems (3)
PATCH 1/87 crypto: skcipher - Fix -Wstringop-truncation warnings
From: Stafford Horne <[email protected]>
[ Upstream commit cefd769fd0192c84d638f66da202459ed8ad63ba ]
As of GCC 9.0.0 the build is reporting warnings like:
crypto/ablkcipher.c: In function ‘crypto_ablkcipher_report’:
crypto/ablkcipher.c:374:2: warning: ‘strncpy’ specified bound 64 equals destination size [-Wstringop-truncation]
strncpy(rblkcipher.geniv, alg->cra_ablkcipher.geniv ?: "<default>",
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sizeof(rblkcipher.geniv));
~~~~~~~~~~~~~~~~~~~~~~~~~This means the strnycpy might create a non null terminated string. Fix this by explicitly performing '\0' termination.
--- crypto/ablkcipher.c | 2 ++ crypto/blkcipher.c | 1 + 2 files changed, 3 insertions(+)
crypto/ablkcipher.c +2 -0
@@ -368,6 +368,7 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)strncpy (rblkcipher.type,"ablkcipher" ,sizeof (rblkcipher.type));strncpy (rblkcipher.geniv, alg->cra_ablkcipher.geniv ?:"<default>" ,sizeof (rblkcipher.geniv)); + rblkcipher.geniv[sizeof (rblkcipher.geniv) -1 ] ='\0' ; rblkcipher.blocksize = alg->cra_blocksize; rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
@@ -442,6 +443,7 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)strncpy (rblkcipher.type,"givcipher" ,sizeof (rblkcipher.type));strncpy (rblkcipher.geniv, alg->cra_ablkcipher.geniv ?:"<built-in>" ,sizeof (rblkcipher.geniv)); + rblkcipher.geniv[sizeof (rblkcipher.geniv) -1 ] ='\0' ; rblkcipher.blocksize = alg->cra_blocksize; rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
crypto/blkcipher.c +1 -0
@@ -511,6 +511,7 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)strncpy (rblkcipher.type,"blkcipher" ,sizeof (rblkcipher.type));strncpy (rblkcipher.geniv, alg->cra_blkcipher.geniv ?:"<default>" ,sizeof (rblkcipher.geniv)); + rblkcipher.geniv[sizeof (rblkcipher.geniv) -1 ] ='\0' ; rblkcipher.blocksize = alg->cra_blocksize; rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;
Signature · 1 line
2.17.1
PATCH 2/87 iio: adc: ina2xx: avoid kthread_stop() with stale task_struct
From: Akinobu Mita <[email protected]>
[ Upstream commit 7d6cd21d82bacab2d1786fe5e989e4815b75d9a3 ]
When the buffer is enabled for ina2xx driver, a dedicated kthread is invoked to capture mesurement data. When the buffer is disabled, the kthread is stopped.
However if the kthread gets register access errors, it immediately exits and when the malfunctional buffer is disabled, the stale task_struct pointer is accessed as there is no kthread to be stopped.
A similar issue in the usbip driver is prevented by kthread_get_run and kthread_stop_put helpers by increasing usage count of the task_struct. This change applies the same solution.
--- drivers/iio/adc/ina2xx-adc.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/iio/adc/ina2xx-adc.c +13 -4
@@ -30,6 +30,7 @@#include <linux/module.h> #include <linux/of_device.h> #include <linux/regmap.h> +#include <linux/sched/task.h> #include <linux/util_macros.h> #include <linux/platform_data/ina2xx.h>
@@ -701,6 +702,7 @@ static int ina2xx_buffer_enable(struct iio_dev *indio_dev) {struct ina2xx_chip_info *chip =iio_priv (indio_dev);unsigned int sampling_us =SAMPLING_PERIOD (chip); +struct task_struct *task; dev_dbg(&indio_dev->dev, "Enabling buffer w/ scan_mask %02x, freq = %d, avg =%u\n", (unsigned int)(*indio_dev->active_scan_mask),
@@ -710,11 +712,17 @@ static int ina2xx_buffer_enable(struct iio_dev *indio_dev)dev_dbg (&indio_dev->dev,"Async readout mode: %d\n" , chip->allow_async_readout); - chip->task =kthread_run (ina2xx_capture_thread, (void *)indio_dev, -"%s:%d-%uus" , indio_dev->name, indio_dev->id, - sampling_us); + task =kthread_create (ina2xx_capture_thread, (void *)indio_dev, +"%s:%d-%uus" , indio_dev->name, indio_dev->id, + sampling_us); +if (IS_ERR (task)) +return PTR_ERR (task); + +get_task_struct (task); +wake_up_process (task); + chip->task = task; -return PTR_ERR_OR_ZERO (chip->task); +return 0 ; }static int ina2xx_buffer_disable (struct iio_dev *indio_dev)
@@ -723,6 +731,7 @@ static int ina2xx_buffer_disable(struct iio_dev *indio_dev)if (chip->task) {kthread_stop (chip->task); +put_task_struct (chip->task); chip->task =NULL ; }
Signature · 1 line
2.17.1
PATCH 3/87 tsl2550: fix lux1_input error in low light
In reply to Sasha LevinFrom: Matt Ranostay <[email protected]>
[ Upstream commit ce054546cc2c26891cefa2f284d90d93b52205de ]
ADC channel 0 photodiode detects both infrared + visible light, but ADC channel 1 just detects infrared. However, the latter is a bit more sensitive in that range so complete darkness or low light causes a error condition in which the chan0 - chan1 is negative that results in a -EAGAIN.
This patch changes the resulting lux1_input sysfs attribute message from "Resource temporarily unavailable" to a user-grokable lux value of 0.
--- drivers/misc/tsl2550.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/tsl2550.c +1 -1
@@ -177,7 +177,7 @@ static int tsl2550_calculate_lux(u8 ch0, u8 ch1) }else lux =0 ; else - return -EAGAIN; + return 0;/* LUX range check */ return lux >TSL2550_MAX_LUX ?TSL2550_MAX_LUX : lux;
Signature · 1 line
2.17.1
PATCH 4/87 vmci: type promotion bug in qp_host_get_user_memory()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7fb2fd4e25fc1fb10dcb30b5519de257cfeae84c ]
The problem is that if get_user_pages_fast() fails and returns a negative error code, it gets type promoted to a high positive value and treated as a success.
--- drivers/misc/vmw_vmci/vmci_queue_pair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/vmw_vmci/vmci_queue_pair.c +2 -2
@@ -755,7 +755,7 @@ static int qp_host_get_user_memory(u64 produce_uva, retval =get_user_pages_fast ((uintptr_t ) produce_uva, produce_q->kernel_if->num_pages,1 , produce_q->kernel_if->u.h.header_page); -if (retval < produce_q->kernel_if->num_pages) { +if (retval < (int )produce_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(produce) failed (retval=%d)" , retval); qp_release_pages(produce_q->kernel_if->u.h.header_page,
@@ -767,7 +767,7 @@ static int qp_host_get_user_memory(u64 produce_uva, retval =get_user_pages_fast ((uintptr_t ) consume_uva, consume_q->kernel_if->num_pages,1 , consume_q->kernel_if->u.h.header_page); -if (retval < consume_q->kernel_if->num_pages) { +if (retval < (int )consume_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(consume) failed (retval=%d)" , retval); qp_release_pages(consume_q->kernel_if->u.h.header_page,
Signature · 1 line
2.17.1
PATCH 5/87 x86/numa_emulation: Fix emulated-to-physical node mapping
In reply to Sasha LevinFrom: Dan Williams <[email protected]>
[ Upstream commit 3b6c62f363a19ce82bf378187ab97c9dc01e3927 ]
Without this change the distance table calculation for emulated nodes may use the wrong numa node and report an incorrect distance.
--- arch/x86/mm/numa_emulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/numa_emulation.c +1 -1
@@ -61,7 +61,7 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, eb->nid = nid;if (emu_nid_to_phys[nid] ==NUMA_NO_NODE ) - emu_nid_to_phys[nid] = nid; + emu_nid_to_phys[nid] = pb->nid; pb->start += size;if (pb->start >= pb->end) {
Signature · 1 line
2.17.1
PATCH 6/87 staging: rts5208: fix missing error check on call to rtsx_write_register
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit c5fae4f4fd28189b1062fb8ef7b21fec37cb8b17 ]
Currently the check on error return from the call to rtsx_write_register is checking the error status from the previous call. Fix this by adding in the missing assignment of retval.
Detected by CoverityScan, CID#709877
--- drivers/staging/rts5208/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rts5208/sd.c +1 -1
@@ -5002,7 +5002,7 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) goto sd_execute_write_cmd_failed; } -rtsx_write_register (chip,SD_BYTE_CNT_L ,0xFF ,0x00 ); + retval =rtsx_write_register (chip,SD_BYTE_CNT_L ,0xFF ,0x00 );if (retval !=STATUS_SUCCESS ) {rtsx_trace (chip); goto sd_execute_write_cmd_failed;
Signature · 1 line
2.17.1
PATCH 7/87 power: supply: axp288_charger: Fix initial constant_charge_current value
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit f2a42595f0865886a2d40524b0e9d15600848670 ]
We should look at val which contains the value read from the register, not ret which is always 0 on a successful read.
--- drivers/power/supply/axp288_charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/axp288_charger.c +1 -1
@@ -771,7 +771,7 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info) }/* Determine charge current limit */ - cc = (ret &CHRG_CCCV_CC_MASK ) >>CHRG_CCCV_CC_BIT_POS ; + cc = (val &CHRG_CCCV_CC_MASK ) >>CHRG_CCCV_CC_BIT_POS ; cc = (cc *CHRG_CCCV_CC_LSB_RES ) +CHRG_CCCV_CC_OFFSET ; info->cc = cc;
Signature · 1 line
2.17.1
PATCH 8/87 misc: sram: enable clock before registering regions
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit d5b9653dd2bb7a2b1c8cc783c5d3b607bbb6b271 ]
Make sure to enable the clock before registering regions and exporting partitions to user space at which point we must be prepared for I/O.
--- drivers/misc/sram.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/misc/sram.c +7 -6
@@ -391,23 +391,23 @@ static int sram_probe(struct platform_device *pdev)if (IS_ERR (sram->pool))return PTR_ERR (sram->pool); - ret =sram_reserve_regions (sram, res); -if (ret) -return ret; - sram->clk =devm_clk_get (sram->dev,NULL );if (IS_ERR (sram->clk)) sram->clk =NULL ;else clk_prepare_enable (sram->clk); + ret =sram_reserve_regions (sram, res); +if (ret) + goto err_disable_clk; +platform_set_drvdata (pdev, sram); init_func =of_device_get_match_data (&pdev->dev);if (init_func) { ret =init_func ();if (ret) - goto err_disable_clk; + goto err_free_partitions; } dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n",
@@ -415,10 +415,11 @@ static int sram_probe(struct platform_device *pdev)return 0 ; +err_free_partitions: +sram_free_partitions (sram); err_disable_clk:if (sram->clk)clk_disable_unprepare (sram->clk); -sram_free_partitions (sram);return ret; }
Signature · 1 line
2.17.1
PATCH 9/87 serial: sh-sci: Stop RX FIFO timer during port shutdown
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit c5a9262fa8bfed0dddc7466ef10fcd292e2af61b ]
The RX FIFO timer may be armed when the port is shut down, hence the timer function may still be called afterwards.
Fix this race condition by deleting the timer during port shutdown.
--- drivers/tty/serial/sh-sci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/sh-sci.c +2 -0
@@ -2060,6 +2060,8 @@ static void sci_shutdown(struct uart_port *port) }#endif +if (s->rx_trigger >1 && s->rx_fifo_timeout >0 ) +del_timer_sync (&s->rx_fifo_timer);sci_free_irq (s);sci_free_dma (port); }
Signature · 1 line
2.17.1
PATCH 10/87 uwb: hwa-rc: fix memory leak at probe
In reply to Sasha LevinFrom: Anton Vasilyev <[email protected]>
[ Upstream commit 11b71782c1d10d9bccc31825cf84291cd7588a1e ]
hwarc_probe() allocates memory for hwarc, but does not free it if uwb_rc_add() or hwarc_get_version() fail.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/uwb/hwa-rc.c | 1 + 1 file changed, 1 insertion(+)
drivers/uwb/hwa-rc.c +1 -0
@@ -873,6 +873,7 @@ static int hwarc_probe(struct usb_interface *iface, error_rc_add:usb_put_intf (iface);usb_put_dev (hwarc->usb_dev); +kfree (hwarc); error_alloc:uwb_rc_put (uwb_rc); error_rc_alloc:
Signature · 1 line
2.17.1
PATCH 11/87 power: vexpress: fix corruption in notifier registration
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit 09bebb1adb21ecd04adf7ccb3b06f73e3a851e93 ]
Vexpress platforms provide two different restart handlers: SYS_REBOOT that restart the entire system, while DB_RESET only restarts the daughter board containing the CPU. DB_RESET is overridden by SYS_REBOOT if it exists.
notifier_chain_register used in register_restart_handler by design relies on notifiers to be registered once only, however vexpress restart notifier can get registered twice. When this happen it corrupts list of notifiers, as result some notifiers can be not called on proper event, traverse on list can be cycled forever, and second unregister can access already freed memory.
So far, since this was the only restart handler in the system, no issue was observed even if the same notifier was registered twice. However commit 6c5c0d48b686 ("watchdog: sp805: add restart handler") added support for SP805 restart handlers and since the system under test contains two vexpress restart and two SP805 watchdog instances, it was observed that during the boot traversing the restart handler list looped forever as there's a cycle in that list resulting in boot hang.
This patch fixes the issues by ensuring that the notifier is installed only once.
--- drivers/power/reset/vexpress-poweroff.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/power/reset/vexpress-poweroff.c +8 -4
@@ -35,6 +35,7 @@ static void vexpress_reset_do(struct device *dev, const char *what) }static struct device *vexpress_power_off_device; +static atomic_t vexpress_restart_nb_refcnt =ATOMIC_INIT (0 );static void vexpress_power_off (void ) {
@@ -99,10 +100,13 @@ static int _vexpress_register_restart_handler(struct device *dev)int err; vexpress_restart_device = dev; - err =register_restart_handler (&vexpress_restart_nb); -if (err) { -dev_err (dev,"cannot register restart handler (err=%d)\n" , err); -return err; +if (atomic_inc_return (&vexpress_restart_nb_refcnt) ==1 ) { + err =register_restart_handler (&vexpress_restart_nb); +if (err) { +dev_err (dev,"cannot register restart handler (err=%d)\n" , err); +atomic_dec (&vexpress_restart_nb_refcnt); +return err; + } }device_create_file (dev, &dev_attr_active);
Signature · 1 line
2.17.1
PATCH 12/87 iommu/amd: make sure TLB to be flushed before IOVA freed
In reply to Sasha LevinFrom: Zhen Lei <[email protected]>
[ Upstream commit 3c120143f584360a13614787e23ae2cdcb5e5ccd ]
Although the mapping has already been removed in the page table, it maybe still exist in TLB. Suppose the freed IOVAs is reused by others before the flush operation completed, the new user can not correctly access to its meomory.
--- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +1 -1
@@ -2400,9 +2400,9 @@ static void __unmap_single(struct dma_ops_domain *dma_dom, }if (amd_iommu_unmap_flush) { -dma_ops_free_iova (dma_dom, dma_addr, pages);domain_flush_tlb (&dma_dom->domain);domain_flush_complete (&dma_dom->domain); +dma_ops_free_iova (dma_dom, dma_addr, pages); }else { pages =__roundup_pow_of_two (pages);queue_iova (&dma_dom->iovad, dma_addr >>PAGE_SHIFT , pages,0 );
Signature · 1 line
2.17.1
PATCH 13/87 Bluetooth: Add a new Realtek 8723DE ID 0bda:b009
In reply to Sasha LevinFrom: Jian-Hong Pan <[email protected]>
[ Upstream commit 45ae68b8cfc25bdbffc11248001c47ab1b76ff6e ]
Without this patch we cannot turn on the Bluethooth adapter on HP 14-bs007la.
T: Bus=01 Lev=02 Prnt=03 Port=00 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0bda ProdID=b009 Rev= 2.00 S: Manufacturer=Realtek S: Product=802.11n WLAN Adapter S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -375,6 +375,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x7392, 0xa611), .driver_info = BTUSB_REALTEK }, /* Additional Realtek 8723DE Bluetooth devices */ + { USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },/* Additional Realtek 8821AE Bluetooth devices */
Signature · 1 line
2.17.1
PATCH 14/87 USB: serial: kobil_sct: fix modem-status error handling
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit a420b5d939ee58f1d950f0ea782834056520aeaa ]
Make sure to return -EIO in case of a short modem-status read request.
While at it, split the debug message to not include the (zeroed) transfer-buffer content in case of errors.
--- drivers/usb/serial/kobil_sct.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/usb/serial/kobil_sct.c +10 -2
@@ -397,12 +397,20 @@ static int kobil_tiocmget(struct tty_struct *tty) transfer_buffer_length, KOBIL_TIMEOUT); -dev_dbg (&port->dev,"%s - Send get_status_line_state URB returns: %i. Statusline: %02x\n" , - __func__, result, transfer_buffer[0 ]); +dev_dbg (&port->dev,"Send get_status_line_state URB returns: %i\n" , + result); +if (result <1 ) { +if (result >=0 ) + result = -EIO ; + goto out_free; + } + +dev_dbg (&port->dev,"Statusline: %02x\n" , transfer_buffer[0 ]); result =0 ;if ((transfer_buffer[0 ] &SUSBCR_GSL_DSR ) !=0 ) result =TIOCM_DSR ; +out_free:kfree (transfer_buffer);return result; }
Signature · 1 line
2.17.1
PATCH 15/87 6lowpan: iphc: reset mac_header after decompress to fix panic
In reply to Sasha LevinFrom: Michael Scott <[email protected]>
[ Upstream commit 03bc05e1a4972f73b4eb8907aa373369e825c252 ]
After decompression of 6lowpan socket data, an IPv6 header is inserted before the existing socket payload. After this, we reset the network_header value of the skb to account for the difference in payload size from prior to decompression + the addition of the IPv6 header.
However, we fail to reset the mac_header value.
Leaving the mac_header value untouched here, can cause a calculation error in net/packet/af_packet.c packet_rcv() function when an AF_PACKET socket is opened in SOCK_RAW mode for use on a 6lowpan interface.
On line 2088, the data pointer is moved backward by the value returned from skb_mac_header(). If skb->data is adjusted so that it is before the skb->head pointer (which can happen when an old value of mac_header is left in place) the kernel generates a panic in net/core/skbuff.c line 1717.
This panic can be generated by BLE 6lowpan interfaces (such as bt0) and 802.15.4 interfaces (such as lowpan0) as they both use the same 6lowpan sources for compression and decompression.
--- net/6lowpan/iphc.c | 1 + 1 file changed, 1 insertion(+)
net/6lowpan/iphc.c +1 -0
@@ -770,6 +770,7 @@ int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev, hdr.hop_limit, &hdr.daddr);skb_push (skb,sizeof (hdr)); +skb_reset_mac_header (skb);skb_reset_network_header (skb);skb_copy_to_linear_data (skb, &hdr,sizeof (hdr));
Signature · 1 line
2.17.1
PATCH 16/87 iommu/msm: Don't call iommu_device_{,un}link from atomic context
In reply to Sasha LevinFrom: Niklas Cassel <[email protected]>
[ Upstream commit 379521462e4add27f3514da8e4ab1fd7a54fe1c7 ]
Fixes the following splat during boot:
BUG: sleeping function called from invalid context at kernel/locking/mutex.c:747
in_atomic(): 1, irqs_disabled(): 128, pid: 77, name: kworker/2:1
4 locks held by kworker/2:1/77:
#0: (ptrval) ((wq_completion)"events"){+.+.}, at: process_one_work+0x1fc/0x8fc #1: (ptrval) (deferred_probe_work){+.+.}, at: process_one_work+0x1fc/0x8fc #2: (ptrval) (&dev->mutex){....}, at: __device_attach+0x40/0x178 #3: (ptrval) (msm_iommu_lock){....}, at: msm_iommu_add_device+0x28/0xcc
irq event stamp: 348 hardirqs last enabled at (347): [<c049dc18>] kfree+0xe0/0x3c0 hardirqs last disabled at (348): [<c0c35cac>] _raw_spin_lock_irqsave+0x2c/0x68 softirqs last enabled at (0): [<c0322fd8>] copy_process.part.5+0x280/0x1a68 softirqs last disabled at (0): [<00000000>] (null) Preemption disabled at: [<00000000>] (null) CPU: 2 PID: 77 Comm: kworker/2:1 Not tainted 4.17.0-rc5-wt-ath-01075-gaca0516bb4cf #239 Hardware name: Generic DT based system Workqueue: events deferred_probe_work_func [<c0314e00>] (unwind_backtrace) from [<c030fc70>] (show_stack+0x20/0x24) [<c030fc70>] (show_stack) from [<c0c16ad8>] (dump_stack+0xa0/0xcc) [<c0c16ad8>] (dump_stack) from [<c035a978>] (___might_sleep+0x1f8/0x2d4)
ath10k_sdio mmc2:0001:1: Direct firmware load for ath10k/QCA9377/hw1.0/board-2.bin failed with error -2 [<c035a978>] (___might_sleep) from [<c035aac4>] (__might_sleep+0x70/0xa8)
[<c035aac4>] (__might_sleep) from [<c0c3066c>] (__mutex_lock+0x50/0xb28)
[<c0c3066c>] (__mutex_lock) from [<c0c31170>] (mutex_lock_nested+0x2c/0x34) ath10k_sdio mmc2:0001:1: board_file api 1 bmi_id N/A crc32 544289f7
[<c0c31170>] (mutex_lock_nested) from [<c052d798>] (kernfs_find_and_get_ns+0x30/0x5c) [<c052d798>] (kernfs_find_and_get_ns) from [<c0531cc8>] (sysfs_add_link_to_group+0x28/0x58) [<c0531cc8>] (sysfs_add_link_to_group) from [<c07ef75c>] (iommu_device_link+0x50/0xb4) [<c07ef75c>] (iommu_device_link) from [<c07f2288>] (msm_iommu_add_device+0xa0/0xcc) [<c07f2288>] (msm_iommu_add_device) from [<c07ec6d0>] (add_iommu_group+0x3c/0x64) [<c07ec6d0>] (add_iommu_group) from [<c07f9d40>] (bus_for_each_dev+0x84/0xc4) [<c07f9d40>] (bus_for_each_dev) from [<c07ec7c8>] (bus_set_iommu+0xd0/0x10c) [<c07ec7c8>] (bus_set_iommu) from [<c07f1a68>] (msm_iommu_probe+0x5b8/0x66c) [<c07f1a68>] (msm_iommu_probe) from [<c07feaa8>] (platform_drv_probe+0x60/0xbc) [<c07feaa8>] (platform_drv_probe) from [<c07fc1fc>] (driver_probe_device+0x30c/0x4cc) [<c07fc1fc>] (driver_probe_device) from [<c07fc59c>] (__device_attach_driver+0xac/0x14c) [<c07fc59c>] (__device_attach_driver) from [<c07f9e14>] (bus_for_each_drv+0x68/0xc8) [<c07f9e14>] (bus_for_each_drv) from [<c07fbd3c>] (__device_attach+0xe4/0x178) [<c07fbd3c>] (__device_attach) from [<c07fc698>] (device_initial_probe+0x1c/0x20) [<c07fc698>] (device_initial_probe) from [<c07faee8>] (bus_probe_device+0x98/0xa0) [<c07faee8>] (bus_probe_device) from [<c07fb4f4>] (deferred_probe_work_func+0x74/0x198) [<c07fb4f4>] (deferred_probe_work_func) from [<c0348eb4>] (process_one_work+0x2c4/0x8fc) [<c0348eb4>] (process_one_work) from [<c03497b0>] (worker_thread+0x2c4/0x5cc) [<c03497b0>] (worker_thread) from [<c0350d10>] (kthread+0x180/0x188)
[<c0350d10>] (kthread) from [<c03010b4>] (ret_from_fork+0x14/0x20)
--- drivers/iommu/msm_iommu.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/iommu/msm_iommu.c +5 -11
@@ -395,20 +395,15 @@ static int msm_iommu_add_device(struct device *dev)struct msm_iommu_dev *iommu;struct iommu_group *group;unsigned long flags; -int ret =0 ;spin_lock_irqsave (&msm_iommu_lock, flags); - iommu =find_iommu_for_dev (dev); +spin_unlock_irqrestore (&msm_iommu_lock, flags); +if (iommu)iommu_device_link (&iommu->iommu, dev);else - ret = -ENODEV ; - -spin_unlock_irqrestore (&msm_iommu_lock, flags); - -if (ret) -return ret; +return -ENODEV ; group =iommu_group_get_for_dev (dev);if (IS_ERR (group))
@@ -425,13 +420,12 @@ static void msm_iommu_remove_device(struct device *dev)unsigned long flags;spin_lock_irqsave (&msm_iommu_lock, flags); - iommu =find_iommu_for_dev (dev); +spin_unlock_irqrestore (&msm_iommu_lock, flags); +if (iommu)iommu_device_unlink (&iommu->iommu, dev); -spin_unlock_irqrestore (&msm_iommu_lock, flags); -iommu_group_remove_device (dev); }
Signature · 1 line
2.17.1
PATCH 17/87 s390/mm: correct allocate_pgste proc_handler callback
In reply to Sasha LevinFrom: Vasily Gorbik <[email protected]>
[ Upstream commit 5bedf8aa03c28cb8dc98bdd32a41b66d8f7d3eaa ]
Since proc_dointvec does not perform value range control, proc_dointvec_minmax should be used to limit value range, which is clearly intended here, as the internal representation of the value:
unsigned int alloc_pgste:1;
In fact it currently works, since we have
mm->context.alloc_pgste = page_table_allocate_pgste || ...
... since commit 23fefe119ceb5 ("s390/kvm: avoid global config of vm.alloc_pgste=1")
Before that it was
mm->context.alloc_pgste = page_table_allocate_pgste;
which was broken. That was introduced with commit 0b46e0a3ec0d7 ("s390/kvm:
remove delayed reallocation of page tables for KVM").
--- arch/s390/mm/pgalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/mm/pgalloc.c +1 -1
@@ -27,7 +27,7 @@ static struct ctl_table page_table_sysctl[] = { .data = &page_table_allocate_pgste, .maxlen = sizeof(int), .mode = S_IRUGO | S_IWUSR, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, .extra1 = &page_table_allocate_pgste_min, .extra2 = &page_table_allocate_pgste_max, },
Signature · 1 line
2.17.1
PATCH 18/87 power: remove possible deadlock when unregistering power_supply
In reply to Sasha LevinFrom: Benjamin Tissoires <[email protected]>
[ Upstream commit 3ffa6583e24e1ad1abab836d24bfc9d2308074e5 ]
If a device gets removed right after having registered a power_supply node, we might enter in a deadlock between the remove call (that has a lock on the parent device) and the deferred register work.
Allow the deferred register work to exit without taking the lock when we are in the remove state.
Stack trace on a Ubuntu 16.04:
[16072.109121] INFO: task kworker/u16:2:1180 blocked for more than 120 seconds. [16072.109127] Not tainted 4.13.0-41-generic #46~16.04.1-Ubuntu [16072.109129] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [16072.109132] kworker/u16:2 D 0 1180 2 0x80000000 [16072.109142] Workqueue: events_power_efficient power_supply_deferred_register_work [16072.109144] Call Trace: [16072.109152] __schedule+0x3d6/0x8b0 [16072.109155] schedule+0x36/0x80 [16072.109158] schedule_preempt_disabled+0xe/0x10 [16072.109161] __mutex_lock.isra.2+0x2ab/0x4e0 [16072.109166] __mutex_lock_slowpath+0x13/0x20 [16072.109168] ? __mutex_lock_slowpath+0x13/0x20 [16072.109171] mutex_lock+0x2f/0x40 [16072.109174] power_supply_deferred_register_work+0x2b/0x50 [16072.109179] process_one_work+0x15b/0x410 [16072.109182] worker_thread+0x4b/0x460 [16072.109186] kthread+0x10c/0x140 [16072.109189] ? process_one_work+0x410/0x410 [16072.109191] ? kthread_create_on_node+0x70/0x70 [16072.109194] ret_from_fork+0x35/0x40 [16072.109199] INFO: task test:2257 blocked for more than 120 seconds. [16072.109202] Not tainted 4.13.0-41-generic #46~16.04.1-Ubuntu [16072.109204] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [16072.109206] test D 0 2257 2256 0x00000004 [16072.109208] Call Trace: [16072.109211] __schedule+0x3d6/0x8b0 [16072.109215] schedule+0x36/0x80 [16072.109218] schedule_timeout+0x1f3/0x360 [16072.109221] ? check_preempt_curr+0x5a/0xa0 [16072.109224] ? ttwu_do_wakeup+0x1e/0x150 [16072.109227] wait_for_completion+0xb4/0x140 [16072.109230] ? wait_for_completion+0xb4/0x140 [16072.109233] ? wake_up_q+0x70/0x70 [16072.109236] flush_work+0x129/0x1e0 [16072.109240] ? worker_detach_from_pool+0xb0/0xb0 [16072.109243] __cancel_work_timer+0x10f/0x190 [16072.109247] ? device_del+0x264/0x310 [16072.109250] ? __wake_up+0x44/0x50 [16072.109253] cancel_delayed_work_sync+0x13/0x20 [16072.109257] power_supply_unregister+0x37/0xb0 [16072.109260] devm_power_supply_release+0x11/0x20 [16072.109263] release_nodes+0x110/0x200 [16072.109266] devres_release_group+0x7c/0xb0 [16072.109274] wacom_remove+0xc2/0x110 [wacom] [16072.109279] hid_device_remove+0x6e/0xd0 [hid] [16072.109284] device_release_driver_internal+0x158/0x210 [16072.109288] device_release_driver+0x12/0x20 [16072.109291] bus_remove_device+0xec/0x160 [16072.109293] device_del+0x1de/0x310 [16072.109298] hid_destroy_device+0x27/0x60 [hid] [16072.109303] usbhid_disconnect+0x51/0x70 [usbhid] [16072.109308] usb_unbind_interface+0x77/0x270 [16072.109311] device_release_driver_internal+0x158/0x210 [16072.109315] device_release_driver+0x12/0x20 [16072.109318] usb_driver_release_interface+0x77/0x80 [16072.109321] proc_ioctl+0x20f/0x250 [16072.109325] usbdev_do_ioctl+0x57f/0x1140 [16072.109327] ? __wake_up+0x44/0x50 [16072.109331] usbdev_ioctl+0xe/0x20 [16072.109336] do_vfs_ioctl+0xa4/0x600 [16072.109339] ? vfs_write+0x15a/0x1b0 [16072.109343] SyS_ioctl+0x79/0x90 [16072.109347] entry_SYSCALL_64_fastpath+0x24/0xab [16072.109349] RIP: 0033:0x7f20da807f47 [16072.109351] RSP: 002b:00007ffc422ae398 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [16072.109353] RAX: ffffffffffffffda RBX: 00000000010b8560 RCX: 00007f20da807f47 [16072.109355] RDX: 00007ffc422ae3a0 RSI: 00000000c0105512 RDI: 0000000000000009 [16072.109356] RBP: 0000000000000000 R08: 00007ffc422ae3e0 R09: 0000000000000010 [16072.109357] R10: 00000000000000a6 R11: 0000000000000246 R12: 0000000000000000 [16072.109359] R13: 00000000010b8560 R14: 00007ffc422ae2e0 R15: 0000000000000000
--- drivers/power/supply/power_supply_core.c | 11 +++++++++-- include/linux/power_supply.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/power/supply/power_supply_core.c +9 -2
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/init.h> #include <linux/slab.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/notifier.h> #include <linux/err.h>
@@ -139,8 +140,13 @@ static void power_supply_deferred_register_work(struct work_struct *work) struct power_supply *psy = container_of(work, struct power_supply, deferred_register_work.work); -if (psy->dev.parent) -mutex_lock (&psy->dev.parent->mutex); +if (psy->dev.parent) { +while (!mutex_trylock (&psy->dev.parent->mutex)) { +if (psy->removing) +return ; +msleep (10 ); + } + }power_supply_changed (psy);
@@ -1071,6 +1077,7 @@ EXPORT_SYMBOL_GPL(devm_power_supply_register_no_ws);void power_supply_unregister (struct power_supply *psy) {WARN_ON (atomic_dec_return (&psy->use_cnt)); + psy->removing = true;cancel_work_sync (&psy->changed_work);cancel_delayed_work_sync (&psy->deferred_register_work);sysfs_remove_link (&psy->dev.kobj,"powers" );
include/linux/power_supply.h +1 -0
@@ -251,6 +251,7 @@ struct power_supply {spinlock_t changed_lock;bool changed;bool initialized; +bool removing;atomic_t use_cnt;#ifdef CONFIG_THERMAL struct thermal_zone_device *tzd;
Signature · 1 line
2.17.1
PATCH 19/87 md-cluster: clear another node's suspend_area after the copy is finished
In reply to Sasha LevinFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 010228e4a932ca1e8365e3b58c8e1e44c16ff793 ]
When one node leaves cluster or stops the resyncing (resync or recovery) array, then other nodes need to call recover_bitmaps to continue the unfinished task.
But we need to clear suspend_area later after other nodes copy the resync information to their bitmap (by call bitmap_copy_from_slot). Otherwise, all nodes could write to the suspend_area even the suspend_area is not handled by any node, because area_resyncing returns 0 at the beginning of raid1_write_request. Which means one node could write suspend_area while another node is resyncing the same area, then data could be inconsistent.
So let's clear suspend_area later to avoid above issue with the protection of bm lock. Also it is straightforward to clear suspend_area after nodes have copied the resync info to bitmap.
--- drivers/md/md-cluster.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/md/md-cluster.c +10 -9
@@ -304,15 +304,6 @@ static void recover_bitmaps(struct md_thread *thread)while (cinfo->recovery_map) { slot =fls64 ((u64 )cinfo->recovery_map) -1 ; -/* Clear suspend_area associated with the bitmap */ -spin_lock_irq (&cinfo->suspend_lock); -list_for_each_entry_safe (s, tmp, &cinfo->suspend_list, list) -if (slot == s->slot) { -list_del (&s->list); -kfree (s); - } -spin_unlock_irq (&cinfo->suspend_lock); -snprintf (str,64 ,"bitmap%04d" , slot); bm_lockres =lockres_init (mddev, str,NULL ,1 );if (!bm_lockres) {
@@ -331,6 +322,16 @@ static void recover_bitmaps(struct md_thread *thread)pr_err ("md-cluster: Could not copy data from bitmap %d\n" , slot); goto clear_bit; } + +/* Clear suspend_area associated with the bitmap */ +spin_lock_irq (&cinfo->suspend_lock); +list_for_each_entry_safe (s, tmp, &cinfo->suspend_list, list) +if (slot == s->slot) { +list_del (&s->list); +kfree (s); + } +spin_unlock_irq (&cinfo->suspend_lock); +if (hi >0 ) {if (lo < mddev->recovery_cp) mddev->recovery_cp = lo;
Signature · 1 line
2.17.1
PATCH 20/87 RDMA/bnxt_re: Fix a couple off by one bugs
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 474e5a86067e5f12c97d1db8b170c7f45b53097a ]
The sgid_tbl->tbl[] array is allocated in bnxt_qplib_alloc_sgid_tbl(). It has sgid_tbl->max elements. So the > should be >= to prevent accessing one element beyond the end of the array.
--- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_sp.c +2 -2
@@ -156,7 +156,7 @@ int bnxt_qplib_get_sgid(struct bnxt_qplib_res *res, struct bnxt_qplib_sgid_tbl *sgid_tbl, int index, struct bnxt_qplib_gid *gid) { - if (index > sgid_tbl->max) { + if (index >= sgid_tbl->max) { dev_err(&res->pdev->dev,"QPLIB: Index %d exceeded SGID table max (%d)" , index, sgid_tbl->max);
@@ -361,7 +361,7 @@ int bnxt_qplib_get_pkey(struct bnxt_qplib_res *res, *pkey =0xFFFF ;return 0 ; } -if (index > pkey_tbl->max) { +if (index >= pkey_tbl->max) {dev_err (&res->pdev->dev,"QPLIB: Index %d exceeded PKEY table max (%d)" , index, pkey_tbl->max);
Signature · 1 line
2.17.1
PATCH 21/87 RDMA/i40w: Hold read semaphore while looking after VMA
In reply to Sasha LevinFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 5d9a2b0e28759e319a623da33940dbb3ce952b7d ]
VMA lookup is supposed to be performed while mmap_sem is held.
--- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/i40iw/i40iw_verbs.c +2 -0
@@ -1408,6 +1408,7 @@ static void i40iw_set_hugetlb_values(u64 addr, struct i40iw_mr *iwmr)struct vm_area_struct *vma;struct hstate *h; +down_read (¤t->mm->mmap_sem); vma =find_vma (current->mm, addr);if (vma &&is_vm_hugetlb_page (vma)) { h =hstate_vma (vma);
@@ -1416,6 +1417,7 @@ static void i40iw_set_hugetlb_values(u64 addr, struct i40iw_mr *iwmr) iwmr->page_msk =huge_page_mask (h); } } +up_read (¤t->mm->mmap_sem); }/**
Signature · 1 line
2.17.1
PATCH 22/87 arm64: fix infinite stacktrace
In reply to Sasha LevinFrom: Mikulas Patocka <[email protected]>
[ Upstream commit 7e7df71fd57ff2894d96abb0080922bf39460a79 ]
I've got this infinite stacktrace when debugging another problem:
[ 908.795225] INFO: rcu_preempt detected stalls on CPUs/tasks: [ 908.796176] 1-...!: (1 GPs behind) idle=952/1/4611686018427387904 softirq=1462/1462 fqs=355 [ 908.797692] 2-...!: (1 GPs behind) idle=f42/1/4611686018427387904 softirq=1550/1551 fqs=355 [ 908.799189] (detected by 0, t=2109 jiffies, g=130, c=129, q=235) [ 908.800284] Task dump for CPU 1: [ 908.800871] kworker/1:1 R running task 0 32 2 0x00000022 [ 908.802127] Workqueue: writecache-writeabck writecache_writeback [dm_writecache] [ 908.820285] Call trace: [ 908.824785] __switch_to+0x68/0x90 [ 908.837661] 0xfffffe00603afd90 [ 908.844119] 0xfffffe00603afd90 [ 908.850091] 0xfffffe00603afd90 [ 908.854285] 0xfffffe00603afd90 [ 908.863538] 0xfffffe00603afd90 [ 908.865523] 0xfffffe00603afd90
The machine just locked up and kept on printing the same line over and over again. This patch fixes it.
--- arch/arm64/kernel/stacktrace.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/kernel/stacktrace.c +3 -0
@@ -56,6 +56,9 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) frame->fp =READ_ONCE_NOCHECK (*(unsigned long *)(fp)); frame->pc =READ_ONCE_NOCHECK (*(unsigned long *)(fp +8 )); +if (frame->fp <= fp) +return -EINVAL ; +#ifdef CONFIG_FUNCTION_GRAPH_TRACER if (tsk->ret_stack && (frame->pc == (unsigned long )return_to_handler)) {
Signature · 1 line
2.17.1
PATCH 23/87 IB/core: type promotion bug in rdma_rw_init_one_mr()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit c2d7c8ff89b22ddefb1ac2986c0d48444a667689 ]
"nents" is an unsigned int, so if ib_map_mr_sg() returns a negative error code then it's type promoted to a high unsigned int which is treated as success.
--- drivers/infiniband/core/rw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/rw.c +1 -1
@@ -87,7 +87,7 @@ static int rdma_rw_init_one_mr(struct ib_qp *qp, u8 port_num, } ret =ib_map_mr_sg (reg->mr, sg, nents, &offset,PAGE_SIZE ); -if (ret < nents) { +if (ret <0 || ret < nents) {ib_mr_pool_put (qp, &qp->rdma_mrs, reg->mr);return -EINVAL ; }
Signature · 1 line
2.17.1
PATCH 24/87 media: exynos4-is: Prevent NULL pointer dereference in __isp_video_try_fmt()
In reply to Sasha LevinFrom: Sylwester Nawrocki <[email protected]>
[ Upstream commit 7c1b9a5aeed91bef98988ac0fcf38c8c1f4f9a3a ]
This patch fixes potential NULL pointer dereference as indicated by the following static checker warning:
drivers/media/platform/exynos4-is/fimc-isp-video.c:408 isp_video_try_fmt_mplane()
error: NULL dereference inside function '__isp_video_try_fmt(isp, &f->fmt.pix_mp, (0))()'.
--- drivers/media/platform/exynos4-is/fimc-isp-video.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/media/platform/exynos4-is/fimc-isp-video.c +8 -3
@@ -384,12 +384,17 @@ static void __isp_video_try_fmt(struct fimc_isp *isp,struct v4l2_pix_format_mplane *pixm, const struct fimc_fmt **fmt) { - *fmt =fimc_isp_find_format (&pixm->pixelformat,NULL ,2 ); + const struct fimc_fmt *__fmt; + + __fmt =fimc_isp_find_format (&pixm->pixelformat,NULL ,2 ); + +if (fmt) + *fmt = __fmt; pixm->colorspace =V4L2_COLORSPACE_SRGB ; pixm->field =V4L2_FIELD_NONE ; - pixm->num_planes = (*fmt)->memplanes; - pixm->pixelformat = (*fmt)->fourcc; + pixm->num_planes = __fmt->memplanes; + pixm->pixelformat = __fmt->fourcc;/* * TODO: double check with the docmentation these width/height * constraints are correct.
Signature · 1 line
2.17.1
PATCH 25/87 IB/mlx4: Test port number before querying type.
In reply to Sasha LevinFrom: Tarick Bedeir <[email protected]>
[ Upstream commit f1228867adaf8890826f2b59e4caddb1c5cc2df7 ]
rdma_ah_find_type() can reach into ib_device->port_immutable with a potentially out-of-bounds port number, so check that the port number is valid first.
--- drivers/infiniband/hw/mlx4/qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/qp.c +1 -1
@@ -4014,9 +4014,9 @@ static void to_rdma_ah_attr(struct mlx4_ib_dev *ibdev,u8 port_num = path->sched_queue &0x40 ?2 :1 ;memset (ah_attr,0 ,sizeof (*ah_attr)); - ah_attr->type =rdma_ah_find_type (&ibdev->ib_dev, port_num);if (port_num ==0 || port_num > dev->caps.num_ports)return ; + ah_attr->type =rdma_ah_find_type (&ibdev->ib_dev, port_num);if (ah_attr->type ==RDMA_AH_ATTR_TYPE_ROCE ) rdma_ah_set_sl(ah_attr, ((path->sched_queue >> 3) & 0x7) |
Signature · 1 line
2.17.1
PATCH 26/87 powerpc/kdump: Handle crashkernel memory reservation failure
In reply to Sasha LevinFrom: Hari Bathini <[email protected]>
[ Upstream commit 8950329c4a64c6d3ca0bc34711a1afbd9ce05657 ]
Memory reservation for crashkernel could fail if there are holes around kdump kernel offset (128M). Fail gracefully in such cases and print an error message.
--- arch/powerpc/kernel/machine_kexec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/kernel/machine_kexec.c +6 -1
@@ -186,7 +186,12 @@ void __init reserve_crashkernel(void) (unsigned long )(crashk_res.start >>20 ), (unsigned long)(memblock_phys_mem_size() >> 20)); -memblock_reserve (crashk_res.start, crash_size); +if (!memblock_is_region_memory (crashk_res.start, crash_size) || +memblock_reserve (crashk_res.start, crash_size)) { +pr_err ("Failed to reserve memory for crashkernel!\n" ); + crashk_res.start = crashk_res.end =0 ; +return ; + } }int overlaps_crashkernel (unsigned long start,unsigned long size)
Signature · 1 line
2.17.1
PATCH 27/87 media: fsl-viu: fix error handling in viu_of_probe()
In reply to Sasha LevinFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit 662a99e145661c2b35155cf375044deae9b79896 ]
viu_of_probe() ignores fails in i2c_get_adapter(), tries to unlock uninitialized mutex on error path.
The patch streamlining the error handling in viu_of_probe().
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/fsl-viu.c | 38 +++++++++++++++++++------------- 1 file changed, 23 insertions(+), 15 deletions(-)
drivers/media/platform/fsl-viu.c +23 -15
@@ -1417,7 +1417,7 @@ static int viu_of_probe(struct platform_device *op) sizeof(struct viu_reg), DRV_NAME)) {dev_err (&op->dev,"Error while requesting mem region\n" ); ret = -EBUSY ; - goto err; + goto err_irq; }/* remap registers */
@@ -1425,7 +1425,7 @@ static int viu_of_probe(struct platform_device *op)if (!viu_regs) {dev_err (&op->dev,"Can't map register set\n" ); ret = -ENOMEM ; - goto err; + goto err_irq; }/* Prepare our private structure */
@@ -1433,7 +1433,7 @@ static int viu_of_probe(struct platform_device *op)if (!viu_dev) {dev_err (&op->dev,"Can't allocate private structure\n" ); ret = -ENOMEM ; - goto err; + goto err_irq; } viu_dev->vr = viu_regs;
@@ -1449,16 +1449,21 @@ static int viu_of_probe(struct platform_device *op) ret =v4l2_device_register (viu_dev->dev, &viu_dev->v4l2_dev);if (ret <0 ) {dev_err (&op->dev,"v4l2_device_register() failed: %d\n" , ret); - goto err; + goto err_irq; } ad =i2c_get_adapter (0 ); +if (!ad) { + ret = -EFAULT ; +dev_err (&op->dev,"couldn't get i2c adapter\n" ); + goto err_v4l2; + }v4l2_ctrl_handler_init (&viu_dev->hdl,5 );if (viu_dev->hdl.error) { ret = viu_dev->hdl.error;dev_err (&op->dev,"couldn't register control\n" ); - goto err_vdev; + goto err_i2c; }/* This control handler will inherit the control(s) from the sub-device(s). */
@@ -1475,7 +1480,7 @@ static int viu_of_probe(struct platform_device *op) vdev =video_device_alloc ();if (vdev ==NULL ) { ret = -ENOMEM ; - goto err_vdev; + goto err_hdl; } *vdev = viu_template;
@@ -1496,7 +1501,7 @@ static int viu_of_probe(struct platform_device *op) ret =video_register_device (viu_dev->vdev,VFL_TYPE_GRABBER ,-1 );if (ret <0 ) {video_device_release (viu_dev->vdev); - goto err_vdev; + goto err_unlock; }/* enable VIU clock */
@@ -1504,12 +1509,12 @@ static int viu_of_probe(struct platform_device *op)if (IS_ERR (clk)) {dev_err (&op->dev,"failed to lookup the clock!\n" ); ret =PTR_ERR (clk); - goto err_clk; + goto err_vdev; } ret =clk_prepare_enable (clk);if (ret) {dev_err (&op->dev,"failed to enable the clock!\n" ); - goto err_clk; + goto err_vdev; } viu_dev->clk = clk;
@@ -1520,7 +1525,7 @@ static int viu_of_probe(struct platform_device *op)if (request_irq (viu_dev->irq, viu_intr,0 ,"viu" , (void *)viu_dev)) {dev_err (&op->dev,"Request VIU IRQ failed.\n" ); ret = -ENODEV ; - goto err_irq; + goto err_clk; }mutex_unlock (&viu_dev->lock);
@@ -1528,16 +1533,19 @@ static int viu_of_probe(struct platform_device *op)dev_info (&op->dev,"Freescale VIU Video Capture Board\n" );return ret; -err_irq: -clk_disable_unprepare (viu_dev->clk); err_clk: -video_unregister_device (viu_dev->vdev); +clk_disable_unprepare (viu_dev->clk); err_vdev: -v4l2_ctrl_handler_free (&viu_dev->hdl); +video_unregister_device (viu_dev->vdev); +err_unlock:mutex_unlock (&viu_dev->lock); +err_hdl: +v4l2_ctrl_handler_free (&viu_dev->hdl); +err_i2c:i2c_put_adapter (ad); +err_v4l2:v4l2_device_unregister (&viu_dev->v4l2_dev); -err: +err_irq:irq_dispose_mapping (viu_irq);return ret; }
Signature · 1 line
2.17.1
PATCH 28/87 media: staging/imx: fill vb2_v4l2_buffer field entry
In reply to Sasha LevinFrom: Peter Seiderer <[email protected]>
[ Upstream commit a38d4b71cb7a12b65317f4e3d59883a918957719 ]
- fixes gstreamer v4l2src warning:
0:00:00.716640334 349 0x164f720 WARN v4l2bufferpool gstv4l2bufferpool.c:1195:gst_v4l2_buffer_pool_dqbuf:<v4l2src0:pool:src> Driver should never set v4l2_buffer.field to ANY
- fixes v4l2-compliance test failure:
Streaming ioctls:
test read/write: OK (Not Supported)
Video Capture:
Buffer: 0 Sequence: 0 Field: Any Timestamp: 58.383658s
fail: v4l2-test-buffers.cpp(297): g_field() == V4L2_FIELD_ANY--- drivers/staging/media/imx/imx-ic-prpencvf.c | 1 + drivers/staging/media/imx/imx-media-csi.c | 1 + 2 files changed, 2 insertions(+)
drivers/staging/media/imx/imx-ic-prpencvf.c +1 -0
@@ -210,6 +210,7 @@ static void prp_vb2_buf_done(struct prp_priv *priv, struct ipuv3_channel *ch) done = priv->active_vb2_buf[priv->ipu_buf_num];if (done) { + done->vbuf.field = vdev->fmt.fmt.pix.field; vb = &done->vbuf.vb2_buf; vb->timestamp =ktime_get_ns (); vb2_buffer_done(vb, priv->nfb4eof ?
drivers/staging/media/imx/imx-media-csi.c +1 -0
@@ -171,6 +171,7 @@ static void csi_vb2_buf_done(struct csi_priv *priv) done = priv->active_vb2_buf[priv->ipu_buf_num];if (done) { + done->vbuf.field = vdev->fmt.fmt.pix.field; vb = &done->vbuf.vb2_buf; vb->timestamp =ktime_get_ns (); vb2_buffer_done(vb, priv->nfb4eof ?
Signature · 1 line
2.17.1
PATCH 29/87 media: sta2x11: Add video_device and vb2_queue locks
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit cd63c0288fd760ce7de247fba618e2bbcfc0c35c ]
Currently, this driver does not serialize its video4linux ioctls, which is a bug, as race conditions might appear.
In addition, video_device and vb2_queue locks are now both mandatory. Add them, and implement wait_prepare and wait_finish.
To stay on the safe side, this commit uses a single mutex for both locks. Better latency can be obtained by separating these if needed.
--- drivers/media/pci/sta2x11/sta2x11_vip.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/pci/sta2x11/sta2x11_vip.c +6 -0
@@ -145,6 +145,7 @@ struct sta2x11_vip {unsigned int sequence;struct vip_buffer *active;/* current active buffer */ spinlock_t lock;/* Used in videobuf2 callback */ +struct mutex v4l_lock;/* Interrupt counters */ int tcount, bcount;
@@ -385,6 +386,8 @@ static const struct vb2_ops vip_video_qops = { .buf_queue = buffer_queue, .start_streaming = start_streaming, .stop_streaming = stop_streaming, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, };
@@ -859,6 +862,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip) vip->vb_vidq.mem_ops = &vb2_dma_contig_memops; vip->vb_vidq.timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; vip->vb_vidq.dev = &vip->pdev->dev; + vip->vb_vidq.lock = &vip->v4l_lock; err =vb2_queue_init (&vip->vb_vidq);if (err)return err;
@@ -1024,6 +1028,7 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev, vip->std =V4L2_STD_PAL ; vip->format = formats_50[0 ]; vip->config = config; +mutex_init (&vip->v4l_lock); ret =sta2x11_vip_init_controls (vip);if (ret)
@@ -1070,6 +1075,7 @@ static int sta2x11_vip_init_one(struct pci_dev *pdev, vip->video_dev = video_dev_template; vip->video_dev.v4l2_dev = &vip->v4l2_dev; vip->video_dev.queue = &vip->vb_vidq; + vip->video_dev.lock = &vip->v4l_lock;video_set_drvdata (&vip->video_dev, vip); ret =video_register_device (&vip->video_dev,VFL_TYPE_GRABBER ,-1 );
Signature · 1 line
2.17.1
PATCH 30/87 x86/tsc: Add missing header to tsc_msr.c
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit dbd0fbc76c77daac08ddd245afdcbade0d506e19 ]
Add a missing header otherwise compiler warns about missed prototype:
CC arch/x86/kernel/tsc_msr.oarch/x86/kernel/tsc_msr.c:73:15: warning: no previous prototype for ‘cpu_khz_from_msr’ [-Wmissing-prototypes]
unsigned long cpu_khz_from_msr(void)
^~~~~~~~~~~~~~~~
--- arch/x86/kernel/tsc_msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/tsc_msr.c +1 -0
@@ -12,6 +12,7 @@#include <asm/setup.h> #include <asm/apic.h> #include <asm/param.h> +#include <asm/tsc.h> #define MAX_NUM_FREQS 9
Signature · 1 line
2.17.1
PATCH 31/87 ARM: hwmod: RTC: Don't assume lock/unlock will be called with irq enabled
In reply to Sasha LevinFrom: Dave Gerlach <[email protected]>
[ Upstream commit 6d609b35c815ba20132b7b64bcca04516bb17c56 ]
When the RTC lock and unlock functions were introduced it was likely assumed that they would always be called from irq enabled context, hence the use of local_irq_disable/enable. This is no longer true as the RTC+DDR path makes a late call during the suspend path after irqs have been disabled to enable the RTC hwmod which calls both unlock and lock, leading to IRQs being reenabled through the local_irq_enable call in omap_hwmod_rtc_lock call.
To avoid this change the local_irq_disable/enable to local_irq_save/restore to ensure that from whatever context this is called the proper IRQ configuration is maintained.
--- arch/arm/mach-omap2/omap_hwmod_reset.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/omap_hwmod_reset.c +8 -4
@@ -92,11 +92,13 @@ static void omap_rtc_wait_not_busy(struct omap_hwmod *oh)*/ void omap_hwmod_rtc_unlock (struct omap_hwmod *oh) { -local_irq_disable (); +unsigned long flags; + +local_irq_save (flags);omap_rtc_wait_not_busy (oh);omap_hwmod_write (OMAP_RTC_KICK0_VALUE , oh,OMAP_RTC_KICK0_REG );omap_hwmod_write (OMAP_RTC_KICK1_VALUE , oh,OMAP_RTC_KICK1_REG ); -local_irq_enable (); +local_irq_restore (flags); }/**
@@ -110,9 +112,11 @@ void omap_hwmod_rtc_unlock(struct omap_hwmod *oh)*/ void omap_hwmod_rtc_lock (struct omap_hwmod *oh) { -local_irq_disable (); +unsigned long flags; + +local_irq_save (flags);omap_rtc_wait_not_busy (oh);omap_hwmod_write (0x0 , oh,OMAP_RTC_KICK0_REG );omap_hwmod_write (0x0 , oh,OMAP_RTC_KICK1_REG ); -local_irq_enable (); +local_irq_restore (flags); }
Signature · 1 line
2.17.1
PATCH 32/87 x86/entry/64: Add two more instruction suffixes
In reply to Sasha LevinFrom: Jan Beulich <[email protected]>
[ Upstream commit 6709812f094d96543b443645c68daaa32d3d3e77 ]
Sadly, other than claimed in:
a368d7fd2a ("x86/entry/64: Add instruction suffix")
... there are two more instances which want to be adjusted.
As said there, omitting suffixes from instructions in AT&T mode is bad practice when operand size cannot be determined by the assembler from register operands, and is likely going to be warned about by upstream gas in the future (mine does already).
Add the other missing suffixes here as well.
--- arch/x86/entry/entry_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/entry/entry_64.S +2 -2
@@ -88,7 +88,7 @@ END(native_usergs_sysret64) .endm .macro TRACE_IRQS_IRETQ_DEBUG - bt $9, EFLAGS(%rsp) /* interrupts off? */ + btl $9, EFLAGS(%rsp) /* interrupts off? */ jnc 1f TRACE_IRQS_ON_DEBUG 1:
@@ -630,7 +630,7 @@ retint_kernel: #ifdef CONFIG_PREEMPT /* Interrupts are off */ /* Check if we need preemption */ - bt $9, EFLAGS(%rsp) /* were interrupts off? */ + btl $9, EFLAGS(%rsp) /* were interrupts off? */ jnc 1f 0: cmpl $0, PER_CPU_VAR(__preempt_count) jnz 1f
Signature · 1 line
2.17.1
PATCH 33/87 ARM: dts: ls1021a: Add missing cooling device properties for CPUs
In reply to Sasha LevinFrom: Viresh Kumar <[email protected]>
[ Upstream commit 47768f372eae030db6fab5225f9504a820d2c07f ]
The cooling device properties, like "#cooling-cells" and "dynamic-power-coefficient", should either be present for all the CPUs of a cluster or none. If these are present only for a subset of CPUs of a cluster then things will start falling apart as soon as the CPUs are brought online in a different order. For example, this will happen because the operating system looks for such properties in the CPU node it is trying to bring up, so that it can register a cooling device.
Add such missing properties.
--- arch/arm/boot/dts/ls1021a.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/ls1021a.dtsi +1 -0
@@ -84,6 +84,7 @@ device_type = "cpu"; reg = <0xf01>; clocks = <&clockgen 1 0>; + #cooling-cells = <2>; }; };
Signature · 1 line
2.17.1
PATCH 34/87 scsi: target/iscsi: Make iscsit_ta_authentication() respect the output buffer size
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 35bea5c84fd13c643cce63f0b5cd4b148f8c901d ]
--- drivers/target/iscsi/iscsi_target_tpg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/target/iscsi/iscsi_target_tpg.c +1 -2
@@ -633,8 +633,7 @@ int iscsit_ta_authentication(struct iscsi_portal_group *tpg, u32 authentication) none =strstr (buf1,NONE );if (none) goto out; -strncat (buf1,"," ,strlen ("," )); -strncat (buf1,NONE ,strlen (NONE )); +strlcat (buf1,"," NONE ,sizeof (buf1));if (iscsi_update_param_value (param, buf1) <0 )return -EINVAL ; }
Signature · 1 line
2.17.1
PATCH 35/87 scsi: klist: Make it safe to use klists in atomic context
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 624fa7790f80575a4ec28fbdb2034097dc18d051 ]
In the scsi_transport_srp implementation it cannot be avoided to iterate over a klist from atomic context when using the legacy block layer instead of blk-mq. Hence this patch that makes it safe to use klists in atomic context. This patch avoids that lockdep reports the following:
WARNING: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&(&k->k_lock)->rlock);
local_irq_disable();
lock(&(&q->__queue_lock)->rlock);
lock(&(&k->k_lock)->rlock);
<Interrupt>
lock(&(&q->__queue_lock)->rlock);stack backtrace: Workqueue: kblockd blk_timeout_work Call Trace: dump_stack+0xa4/0xf5 check_usage+0x6e6/0x700 __lock_acquire+0x185d/0x1b50 lock_acquire+0xd2/0x260 _raw_spin_lock+0x32/0x50 klist_next+0x47/0x190 device_for_each_child+0x8e/0x100 srp_timed_out+0xaf/0x1d0 [scsi_transport_srp] scsi_times_out+0xd4/0x410 [scsi_mod] blk_rq_timed_out+0x36/0x70 blk_timeout_work+0x1b5/0x220 process_one_work+0x4fe/0xad0 worker_thread+0x63/0x5a0 kthread+0x1c1/0x1e0 ret_from_fork+0x24/0x30
See also commit c9ddf73476ff ("scsi: scsi_transport_srp: Fix shost to rport translation").
--- lib/klist.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
lib/klist.c +6 -4
@@ -336,8 +336,9 @@ struct klist_node *klist_prev(struct klist_iter *i)void (*put)(struct klist_node *) = i->i_klist->put;struct klist_node *last = i->i_cur;struct klist_node *prev; +unsigned long flags; -spin_lock (&i->i_klist->k_lock); +spin_lock_irqsave (&i->i_klist->k_lock, flags);if (last) { prev =to_klist_node (last->n_node.prev);
@@ -356,7 +357,7 @@ struct klist_node *klist_prev(struct klist_iter *i) prev =to_klist_node (prev->n_node.prev); } -spin_unlock (&i->i_klist->k_lock); +spin_unlock_irqrestore (&i->i_klist->k_lock, flags);if (put && last)put (last);
@@ -377,8 +378,9 @@ struct klist_node *klist_next(struct klist_iter *i)void (*put)(struct klist_node *) = i->i_klist->put;struct klist_node *last = i->i_cur;struct klist_node *next; +unsigned long flags; -spin_lock (&i->i_klist->k_lock); +spin_lock_irqsave (&i->i_klist->k_lock, flags);if (last) { next =to_klist_node (last->n_node.next);
@@ -397,7 +399,7 @@ struct klist_node *klist_next(struct klist_iter *i) next =to_klist_node (next->n_node.next); } -spin_unlock (&i->i_klist->k_lock); +spin_unlock_irqrestore (&i->i_klist->k_lock, flags);if (put && last)put (last);
Signature · 1 line
2.17.1
PATCH 36/87 scsi: ibmvscsi: Improve strings handling
In reply to Sasha LevinFrom: Breno Leitao <[email protected]>
[ Upstream commit 1262dc09dc9ae7bf4ad00b6a2c5ed6a6936bcd10 ]
Currently an open firmware property is copied into partition_name variable without keeping a room for \0.
Later one, this variable (partition_name), which is 97 bytes long, is strncpyed into ibmvcsci_host_data->madapter_info->partition_name, which is 96 bytes long, possibly truncating it 'again' and removing the \0.
This patch simply decreases the partition name to 96 and just copy using strlcpy() which guarantees that the string is \0 terminated. I think there is no issue if this there is a truncation in this very first copy, i.e, when the open firmware property is read and copied into the driver for the very first time;
This issue also causes the following warning on GCC 8:
drivers/scsi/ibmvscsi/ibmvscsi.c:281:2: warning: strncpy output may be truncated copying 96 bytes from a string of length 96 [-Wstringop-truncation]
...
inlined from ibmvscsi_probe at drivers/scsi/ibmvscsi/ibmvscsi.c:2221:7:
drivers/scsi/ibmvscsi/ibmvscsi.c:265:3: warning: strncpy specified bound 97 equals destination size [-Wstringop-truncation]
--- drivers/scsi/ibmvscsi/ibmvscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ibmvscsi/ibmvscsi.c +2 -2
@@ -93,7 +93,7 @@ static int max_requests = IBMVSCSI_MAX_REQUESTS_DEFAULT;static int max_events =IBMVSCSI_MAX_REQUESTS_DEFAULT +2 ;static int fast_fail =1 ;static int client_reserve =1 ; -static char partition_name[97 ] ="UNKNOWN" ; +static char partition_name[96 ] ="UNKNOWN" ;static unsigned int partition_number =-1 ;static LIST_HEAD (ibmvscsi_head);
@@ -262,7 +262,7 @@ static void gather_partition_info(void) ppartition_name =of_get_property (of_root,"ibm,partition-name" ,NULL );if (ppartition_name) -strncpy (partition_name, ppartition_name, +strlcpy (partition_name, ppartition_name,sizeof (partition_name)); p_number_ptr =of_get_property (of_root,"ibm,partition-no" ,NULL );if (p_number_ptr)
Signature · 1 line
2.17.1
PATCH 37/87 scsi: target: Avoid that EXTENDED COPY commands trigger lock inversion
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit 36d4cb460bcbe2a1323732a6e4bb9dd783284368 ]
The approach for adding a device to the devices_idr data structure and for removing it is as follows:
* &dev->dev_group.cg_item is initialized before a device is added to devices_idr.
* If the reference count of a device drops to zero then target_free_device() removes the device from devices_idr.
* All devices_idr manipulations are protected by device_mutex.
This means that increasing the reference count of a device is sufficient to prevent removal from devices_idr and also that it is safe access dev_group.cg_item for any device that is referenced by devices_idr. Use this to modify target_find_device() and target_for_each_device() such that these functions no longer introduce a dependency between device_mutex and the configfs root inode mutex.
Note: it is safe to pass a NULL pointer to config_item_put() and also to config_item_get_unless_zero().
This patch prevents that lockdep reports the following complaint:
======================================================
WARNING: possible circular locking dependency detected 4.12.0-rc1-dbg+ #1 Not tainted
------------------------------------------------------
rmdir/12053 is trying to acquire lock:
(device_mutex#2){+.+.+.}, at: [<ffffffffa010afce>]target_free_device+0xae/0xf0 [target_core_mod]
but task is already holding lock:
(&sb->s_type->i_mutex_key#14){++++++}, at: [<ffffffff811c5c30>]vfs_rmdir+0x50/0x140
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&sb->s_type->i_mutex_key#14){++++++}:
lock_acquire+0x59/0x80
down_write+0x36/0x70
configfs_depend_item+0x3a/0xb0 [configfs]
target_depend_item+0x13/0x20 [target_core_mod]
target_xcopy_locate_se_dev_e4_iter+0x87/0x100 [target_core_mod]
target_devices_idr_iter+0x16/0x20 [target_core_mod]
idr_for_each+0x39/0xc0
target_for_each_device+0x36/0x50 [target_core_mod]
target_xcopy_locate_se_dev_e4+0x28/0x80 [target_core_mod]
target_xcopy_do_work+0x2e9/0xdd0 [target_core_mod]
process_one_work+0x1ca/0x3f0
worker_thread+0x49/0x3b0
kthread+0x109/0x140
ret_from_fork+0x31/0x40-> #0 (device_mutex#2){+.+.+.}:
__lock_acquire+0x101f/0x11d0
lock_acquire+0x59/0x80
__mutex_lock+0x7e/0x950
mutex_lock_nested+0x16/0x20
target_free_device+0xae/0xf0 [target_core_mod]
target_core_dev_release+0x10/0x20 [target_core_mod]
config_item_put+0x6e/0xb0 [configfs]
configfs_rmdir+0x1a6/0x300 [configfs]
vfs_rmdir+0xb7/0x140
do_rmdir+0x1f4/0x200
SyS_rmdir+0x11/0x20
entry_SYSCALL_64_fastpath+0x23/0xc2other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&sb->s_type->i_mutex_key#14);
lock(device_mutex#2);
lock(&sb->s_type->i_mutex_key#14); lock(device_mutex#2);
*** DEADLOCK ***
3 locks held by rmdir/12053:
#0: (sb_writers#10){.+.+.+}, at: [<ffffffff811e223f>]
mnt_want_write+0x1f/0x50
#1: (&sb->s_type->i_mutex_key#14/1){+.+.+.}, at: [<ffffffff811cb97e>]
do_rmdir+0x15e/0x200
#2: (&sb->s_type->i_mutex_key#14){++++++}, at: [<ffffffff811c5c30>]
vfs_rmdir+0x50/0x140
stack backtrace:
CPU: 3 PID: 12053 Comm: rmdir Not tainted 4.12.0-rc1-dbg+ #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
1.0.0-prebuilt.qemu-project.org 04/01/2014
Call Trace:
dump_stack+0x86/0xcf
print_circular_bug+0x1c7/0x220
__lock_acquire+0x101f/0x11d0
lock_acquire+0x59/0x80
__mutex_lock+0x7e/0x950
mutex_lock_nested+0x16/0x20
target_free_device+0xae/0xf0 [target_core_mod]
target_core_dev_release+0x10/0x20 [target_core_mod]
config_item_put+0x6e/0xb0 [configfs]
configfs_rmdir+0x1a6/0x300 [configfs]
vfs_rmdir+0xb7/0x140
do_rmdir+0x1f4/0x200
SyS_rmdir+0x11/0x20
entry_SYSCALL_64_fastpath+0x23/0xc2--- drivers/target/target_core_device.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/target/target_core_device.c +17 -5
@@ -904,14 +904,20 @@ struct se_device *target_find_device(int id, bool do_depend)EXPORT_SYMBOL (target_find_device);struct devices_idr_iter { +struct config_item *prev_item;int (*fn)(struct se_device *dev,void *data);void *data; };static int target_devices_idr_iter (int id,void *p,void *data) + __must_hold(&device_mutex) {struct devices_idr_iter *iter = data;struct se_device *dev = p; +int ret; + +config_item_put (iter->prev_item); + iter->prev_item =NULL ;/* * We add the device early to the idr, so it can be used
@@ -922,7 +928,15 @@ static int target_devices_idr_iter(int id, void *p, void *data)if (!(dev->dev_flags &DF_CONFIGURED ))return 0 ; -return iter->fn (dev, iter->data); + iter->prev_item =config_item_get_unless_zero (&dev->dev_group.cg_item); +if (!iter->prev_item) +return 0 ; +mutex_unlock (&device_mutex); + + ret = iter->fn (dev, iter->data); + +mutex_lock (&device_mutex); +return ret; }/**
@@ -936,15 +950,13 @@ static int target_devices_idr_iter(int id, void *p, void *data)int target_for_each_device (int (*fn)(struct se_device *dev,void *data),void *data) { -struct devices_idr_iter iter; +struct devices_idr_iter iter = { .fn = fn, .data = data };int ret; - iter.fn = fn; - iter.data = data; -mutex_lock (&device_mutex); ret =idr_for_each (&devices_idr, target_devices_idr_iter, &iter);mutex_unlock (&device_mutex); +config_item_put (iter.prev_item);return ret; }
Signature · 1 line
2.17.1
PATCH 38/87 usb: wusbcore: security: cast sizeof to int for comparison
In reply to Sasha LevinFrom: Julia Lawall <[email protected]>
[ Upstream commit d3ac5598c5010a8999978ebbcca3b1c6188ca36b ]
Comparing an int to a size, which is unsigned, causes the int to become unsigned, giving the wrong result. usb_get_descriptor can return a negative error code.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
int x;
expression e,e1;
identifier f;
@@
*x = f(...);
... when != x = e1
when != if (x < 0 || ...) { ... return ...; }*x < sizeof(e)
// </smpl>
--- drivers/usb/wusbcore/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/wusbcore/security.c +1 -1
@@ -230,7 +230,7 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc, result =usb_get_descriptor (usb_dev,USB_DT_SECURITY ,0 , secd,sizeof (*secd)); -if (result <sizeof (*secd)) { +if (result < (int )sizeof (*secd)) {dev_err (dev,"Can't read security descriptor or " "not enough data: %d\n" , result); goto out;
Signature · 1 line
2.17.1
PATCH 39/87 ath10k: sdio: use same endpoint id for all packets in a bundle
In reply to Sasha LevinFrom: Alagu Sankar <[email protected]>
[ Upstream commit 679e1f07c86221b7183dd69df7068fd42d0041f6 ]
All packets in a bundle should use the same endpoint id as the first lookahead.
This matches how things are done is ath6kl, however, this patch can theoretically handle several bundles in ath10k_sdio_mbox_rx_process_packets().
Without this patch we get lots of errors about invalid endpoint id:
ath10k_sdio mmc2:0001:1: invalid endpoint in look-ahead: 224 ath10k_sdio mmc2:0001:1: failed to get pending recv messages: -12 ath10k_sdio mmc2:0001:1: failed to process pending SDIO interrupts: -12
--- drivers/net/wireless/ath/ath10k/sdio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/sdio.c +4 -1
@@ -434,12 +434,14 @@ static int ath10k_sdio_mbox_rx_process_packets(struct ath10k *ar,enum ath10k_htc_ep_id id;int ret, i, *n_lookahead_local;u32 *lookaheads_local; +int lookahead_idx =0 ;for (i =0 ; i < ar_sdio->n_rx_pkts; i++) { lookaheads_local = lookaheads; n_lookahead_local = n_lookahead; - id = ((struct ath10k_htc_hdr *)&lookaheads[i])->eid; + id = ((struct ath10k_htc_hdr *) + &lookaheads[lookahead_idx++])->eid;if (id >=ATH10K_HTC_EP_COUNT ) { ath10k_warn(ar, "invalid endpoint in look-ahead: %d\n",
@@ -462,6 +464,7 @@ static int ath10k_sdio_mbox_rx_process_packets(struct ath10k *ar,/* Only read lookahead's from RX trailers * for the last packet in a bundle. */ + lookahead_idx--; lookaheads_local =NULL ; n_lookahead_local =NULL ; }
Signature · 1 line
2.17.1
PATCH 40/87 ath10k: sdio: set skb len for all rx packets
In reply to Sasha LevinFrom: Alagu Sankar <[email protected]>
[ Upstream commit 8530b4e7b22bc3bd8240579f3844c73947cd5f71 ]
Without this, packets larger than 1500 will silently be dropped. Easily reproduced by sending a ping packet with a size larger than 1500.
--- drivers/net/wireless/ath/ath10k/sdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/sdio.c +1 -0
@@ -396,6 +396,7 @@ static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar,int ret; payload_len =le16_to_cpu (htc_hdr->len); + skb->len = payload_len +sizeof (struct ath10k_htc_hdr );if (trailer_present) { trailer = skb->data + sizeof(*htc_hdr) +
Signature · 1 line
2.17.1
PATCH 41/87 powerpc/powernv/ioda2: Reduce upper limit for DMA window size
In reply to Sasha LevinFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit d3d4ffaae439981e1e441ebb125aa3588627c5d8 ]
We use PHB in mode1 which uses bit 59 to select a correct DMA window. However there is mode2 which uses bits 59:55 and allows up to 32 DMA windows per a PE.
Even though documentation does not clearly specify that, it seems that the actual hardware does not support bits 59:55 even in mode1, in other words we can create a window as big as 1<<58 but DMA simply won't work.
This reduces the upper limit from 59 to 55 bits to let the userspace know about the hardware limits.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -2787,7 +2787,7 @@ static long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, level_shift = entries_shift +3 ; level_shift =max_t (unsigned, level_shift,PAGE_SHIFT ); -if ((level_shift -3 ) * levels + page_shift >=60 ) +if ((level_shift -3 ) * levels + page_shift >=55 )return -EINVAL ;/* Allocate TCE table */
Signature · 1 line
2.17.1
PATCH 42/87 s390/sysinfo: add missing #ifdef CONFIG_PROC_FS
In reply to Sasha LevinFrom: Heiko Carstens <[email protected]>
[ Upstream commit 9f35b818a2f90fb6cb291aa0c9f835d4f0974a9a ]
Get rid of this compile warning for !PROC_FS:
CC arch/s390/kernel/sysinfo.oarch/s390/kernel/sysinfo.c:275:12: warning: 'sysinfo_show' defined but not used [-Wunused-function]
static int sysinfo_show(struct seq_file *m, void *v)
--- arch/s390/kernel/sysinfo.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/s390/kernel/sysinfo.c +4 -0
@@ -59,6 +59,8 @@ int stsi(void *sysinfo, int fc, int sel1, int sel2) }EXPORT_SYMBOL (stsi); +#ifdef CONFIG_PROC_FS +static bool convert_ext_name (unsigned char encoding,char *name,size_t len) {switch (encoding) {
@@ -311,6 +313,8 @@ static int __init sysinfo_create_proc(void) }device_initcall (sysinfo_create_proc); +#endif /* CONFIG_PROC_FS */ +/* * Service levels interface. */
Signature · 1 line
2.17.1
PATCH 43/87 alarmtimer: Prevent overflow for relative nanosleep
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 5f936e19cc0ef97dbe3a56e9498922ad5ba1edef ]
Air Icy reported:
UBSAN: Undefined behaviour in kernel/time/alarmtimer.c:811:7 signed integer overflow: 1529859276030040771 + 9223372036854775807 cannot be represented in type 'long long int' Call Trace: alarm_timer_nsleep+0x44c/0x510 kernel/time/alarmtimer.c:811 __do_sys_clock_nanosleep kernel/time/posix-timers.c:1235 [inline] __se_sys_clock_nanosleep kernel/time/posix-timers.c:1213 [inline] __x64_sys_clock_nanosleep+0x326/0x4e0 kernel/time/posix-timers.c:1213 do_syscall_64+0xb8/0x3a0 arch/x86/entry/common.c:290
alarm_timer_nsleep() uses ktime_add() to add the current time and the relative expiry value. ktime_add() has no sanity checks so the addition can overflow when the relative timeout is large enough.
Use ktime_add_safe() which has the necessary sanity checks in place and limits the result to the valid range.
--- kernel/time/alarmtimer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/time/alarmtimer.c +2 -1
@@ -808,7 +808,8 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,/* Convert (if necessary) to absolute time */ if (flags !=TIMER_ABSTIME ) {ktime_t now = alarm_bases[type].gettime (); - exp =ktime_add (now, exp); + + exp =ktime_add_safe (now, exp); } ret =alarmtimer_do_nsleep (&alarm, exp, type);
Signature · 1 line
2.17.1
PATCH 44/87 s390/dasd: correct numa_node in dasd_alloc_queue
In reply to Sasha LevinFrom: Vasily Gorbik <[email protected]>
[ Upstream commit b17e3abb0af404cb62ad4ef1a5962f58b06e2b78 ]
The numa_node field of the tag_set struct has to be explicitly initialized, otherwise it stays as 0, which is a valid numa node id and cause memory allocation failure if node 0 is offline.
--- drivers/s390/block/dasd.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/block/dasd.c +1 -0
@@ -3190,6 +3190,7 @@ static int dasd_alloc_queue(struct dasd_block *block) block->tag_set.nr_hw_queues =DASD_NR_HW_QUEUES ; block->tag_set.queue_depth =DASD_MAX_LCU_DEV *DASD_REQ_PER_DEV ; block->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; + block->tag_set.numa_node =NUMA_NO_NODE ; rc =blk_mq_alloc_tag_set (&block->tag_set);if (rc)
Signature · 1 line
2.17.1
PATCH 45/87 s390/scm_blk: correct numa_node in scm_blk_dev_setup
In reply to Sasha LevinFrom: Vasily Gorbik <[email protected]>
[ Upstream commit d642d6262f4fcfa5d200ec6e218c17f0c15b3390 ]
The numa_node field of the tag_set struct has to be explicitly initialized, otherwise it stays as 0, which is a valid numa node id and cause memory allocation failure if node 0 is offline.
--- drivers/s390/block/scm_blk.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/block/scm_blk.c +1 -0
@@ -454,6 +454,7 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) bdev->tag_set.nr_hw_queues = nr_requests; bdev->tag_set.queue_depth = nr_requests_per_io * nr_requests; bdev->tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; + bdev->tag_set.numa_node =NUMA_NO_NODE ; ret =blk_mq_alloc_tag_set (&bdev->tag_set);if (ret)
Signature · 1 line
2.17.1
PATCH 46/87 s390/extmem: fix gcc 8 stringop-overflow warning
In reply to Sasha LevinFrom: Vasily Gorbik <[email protected]>
[ Upstream commit 6b2ddf33baec23dace85bd647e3fc4ac070963e8 ]
arch/s390/mm/extmem.c: In function '__segment_load':arch/s390/mm/extmem.c:436:2: warning: 'strncat' specified bound 7 equals source length [-Wstringop-overflow=]
strncat(seg->res_name, " (DCSS)", 7);
What gcc complains about here is the misuse of strncat function, which in this case does not limit a number of bytes taken from "src", so it is in the end the same as strcat(seg->res_name, " (DCSS)");
Keeping in mind that a res_name is 15 bytes, strncat in this case would overflow the buffer and write 0 into alignment byte between the fields in the struct. To avoid that increasing res_name size to 16, and reusing strlcat.
--- arch/s390/mm/extmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/mm/extmem.c +2 -2
@@ -80,7 +80,7 @@ struct qin64 {struct dcss_segment {struct list_head list;char dcss_name[8 ]; -char res_name[15 ]; +char res_name[16 ];unsigned long start_addr;unsigned long end;atomic_t ref_count;
@@ -433,7 +433,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned longmemcpy (&seg->res_name, seg->dcss_name,8 );EBCASC (seg->res_name,8 ); seg->res_name[8 ] ='\0' ; -strncat (seg->res_name," (DCSS)" ,7 ); +strlcat (seg->res_name," (DCSS)" ,sizeof (seg->res_name)); seg->res->name = seg->res_name; rc = seg->vm_segtype; if (rc == SEG_TYPE_SC ||
Signature · 1 line
2.17.1
PATCH 47/87 mtd: rawnand: atmel: add module param to avoid using dma
In reply to Sasha LevinFrom: Peter Rosin <[email protected]>
[ Upstream commit efc6362c6f8c1e74b340e2611f1b35e7d557ce7b ]
On a sama5d31 with a Full-HD dual LVDS panel (132MHz pixel clock) NAND flash accesses have a tendency to cause display disturbances. Add a module param to disable DMA from the NAND controller, since that fixes the display problem for me.
--- drivers/mtd/nand/atmel/nand-controller.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/nand/atmel/nand-controller.c +6 -1
@@ -129,6 +129,11 @@#define DEFAULT_TIMEOUT_MS 1000#define MIN_DMA_LEN 128 +static bool atmel_nand_avoid_dma__read_mostly ; + +MODULE_PARM_DESC (avoiddma,"Avoid using DMA" ); +module_param_named (avoiddma, atmel_nand_avoid_dma, bool,0400 ); +enum atmel_nand_rb_type {ATMEL_NAND_NO_RB ,ATMEL_NAND_NATIVE_RB ,
@@ -1975,7 +1980,7 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,return ret; } -if (nc->caps->has_dma) { +if (nc->caps->has_dma && !atmel_nand_avoid_dma) {dma_cap_mask_t mask;dma_cap_zero (mask);
Signature · 1 line
2.17.1
PATCH 48/87 iio: accel: adxl345: convert address field usage in iio_chan_spec
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit 9048f1f18a70a01eaa3c8e7166fdb2538929d780 ]
Currently the address field in iio_chan_spec is filled with an accel data register address for the corresponding axis.
In preparation for adding calibration offset support, this sets the address field to the index of accel data registers instead of the actual register address.
This change makes it easier to access both accel registers and calibration offset registers with fewer lines of code as these are located in X-axis, Y-axis, Z-axis order.
--- drivers/iio/accel/adxl345_core.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/iio/accel/adxl345_core.c +12 -9
@@ -21,6 +21,8 @@#define ADXL345_REG_DATAX0 0x32#define ADXL345_REG_DATAY0 0x34#define ADXL345_REG_DATAZ0 0x36 +#define ADXL345_REG_DATA_AXIS (index) \ + (ADXL345_REG_DATAX0 + (index) * sizeof(__le16))#define ADXL345_POWER_CTL_MEASURE BIT(3)#define ADXL345_POWER_CTL_STANDBY 0x00
@@ -47,19 +49,19 @@ struct adxl345_data {u8 data_range; }; -#define ADXL345_CHANNEL (reg, axis) { \ +#define ADXL345_CHANNEL (index, axis) { \ .type = IIO_ACCEL, \ .modified = 1, \ .channel2 = IIO_MOD_##axis, \ - .address = reg, \ + .address = index, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ }static const struct iio_chan_spec adxl345_channels[] = { -ADXL345_CHANNEL (ADXL345_REG_DATAX0 ,X ), -ADXL345_CHANNEL (ADXL345_REG_DATAY0 ,Y ), -ADXL345_CHANNEL (ADXL345_REG_DATAZ0 ,Z ), +ADXL345_CHANNEL (0 ,X ), +ADXL345_CHANNEL (1 ,Y ), +ADXL345_CHANNEL (2 ,Z ), }; static int adxl345_read_raw(struct iio_dev *indio_dev,
@@ -67,7 +69,7 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct adxl345_data *data = iio_priv(indio_dev); -__le16 regval; +__le16 accel;int ret;switch (mask) {
@@ -77,12 +79,13 @@ static int adxl345_read_raw(struct iio_dev *indio_dev,* ADXL345_REG_DATA(X0/Y0/Z0) contain the least significant byte * and ADXL345_REG_DATA(X0/Y0/Z0) + 1 the most significant byte */ - ret =regmap_bulk_read (data->regmap, chan->address, ®val, -sizeof (regval)); + ret =regmap_bulk_read (data->regmap, +ADXL345_REG_DATA_AXIS (chan->address), + &accel,sizeof (accel));if (ret <0 )return ret; - *val =sign_extend32 (le16_to_cpu (regval),12 ); + *val =sign_extend32 (le16_to_cpu (accel),12 );return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : *val =0 ;
Signature · 1 line
2.17.1
PATCH 49/87 posix-timers: Make forward callback return s64
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 6fec64e1c92d5c715c6d0f50786daa7708266bde ]
The posix timer ti_overrun handling is broken because the forwarding functions can return a huge number of overruns which does not fit in an int. As a consequence timer_getoverrun(2) and siginfo::si_overrun can turn into random number generators.
As a first step to address that let the timer_forward() callbacks return the full 64 bit value.
Cast it to (int) temporarily until k_itimer::ti_overrun is converted to 64bit and the conversion to user space visible values is sanitized.
--- kernel/time/alarmtimer.c | 4 ++-- kernel/time/posix-timers.c | 6 +++--- kernel/time/posix-timers.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -581,11 +581,11 @@ static void alarm_timer_rearm(struct k_itimer *timr)* @timr: Pointer to the posixtimer data struct * @now: Current time to forward the timer against */ -static int alarm_timer_forward (struct k_itimer *timr,ktime_t now) +static s64 alarm_timer_forward (struct k_itimer *timr,ktime_t now) {struct alarm *alarm = &timr->it.alarm.alarmtimer; -return (int )alarm_forward (alarm, timr->it_interval, now); +return alarm_forward (alarm, timr->it_interval, now); }/**
kernel/time/posix-timers.c +3 -3
@@ -645,11 +645,11 @@ static ktime_t common_hrtimer_remaining(struct k_itimer *timr, ktime_t now)return __hrtimer_expires_remaining_adjusted (timer, now); } -static int common_hrtimer_forward (struct k_itimer *timr,ktime_t now) +static s64 common_hrtimer_forward (struct k_itimer *timr,ktime_t now) {struct hrtimer *timer = &timr->it.real.timer; -return (int )hrtimer_forward (timer, now, timr->it_interval); +return hrtimer_forward (timer, now, timr->it_interval); }/*
@@ -702,7 +702,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)* expiry time forward by intervals, so expiry is > now. */ if (iv && (timr->it_requeue_pending &REQUEUE_PENDING || sig_none)) - timr->it_overrun += kc->timer_forward (timr, now); + timr->it_overrun += (int )kc->timer_forward (timr, now); remaining = kc->timer_remaining (timr, now);/* Return 0 only, when the timer is expired and not pending */
kernel/time/posix-timers.h +1 -1
@@ -19,7 +19,7 @@ struct k_clock {void (*timer_get)(struct k_itimer *timr,struct itimerspec64 *cur_setting);void (*timer_rearm)(struct k_itimer *timr); -int (*timer_forward)(struct k_itimer *timr,ktime_t now); +s64 (*timer_forward)(struct k_itimer *timr,ktime_t now);ktime_t (*timer_remaining)(struct k_itimer *timr,ktime_t now);int (*timer_try_to_cancel)(struct k_itimer *timr); void (*timer_arm)(struct k_itimer *timr, ktime_t expires,
Signature · 1 line
2.17.1
PATCH 50/87 posix-timers: Sanitize overrun handling
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 78c9c4dfbf8c04883941445a195276bb4bb92c76 ]
The posix timer overrun handling is broken because the forwarding functions can return a huge number of overruns which does not fit in an int. As a consequence timer_getoverrun(2) and siginfo::si_overrun can turn into random number generators.
The k_clock::timer_forward() callbacks return a 64 bit value now. Make k_itimer::ti_overrun[_last] 64bit as well, so the kernel internal accounting is correct. 3Remove the temporary (int) casts.
Add a helper function which clamps the overrun value returned to user space via timer_getoverrun(2) or siginfo::si_overrun limited to a positive value between 0 and INT_MAX. INT_MAX is an indicator for user space that the overrun value has been clamped.
--- include/linux/posix-timers.h | 4 ++-- kernel/time/posix-cpu-timers.c | 2 +- kernel/time/posix-timers.c | 31 ++++++++++++++++++++----------- 3 files changed, 23 insertions(+), 14 deletions(-)
include/linux/posix-timers.h +2 -2
@@ -82,8 +82,8 @@ struct k_itimer {clockid_t it_clock;timer_t it_id;int it_active; -int it_overrun; -int it_overrun_last; +s64 it_overrun; +s64 it_overrun_last;int it_requeue_pending;int it_sigev_notify;ktime_t it_interval;
kernel/time/posix-cpu-timers.c +1 -1
@@ -84,7 +84,7 @@ static void bump_cpu_timer(struct k_itimer *timer, u64 now)continue ; timer->it.cpu.expires += incr; - timer->it_overrun +=1 << i; + timer->it_overrun +=1LL << i; delta -= incr; } }
kernel/time/posix-timers.c +20 -11
@@ -283,6 +283,17 @@ static __init int init_posix_timers(void) }__initcall (init_posix_timers); +/* +* The siginfo si_overrun field and the return value of timer_getoverrun(2) +* are of type int. Clamp the overrun value to INT_MAX +*/ +static inline int timer_overrun_to_int (struct k_itimer *timr,int baseval) +{ +s64 sum = timr->it_overrun_last + (s64 )baseval; + +return sum > (s64 )INT_MAX ?INT_MAX : (int )sum; +} +static void common_hrtimer_rearm (struct k_itimer *timr) {struct hrtimer *timer = &timr->it.real.timer;
@@ -290,9 +301,8 @@ static void common_hrtimer_rearm(struct k_itimer *timr)if (!timr->it_interval)return ; - timr->it_overrun += (unsigned int )hrtimer_forward (timer, - timer->base->get_time (), - timr->it_interval); + timr->it_overrun +=hrtimer_forward (timer, timer->base->get_time (), + timr->it_interval);hrtimer_restart (timer); }
@@ -321,10 +331,10 @@ void posixtimer_rearm(struct siginfo *info) timr->it_active =1 ; timr->it_overrun_last = timr->it_overrun; - timr->it_overrun =-1 ; + timr->it_overrun =-1LL ; ++timr->it_requeue_pending; - info->si_overrun += timr->it_overrun_last; + info->si_overrun =timer_overrun_to_int (timr, info->si_overrun); }unlock_timer (timr, flags);
@@ -418,9 +428,8 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) now = ktime_add(now, kj); }#endif - timr->it_overrun += (unsigned int ) -hrtimer_forward (timer, now, - timr->it_interval); + timr->it_overrun +=hrtimer_forward (timer, now, + timr->it_interval); ret =HRTIMER_RESTART ; ++timr->it_requeue_pending; timr->it_active =1 ;
@@ -524,7 +533,7 @@ static int do_timer_create(clockid_t which_clock, struct sigevent *event, new_timer->it_id = (timer_t ) new_timer_id; new_timer->it_clock = which_clock; new_timer->kclock = kc; - new_timer->it_overrun =-1 ; + new_timer->it_overrun =-1LL ;if (event) {rcu_read_lock ();
@@ -702,7 +711,7 @@ void common_timer_get(struct k_itimer *timr, struct itimerspec64 *cur_setting)* expiry time forward by intervals, so expiry is > now. */ if (iv && (timr->it_requeue_pending &REQUEUE_PENDING || sig_none)) - timr->it_overrun += (int )kc->timer_forward (timr, now); + timr->it_overrun += kc->timer_forward (timr, now); remaining = kc->timer_remaining (timr, now);/* Return 0 only, when the timer is expired and not pending */
@@ -789,7 +798,7 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)if (!timr)return -EINVAL ; - overrun = timr->it_overrun_last; + overrun =timer_overrun_to_int (timr,0 );unlock_timer (timr, flags);return overrun;
Signature · 1 line
2.17.1
PATCH 51/87 ALSA: snd-aoa: add of_node_put() in error path
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 222bce5eb88d1af656419db04bcd84b2419fb900 ]
Both calls to of_find_node_by_name() and of_get_next_child() return a
node pointer with refcount incremented thus it must be explicidly decremented here after the last usage. As we are assured to have a refcounted np either from the initial of_find_node_by_name(NULL, name); or from the of_get_next_child(gpio, np) in the while loop if we reached the error code path below, an x of_node_put(np) is needed.
--- sound/aoa/core/gpio-feature.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/aoa/core/gpio-feature.c +3 -1
@@ -88,8 +88,10 @@ static struct device_node *get_gpio(char *name, } reg =of_get_property (np,"reg" ,NULL ); -if (!reg) +if (!reg) { +of_node_put (np);return NULL ; + } *gpioptr = *reg;
Signature · 1 line
2.17.1
PATCH 52/87 nfp: fail probe if serial or interface id is missing
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 18aa5b180f00a10c2f63944b4f0ab116bf8ea19b ]
On some platforms with broken ACPI tables we may not have access to the Serial Number PCIe capability. This capability is crucial for us for switchdev operation as we use serial number as switch ID, and for communication with management FW where interface ID is used.
If we can't determine the Serial Number we have to fail device probe.
--- .../netronome/nfp/nfpcore/nfp6000_pcie.c | 16 +++++++++----- .../ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 4 ++-- .../netronome/nfp/nfpcore/nfp_cppcore.c | 22 ++++++++++++++----- 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c +10 -6
@@ -1254,7 +1254,7 @@ static void nfp6000_free(struct nfp_cpp *cpp)kfree (nfp); } -static void nfp6000_read_serial (struct device *dev,u8 *serial) +static int nfp6000_read_serial (struct device *dev,u8 *serial) {struct pci_dev *pdev =to_pci_dev (dev);int pos;
@@ -1262,25 +1262,29 @@ static void nfp6000_read_serial(struct device *dev, u8 *serial) pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_DSN );if (!pos) { -memset (serial,0 ,NFP_SERIAL_LEN ); -return ; +dev_err (dev,"can't find PCIe Serial Number Capability\n" ); +return -EINVAL ; }pci_read_config_dword (pdev, pos +4 , ®);put_unaligned_be16 (reg >>16 , serial +4 );pci_read_config_dword (pdev, pos +8 , ®);put_unaligned_be32 (reg, serial); + +return 0 ; } -static u16 nfp6000_get_interface (struct device *dev) +static int nfp6000_get_interface (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);int pos;u32 reg; pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_DSN ); -if (!pos) -return NFP_CPP_INTERFACE (NFP_CPP_INTERFACE_TYPE_PCI ,0 ,0xff ); +if (!pos) { +dev_err (dev,"can't find PCIe Serial Number Capability\n" ); +return -EINVAL ; + }pci_read_config_dword (pdev, pos +4 , ®);
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h +2 -2
@@ -356,8 +356,8 @@ struct nfp_cpp_operations {int (*init)(struct nfp_cpp *cpp);void (*free)(struct nfp_cpp *cpp); -void (*read_serial)(struct device *dev,u8 *serial); -u16 (*get_interface)(struct device *dev); +int (*read_serial)(struct device *dev,u8 *serial); +int (*get_interface)(struct device *dev); int (*area_init)(struct nfp_cpp_area *area, u32 dest, unsigned long long address,
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c +16 -6
@@ -1147,10 +1147,10 @@ nfp_cpp_from_operations(const struct nfp_cpp_operations *ops, {const u32 arm =NFP_CPP_ID (NFP_CPP_TARGET_ARM ,NFP_CPP_ACTION_RW ,0 );struct nfp_cpp *cpp; +int ifc, err;u32 mask[2 ];u32 xpbaddr;size_t tgt; -int err; cpp =kzalloc (sizeof (*cpp),GFP_KERNEL );if (!cpp) {
@@ -1160,9 +1160,19 @@ nfp_cpp_from_operations(const struct nfp_cpp_operations *ops, cpp->op = ops; cpp->priv = priv; - cpp->interface = ops->get_interface (parent); -if (ops->read_serial) - ops->read_serial (parent, cpp->serial); + + ifc = ops->get_interface (parent); +if (ifc <0 ) { + err = ifc; + goto err_free_cpp; + } + cpp->interface = ifc; +if (ops->read_serial) { + err = ops->read_serial (parent, cpp->serial); +if (err) + goto err_free_cpp; + } +rwlock_init (&cpp->resource_lock);init_waitqueue_head (&cpp->waitq);lockdep_set_class (&cpp->resource_lock, &nfp_cpp_resource_lock_key);
@@ -1175,7 +1185,7 @@ nfp_cpp_from_operations(const struct nfp_cpp_operations *ops, err =device_register (&cpp->dev);if (err <0 ) {put_device (&cpp->dev); - goto err_dev; + goto err_free_cpp; }dev_set_drvdata (&cpp->dev, cpp);
@@ -1222,7 +1232,7 @@ nfp_cpp_from_operations(const struct nfp_cpp_operations *ops, err_out:device_unregister (&cpp->dev); -err_dev: +err_free_cpp:kfree (cpp); err_malloc:return ERR_PTR (err);
Signature · 1 line
2.17.1
Re: [PATCH AUTOSEL 4.14 52/87] nfp: fail probe if serial or interface id is missing
Quoted 9 lines · Sasha Levin
From: Jakub Kicinski <[email protected]>
[ Upstream commit
18aa5b180f00a10c2f63944b4f0ab116bf8ea19b]On some platforms with broken ACPI tables we may not have access to the Serial Number PCIe capability. This capability is crucial for us for switchdev operation as we use serial number as switch ID, and for communication with management FW where interface ID is used.
Quoted 5 lines
If we can't determine the Serial Number we have to fail device probe.
Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
If the problem occurs the driver would usually fail to probe anyway (e.g. due to missing SR-IOV capability), just without providing any clear message why. So the patch is not of huge importance, but I'm not opposed to back porting it.
I should've put this info in the commit message, my bad.
Re: [PATCH AUTOSEL 4.14 52/87] nfp: fail probe if serial or interface id is missing
Quoted 16 lines · Jakub Kicinski
Quoted 9 lines · Sasha Levin
From: Jakub Kicinski <[email protected]>
[ Upstream commit
18aa5b180f00a10c2f63944b4f0ab116bf8ea19b]On some platforms with broken ACPI tables we may not have access to the Serial Number PCIe capability. This capability is crucial for us for switchdev operation as we use serial number as switch ID, and for communication with management FW where interface ID is used.
Quoted 5 lines
If we can't determine the Serial Number we have to fail device probe.
Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 6 lines
If the problem occurs the driver would usually fail to probe anyway (e.g. due to missing SR-IOV capability), just without providing any clear message why. So the patch is not of huge importance, but I'm not opposed to back porting it.
I should've put this info in the commit message, my bad.
Now removed, thanks!
PATCH 53/87 media: s3c-camif: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit 30ed2b83343bd1e07884ca7355dac70d25ffc158 ]
When the subdevice doesn't provide s_power core ops callback, the v4l2_subdev_call for s_power returns -ENOIOCTLCMD. If the subdevice doesn't have the special handling for its power saving mode, the s_power isn't required. So -ENOIOCTLCMD from the v4l2_subdev_call should be ignored.
--- drivers/media/platform/s3c-camif/camif-capture.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/s3c-camif/camif-capture.c +2 -0
@@ -117,6 +117,8 @@ static int sensor_set_power(struct camif_dev *camif, int on)if (camif->sensor.power_count == !on) err =v4l2_subdev_call (sensor->sd, core, s_power, on); +if (err == -ENOIOCTLCMD ) + err =0 ;if (!err) sensor->power_count += on ?1 :-1 ;
Signature · 1 line
2.17.1
PATCH 54/87 media: soc_camera: ov772x: correct setting of banding filter
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit 22216ec41e919682c15345e95928f266e8ba6f9e ]
The banding filter ON/OFF is controlled via bit 5 of COM8 register. It is attempted to be enabled in ov772x_set_params() by the following line.
ret = ov772x_mask_set(client, COM8, BNDF_ON_OFF, 1);
But this unexpectedly results disabling the banding filter, because the mask and set bits are exclusive.
On the other hand, ov772x_s_ctrl() correctly sets the bit by:
ret = ov772x_mask_set(client, COM8, BNDF_ON_OFF, BNDF_ON_OFF);
The same fix was already applied to non-soc_camera version of ov772x driver in the commit commit a024ee14cd36 ("media: ov772x: correct setting of banding filter")
--- drivers/media/i2c/soc_camera/ov772x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/soc_camera/ov772x.c +1 -1
@@ -834,7 +834,7 @@ static int ov772x_set_params(struct ov772x_priv *priv,* set COM8 */ if (priv->band_filter) { - ret =ov772x_mask_set (client,COM8 ,BNDF_ON_OFF ,1 ); + ret =ov772x_mask_set (client,COM8 ,BNDF_ON_OFF ,BNDF_ON_OFF );if (!ret) ret =ov772x_mask_set (client,BDBASE ,0xff ,256 - priv->band_filter);
Signature · 1 line
2.17.1
PATCH 55/87 media: omap3isp: zero-initialize the isp cam_xclk{a,b} initial data
In reply to Sasha LevinFrom: Javier Martinez Canillas <[email protected]>
[ Upstream commit 2ec7debd44b49927a6e2861521994cc075a389ed ]
The struct clk_init_data init variable is declared in the isp_xclk_init() function so is an automatic variable allocated in the stack. But it's not explicitly zero-initialized, so some init fields are left uninitialized.
This causes the data structure to have undefined values that may confuse the common clock framework when the clock is registered.
For example, the uninitialized .flags field could have the CLK_IS_CRITICAL bit set, causing the framework to wrongly prepare the clk on registration. This leads to the isp_xclk_prepare() callback being called, which in turn calls to the omap3isp_get() function that increments the isp dev refcount.
Since this omap3isp_get() call is unexpected, this leads to an unbalanced omap3isp_get() call that prevents the requested IRQ to be later enabled, due the refcount not being 0 when the correct omap3isp_get() call happens.
--- drivers/media/platform/omap3isp/isp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/omap3isp/isp.c +1 -1
@@ -305,7 +305,7 @@ static struct clk *isp_xclk_src_get(struct of_phandle_args *clkspec, void *data)static int isp_xclk_init (struct isp_device *isp) {struct device_node *np = isp->dev->of_node; -struct clk_init_data init; +struct clk_init_data init = {0 };unsigned int i;for (i =0 ; i <ARRAY_SIZE (isp->xclks); ++i)
Signature · 1 line
2.17.1
PATCH 56/87 staging: android: ashmem: Fix mmap size validation
In reply to Sasha LevinFrom: Alistair Strachan <[email protected]>
[ Upstream commit 8632c614565d0c5fdde527889601c018e97b6384 ]
The ashmem driver did not check that the size/offset of the vma passed to its .mmap() function was not larger than the ashmem object being mapped. This could cause mmap() to succeed, even though accessing parts of the mapping would later fail with a segmentation fault.
Ensure an error is returned by the ashmem_mmap() function if the vma size is larger than the ashmem object size. This enables safer handling of the problem in userspace.
--- drivers/staging/android/ashmem.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/staging/android/ashmem.c +6 -0
@@ -374,6 +374,12 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) goto out; } +/* requested mapping size larger than object size */ +if (vma->vm_end - vma->vm_start >PAGE_ALIGN (asma->size)) { + ret = -EINVAL ; + goto out; + } +/* requested protection bits must match our allowed protection mask */ if (unlikely ((vma->vm_flags & ~calc_vm_prot_bits (asma->prot_mask,0 )) &calc_vm_prot_bits (PROT_MASK ,0 ))) {
Signature · 1 line
2.17.1
PATCH 57/87 drivers/tty: add error handling for pcmcia_loop_config
In reply to Sasha LevinFrom: Zhouyang Jia <[email protected]>
[ Upstream commit 85c634e919bd6ef17427f26a52920aeba12e16ee ]
When pcmcia_loop_config fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling pcmcia_loop_config.
--- drivers/tty/serial/8250/serial_cs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/serial_cs.c +4 -2
@@ -637,8 +637,10 @@ static int serial_config(struct pcmcia_device *link) (link->has_func_id) && (link->socket->pcmcia_pfc ==0 ) && ((link->func_id ==CISTPL_FUNCID_MULTI ) || - (link->func_id == CISTPL_FUNCID_SERIAL))) -pcmcia_loop_config (link, serial_check_for_multi, info); + (link->func_id == CISTPL_FUNCID_SERIAL))) { + if (pcmcia_loop_config(link, serial_check_for_multi, info)) + goto failed; + }/* * Apply any multi-port quirk.
Signature · 1 line
2.17.1
PATCH 58/87 media: tm6000: add error handling for dvb_register_adapter
In reply to Sasha LevinFrom: Zhouyang Jia <[email protected]>
[ Upstream commit e95d7c6eb94c634852eaa5ff4caf3db05b5d2e86 ]
When dvb_register_adapter fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling dvb_register_adapter.
--- drivers/media/usb/tm6000/tm6000-dvb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/usb/tm6000/tm6000-dvb.c +5 -0
@@ -267,6 +267,11 @@ static int register_dvb(struct tm6000_core *dev) ret =dvb_register_adapter (&dvb->adapter,"Trident TVMaster 6000 DVB-T" ,THIS_MODULE , &dev->udev->dev, adapter_nr); +if (ret <0 ) { +pr_err ("tm6000: couldn't register the adapter!\n" ); + goto err; + } + dvb->adapter.priv = dev;if (dvb->frontend) {
Signature · 1 line
2.17.1
PATCH 59/87 ALSA: hda: Add AZX_DCAPS_PM_RUNTIME for AMD Raven Ridge
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 1adca4b0cd65c14cb8b8c9c257720385869c3d5f ]
This patch can make audio controller in AMD Raven Ridge gets runtime suspended to D3, to save ~1W power when it's not in use.
--- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +2 -1
@@ -2510,7 +2510,8 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB },/* AMD Raven */ { PCI_DEVICE(0x1022, 0x15e3), - .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB }, + .driver_data =AZX_DRIVER_GENERIC |AZX_DCAPS_PRESET_ATI_SB | + AZX_DCAPS_PM_RUNTIME }, /* ATI HDMI */ { PCI_DEVICE(0x1002, 0x0002), .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
Signature · 1 line
2.17.1
PATCH 60/87 net: phy: xgmiitorgmii: Check read_status results
In reply to Sasha LevinFrom: Brandon Maier <[email protected]>
[ Upstream commit 8d0752d11312be830c33e84dfd1016e6a47c2938 ]
We're ignoring the result of the attached phy device's read_status(). Return it so we can detect errors.
--- drivers/net/phy/xilinx_gmii2rgmii.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/phy/xilinx_gmii2rgmii.c +4 -1
@@ -40,8 +40,11 @@ static int xgmiitorgmii_read_status(struct phy_device *phydev) {struct gmii2rgmii *priv = phydev->priv;u16 val =0 ; +int err; - priv->phy_drv->read_status (phydev); + err = priv->phy_drv->read_status (phydev); +if (err <0 ) +return err; val =mdiobus_read (phydev->mdio.bus, priv->addr,XILINX_GMII2RGMII_REG ); val &= ~XILINX_GMII2RGMII_SPEED_MASK ;
Signature · 1 line
2.17.1
PATCH 61/87 ath10k: protect ath10k_htt_rx_ring_free with rx_ring.lock
In reply to Sasha LevinFrom: Ben Greear <[email protected]>
[ Upstream commit 168f75f11fe68455e0d058a818ebccfc329d8685 ]
While debugging driver crashes related to a buggy firmware crashing under load, I noticed that ath10k_htt_rx_ring_free could be called without being under lock. I'm not sure if this is the root cause of the crash or not, but it seems prudent to protect it.
Originally tested on 4.16+ kernel with ath10k-ct 10.4 firmware running on 9984 NIC.
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +4 -1
@@ -215,11 +215,12 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)spin_lock_bh (&htt->rx_ring.lock); ret =ath10k_htt_rx_ring_fill_n (htt, (htt->rx_ring.fill_level - htt->rx_ring.fill_cnt)); -spin_unlock_bh (&htt->rx_ring.lock);if (ret)ath10k_htt_rx_ring_free (htt); +spin_unlock_bh (&htt->rx_ring.lock); +return ret; }
@@ -231,7 +232,9 @@ void ath10k_htt_rx_free(struct ath10k_htt *htt)skb_queue_purge (&htt->rx_in_ord_compl_q);skb_queue_purge (&htt->tx_fetch_ind_q); +spin_lock_bh (&htt->rx_ring.lock);ath10k_htt_rx_ring_free (htt); +spin_unlock_bh (&htt->rx_ring.lock); dma_free_coherent(htt->ar->dev, (htt->rx_ring.size *
Signature · 1 line
2.17.1
PATCH 62/87 net: phy: xgmiitorgmii: Check phy_driver ready before accessing
In reply to Sasha LevinFrom: Brandon Maier <[email protected]>
[ Upstream commit ab4e6ee578e88a659938db8fbf33720bc048d29c ]
Since a phy_device is added to the global mdio_bus list during phy_device_register(), but a phy_device's phy_driver doesn't get attached until phy_probe(). It's possible of_phy_find_device() in xgmiitorgmii will return a valid phy with a NULL phy_driver. Leading to a NULL pointer access during the memcpy().
Fixes this Oops:
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = c0004000 [00000000] *pgd=00000000 Internal error: Oops: 5 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.14.40 #1 Hardware name: Xilinx Zynq Platform task: ce4c8d00 task.stack: ce4ca000 PC is at memcpy+0x48/0x330 LR is at xgmiitorgmii_probe+0x90/0xe8 pc : [<c074bc68>] lr : [<c0529548>] psr: 20000013
sp : ce4cbb54 ip : 00000000 fp : ce4cbb8c
r10: 00000000 r9 : 00000000 r8 : c0c49178
r7 : 00000000 r6 : cdc14718 r5 : ce762800 r4 : cdc14710
r3 : 00000000 r2 : 00000054 r1 : 00000000 r0 : cdc14718
Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
Control: 18c5387d Table: 0000404a DAC: 00000051
Process swapper/0 (pid: 1, stack limit = 0xce4ca210)
...
[<c074bc68>] (memcpy) from [<c0529548>] (xgmiitorgmii_probe+0x90/0xe8) [<c0529548>] (xgmiitorgmii_probe) from [<c0526a94>] (mdio_probe+0x28/0x34) [<c0526a94>] (mdio_probe) from [<c04db98c>] (driver_probe_device+0x254/0x414) [<c04db98c>] (driver_probe_device) from [<c04dbd58>] (__device_attach_driver+0xac/0x10c) [<c04dbd58>] (__device_attach_driver) from [<c04d96f4>] (bus_for_each_drv+0x84/0xc8) [<c04d96f4>] (bus_for_each_drv) from [<c04db5bc>] (__device_attach+0xd0/0x134) [<c04db5bc>] (__device_attach) from [<c04dbdd4>] (device_initial_probe+0x1c/0x20) [<c04dbdd4>] (device_initial_probe) from [<c04da8fc>] (bus_probe_device+0x98/0xa0) [<c04da8fc>] (bus_probe_device) from [<c04d8660>] (device_add+0x43c/0x5d0) [<c04d8660>] (device_add) from [<c0526cb8>] (mdio_device_register+0x34/0x80) [<c0526cb8>] (mdio_device_register) from [<c0580b48>] (of_mdiobus_register+0x170/0x30c) [<c0580b48>] (of_mdiobus_register) from [<c05349c4>] (macb_probe+0x710/0xc00) [<c05349c4>] (macb_probe) from [<c04dd700>] (platform_drv_probe+0x44/0x80) [<c04dd700>] (platform_drv_probe) from [<c04db98c>] (driver_probe_device+0x254/0x414) [<c04db98c>] (driver_probe_device) from [<c04dbc58>] (__driver_attach+0x10c/0x118) [<c04dbc58>] (__driver_attach) from [<c04d9600>] (bus_for_each_dev+0x8c/0xd0) [<c04d9600>] (bus_for_each_dev) from [<c04db1fc>] (driver_attach+0x2c/0x30) [<c04db1fc>] (driver_attach) from [<c04daa98>] (bus_add_driver+0x50/0x260) [<c04daa98>] (bus_add_driver) from [<c04dc440>] (driver_register+0x88/0x108) [<c04dc440>] (driver_register) from [<c04dd6b4>] (__platform_driver_register+0x50/0x58) [<c04dd6b4>] (__platform_driver_register) from [<c0b31248>] (macb_driver_init+0x24/0x28) [<c0b31248>] (macb_driver_init) from [<c010203c>] (do_one_initcall+0x60/0x1a4) [<c010203c>] (do_one_initcall) from [<c0b00f78>] (kernel_init_freeable+0x15c/0x1f8) [<c0b00f78>] (kernel_init_freeable) from [<c0763d10>] (kernel_init+0x18/0x124) [<c0763d10>] (kernel_init) from [<c0112d74>] (ret_from_fork+0x14/0x20)
Code: ba000002 f5d1f03c f5d1f05c f5d1f07c (e8b151f8) ---[ end trace 3e4ec21905820a1f ]---
--- drivers/net/phy/xilinx_gmii2rgmii.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/phy/xilinx_gmii2rgmii.c +5 -0
@@ -84,6 +84,11 @@ static int xgmiitorgmii_probe(struct mdio_device *mdiodev)return -EPROBE_DEFER ; } +if (!priv->phy_dev->drv) { +dev_info (dev,"Attached phy not ready\n" ); +return -EPROBE_DEFER ; + } + priv->addr = mdiodev->addr; priv->phy_drv = priv->phy_dev->drv; memcpy(&priv->conv_phy_drv, priv->phy_dev->drv,
Signature · 1 line
2.17.1
PATCH 63/87 drm/sun4i: Fix releasing node when enumerating enpoints
In reply to Sasha LevinFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 367c359aa8637b15ee8df6335c5a29b7623966ec ]
sun4i_drv_add_endpoints() has a memory leak since it uses of_node_put() when remote is equal to NULL and does nothing when remote has a valid pointer.
Invert the logic to fix memory leak.
--- drivers/gpu/drm/sun4i/sun4i_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun4i_drv.c +2 -1
@@ -241,7 +241,6 @@ static int sun4i_drv_add_endpoints(struct device *dev, remote =of_graph_get_remote_port_parent (ep);if (!remote) {DRM_DEBUG_DRIVER ("Error retrieving the output node\n" ); -of_node_put (remote);continue ; }
@@ -255,11 +254,13 @@ static int sun4i_drv_add_endpoints(struct device *dev,if (of_graph_parse_endpoint (ep, &endpoint)) {DRM_DEBUG_DRIVER ("Couldn't parse endpoint\n" ); +of_node_put (remote);continue ; }if (!endpoint.id) {DRM_DEBUG_DRIVER ("Endpoint is our panel... skipping\n" ); +of_node_put (remote);continue ; } }
Signature · 1 line
2.17.1
PATCH 64/87 ath10k: transmit queued frames after processing rx packets
In reply to Sasha LevinFrom: Niklas Cassel <[email protected]>
[ Upstream commit 3f04950f32d5d592ab4fcaecac2178558a6f7437 ]
When running iperf on ath10k SDIO, TX can stop working:
iperf -c 192.168.1.1 -i 1 -t 20 -w 10K
[ 3] 0.0- 1.0 sec 2.00 MBytes 16.8 Mbits/sec [ 3] 1.0- 2.0 sec 3.12 MBytes 26.2 Mbits/sec [ 3] 2.0- 3.0 sec 3.25 MBytes 27.3 Mbits/sec [ 3] 3.0- 4.0 sec 655 KBytes 5.36 Mbits/sec [ 3] 4.0- 5.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 5.0- 6.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 6.0- 7.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 7.0- 8.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 8.0- 9.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 9.0-10.0 sec 0.00 Bytes 0.00 bits/sec [ 3] 0.0-10.3 sec 9.01 MBytes 7.32 Mbits/sec
There are frames in the ieee80211_txq and there are frames that have been removed from from this queue, but haven't yet been sent on the wire (num_pending_tx).
When num_pending_tx reaches max_num_pending_tx, we will stop the queues by calling ieee80211_stop_queues().
As frames that have previously been sent for transmission (num_pending_tx) are completed, we will decrease num_pending_tx and wake the queues by calling ieee80211_wake_queue(). ieee80211_wake_queue() does not call wake_tx_queue, so we might still have frames in the queue at this point.
While the queues were stopped, the socket buffer might have filled up, and in order for user space to write more, we need to free the frames in the queue, since they are accounted to the socket. In order to free them, we first need to transmit them.
This problem cannot be reproduced on low-latency devices, e.g. pci, since they call ath10k_mac_tx_push_pending() from ath10k_htt_txrx_compl_task(). ath10k_htt_txrx_compl_task() is not called on high-latency devices.
Fix the problem by calling ath10k_mac_tx_push_pending(), after processing rx packets, just like for low-latency devices, also in the SDIO case. Since we are calling ath10k_mac_tx_push_pending() directly, we also need to export it.
--- drivers/net/wireless/ath/ath10k/mac.c | 1 + drivers/net/wireless/ath/ath10k/sdio.c | 3 +++ 2 files changed, 4 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +1 -0
@@ -4008,6 +4008,7 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar)rcu_read_unlock ();spin_unlock_bh (&ar->txqs_lock); } +EXPORT_SYMBOL (ath10k_mac_tx_push_pending);/************/ /* Scanning */
drivers/net/wireless/ath/ath10k/sdio.c +3 -0
@@ -30,6 +30,7 @@#include "debug.h" #include "hif.h" #include "htc.h" +#include "mac.h" #include "targaddrs.h" #include "trace.h" #include "sdio.h"
@@ -1346,6 +1347,8 @@ static void ath10k_sdio_irq_handler(struct sdio_func *func)break ; }while (time_before (jiffies, timeout) && !done); +ath10k_mac_tx_push_pending (ar); +sdio_claim_host (ar_sdio->func);if (ret && ret != -ECANCELED )
Signature · 1 line
2.17.1
PATCH 65/87 rndis_wlan: potential buffer overflow in rndis_wlan_auth_indication()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit ae636fb1554833ee5133ca47bf4b2791b6739c52 ]
This is a static checker fix, not something I have tested. The issue is that on the second iteration through the loop, we jump forward by le32_to_cpu(auth_req->length) bytes. The problem is that if the length is more than "buflen" then we end up with a negative "buflen". A negative buflen is type promoted to a high positive value and the loop continues but it's accessing beyond the end of the buffer.
I believe the "auth_req->length" comes from the firmware and if the firmware is malicious or buggy, you're already toasted so the impact of this bug is probably not very severe.
--- drivers/net/wireless/rndis_wlan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/rndis_wlan.c +2 -0
@@ -2928,6 +2928,8 @@ static void rndis_wlan_auth_indication(struct usbnet *usbdev,while (buflen >=sizeof (*auth_req)) { auth_req = (void *)buf; +if (buflen <le32_to_cpu (auth_req->length)) +return ; type ="unknown" ; flags =le32_to_cpu (auth_req->flags); pairwise_error = false;
Signature · 1 line
2.17.1
PATCH 66/87 brcmsmac: fix wrap around in conversion from constant to s16
In reply to Sasha LevinFrom: Stefan Agner <[email protected]>
[ Upstream commit c9a61469fc97672a08b2f798830a55ea6e03dc4a ]
The last value in the log_table wraps around to a negative value since s16 has a value range of -32768 to 32767. This is not what the table intends to represent. Use the closest positive value 32767.
This fixes a warning seen with clang:drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c:216:2: warning:
implicit conversion from 'int' to 's16' (aka 'short') changes
value from 32768
to -32768 [-Wconstant-conversion]
32768
^~~~~1 warning generated.
--- .../net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c +1 -1
@@ -213,7 +213,7 @@ static const s16 log_table[] = {30498 ,31267 ,32024 , - 32768 + 32767 };#define LOG_TABLE_SIZE 32/* log_table size */
Signature · 1 line
2.17.1
PATCH 67/87 wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 4ec7cece87b3ed21ffcd407c62fb2f151a366bc1 ]
Otherwise we can get:
WARNING: CPU: 0 PID: 55 at drivers/net/wireless/ti/wlcore/io.h:84
I've only seen this few times with the runtime PM patches enabled so this one is probably not needed before that. This seems to work currently based on the current PM implementation timer. Let's apply this separately though in case others are hitting this issue.
--- drivers/net/wireless/ti/wlcore/cmd.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ti/wlcore/cmd.c +6 -0
@@ -35,6 +35,7 @@#include "wl12xx_80211.h" #include "cmd.h" #include "event.h" +#include "ps.h" #include "tx.h" #include "hw_ops.h"
@@ -191,6 +192,10 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl, timeout_time = jiffies +msecs_to_jiffies (WL1271_EVENT_TIMEOUT ); + ret =wl1271_ps_elp_wakeup (wl); +if (ret <0 ) +return ret; + do { if (time_after(jiffies, timeout_time)) { wl1271_debug(DEBUG_CMD, "timeout waiting for event %d",
@@ -222,6 +227,7 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl, }while (!event); out: +wl1271_ps_elp_sleep (wl);kfree (events_vector);return ret; }
Signature · 1 line
2.17.1
PATCH 68/87 ARM: mvebu: declare asm symbols as character arrays in pmsu.c
In reply to Sasha LevinFrom: Ethan Tuttle <[email protected]>
[ Upstream commit d0d378ff451a66e486488eec842e507d28145813 ]
With CONFIG_FORTIFY_SOURCE, memcpy uses the declared size of operands to detect buffer overflows. If src or dest is declared as a char, attempts to copy more than byte will result in a fortify_panic().
Address this problem in mvebu_setup_boot_addr_wa() by declaring mvebu_boot_wa_start and mvebu_boot_wa_end as character arrays. Also remove a couple addressof operators to avoid "arithmetic on pointer to an incomplete type" compiler error.
See commit 54a7d50b9205 ("x86: mark kprobe templates as character arrays, not single characters") for a similar fix.
Fixes "detected buffer overflow in memcpy" error during init on some mvebu systems (armada-370-xp, armada-375):
(fortify_panic) from (mvebu_setup_boot_addr_wa+0xb0/0xb4) (mvebu_setup_boot_addr_wa) from (mvebu_v7_cpu_pm_init+0x154/0x204) (mvebu_v7_cpu_pm_init) from (do_one_initcall+0x7c/0x1a8) (do_one_initcall) from (kernel_init_freeable+0x1bc/0x254) (kernel_init_freeable) from (kernel_init+0x8/0x114) (kernel_init) from (ret_from_fork+0x14/0x2c)
--- arch/arm/mach-mvebu/pmsu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mvebu/pmsu.c +3 -3
@@ -116,8 +116,8 @@ void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr) PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu)); } -extern unsigned char mvebu_boot_wa_start; -extern unsigned char mvebu_boot_wa_end; +extern unsigned char mvebu_boot_wa_start[]; +extern unsigned char mvebu_boot_wa_end[];/* * This function sets up the boot address workaround needed for SMP
@@ -130,7 +130,7 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target, phys_addr_t resume_addr_reg) {void __iomem *sram_virt_base; -u32 code_len = &mvebu_boot_wa_end - &mvebu_boot_wa_start; +u32 code_len = mvebu_boot_wa_end - mvebu_boot_wa_start;mvebu_mbus_del_window (BOOTROM_BASE ,BOOTROM_SIZE ); mvebu_mbus_add_window_by_id(crypto_eng_target, crypto_eng_attribute,
Signature · 1 line
2.17.1
PATCH 69/87 arm: dts: mediatek: Add missing cooling device properties for CPUs
In reply to Sasha LevinFrom: Viresh Kumar <[email protected]>
[ Upstream commit 0c7f7a5150023f3c6f0b27c4d4940ce3dfaf62cc ]
The cooling device properties, like "#cooling-cells" and "dynamic-power-coefficient", should either be present for all the CPUs of a cluster or none. If these are present only for a subset of CPUs of a cluster then things will start falling apart as soon as the CPUs are brought online in a different order. For example, this will happen because the operating system looks for such properties in the CPU node it is trying to bring up, so that it can register a cooling device.
Add such missing properties.
--- arch/arm/boot/dts/mt7623.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/mt7623.dtsi +3 -0
@@ -98,6 +98,7 @@ compatible = "arm,cortex-a7"; reg = <0x1>; operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; clock-frequency = <1300000000>; };
@@ -106,6 +107,7 @@ compatible = "arm,cortex-a7"; reg = <0x2>; operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; clock-frequency = <1300000000>; };
@@ -114,6 +116,7 @@ compatible = "arm,cortex-a7"; reg = <0x3>; operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; clock-frequency = <1300000000>; }; };
Signature · 1 line
2.17.1
PATCH 70/87 HID: hid-ntrig: add error handling for sysfs_create_group
In reply to Sasha LevinFrom: Zhouyang Jia <[email protected]>
[ Upstream commit 44d4d51de9a3534a2b63d69efda02a10e66541e4 ]
When sysfs_create_group fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling sysfs_create_group.
--- drivers/hid/hid-ntrig.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/hid-ntrig.c +2 -0
@@ -955,6 +955,8 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =sysfs_create_group (&hdev->dev.kobj, &ntrig_attribute_group); +if (ret) +hid_err (hdev,"cannot create sysfs group\n" );return 0 ; err_free:
Signature · 1 line
2.17.1
PATCH 71/87 MIPS: boot: fix build rule of vmlinux.its.S
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 67e09db507db3e1642ddce512a4313d20addd6e5 ]
As Documentation/kbuild/makefile.txt says, it is a typical mistake to forget the FORCE prerequisite for the rule invoked by if_changed.
Add the FORCE to the prerequisite, but it must be filtered-out from the files passed to the 'cat' command. Because this rule generates .vmlinux.its.S.cmd, vmlinux.its.S must be specified as targets so that the .cmd file is included.
Patchwork: https://patchwork.linux-mips.org/patch/19097/
--- arch/mips/boot/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/mips/boot/Makefile +4 -2
@@ -118,10 +118,12 @@ ifeq ($(ADDR_BITS),64) itb_addr_cells = 2 endif +targets += vmlinux.its.S + quiet_cmd_its_cat = CAT $@ - cmd_its_cat = cat $^ >$@ + cmd_its_cat = cat $(filter-out $(PHONY), $^) >$@ -$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) +$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) FORCE $(call if_changed,its_cat) quiet_cmd_cpp_its_S = ITS $@
Signature · 1 line
2.17.1
PATCH 72/87 perf/x86/intel/lbr: Fix incomplete LBR call stack
In reply to Sasha LevinFrom: Kan Liang <[email protected]>
[ Upstream commit 0592e57b24e7e05ec1f4c50b9666c013abff7017 ]
LBR has a limited stack size. If a task has a deeper call stack than LBR's stack size, only the overflowed part is reported. A complete call stack may not be reconstructed by perf tool.
Current code doesn't access all LBR registers. It only read the ones below the TOS. The LBR registers above the TOS will be discarded unconditionally.
When a CALL is captured, the TOS is incremented by 1 , modulo max LBR stack size. The LBR HW only records the call stack information to the register which the TOS points to. It will not touch other LBR registers. So the registers above the TOS probably still store the valid call stack information for an overflowed call stack, which need to be reported.
To retrieve complete call stack information, we need to start from TOS, read all LBR registers until an invalid entry is detected. 0s can be used to detect the invalid entry, because:
- When a RET is captured, the HW zeros the LBR register which TOS points to, then decreases the TOS.
- The LBR registers are reset to 0 when adding a new LBR event or scheduling an existing LBR event.
- A taken branch at IP 0 is not expected
The context switch code is also modified to save/restore all valid LBR registers. Furthermore, the LBR registers, which don't have valid call stack information, need to be reset in restore, because they may be polluted while swapped out.
Here is a small test program, tchain_deep.
Its call stack is deeper than 32.
noinline void f33(void)
{
int i;
for (i = 0; i < 10000000;) {
if (i%2)
i++;
else
i++;
}}
noinline void f32(void)
{
f33();}
noinline void f31(void)
{
f32();}
... ...
noinline void f1(void)
{
f2();}
int main()
{
f1();}
Here is the test result on SKX. The max stack size of SKX is 32.
Without the patch:
$ perf record -e cycles --call-graph lbr -- ./tchain_deep
$ perf report --stdio
#
# Children Self Command Shared Object Symbol
# ........ ........ ........... ................ .................
#
100.00% 99.99% tchain_deep tchain_deep [.] f33
|
--99.99%--f30
f31
f32
f33With the patch:
$ perf record -e cycles --call-graph lbr -- ./tchain_deep
$ perf report --stdio
# Children Self Command Shared Object Symbol
# ........ ........ ........... ................ ..................
#
99.99% 0.00% tchain_deep tchain_deep [.] f1
|
---f1
f2
f3
f4
f5
f6
f7
f8
f9
f10
f11
f12
f13
f14
f15
f16
f17
f18
f19
f20
f21
f22
f23
f24
f25
f26
f27
f28
f29
f30
f31
f32
f33--- arch/x86/events/intel/lbr.c | 32 ++++++++++++++++++++++++++------ arch/x86/events/perf_event.h | 1 + 2 files changed, 27 insertions(+), 6 deletions(-)
arch/x86/events/intel/lbr.c +26 -6
@@ -346,7 +346,7 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx) mask = x86_pmu.lbr_nr -1 ; tos = task_ctx->tos; -for (i =0 ; i < tos; i++) { +for (i =0 ; i < task_ctx->valid_lbrs; i++) { lbr_idx = (tos - i) & mask;wrlbr_from (lbr_idx, task_ctx->lbr_from[i]);wrlbr_to (lbr_idx, task_ctx->lbr_to[i]);
@@ -354,6 +354,15 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx)if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_INFO )wrmsrl (MSR_LBR_INFO_0 + lbr_idx, task_ctx->lbr_info[i]); } + +for (; i < x86_pmu.lbr_nr; i++) { + lbr_idx = (tos - i) & mask; +wrlbr_from (lbr_idx,0 ); +wrlbr_to (lbr_idx,0 ); +if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_INFO ) +wrmsrl (MSR_LBR_INFO_0 + lbr_idx,0 ); + } +wrmsrl (x86_pmu.lbr_tos, tos); task_ctx->lbr_stack_state =LBR_NONE ; }
@@ -361,7 +370,7 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx)static void __intel_pmu_lbr_save (struct x86_perf_task_context *task_ctx) {unsigned lbr_idx, mask; -u64 tos; +u64 tos, from;int i;if (task_ctx->lbr_callstack_users ==0 ) {
@@ -371,13 +380,17 @@ static void __intel_pmu_lbr_save(struct x86_perf_task_context *task_ctx) mask = x86_pmu.lbr_nr -1 ; tos =intel_pmu_lbr_tos (); -for (i =0 ; i < tos; i++) { +for (i =0 ; i < x86_pmu.lbr_nr; i++) { lbr_idx = (tos - i) & mask; - task_ctx->lbr_from[i] =rdlbr_from (lbr_idx); + from =rdlbr_from (lbr_idx); +if (!from) +break ; + task_ctx->lbr_from[i] = from; task_ctx->lbr_to[i] =rdlbr_to (lbr_idx);if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_INFO )rdmsrl (MSR_LBR_INFO_0 + lbr_idx, task_ctx->lbr_info[i]); } + task_ctx->valid_lbrs = i; task_ctx->tos = tos; task_ctx->lbr_stack_state =LBR_VALID ; }
@@ -531,7 +544,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc)*/ static void intel_pmu_lbr_read_64 (struct cpu_hw_events *cpuc) { -bool need_info = false; +bool need_info = false, call_stack = false;unsigned long mask = x86_pmu.lbr_nr -1 ;int lbr_format = x86_pmu.intel_cap.lbr_format;u64 tos =intel_pmu_lbr_tos ();
@@ -542,7 +555,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)if (cpuc->lbr_sel) { need_info = !(cpuc->lbr_sel->config &LBR_NO_INFO );if (cpuc->lbr_sel->config &LBR_CALL_STACK ) - num = tos; + call_stack = true; }for (i =0 ; i < num; i++) {
@@ -555,6 +568,13 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) from =rdlbr_from (lbr_idx); to =rdlbr_to (lbr_idx); +/* +* Read LBR call stack entries +* until invalid entry (0s) is detected. +*/ +if (call_stack && !from) +break ; +if (lbr_format ==LBR_FORMAT_INFO && need_info) {u64 info;
arch/x86/events/perf_event.h +1 -0
@@ -646,6 +646,7 @@ struct x86_perf_task_context {u64 lbr_to[MAX_LBR_ENTRIES ];u64 lbr_info[MAX_LBR_ENTRIES ];int tos; +int valid_lbrs;int lbr_callstack_users;int lbr_stack_state; };
Signature · 1 line
2.17.1
PATCH 73/87 scsi: bnx2i: add error handling for ioremap_nocache
In reply to Sasha LevinFrom: Zhouyang Jia <[email protected]>
[ Upstream commit aa154ea885eb0c2407457ce9c1538d78c95456fa ]
When ioremap_nocache fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling ioremap_nocache.
--- drivers/scsi/bnx2i/bnx2i_hwi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/bnx2i/bnx2i_hwi.c +2 -0
@@ -2742,6 +2742,8 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) BNX2X_DOORBELL_PCI_BAR); reg_off = (1 <<BNX2X_DB_SHIFT ) * (cid_num &0x1FFFF ); ep->qp.ctx_base =ioremap_nocache (reg_base + reg_off,4 ); +if (!ep->qp.ctx_base) +return -ENOMEM ; goto arm_cq; }
Signature · 1 line
2.17.1
PATCH 74/87 iomap: complete partial direct I/O writes synchronously
In reply to Sasha LevinFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit ebf00be37de35788cad72f4f20b4a39e30c0be4a ]
According to xfstest generic/240, applications seem to expect direct I/O writes to either complete as a whole or to fail; short direct I/O writes are apparently not appreciated. This means that when only part of an asynchronous direct I/O write succeeds, we can either fail the entire write, or we can wait for the partial write to complete and retry the remaining write as buffered I/O. The old __blockdev_direct_IO helper has code for waiting for partial writes to complete; the new iomap_dio_rw iomap helper does not.
The above mentioned fallback mode is needed for gfs2, which doesn't allow block allocations under direct I/O to avoid taking cluster-wide exclusive locks. As a consequence, an asynchronous direct I/O write to a file range that contains a hole will result in a short write. In that case, wait for the short write to complete to allow gfs2 to recover.
--- fs/iomap.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/iomap.c +11 -10
@@ -693,6 +693,7 @@ struct iomap_dio {atomic_t ref;unsigned flags;int error; +bool wait_for_completion;union {/* used during submission and for synchronous completion: */
@@ -793,9 +794,8 @@ static void iomap_dio_bio_end_io(struct bio *bio)iomap_dio_set_error (dio,blk_status_to_errno (bio->bi_status));if (atomic_dec_and_test (&dio->ref)) { -if (is_sync_kiocb (dio->iocb)) { +if (dio->wait_for_completion) {struct task_struct *waiter = dio->submit.waiter; -WRITE_ONCE (dio->submit.waiter,NULL );wake_up_process (waiter); }else if (dio->flags &IOMAP_DIO_WRITE ) {
@@ -980,13 +980,12 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, dio->end_io = end_io; dio->error =0 ; dio->flags =0 ; + dio->wait_for_completion =is_sync_kiocb (iocb); dio->submit.iter = iter; -if (is_sync_kiocb (iocb)) { - dio->submit.waiter = current; - dio->submit.cookie =BLK_QC_T_NONE ; - dio->submit.last_queue =NULL ; - } + dio->submit.waiter = current; + dio->submit.cookie =BLK_QC_T_NONE ; + dio->submit.last_queue =NULL ;if (iov_iter_rw (iter) ==READ ) {if (pos >= dio->i_size)
@@ -1016,7 +1015,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,WARN_ON_ONCE (ret); ret =0 ; -if (iov_iter_rw (iter) ==WRITE && !is_sync_kiocb (iocb) && +if (iov_iter_rw (iter) ==WRITE && !dio->wait_for_completion && !inode->i_sb->s_dio_done_wq) { ret =sb_init_dio_done_wq (inode->i_sb);if (ret <0 )
@@ -1031,8 +1030,10 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, iomap_dio_actor);if (ret <=0 ) {/* magic error code to fall back to buffered I/O */ -if (ret == -ENOTBLK ) +if (ret == -ENOTBLK ) { + dio->wait_for_completion = true; ret =0 ; + }break ; } pos += ret;
@@ -1046,7 +1047,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,iomap_dio_set_error (dio, ret);if (!atomic_dec_and_test (&dio->ref)) { -if (!is_sync_kiocb (iocb)) +if (!dio->wait_for_completion)return -EIOCBQUEUED ;for (;;) {
Signature · 1 line
2.17.1
PATCH 75/87 audit: Fix extended comparison of GID/EGID
In reply to Sasha LevinFrom: Ondrej Mosnáček <[email protected]>
[ Upstream commit af85d1772e31fed34165a1b3decef340cf4080c0 ]
The audit_filter_rules() function in auditsc.c used the in_[e]group_p() functions to check GID/EGID match, but these functions use the current task's credentials, while the comparison should use the credentials of the task given to audit_filter_rules() as a parameter (tsk).
Note that we can use group_search(cred->group_info, ...) as a replacement for both in_group_p and in_egroup_p as these functions only compare the parameter to cred->fsgid/egid and then call group_search.
In fact, the usage of in_group_p was even more incorrect: it compares to cred->fsgid (which is usually equal to cred->egid) and not cred->gid.
GitHub issue:
https://github.com/linux-audit/audit-kernel/issues/82
--- kernel/auditsc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/auditsc.c +4 -4
@@ -490,20 +490,20 @@ static int audit_filter_rules(struct task_struct *tsk, result =audit_gid_comparator (cred->gid, f->op, f->gid);if (f->op == Audit_equal) {if (!result) - result =in_group_p (f->gid); + result =groups_search (cred->group_info, f->gid); }else if (f->op == Audit_not_equal) {if (result) - result = !in_group_p (f->gid); + result = !groups_search (cred->group_info, f->gid); }break ;case AUDIT_EGID : result =audit_gid_comparator (cred->egid, f->op, f->gid);if (f->op == Audit_equal) {if (!result) - result =in_egroup_p (f->gid); + result =groups_search (cred->group_info, f->gid); }else if (f->op == Audit_not_equal) {if (result) - result = !in_egroup_p (f->gid); + result = !groups_search (cred->group_info, f->gid); }break ;case AUDIT_SGID :
Signature · 1 line
2.17.1
PATCH 76/87 scsi: megaraid_sas: Update controller info during resume
In reply to Sasha LevinFrom: Shivasharan S <[email protected]>
[ Upstream commit c3b10a55abc943a526aaecd7e860b15671beb906 ]
There is a possibility that firmware on the controller was upgraded before system was suspended. During resume, driver needs to read updated controller properties.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/megaraid/megaraid_sas_base.c +3 -0
@@ -6597,6 +6597,9 @@ megasas_resume(struct pci_dev *pdev) goto fail_init_mfi; } +if (megasas_get_ctrl_info (instance) !=DCMD_SUCCESS ) + goto fail_init_mfi; +tasklet_init (&instance->isr_tasklet, instance->instancet->tasklet, (unsigned long )instance);
Signature · 1 line
2.17.1
PATCH 77/87 EDAC, i7core: Fix memleaks and use-after-free on probe and remove
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 6c974d4dfafe5e9ee754f2a6fba0eb1864f1649e ]
Make sure to free and deregister the addrmatch and chancounts devices allocated during probe in all error paths. Also fix use-after-free in a probe error path and in the remove success path where the devices were being put before before deregistration.
--- drivers/edac/i7core_edac.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/edac/i7core_edac.c +15 -7
@@ -1177,15 +1177,14 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) rc =device_add (pvt->addrmatch_dev);if (rc <0 ) -return rc; + goto err_put_addrmatch;if (!pvt->is_registered) { pvt->chancounts_dev =kzalloc (sizeof (*pvt->chancounts_dev),GFP_KERNEL );if (!pvt->chancounts_dev) { -put_device (pvt->addrmatch_dev); -device_del (pvt->addrmatch_dev); -return -ENOMEM ; + rc = -ENOMEM ; + goto err_del_addrmatch; } pvt->chancounts_dev->type = &all_channel_counts_type;
@@ -1199,9 +1198,18 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) rc =device_add (pvt->chancounts_dev);if (rc <0 ) -return rc; + goto err_put_chancounts; }return 0 ; + +err_put_chancounts: +put_device (pvt->chancounts_dev); +err_del_addrmatch: +device_del (pvt->addrmatch_dev); +err_put_addrmatch: +put_device (pvt->addrmatch_dev); + +return rc; }static void i7core_delete_sysfs_devices (struct mem_ctl_info *mci)
@@ -1211,11 +1219,11 @@ static void i7core_delete_sysfs_devices(struct mem_ctl_info *mci)edac_dbg (1 ,"\n" );if (!pvt->is_registered) { -put_device (pvt->chancounts_dev);device_del (pvt->chancounts_dev); +put_device (pvt->chancounts_dev); } -put_device (pvt->addrmatch_dev);device_del (pvt->addrmatch_dev); +put_device (pvt->addrmatch_dev); }/****************************************************************************
PATCH 78/87 ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
In reply to Sasha LevinFrom: Liam Girdwood <[email protected]>
[ Upstream commit e01b4f624278d5efe5fb5da585ca371947b16680 ]
Sometime a component or topology may configure a DAI widget with no private data leading to a dev_dbg() dereferencne of this data.
Fix this to check for non NULL private data and let users know if widget is missing DAI.
--- sound/soc/soc-dapm.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/soc-dapm.c +7 -0
@@ -4005,6 +4005,13 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)continue ; } +/* let users know there is no DAI to link */ +if (!dai_w->priv) { +dev_dbg (card->dev,"dai widget %s has no DAI\n" , + dai_w->name); +continue ; + } + dai = dai_w->priv;/* ...find all widgets with the same stream and link them */
Signature · 1 line
2.17.1
PATCH 79/87 module: exclude SHN_UNDEF symbols from kallsyms api
In reply to Sasha LevinFrom: Jessica Yu <[email protected]>
[ Upstream commit 9f2d1e68cf4d641def734adaccfc3823d3575e6c ]
Livepatch modules are special in that we preserve their entire symbol tables in order to be able to apply relocations after module load. The unwanted side effect of this is that undefined (SHN_UNDEF) symbols of livepatch modules are accessible via the kallsyms api and this can confuse symbol resolution in livepatch (klp_find_object_symbol()) and cause subtle bugs in livepatch.
Have the module kallsyms api skip over SHN_UNDEF symbols. These symbols are usually not available for normal modules anyway as we cut down their symbol tables to just the core (non-undefined) symbols, so this should really just affect livepatch modules. Note that this patch doesn't affect the display of undefined symbols in /proc/kallsyms.
--- kernel/module.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/module.c +5 -1
@@ -4058,7 +4058,7 @@ static unsigned long mod_find_symname(struct module *mod, const char *name)for (i =0 ; i < kallsyms->num_symtab; i++)if (strcmp (name,symname (kallsyms, i)) ==0 && - kallsyms->symtab[i].st_info !='U' ) + kallsyms->symtab[i].st_shndx !=SHN_UNDEF )return kallsyms->symtab[i].st_value;return 0 ; }
@@ -4104,6 +4104,10 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,if (mod->state ==MODULE_STATE_UNFORMED )continue ;for (i =0 ; i < kallsyms->num_symtab; i++) { + +if (kallsyms->symtab[i].st_shndx ==SHN_UNDEF ) +continue ; + ret =fn (data,symname (kallsyms, i), mod, kallsyms->symtab[i].st_value);if (ret !=0 )
Signature · 1 line
2.17.1
PATCH 80/87 gpio: Fix wrong rounding in gpio-menz127
In reply to Sasha LevinFrom: Nadav Amit <[email protected]>
[ Upstream commit 7279d9917560bbd0d82813d6bf00490a82c06783 ]
men_z127_debounce() tries to round up and down, but uses functions which are only suitable when the divider is a power of two, which is not the case. Use the appropriate ones.
Found by static check. Compile tested.
--- drivers/gpio/gpio-menz127.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpio-menz127.c +2 -2
@@ -56,9 +56,9 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio, rnd =fls (debounce) -1 ;if (rnd && (debounce &BIT (rnd -1 ))) - debounce =round_up (debounce,MEN_Z127_DB_MIN_US ); + debounce =roundup (debounce,MEN_Z127_DB_MIN_US );else - debounce =round_down (debounce,MEN_Z127_DB_MIN_US ); + debounce =rounddown (debounce,MEN_Z127_DB_MIN_US );if (debounce >MEN_Z127_DB_MAX_US ) debounce =MEN_Z127_DB_MAX_US ;
Signature · 1 line
2.17.1
PATCH 81/87 nfsd: fix corrupted reply to badly ordered compound
In reply to Sasha LevinFrom: "J. Bruce Fields" <[email protected]>
[ Upstream commit 5b7b15aee641904ae269be9846610a3950cbd64c ]
We're encoding a single op in the reply but leaving the number of ops zero, so the reply makes no sense.
Somewhat academic as this isn't a case any real client will hit, though in theory perhaps that could change in a future protocol extension.
--- fs/nfsd/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfsd/nfs4proc.c +1 -0
@@ -1725,6 +1725,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)if (status) { op = &args->ops[0 ]; op->status = status; + resp->opcnt =1 ; goto encode_op; }
Signature · 1 line
2.17.1
PATCH 82/87 EDAC: Fix memleak in module init error path
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 4708aa85d50cc6e962dfa8acf5ad4e0d290a21db ]
Make sure to use put_device() to free the initialised struct device so that resources managed by driver core also gets released in the event of a registration failure.
--- drivers/edac/edac_mc_sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/edac/edac_mc_sysfs.c +3 -3
@@ -1097,14 +1097,14 @@ int __init edac_mc_sysfs_init(void) err =device_add (mci_pdev);if (err <0 ) - goto out_dev_free; + goto out_put_device;edac_dbg (0 ,"device %s created\n" ,dev_name (mci_pdev));return 0 ; - out_dev_free: -kfree (mci_pdev); + out_put_device: +put_device (mci_pdev); out:return err; }
PATCH 83/87 fs/lock: skip lock owner pid translation in case we are in init_pid_ns
In reply to Sasha LevinFrom: Konstantin Khorenko <[email protected]>
[ Upstream commit 826d7bc9f013d01e92997883d2fd0c25f4af1f1c ]
If the flock owner process is dead and its pid has been already freed, pid translation won't work, but we still want to show flock owner pid number when expecting /proc/$PID/fdinfo/$FD in init pidns.
Reproducer:
process A process A1 process A2
fork()--------->exit() open()
flock() fork()---------> exit() sleep()
Before the patch:
================
(root@vz7)/: cat /proc/${PID_A2}/fdinfo/3
pos: 4 flags: 02100002 mnt_id: 257 lock: (root@vz7)/:
After the patch:
===============
(root@vz7)/:cat /proc/${PID_A2}/fdinfo/3
pos: 4
flags: 02100002
mnt_id: 295
lock: 1: FLOCK ADVISORY WRITE ${PID_A1} b6:f8a61:529946 0 EOF--- fs/locks.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/locks.c +7 -0
@@ -2074,6 +2074,13 @@ static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns)return -1 ;if (IS_REMOTELCK (fl))return fl->fl_pid; +/* +* If the flock owner process is dead and its pid has been already +* freed, the translation below won't work, but we still want to show +* flock owner pid number in init pidns. +*/ +if (ns == &init_pid_ns) +return (pid_t )fl->fl_pid;rcu_read_lock (); pid =find_pid_ns (fl->fl_pid, &init_pid_ns);
Signature · 1 line
2.17.1
PATCH 84/87 Input: xen-kbdfront - fix multi-touch XenStore node's locations
In reply to Sasha LevinFrom: Oleksandr Andrushchenko <[email protected]>
[ Upstream commit ce6f7d087e2b037f47349c1c36ac97678d02e394 ]
kbdif protocol describes multi-touch device parameters as a part of frontend's XenBus configuration nodes while they belong to backend's configuration. Fix this by reading the parameters as defined by the protocol.
--- drivers/input/misc/xen-kbdfront.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/input/misc/xen-kbdfront.c +4 -4
@@ -229,7 +229,7 @@ static int xenkbd_probe(struct xenbus_device *dev, } } - touch =xenbus_read_unsigned (dev->nodename, + touch =xenbus_read_unsigned (dev->otherend,XENKBD_FIELD_FEAT_MTOUCH ,0 );if (touch) { ret = xenbus_write(XBT_NIL, dev->nodename,
@@ -304,13 +304,13 @@ static int xenkbd_probe(struct xenbus_device *dev,if (!mtouch) goto error_nomem; - num_cont =xenbus_read_unsigned (info->xbdev->nodename, + num_cont =xenbus_read_unsigned (info->xbdev->otherend,XENKBD_FIELD_MT_NUM_CONTACTS ,1 ); - width =xenbus_read_unsigned (info->xbdev->nodename, + width =xenbus_read_unsigned (info->xbdev->otherend,XENKBD_FIELD_MT_WIDTH ,XENFB_WIDTH ); - height =xenbus_read_unsigned (info->xbdev->nodename, + height =xenbus_read_unsigned (info->xbdev->otherend,XENKBD_FIELD_MT_HEIGHT ,XENFB_HEIGHT );
Signature · 1 line
2.17.1
PATCH 85/87 iio: 104-quad-8: Fix off-by-one error in register selection
In reply to Sasha LevinFrom: William Breathitt Gray <[email protected]>
[ Upstream commit 2873c3f0e2bd12a7612e905c920c058855f4072a ]
The reset flags operation is selected by bit 2 in the "Reset and Load Signals Decoders" register, not bit 1.
--- drivers/iio/counter/104-quad-8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/counter/104-quad-8.c +1 -1
@@ -138,7 +138,7 @@ static int quad8_write_raw(struct iio_dev *indio_dev,outb (val >> (8 * i), base_offset);/* Reset Borrow, Carry, Compare, and Sign flags */ -outb (0x02 , base_offset +1 ); +outb (0x04 , base_offset +1 );/* Reset Error flag */ outb (0x06 , base_offset +1 );
Signature · 1 line
2.17.1
PATCH 86/87 ARM: dts: dra7: fix DCAN node addresses
In reply to Sasha LevinFrom: Kevin Hilman <[email protected]>
[ Upstream commit 949bdcc8a97c6078f21c8d4966436b117f2e4cd3 ]
Fix the DT node addresses to match the reg property addresses, which were verified to match the TRM:
http://www.ti.com/lit/pdf/sprui30
--- arch/arm/boot/dts/dra7.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/dra7.dtsi +2 -2
@@ -1818,7 +1818,7 @@ }; }; - dcan1: can@481cc000 { + dcan1: can@4ae3c000 { compatible = "ti,dra7-d_can"; ti,hwmods = "dcan1"; reg = <0x4ae3c000 0x2000>;
@@ -1828,7 +1828,7 @@ status = "disabled"; }; - dcan2: can@481d0000 { + dcan2: can@48480000 { compatible = "ti,dra7-d_can"; ti,hwmods = "dcan2"; reg = <0x48480000 0x2000>;
Signature · 1 line
2.17.1
PATCH 87/87 PCI: Whitelist Thunderbolt ports for runtime D3
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit 47a8e237ed443c174f8f73402755c458c56eb611 ]
Thunderbolt controllers can be runtime suspended to D3cold to save ~1.5W. This requires that runtime D3 is allowed on its PCIe ports, so whitelist them.
The 2015 BIOS cutoff that we've instituted for runtime D3 on PCIe ports is unnecessary on Thunderbolt because we know that even the oldest controller, Light Ridge (2010), is able to suspend its ports to D3 just fine -- specifically including its hotplug ports. And the power saving should be afforded to machines even if their BIOS predates 2015.
--- drivers/pci/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/pci.c +5 -1
@@ -2267,7 +2267,7 @@ void pci_config_pm_runtime_put(struct pci_dev *pdev)* @bridge: Bridge to check * * This function checks if it is possible to move the bridge to D3. -* Currently we only allow D3 for recent enough PCIe ports. +* Currently we only allow D3 for recent enough PCIe ports and Thunderbolt. */ bool pci_bridge_d3_possible (struct pci_dev *bridge) {
@@ -2296,6 +2296,10 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)if (pci_bridge_d3_force)return true; +/* Even the oldest 2010 Thunderbolt controller supports D3. */ +if (bridge->is_thunderbolt) +return true; +/* * It should be safe to put PCIe ports from 2015 or newer * to D3.
Signature · 1 line
2.17.1
Re: [PATCH AUTOSEL 4.14 87/87] PCI: Whitelist Thunderbolt ports for runtime D3
Hi Sasha,
Quoted 7 lines · Sasha Levin
From: Lukas Wunner <[email protected]>
[ Upstream commit
47a8e237ed443c174f8f73402755c458c56eb611]Thunderbolt controllers can be runtime suspended to D3cold to save ~1.5W. This requires that runtime D3 is allowed on its PCIe ports, so whitelist them.
This commit was at the end of a series with 30+ patches and depends on all the preceding patches. It cannot be backported on its own I'm afraid, hence should be removed from the 4.14 and 4.18 stable queue.
Thanks,
Lukas
Re: [PATCH AUTOSEL 4.14 87/87] PCI: Whitelist Thunderbolt ports for runtime D3
Quoted 7 lines · Lukas Wunner
Hi Sasha,
Quoted 4 lines · Sasha Levin
From: Lukas Wunner <[email protected]>
[ Upstream commit
47a8e237ed443c174f8f73402755c458c56eb611]
Quoted 7 lines
Quoted 3 lines
Thunderbolt controllers can be runtime suspended to D3cold to save ~1.5W. This requires that runtime D3 is allowed on its PCIe ports, so whitelist them.
This commit was at the end of a series with 30+ patches and depends on all the preceding patches. It cannot be backported on its own I'm afraid, hence should be removed from the 4.14 and 4.18 stable queue.
I'll remove it, thanks!