ALSA: isight: fix leak of reference to firewire unit in error path of .probe callback
Subsystems (41)
Sasha Levin
maintainerPATCH 163/237 mm/memory_hotplug: make add_memory() take the device_hotplug_lock
In reply to Sasha LevinFrom: David Hildenbrand <[email protected]>
[ Upstream commit 8df1d0e4a265f25dc1e7e7624ccdbcb4a6630c89 ]
add_memory() currently does not take the device_hotplug_lock, however is aleady called under the lock from
arch/powerpc/platforms/pseries/hotplug-memory.c drivers/acpi/acpi_memhotplug.c
to synchronize against CPU hot-remove and similar.
In general, we should hold the device_hotplug_lock when adding memory to synchronize against online/offline request (e.g. from user space) - which already resulted in lock inversions due to device_lock() and mem_hotplug_lock - see 30467e0b3be ("mm, hotplug: fix concurrent memory hot-add deadlock"). add_memory()/add_memory_resource() will create memory block devices, so this really feels like the right thing to do.
Holding the device_hotplug_lock makes sure that a memory block device can really only be accessed (e.g. via .online/.state) from user space, once the memory has been fully added to the system.
The lock is not held yet in
drivers/xen/balloon.c arch/powerpc/platforms/powernv/memtrace.c drivers/s390/char/sclp_cmd.c drivers/hv/hv_balloon.c
So, let's either use the locked variants or take the lock.
Don't export add_memory_resource(), as it once was exported to be used by XEN, which is never built as a module. If somebody requires it, we also have to export a locked variant (as device_hotplug_lock is never exported).
--- .../platforms/pseries/hotplug-memory.c | 2 +- drivers/acpi/acpi_memhotplug.c | 2 +- drivers/base/memory.c | 9 ++++++-- drivers/xen/balloon.c | 3 +++ include/linux/memory_hotplug.h | 1 + mm/memory_hotplug.c | 22 ++++++++++++++++--- 6 files changed, 32 insertions(+), 7 deletions(-)
arch/powerpc/platforms/pseries/hotplug-memory.c +1 -1
@@ -705,7 +705,7 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb) nid =memory_add_physaddr_to_nid (lmb->base_addr);/* Add the memory */ - rc =add_memory (nid, lmb->base_addr, block_sz); + rc =__add_memory (nid, lmb->base_addr, block_sz);if (rc) {dlpar_remove_device_tree_lmb (lmb);return rc;
drivers/acpi/acpi_memhotplug.c +1 -1
@@ -228,7 +228,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)if (node <0 ) node =memory_add_physaddr_to_nid (info->start_addr); - result =add_memory (node, info->start_addr, info->length); + result =__add_memory (node, info->start_addr, info->length);/* * If the memory block has been used by the kernel, add_memory()
drivers/base/memory.c +7 -2
@@ -519,15 +519,20 @@ memory_probe_store(struct device *dev, struct device_attribute *attr,if (phys_addr & ((pages_per_block <<PAGE_SHIFT ) -1 ))return -EINVAL ; + ret =lock_device_hotplug_sysfs (); +if (ret) + goto out; + nid =memory_add_physaddr_to_nid (phys_addr); - ret =add_memory (nid, phys_addr, -MIN_MEMORY_BLOCK_SIZE * sections_per_block); + ret =__add_memory (nid, phys_addr, +MIN_MEMORY_BLOCK_SIZE * sections_per_block);if (ret) goto out; ret = count; out: +unlock_device_hotplug ();return ret; }
drivers/xen/balloon.c +3 -0
@@ -350,7 +350,10 @@ static enum bp_state reserve_additional_memory(void)* callers drop the mutex before trying again. */ mutex_unlock (&balloon_mutex); +/* add_memory_resource() requires the device_hotplug lock */ +lock_device_hotplug (); rc =add_memory_resource (nid, resource, memhp_auto_online); +unlock_device_hotplug ();mutex_lock (&balloon_mutex);if (rc) {
include/linux/memory_hotplug.h +1 -0
@@ -322,6 +322,7 @@ static inline void remove_memory(int nid, u64 start, u64 size) {}extern void __ref free_area_init_core_hotplug (int nid);extern int walk_memory_range (unsigned long start_pfn,unsigned long end_pfn,void *arg,int (*func)(struct memory_block *,void *)); +extern int __add_memory (int nid,u64 start,u64 size);extern int add_memory (int nid,u64 start,u64 size);extern int add_memory_resource (int nid,struct resource *resource,bool online); extern int arch_add_memory(int nid, u64 start, u64 size,
mm/memory_hotplug.c +19 -3
@@ -1114,7 +1114,12 @@ static int online_memory_block(struct memory_block *mem, void *arg)return device_online (&mem->dev); } -/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ +/* +* NOTE: The caller must call lock_device_hotplug() to serialize hotplug +* and online/offline operations (triggered e.g. by sysfs). +* +* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG +*/ int __ref add_memory_resource (int nid,struct resource *res,bool online) {u64 start, size;
@@ -1183,9 +1188,9 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online)mem_hotplug_done ();return ret; } -EXPORT_SYMBOL_GPL (add_memory_resource); -int __ref add_memory (int nid,u64 start,u64 size) +/* requires device_hotplug_lock, see add_memory_resource() */ +int __ref __add_memory (int nid,u64 start,u64 size) {struct resource *res;int ret;
@@ -1199,6 +1204,17 @@ int __ref add_memory(int nid, u64 start, u64 size)release_memory_resource (res);return ret; } + +int add_memory (int nid,u64 start,u64 size) +{ +int rc; + +lock_device_hotplug (); + rc =__add_memory (nid, start, size); +unlock_device_hotplug (); + +return rc; +}EXPORT_SYMBOL_GPL (add_memory);#ifdef CONFIG_MEMORY_HOTREMOVE
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 164/237 mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock
In reply to Sasha LevinFrom: David Hildenbrand <[email protected]>
[ Upstream commit 381eab4a6ee81266f8dddc62e57376c7e584e5b8 ]
There seem to be some problems as result of 30467e0b3be ("mm, hotplug:
fix concurrent memory hot-add deadlock"), which tried to fix a possible lock inversion reported and discussed in [1] due to the two locks
a) device_lock()
b) mem_hotplug_lock
While add_memory() first takes b), followed by a) during bus_probe_device(), onlining of memory from user space first took a), followed by b), exposing a possible deadlock.
In [1], and it was decided to not make use of device_hotplug_lock, but rather to enforce a locking order.
The problems I spotted related to this:
1. Memory block device attributes: While .state first calls mem_hotplug_begin() and the calls device_online() - which takes device_lock() - .online does no longer call mem_hotplug_begin(), so effectively calls online_pages() without mem_hotplug_lock.
2. device_online() should be called under device_hotplug_lock, however onlining memory during add_memory() does not take care of that.
In addition, I think there is also something wrong about the locking in
3. arch/powerpc/platforms/powernv/memtrace.c calls offline_pages() without locks. This was introduced after 30467e0b3be. And skimming over the code, I assume it could need some more care in regards to locking (e.g. device_online() called without device_hotplug_lock. This will be addressed in the following patches.
Now that we hold the device_hotplug_lock when
- adding memory (e.g. via add_memory()/add_memory_resource())
- removing memory (e.g. via remove_memory())
- device_online()/device_offline()
We can move mem_hotplug_lock usage back into
online_pages()/offline_pages().
Why is mem_hotplug_lock still needed? Essentially to make get_online_mems()/put_online_mems() be very fast (relying on device_hotplug_lock would be very slow), and to serialize against addition of memory that does not create memory block devices (hmm).
[1] http://driverdev.linuxdriverproject.org/pipermail/ driverdev-devel/
2015-February/065324.html
This patch is partly based on a patch by Vitaly Kuznetsov.
--- drivers/base/memory.c | 13 +------------ mm/memory_hotplug.c | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 20 deletions(-)
drivers/base/memory.c +1 -12
@@ -228,7 +228,6 @@ static bool pages_correctly_probed(unsigned long start_pfn)/* * MEMORY_HOTPLUG depends on SPARSEMEM in mm/Kconfig, so it is * OK to have direct references to sparsemem variables in here. -* Must already be protected by mem_hotplug_begin(). */ static int memory_block_action (unsigned long phys_index,unsigned long action,int online_type)
@@ -294,7 +293,6 @@ static int memory_subsys_online(struct device *dev)if (mem->online_type <0 ) mem->online_type =MMOP_ONLINE_KEEP ; -/* Already under protection of mem_hotplug_begin() */ ret =memory_block_change_state (mem,MEM_ONLINE ,MEM_OFFLINE );/* clear online_type */
@@ -341,19 +339,11 @@ store_mem_state(struct device *dev, goto err; } -/* -* Memory hotplug needs to hold mem_hotplug_begin() for probe to find -* the correct memory block to online before doing device_online(dev), -* which will take dev->mutex. Take the lock early to prevent an -* inversion, memory_subsys_online() callbacks will be implemented by -* assuming it's already protected. -*/ -mem_hotplug_begin (); -switch (online_type) {case MMOP_ONLINE_KERNEL :case MMOP_ONLINE_MOVABLE :case MMOP_ONLINE_KEEP : +/* mem->online_type is protected by device_hotplug_lock */ mem->online_type = online_type; ret =device_online (&mem->dev);break ;
@@ -364,7 +354,6 @@ store_mem_state(struct device *dev, ret = -EINVAL ;/* should never happen */ } -mem_hotplug_done (); err:unlock_device_hotplug ();
mm/memory_hotplug.c +20 -8
@@ -883,7 +883,6 @@ static struct zone * __meminit move_pfn_range(int online_type, int nid,return zone; } -/* Must be protected by mem_hotplug_begin() or a device_lock */ int __ref online_pages (unsigned long pfn,unsigned long nr_pages,int online_type) {unsigned long flags;
@@ -895,6 +894,8 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typstruct memory_notify arg;struct memory_block *mem; +mem_hotplug_begin (); +/* * We can't use pfn_to_nid() because nid might be stored in struct page * which is not yet initialized. Instead, we find nid from memory block.
@@ -960,6 +961,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typif (onlined_pages)memory_notify (MEM_ONLINE , &arg); +mem_hotplug_done ();return 0 ; failed_addition:
@@ -967,6 +969,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ (unsigned long long ) pfn <<PAGE_SHIFT , (((unsigned long long) pfn + nr_pages) << PAGE_SHIFT) - 1);memory_notify (MEM_CANCEL_ONLINE , &arg); +mem_hotplug_done (); return ret; }#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
@@ -1171,20 +1174,20 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online)/* create new memmap entry */ firmware_map_add_hotplug (start, start + size,"System RAM" ); +/* device_online() will take the lock when calling online_pages() */ +mem_hotplug_done (); +/* online pages if requested */ if (online)walk_memory_range (PFN_DOWN (start),PFN_UP (start + size -1 ),NULL , online_memory_block); - goto out; - +return ret; error:/* rollback pgdat allocation and others */ if (new_node)rollback_node_hotadd (nid);memblock_remove (start, size); - -out:mem_hotplug_done ();return ret; }
@@ -1651,10 +1654,16 @@ static int __ref __offline_pages(unsigned long start_pfn,return -EINVAL ;if (!IS_ALIGNED (end_pfn, pageblock_nr_pages))return -EINVAL ; + +mem_hotplug_begin (); +/* This makes hotplug much easier...and readable. we assume this for now. .*/ -if (!test_pages_in_a_zone (start_pfn, end_pfn, &valid_start, &valid_end)) +if (!test_pages_in_a_zone (start_pfn, end_pfn, &valid_start, + &valid_end)) { +mem_hotplug_done ();return -EINVAL ; + } zone =page_zone (pfn_to_page (valid_start)); node =zone_to_nid (zone);
@@ -1663,8 +1672,10 @@ static int __ref __offline_pages(unsigned long start_pfn,/* set above range as isolated */ ret =start_isolate_page_range (start_pfn, end_pfn,MIGRATE_MOVABLE , true); -if (ret) +if (ret) { +mem_hotplug_done ();return ret; + } arg.start_pfn = start_pfn; arg.nr_pages = nr_pages;
@@ -1735,6 +1746,7 @@ static int __ref __offline_pages(unsigned long start_pfn,writeback_set_ratelimit ();memory_notify (MEM_OFFLINE , &arg); +mem_hotplug_done ();return 0 ; failed_removal:
@@ -1744,10 +1756,10 @@ static int __ref __offline_pages(unsigned long start_pfn,memory_notify (MEM_CANCEL_OFFLINE , &arg);/* pushback to free area */ undo_isolate_page_range (start_pfn, end_pfn,MIGRATE_MOVABLE ); +mem_hotplug_done ();return ret; } -/* Must be protected by mem_hotplug_begin() or a device_lock */ int offline_pages (unsigned long start_pfn,unsigned long nr_pages) {return __offline_pages (start_pfn, start_pfn + nr_pages);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 165/237 powerpc/powernv: hold device_hotplug_lock when calling device_online()
In reply to Sasha LevinFrom: David Hildenbrand <[email protected]>
[ Upstream commit cec1680591d6d5b10ecc10f370210089416e98af ]
device_online() should be called with device_hotplug_lock() held.
--- arch/powerpc/platforms/powernv/memtrace.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/platforms/powernv/memtrace.c +2 -0
@@ -244,9 +244,11 @@ static int memtrace_online(void)* we need to online the memory ourselves. */ if (!memhp_auto_online) { +lock_device_hotplug ();walk_memory_range (PFN_DOWN (ent->start),PFN_UP (ent->start + ent->size -1 ),NULL , online_mem_block); +unlock_device_hotplug (); }/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 166/237 igb: shorten maximum PHC timecounter update interval
In reply to Sasha LevinFrom: Miroslav Lichvar <[email protected]>
[ Upstream commit 094bf4d0e9657f6ea1ee3d7e07ce3970796949ce ]
The timecounter needs to be updated at least once per ~550 seconds in order to avoid a 40-bit SYSTIM timestamp to be misinterpreted as an old timestamp.
Since commit 500462a9d ("timers: Switch to a non-cascading wheel"), scheduling of delayed work seems to be less accurate and a requested delay of 540 seconds may actually be longer than 550 seconds. Shorten the delay to 480 seconds to be sure the timecounter is updated in time.
This fixes an issue with HW timestamps on 82580/I350/I354 being off by ~1100 seconds for few seconds every ~9 minutes.
--- drivers/net/ethernet/intel/igb/igb_ptp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/igb_ptp.c +7 -1
@@ -51,9 +51,15 @@* * The 40 bit 82580 SYSTIM overflows every * 2^40 * 10^-9 / 60 = 18.3 minutes. +* +* SYSTIM is converted to real time using a timecounter. As +* timecounter_cyc2time() allows old timestamps, the timecounter +* needs to be updated at least once per half of the SYSTIM interval. +* Scheduling of delayed work is not very accurate, so we aim for 8 +* minutes to be sure the actual interval is shorter than 9.16 minutes. */ -#define IGB_SYSTIM_OVERFLOW_PERIOD (HZ * 60 * 9) +#define IGB_SYSTIM_OVERFLOW_PERIOD (HZ * 60 * 8)#define IGB_PTP_TX_TIMEOUT (HZ * 15)#define INCPERIOD_82576 BIT(E1000_TIMINCA_16NS_SHIFT)#define INCVALUE_82576_MASK GENMASK(E1000_TIMINCA_16NS_SHIFT - 1, 0)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 167/237 fm10k: ensure completer aborts are marked as non-fatal after a resume
In reply to Sasha LevinFrom: Jacob Keller <[email protected]>
[ Upstream commit e330af788998b0de4da4f5bd7ddd087507999800 ]
VF drivers can trigger PCIe completer aborts any time they read a queue that they don't own. Even in nominal circumstances, it is not possible to prevent the VF driver from reading queues it doesn't own. VF drivers may attempt to read queues it previously owned, but which it no longer does due to a PF reset.
Normally these completer aborts aren't an issue. However, on some platforms these trigger machine check errors. This is true even if we lower their severity from fatal to non-fatal. Indeed, we already have code for lowering the severity.
We could attempt to mask these errors conditionally around resets, which is the most common time they would occur. However this would essentially be a race between the PF and VF drivers, and we may still occasionally see machine check exceptions on these strictly configured platforms.
Instead, mask the errors entirely any time we resume VFs. By doing so, we prevent the completer aborts from being sent to the parent PCIe device, and thus these strict platforms will not upgrade them into machine check errors.
Additionally, we don't lose any information by masking these errors, because we'll still report VFs which attempt to access queues via the FUM_BAD_VF_QACCESS errors.
Without this change, on platforms where completer aborts cause machine check exceptions, the VF reading queues it doesn't own could crash the host system. Masking the completer abort prevents this, so we should mask it for good, and not just around a PCIe reset. Otherwise malicious or misconfigured VFs could cause the host system to crash.
Because we are masking the error entirely, there is little reason to also keep setting the severity bit, so that code is also removed.
--- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 48 ++++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k_iov.c +28 -20
@@ -302,6 +302,28 @@ void fm10k_iov_suspend(struct pci_dev *pdev) } } +static void fm10k_mask_aer_comp_abort (struct pci_dev *pdev) +{ +u32 err_mask; +int pos; + + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_ERR ); +if (!pos) +return ; + +/* Mask the completion abort bit in the ERR_UNCOR_MASK register, +* preventing the device from reporting these errors to the upstream +* PCIe root device. This avoids bringing down platforms which upgrade +* non-fatal completer aborts into machine check exceptions. Completer +* aborts can occur whenever a VF reads a queue it doesn't own. +*/ +pci_read_config_dword (pdev, pos +PCI_ERR_UNCOR_MASK , &err_mask); + err_mask |=PCI_ERR_UNC_COMP_ABORT ; +pci_write_config_dword (pdev, pos +PCI_ERR_UNCOR_MASK , err_mask); + +mmiowb (); +} +int fm10k_iov_resume (struct pci_dev *pdev) {struct fm10k_intfc *interface =pci_get_drvdata (pdev);
@@ -317,6 +339,12 @@ int fm10k_iov_resume(struct pci_dev *pdev)if (!iov_data)return -ENOMEM ; +/* Lower severity of completer abort error reporting as +* the VFs can trigger this any time they read a queue +* that they don't own. +*/ +fm10k_mask_aer_comp_abort (pdev); +/* allocate hardware resources for the VFs */ hw->iov.ops.assign_resources (hw, num_vfs, num_vfs);
@@ -460,20 +488,6 @@ void fm10k_iov_disable(struct pci_dev *pdev)fm10k_iov_free_data (pdev); } -static void fm10k_disable_aer_comp_abort (struct pci_dev *pdev) -{ -u32 err_sev; -int pos; - - pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_ERR ); -if (!pos) -return ; - -pci_read_config_dword (pdev, pos +PCI_ERR_UNCOR_SEVER , &err_sev); - err_sev &= ~PCI_ERR_UNC_COMP_ABORT ; -pci_write_config_dword (pdev, pos +PCI_ERR_UNCOR_SEVER , err_sev); -} -int fm10k_iov_configure (struct pci_dev *pdev,int num_vfs) {int current_vfs =pci_num_vf (pdev);
@@ -495,12 +509,6 @@ int fm10k_iov_configure(struct pci_dev *pdev, int num_vfs)/* allocate VFs if not already allocated */ if (num_vfs && num_vfs != current_vfs) { -/* Disable completer abort error reporting as -* the VFs can trigger this any time they read a queue -* that they don't own. -*/ -fm10k_disable_aer_comp_abort (pdev); - err =pci_enable_sriov (pdev, num_vfs);if (err) { dev_err(&pdev->dev,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 168/237 net: hns3: bugfix for buffer not free problem during resetting
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit 73b907a083b8a8c1c62cb494bc9fbe6ae086c460 ]
When hns3_get_ring_config()/hns3_queue_to_ring()/ hns3_get_vector_ring_chain() failed during resetting, the allocated memory has not been freed before these three functions return. So this patch adds error handler in these functions to fix it.
--- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +21 -3
@@ -2558,7 +2558,7 @@ static int hns3_get_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector, chain =devm_kzalloc (&pdev->dev,sizeof (*chain),GFP_KERNEL );if (!chain) -return -ENOMEM ; + goto err_free_chain; cur_chain->next = chain; chain->tqp_index = tx_ring->tqp->tqp_index;
@@ -2588,7 +2588,7 @@ static int hns3_get_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector,while (rx_ring) { chain =devm_kzalloc (&pdev->dev,sizeof (*chain),GFP_KERNEL );if (!chain) -return -ENOMEM ; + goto err_free_chain; cur_chain->next = chain; chain->tqp_index = rx_ring->tqp->tqp_index;
@@ -2603,6 +2603,16 @@ static int hns3_get_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector, }return 0 ; + +err_free_chain: + cur_chain = head->next; +while (cur_chain) { + chain = cur_chain->next; +devm_kfree (&pdev->dev, chain); + cur_chain = chain; + } + +return -ENOMEM ; } static void hns3_free_vector_ring_chain(struct hns3_enet_tqp_vector *tqp_vector,
@@ -2847,8 +2857,10 @@ static int hns3_queue_to_ring(struct hnae3_queue *tqp,return ret; ret =hns3_ring_get_cfg (tqp, priv,HNAE3_RING_TYPE_RX ); -if (ret) +if (ret) { +devm_kfree (priv->dev, priv->ring_data[tqp->tqp_index].ring);return ret; + }return 0 ; }
@@ -2875,6 +2887,12 @@ static int hns3_get_ring_config(struct hns3_nic_priv *priv)return 0 ; err: +while (i--) { +devm_kfree (priv->dev, priv->ring_data[i].ring); +devm_kfree (priv->dev, + priv->ring_data[i + h->kinfo.num_tqps].ring); + } +devm_kfree (&pdev->dev, priv->ring_data);return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 169/237 net: hns3: bugfix for reporting unknown vector0 interrupt repeatly problem
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit 0d4411408a7fb9aad0645f23911d9bfdd2ce3177 ]
The current driver supports handling two vector0 interrupts, reset and mailbox. When the hardware reports an interrupt of another type of interrupt source, if the driver does not process the interrupt, but enables the interrupt, the hardware will repeatedly report the unknown interrupt.
Therefore, the driver enables the vector0 interrupt after clearing the known type of interrupt source. Other conditions are not enabled.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -2574,7 +2574,7 @@ static irqreturn_t hclge_misc_irq_handle(int irq, void *data) }/* clear the source of interrupt if it is not cause by reset */ -if (event_cause !=HCLGE_VECTOR0_EVENT_RST ) { +if (event_cause ==HCLGE_VECTOR0_EVENT_MBX ) {hclge_clear_event_cause (hdev, event_cause, clearval);hclge_enable_vector (&hdev->misc_vector, true); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 170/237 net: hns3: bugfix for is_valid_csq_clean_head()
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit 6d71ec6cbf74ac9c2823ef751b1baa5b889bb3ac ]
The HEAD pointer of the hardware command queue maybe equal to the command queue's next_to_use in the driver, so that does not belong to the invalid HEAD pointer, since the hardware may not process the command in time, causing the HEAD pointer to be too late to update. The variables' name in this function is unreadable, so give them a more readable one.
--- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c +6 -6
@@ -24,15 +24,15 @@ static int hclge_ring_space(struct hclge_cmq_ring *ring)return ring->desc_num - used -1 ; } -static int is_valid_csq_clean_head (struct hclge_cmq_ring *ring,int h) +static int is_valid_csq_clean_head (struct hclge_cmq_ring *ring,int head) { -int u = ring->next_to_use; -int c = ring->next_to_clean; +int ntu = ring->next_to_use; +int ntc = ring->next_to_clean; -if (unlikely (h >= ring->desc_num)) -return 0 ; +if (ntu > ntc) +return head >= ntc && head <= ntu; -return u > c ? (h > c && h <= u) : (h > c || h <= u); +return head >= ntc || head <= ntu; }static int hclge_alloc_cmd_desc (struct hclge_cmq_ring *ring)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 171/237 net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read
In reply to Sasha LevinFrom: Huazhong Tan <[email protected]>
[ Upstream commit 1c12493809924deda6c0834cb2f2c5a6dc786390 ]
When there is a PHY, the driver needs to complete some operations through MDIO during reset reinitialization, so HCLGE_STATE_CMD_DISABLE is more suitable than HCLGE_STATE_RST_HANDLING to prevent the MDIO operation from being sent during the hardware reset.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +2 -2
@@ -54,7 +54,7 @@ static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum,struct hclge_desc desc;int ret; -if (test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state)) +if (test_bit (HCLGE_STATE_CMD_DISABLE , &hdev->state))return 0 ;hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_MDIO_CONFIG , false);
@@ -92,7 +92,7 @@ static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum)struct hclge_desc desc;int ret; -if (test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state)) +if (test_bit (HCLGE_STATE_CMD_DISABLE , &hdev->state))return 0 ;hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_MDIO_CONFIG , true);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 172/237 ntb_netdev: fix sleep time mismatch
In reply to Sasha LevinFrom: Jon Mason <[email protected]>
[ Upstream commit a861594b1b7ffd630f335b351c4e9f938feadb8e ]
The tx_time should be in usecs (according to the comment above the variable), but the setting of the timer during the rearming is done in msecs. Change it to match the expected units.
--- drivers/net/ntb_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ntb_netdev.c +1 -1
@@ -236,7 +236,7 @@ static void ntb_netdev_tx_timer(struct timer_list *t)struct net_device *ndev = dev->ndev;if (ntb_transport_tx_free_entry (dev->qp) < tx_stop) { -mod_timer (&dev->tx_timer, jiffies +msecs_to_jiffies (tx_time)); +mod_timer (&dev->tx_timer, jiffies +usecs_to_jiffies (tx_time)); }else {/* Make sure anybody stopping the queue after this sees the new * value of ntb_transport_tx_free_entry()
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 173/237 ntb: intel: fix return value for ndev_vec_mask()
In reply to Sasha LevinFrom: Dave Jiang <[email protected]>
[ Upstream commit 7756e2b5d68c36e170a111dceea22f7365f83256 ]
ndev_vec_mask() should be returning u64 mask value instead of int. Otherwise the mask value returned can be incorrect for larger vectors.
--- drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/hw/intel/ntb_hw_gen1.c +1 -1
@@ -265,7 +265,7 @@ static inline int ndev_db_clear_mask(struct intel_ntb_dev *ndev, u64 db_bits,return 0 ; } -static inline int ndev_vec_mask (struct intel_ntb_dev *ndev,int db_vector) +static inline u64 ndev_vec_mask (struct intel_ntb_dev *ndev,int db_vector) {u64 shift, mask;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 174/237 irq/matrix: Fix memory overallocation
In reply to Sasha LevinFrom: Michael Kelley <[email protected]>
[ Upstream commit 57f01796f14fecf00d330fe39c8d2477ced9cd79 ]
IRQ_MATRIX_SIZE is the number of longs needed for a bitmap, multiplied by the size of a long, yielding a byte count. But it is used to size an array of longs, which is way more memory than is needed.
Change IRQ_MATRIX_SIZE so it is just the number of longs needed and the arrays come out the correct size.
--- kernel/irq/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/irq/matrix.c +1 -1
@@ -8,7 +8,7 @@#include <linux/cpu.h> #include <linux/irq.h> -#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS) * sizeof(unsigned long)) +#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS))struct cpumap {unsigned int available;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 175/237 nvme-pci: fix conflicting p2p resource adds
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit 9fe5c59ff6a1e5e26a39b75489a1420e7eaaf0b1 ]
The nvme pci driver had been adding its CMB resource to the P2P DMA subsystem everytime on on a controller reset. This results in the following warning:
------------[ cut here ]------------
nvme 0000:00:03.0: Conflicting mapping in same section
WARNING: CPU: 7 PID: 81 at kernel/memremap.c:155 devm_memremap_pages+0xa6/0x380
...
Call Trace:
pci_p2pdma_add_resource+0x153/0x370
nvme_reset_work+0x28c/0x17b1 [nvme]
? add_timer+0x107/0x1e0
? dequeue_entity+0x81/0x660
? dequeue_entity+0x3b0/0x660
? pick_next_task_fair+0xaf/0x610
? __switch_to+0xbc/0x410
process_one_work+0x1cf/0x350
worker_thread+0x215/0x3d0
? process_one_work+0x350/0x350
kthread+0x107/0x120
? kthread_park+0x80/0x80
ret_from_fork+0x1f/0x30
---[ end trace f7ea76ac6ee72727 ]---
nvme nvme0: failed to register the CMBThis patch fixes this by registering the CMB with P2P only once.
--- drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +4 -1
@@ -1652,6 +1652,9 @@ static void nvme_map_cmb(struct nvme_dev *dev)struct pci_dev *pdev =to_pci_dev (dev->dev);int bar; +if (dev->cmb_size) +return ; + dev->cmbsz =readl (dev->bar +NVME_REG_CMBSZ );if (!dev->cmbsz)return ;
@@ -2136,7 +2139,6 @@ static void nvme_pci_disable(struct nvme_dev *dev) {struct pci_dev *pdev =to_pci_dev (dev->dev); -nvme_release_cmb (dev);pci_free_irq_vectors (pdev);if (pci_is_enabled (pdev)) {
@@ -2595,6 +2597,7 @@ static void nvme_remove(struct pci_dev *pdev)nvme_stop_ctrl (&dev->ctrl);nvme_remove_namespaces (&dev->ctrl);nvme_dev_disable (dev, true); +nvme_release_cmb (dev);nvme_free_host_mem (dev);nvme_dev_remove_admin (dev);nvme_free_queues (dev,0 );
Signature · 7 lines
2.20.1 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sasha Levin
maintainerPATCH 176/237 arm64: makefile fix build of .i file in external module case
In reply to Sasha LevinFrom: Victor Kamensky <[email protected]>
[ Upstream commit 98356eb0ae499c63e78073ccedd9a5fc5c563288 ]
After 'a66649dab350 arm64: fix vdso-offsets.h dependency' if one will try to build .i file in case of external kernel module, build fails complaining that prepare0 target is missing. This issue came up with SystemTap when it tries to build variety of .i files for its own generated kernel modules trying to figure given kernel features/capabilities.
The issue is that prepare0 is defined in top level Makefile only if KBUILD_EXTMOD is not defined. .i file rule depends on prepare and in case KBUILD_EXTMOD defined top level Makefile contains empty rule for prepare. But after mentioned commit arch/arm64/Makefile would introduce dependency on prepare0 through its own prepare target.
Fix it to put proper ifdef KBUILD_EXTMOD around code introduced by mentioned commit. It matches what top level Makefile does.
--- arch/arm64/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/Makefile +2 -0
@@ -148,6 +148,7 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)/dts +ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. # In order to do that, we should use the archprepare target, but we can't since # asm-offsets.h is included in some files used to generate vdso-offsets.h, and
@@ -157,6 +158,7 @@ archclean: prepare: vdso_prepare vdso_prepare: prepare0 $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h +endif define archhelp echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 177/237 tools/power turbosat: fix AMD APIC-id output
In reply to Sasha LevinFrom: Len Brown <[email protected]>
[ Upstream commit 3404155190ce09a1e5d8407e968fc19aac4493e3 ]
turbostat recently gained a feature adding APIC and X2APIC columns. While they are disabled by-default, they are enabled with --debug or when explicitly requested, eg.
$ sudo turbostat --quiet --show Package,Node,Core,CPU,APIC,X2APIC date
But these columns erroneously showed zeros on AMD hardware. This patch corrects the APIC and X2APIC [sic] columns on AMD.
--- tools/power/x86/turbostat/turbostat.c | 93 +++++++++++++++++---------- 1 file changed, 60 insertions(+), 33 deletions(-)
tools/power/x86/turbostat/turbostat.c +60 -33
@@ -1,6 +1,6 @@/* * turbostat -- show CPU frequency and C-state residency -* on modern Intel turbo-capable processors. +* on modern Intel and AMD processors. * * Copyright (c) 2013 Intel Corporation. * Len Brown <[email protected]>
@@ -71,6 +71,8 @@ unsigned int do_irtl_snb;unsigned int do_irtl_hsw;unsigned int units =1000000 ;/* MHz etc */ unsigned int genuine_intel; +unsigned int authentic_amd; +unsigned int max_level, max_extended_level;unsigned int has_invariant_tsc;unsigned int do_nhm_platform_info;unsigned int no_MSR_MISC_PWR_MGMT;
@@ -1667,30 +1669,51 @@ int get_mp(int cpu, struct msr_counter *mp, unsigned long long *counterp)void get_apic_id (struct thread_data *t) { -unsigned int eax, ebx, ecx, edx, max_level; +unsigned int eax, ebx, ecx, edx; - eax = ebx = ecx = edx =0 ; +if (DO_BIC (BIC_APIC )) { + eax = ebx = ecx = edx =0 ; +__cpuid (1 , eax, ebx, ecx, edx); -if (!genuine_intel) + t->apic_id = (ebx >>24 ) &0xff ; + } + +if (!DO_BIC (BIC_X2APIC ))return ; -__cpuid (0 , max_level, ebx, ecx, edx); +if (authentic_amd) { +unsigned int topology_extensions; -__cpuid (1 , eax, ebx, ecx, edx); - t->apic_id = (ebx >>24 ) &0xf ; +if (max_extended_level <0x8000001e ) +return ; -if (max_level <0xb ) + eax = ebx = ecx = edx =0 ; +__cpuid (0x80000001 , eax, ebx, ecx, edx); + topology_extensions = ecx & (1 <<22 ); + +if (topology_extensions ==0 ) +return ; + + eax = ebx = ecx = edx =0 ; +__cpuid (0x8000001e , eax, ebx, ecx, edx); + + t->x2apic_id = eax;return ; + } -if (!DO_BIC (BIC_X2APIC )) +if (!genuine_intel) +return ; + +if (max_level <0xb )return ; ecx =0 ;__cpuid (0xb , eax, ebx, ecx, edx); t->x2apic_id = edx; -if (debug && (t->apic_id != t->x2apic_id)) -fprintf (outf,"cpu%d: apic 0x%x x2apic 0x%x\n" , t->cpu_id, t->apic_id, t->x2apic_id); +if (debug && (t->apic_id != (t->x2apic_id &0xff ))) +fprintf (outf,"cpu%d: BIOS BUG: apic 0x%x x2apic 0x%x\n" , + t->cpu_id, t->apic_id, t->x2apic_id); }/*
@@ -4439,16 +4462,18 @@ void decode_c6_demotion_policy_msr(void)void process_cpuid () { -unsigned int eax, ebx, ecx, edx, max_level, max_extended_level; -unsigned int fms, family, model, stepping; +unsigned int eax, ebx, ecx, edx; +unsigned int fms, family, model, stepping, ecx_flags, edx_flags;unsigned int has_turbo; eax = ebx = ecx = edx =0 ;__cpuid (0 , max_level, ebx, ecx, edx); -if (ebx ==0x756e6547 && edx ==0x49656e69 && ecx ==0x6c65746e ) +if (ebx ==0x756e6547 && ecx ==0x6c65746e && edx ==0x49656e69 ) genuine_intel =1 ; +else if (ebx ==0x68747541 && ecx ==0x444d4163 && edx ==0x69746e65 ) + authentic_amd =1 ;if (!quiet) fprintf(outf, "CPUID(0): %.4s%.4s%.4s ",
@@ -4462,25 +4487,8 @@ void process_cpuid() family += (fms >>20 ) &0xff ;if (family >=6 ) model += ((fms >>16 ) &0xf ) <<4 ; - -if (!quiet) { -fprintf (outf,"%d CPUID levels; family:model:stepping 0x%x:%x:%x (%d:%d:%d)\n" , - max_level, family, model, stepping, family, model, stepping); -fprintf (outf,"CPUID(1): %s %s %s %s %s %s %s %s %s %s\n" , - ecx & (1 <<0 ) ?"SSE3" :"-" , - ecx & (1 <<3 ) ?"MONITOR" :"-" , - ecx & (1 <<6 ) ?"SMX" :"-" , - ecx & (1 <<7 ) ?"EIST" :"-" , - ecx & (1 <<8 ) ?"TM2" :"-" , - edx & (1 <<4 ) ?"TSC" :"-" , - edx & (1 <<5 ) ?"MSR" :"-" , - edx & (1 <<22 ) ?"ACPI-TM" :"-" , - edx & (1 <<28 ) ?"HT" :"-" , - edx & (1 <<29 ) ?"TM" :"-" ); - } - -if (!(edx & (1 <<5 ))) -errx (1 ,"CPUID: no MSR" ); + ecx_flags = ecx; + edx_flags = edx;/* * check max extended function levels of CPUID.
@@ -4490,6 +4498,25 @@ void process_cpuid() ebx = ecx = edx =0 ;__cpuid (0x80000000 , max_extended_level, ebx, ecx, edx); +if (!quiet) { +fprintf (outf,"0x%x CPUID levels; 0x%x xlevels; family:model:stepping 0x%x:%x:%x (%d:%d:%d)\n" , + max_level, max_extended_level, family, model, stepping, family, model, stepping); +fprintf (outf,"CPUID(1): %s %s %s %s %s %s %s %s %s %s\n" , + ecx_flags & (1 <<0 ) ?"SSE3" :"-" , + ecx_flags & (1 <<3 ) ?"MONITOR" :"-" , + ecx_flags & (1 <<6 ) ?"SMX" :"-" , + ecx_flags & (1 <<7 ) ?"EIST" :"-" , + ecx_flags & (1 <<8 ) ?"TM2" :"-" , + edx_flags & (1 <<4 ) ?"TSC" :"-" , + edx_flags & (1 <<5 ) ?"MSR" :"-" , + edx_flags & (1 <<22 ) ?"ACPI-TM" :"-" , + edx_flags & (1 <<28 ) ?"HT" :"-" , + edx_flags & (1 <<29 ) ?"TM" :"-" ); + } + +if (!(edx_flags & (1 <<5 ))) +errx (1 ,"CPUID: no MSR" ); +if (max_extended_level >=0x80000007 ) {/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 178/237 mm: handle no memcg case in memcg_kmem_charge() properly
In reply to Sasha LevinFrom: Roman Gushchin <[email protected]>
[ Upstream commit e68599a3c3ad0f3171a7cb4e48aa6f9a69381902 ]
Mike Galbraith reported a regression caused by the commit 9b6f7e163cd0 ("mm: rework memcg kernel stack accounting") on a system with "cgroup_disable=memory" boot option: the system panics with the following stack trace:
BUG: unable to handle kernel NULL pointer dereference at 00000000000000f8 PGD 0 P4D 0 Oops: 0002 [#1] PREEMPT SMP PTI CPU: 0 PID: 1 Comm: systemd Not tainted 4.19.0-preempt+ #410 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20180531_142017-buildhw-08.phx2.fed4 RIP: 0010:page_counter_try_charge+0x22/0xc0 Code: 41 5d c3 c3 0f 1f 40 00 0f 1f 44 00 00 48 85 ff 0f 84 a7 00 00 00 41 56 48 89 f8 49 89 fe 49 Call Trace: try_charge+0xcb/0x780 memcg_kmem_charge_memcg+0x28/0x80 memcg_kmem_charge+0x8b/0x1d0 copy_process.part.41+0x1ca/0x2070 _do_fork+0xd7/0x3d0 do_syscall_64+0x5a/0x180 entry_SYSCALL_64_after_hwframe+0x49/0xbe
The problem occurs because get_mem_cgroup_from_current() returns the NULL pointer if memory controller is disabled. Let's check if this is a case at the beginning of memcg_kmem_charge() and just return 0 if mem_cgroup_disabled() returns true. This is how we handle this case in many other places in the memory controller code.
--- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memcontrol.c +1 -1
@@ -2678,7 +2678,7 @@ int memcg_kmem_charge(struct page *page, gfp_t gfp, int order)struct mem_cgroup *memcg;int ret =0 ; -if (memcg_kmem_bypass ()) +if (mem_cgroup_disabled () ||memcg_kmem_bypass ())return 0 ; memcg =get_mem_cgroup_from_current ();
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 179/237 ocfs2: without quota support, avoid calling quota recovery
In reply to Sasha LevinFrom: Guozhonghua <[email protected]>
[ Upstream commit 21158ca85b73ddd0088076a5209cfd040513a8b5 ]
During one dead node's recovery by other node, quota recovery work will be queued. We should avoid calling quota when it is not supported, so check the quota flags.
--- fs/ocfs2/journal.c | 51 ++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 17 deletions(-)
fs/ocfs2/journal.c +34 -17
@@ -1379,15 +1379,23 @@ static int __ocfs2_recovery_thread(void *arg)int rm_quota_used =0 , i;struct ocfs2_quota_recovery *qrec; +/* Whether the quota supported. */ +int quota_enabled =OCFS2_HAS_RO_COMPAT_FEATURE (osb->sb, +OCFS2_FEATURE_RO_COMPAT_USRQUOTA ) + ||OCFS2_HAS_RO_COMPAT_FEATURE (osb->sb, +OCFS2_FEATURE_RO_COMPAT_GRPQUOTA ); + status =ocfs2_wait_on_mount (osb);if (status <0 ) { goto bail; } - rm_quota =kcalloc (osb->max_slots,sizeof (int ),GFP_NOFS ); -if (!rm_quota) { - status = -ENOMEM ; - goto bail; +if (quota_enabled) { + rm_quota =kcalloc (osb->max_slots,sizeof (int ),GFP_NOFS ); +if (!rm_quota) { + status = -ENOMEM ; + goto bail; + } } restart: status =ocfs2_super_lock (osb,1 );
@@ -1423,9 +1431,14 @@ static int __ocfs2_recovery_thread(void *arg)* then quota usage would be out of sync until some node takes * the slot. So we remember which nodes need quota recovery * and when everything else is done, we recover quotas. */ -for (i =0 ; i < rm_quota_used && rm_quota[i] != slot_num; i++); -if (i == rm_quota_used) - rm_quota[rm_quota_used++] = slot_num; +if (quota_enabled) { +for (i =0 ; i < rm_quota_used + && rm_quota[i] != slot_num; i++) + ; + +if (i == rm_quota_used) + rm_quota[rm_quota_used++] = slot_num; + } status =ocfs2_recover_node (osb, node_num, slot_num); skip_recovery:
@@ -1453,16 +1466,19 @@ static int __ocfs2_recovery_thread(void *arg)/* Now it is right time to recover quotas... We have to do this under * superblock lock so that no one can start using the slot (and crash) * before we recover it */ -for (i =0 ; i < rm_quota_used; i++) { - qrec =ocfs2_begin_quota_recovery (osb, rm_quota[i]); -if (IS_ERR (qrec)) { - status =PTR_ERR (qrec); -mlog_errno (status); -continue ; +if (quota_enabled) { +for (i =0 ; i < rm_quota_used; i++) { + qrec =ocfs2_begin_quota_recovery (osb, rm_quota[i]); +if (IS_ERR (qrec)) { + status =PTR_ERR (qrec); +mlog_errno (status); +continue ; + } +ocfs2_queue_recovery_completion (osb->journal, + rm_quota[i], +NULL ,NULL , qrec, +ORPHAN_NEED_TRUNCATE ); } -ocfs2_queue_recovery_completion (osb->journal, rm_quota[i], -NULL ,NULL , qrec, -ORPHAN_NEED_TRUNCATE ); }ocfs2_super_unlock (osb,1 );
@@ -1484,7 +1500,8 @@ static int __ocfs2_recovery_thread(void *arg)mutex_unlock (&osb->recovery_lock); -kfree (rm_quota); +if (quota_enabled) +kfree (rm_quota);/* no one is callint kthread_stop() for us so the kthread() api * requires that we call do_exit(). And it isn't exported, but
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 180/237 ocfs2: don't use iocb when EIOCBQUEUED returns
In reply to Sasha LevinFrom: Changwei Ge <[email protected]>
[ Upstream commit 9e985787750db8aae87f02b67e908f28ac4d6b83 ]
When -EIOCBQUEUED returns, it means that aio_complete() will be called from dio_complete(), which is an asynchronous progress against write_iter. Generally, IO is a very slow progress than executing instruction, but we still can't take the risk to access a freed iocb.
And we do face a BUG crash issue. Using the crash tool, iocb is obviously freed already.
crash> struct -x kiocb ffff881a350f5900
struct kiocb {
ki_filp = 0xffff881a350f5a80,
ki_pos = 0x0,
ki_complete = 0x0,
private = 0x0,
ki_flags = 0x0
}And the backtrace shows:
ocfs2_file_write_iter+0xcaa/0xd00 [ocfs2] aio_run_iocb+0x229/0x2f0 do_io_submit+0x291/0x540 SyS_io_submit+0x10/0x20 system_call_fastpath+0x16/0x75
--- fs/ocfs2/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ocfs2/file.c +2 -2
@@ -2389,7 +2389,7 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, written =__generic_file_write_iter (iocb, from);/* buffered aio wouldn't have proper lock coverage today */ -BUG_ON (written == -EIOCBQUEUED && !(iocb->ki_flags &IOCB_DIRECT )); +BUG_ON (written == -EIOCBQUEUED && !direct_io);/* * deep in g_f_a_w_n()->ocfs2_direct_IO we pass in a ocfs2_dio_end_io
@@ -2509,7 +2509,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,trace_generic_file_read_iter_ret (ret);/* buffered aio wouldn't have proper lock coverage today */ -BUG_ON (ret == -EIOCBQUEUED && !(iocb->ki_flags &IOCB_DIRECT )); +BUG_ON (ret == -EIOCBQUEUED && !direct_io);/* see ocfs2_file_write_iter */ if (ret == -EIOCBQUEUED || !ocfs2_iocb_is_rw_locked (iocb)) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 181/237 ocfs2: don't put and assigning null to bh allocated outside
In reply to Sasha LevinFrom: Changwei Ge <[email protected]>
[ Upstream commit cf76c78595ca87548ca5e45c862ac9e0949c4687 ]
ocfs2_read_blocks() and ocfs2_read_blocks_sync() are both used to read several blocks from disk. Currently, the input argument *bhs* can be NULL or NOT. It depends on the caller's behavior. If the function fails in reading blocks from disk, the corresponding bh will be assigned to NULL and put.
Obviously, above process for non-NULL input bh is not appropriate. Because the caller doesn't even know its bhs are put and re-assigned.
If buffer head is managed by caller, ocfs2_read_blocks and ocfs2_read_blocks_sync() should not evaluate it to NULL. It will cause caller accessing illegal memory, thus crash.
--- fs/ocfs2/buffer_head_io.c | 77 ++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 18 deletions(-)
fs/ocfs2/buffer_head_io.c +59 -18
@@ -99,25 +99,34 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh,return ret; } +/* Caller must provide a bhs[] with all NULL or non-NULL entries, so it +* will be easier to handle read failure. +*/ int ocfs2_read_blocks_sync (struct ocfs2_super *osb,u64 block,unsigned int nr,struct buffer_head *bhs[]) {int status =0 ;unsigned int i;struct buffer_head *bh; +int new_bh =0 ;trace_ocfs2_read_blocks_sync ((unsigned long long )block, nr);if (!nr) goto bail; +/* Don't put buffer head and re-assign it to NULL if it is allocated +* outside since the caller can't be aware of this alternation! +*/ + new_bh = (bhs[0 ] ==NULL ); +for (i =0 ; i < nr ; i++) {if (bhs[i] ==NULL ) { bhs[i] =sb_getblk (osb->sb, block++);if (bhs[i] ==NULL ) { status = -ENOMEM ;mlog_errno (status); - goto bail; +break ; } } bh = bhs[i];
@@ -157,9 +166,26 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,submit_bh (REQ_OP_READ ,0 , bh); } +read_failure:for (i = nr; i >0 ; i--) { bh = bhs[i -1 ]; +if (unlikely (status)) { +if (new_bh && bh) { +/* If middle bh fails, let previous bh +* finish its read and then put it to +* aovoid bh leak +*/ +if (!buffer_jbd (bh)) +wait_on_buffer (bh); +put_bh (bh); + bhs[i -1 ] =NULL ; + }else if (bh &&buffer_uptodate (bh)) { +clear_buffer_uptodate (bh); + } +continue ; + } +/* No need to wait on the buffer if it's managed by JBD. */ if (!buffer_jbd (bh))wait_on_buffer (bh);
@@ -169,8 +195,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,* so we can safely record this and loop back * to cleanup the other buffers. */ status = -EIO ; -put_bh (bh); - bhs[i -1 ] =NULL ; + goto read_failure; } }
@@ -178,6 +203,9 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,return status; } +/* Caller must provide a bhs[] with all NULL or non-NULL entries, so it +* will be easier to handle read failure. +*/ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, struct buffer_head *bhs[], int flags, int (*validate)(struct super_block *sb,
@@ -187,6 +215,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,int i, ignore_cache =0 ;struct buffer_head *bh;struct super_block *sb =ocfs2_metadata_cache_get_super (ci); +int new_bh =0 ;trace_ocfs2_read_blocks_begin (ci, (unsigned long long )block, nr, flags);
@@ -212,6 +241,11 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, goto bail; } +/* Don't put buffer head and re-assign it to NULL if it is allocated +* outside since the caller can't be aware of this alternation! +*/ + new_bh = (bhs[0 ] ==NULL ); +ocfs2_metadata_cache_io_lock (ci);for (i =0 ; i < nr ; i++) {if (bhs[i] ==NULL ) {
@@ -220,7 +254,8 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,ocfs2_metadata_cache_io_unlock (ci); status = -ENOMEM ;mlog_errno (status); - goto bail; +/* Don't forget to put previous bh! */ +break ; } } bh = bhs[i];
@@ -314,16 +349,27 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, } } - status =0 ; - +read_failure:for (i = (nr -1 ); i >=0 ; i--) { bh = bhs[i];if (!(flags &OCFS2_BH_READAHEAD )) { -if (status) { -/* Clear the rest of the buffers on error */ -put_bh (bh); - bhs[i] =NULL ; +if (unlikely (status)) { +/* Clear the buffers on error including those +* ever succeeded in reading +*/ +if (new_bh && bh) { +/* If middle bh fails, let previous bh +* finish its read and then put it to +* aovoid bh leak +*/ +if (!buffer_jbd (bh)) +wait_on_buffer (bh); +put_bh (bh); + bhs[i] =NULL ; + }else if (bh &&buffer_uptodate (bh)) { +clear_buffer_uptodate (bh); + }continue ; }/* We know this can't have changed as we hold the
@@ -341,9 +387,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,* uptodate. */ status = -EIO ;clear_buffer_needs_validate (bh); -put_bh (bh); - bhs[i] =NULL ; -continue ; + goto read_failure; }if (buffer_needs_validate (bh)) {
@@ -353,11 +397,8 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,BUG_ON (buffer_jbd (bh));clear_buffer_needs_validate (bh); status =validate (sb, bh); -if (status) { -put_bh (bh); - bhs[i] =NULL ; -continue ; - } +if (status) + goto read_failure; } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 182/237 ocfs2: fix clusters leak in ocfs2_defrag_extent()
In reply to Sasha LevinFrom: Larry Chen <[email protected]>
[ Upstream commit 6194ae4242dec0c9d604bc05df83aa9260a899e4 ]
ocfs2_defrag_extent() might leak allocated clusters. When the file system has insufficient space, the number of claimed clusters might be less than the caller wants. If that happens, the original code might directly commit the transaction without returning clusters.
This patch is based on code in ocfs2_add_clusters_in_btree().
--- fs/ocfs2/move_extents.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/ocfs2/move_extents.c +17 -0
@@ -25,6 +25,7 @@#include "ocfs2_ioctl.h" #include "alloc.h" +#include "localalloc.h" #include "aops.h" #include "dlmglue.h" #include "extent_map.h"
@@ -222,6 +223,7 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,struct ocfs2_refcount_tree *ref_tree =NULL ;u32 new_phys_cpos, new_len;u64 phys_blkno =ocfs2_clusters_to_blocks (inode->i_sb, phys_cpos); +int need_free =0 ;if ((ext_flags &OCFS2_EXT_REFCOUNTED ) && *len) {BUG_ON (!ocfs2_is_refcount_inode (inode));
@@ -312,6 +314,7 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,if (!partial) { context->range->me_flags &= ~OCFS2_MOVE_EXT_FL_COMPLETE ; ret = -ENOSPC ; + need_free =1 ; goto out_commit; } }
@@ -336,6 +339,20 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,mlog_errno (ret); out_commit: +if (need_free && context->data_ac) { +struct ocfs2_alloc_context *data_ac = context->data_ac; + +if (context->data_ac->ac_which ==OCFS2_AC_USE_LOCAL ) +ocfs2_free_local_alloc_bits (osb, handle, data_ac, + new_phys_cpos, new_len); +else +ocfs2_free_clusters (handle, + data_ac->ac_inode, + data_ac->ac_bh, +ocfs2_clusters_to_blocks (osb->sb, new_phys_cpos), + new_len); + } +ocfs2_commit_trans (osb, handle); out_unlock_mutex:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 183/237 net: do not abort bulk send on BQL status
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit fe60faa5063822f2d555f4f326c7dd72a60929bf ]
Before calling dev_hard_start_xmit(), upper layers tried to cook optimal skb list based on BQL budget.
Problem is that GSO packets can end up comsuming more than the BQL budget.
Breaking the loop is not useful, since requeued packets are ahead of any packets still in the qdisc.
It is also more expensive, since next TX completion will push these packets later, while skbs are not in cpu caches.
It is also a behavior difference with TSO packets, that can break the BQL limit by a large amount.
Note that drivers should use __netdev_tx_sent_queue() in order to have optimal xmit_more support, and avoid useless atomic operations as shown in the following patch.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -3277,7 +3277,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de } skb = next; -if (netif_xmit_stopped (txq) && skb) { +if (netif_tx_queue_stopped (txq) && skb) { rc =NETDEV_TX_BUSY ;break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 184/237 sched/topology: Fix off by one bug
In reply to Sasha LevinFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 993f0b0510dad98b4e6e39506834dab0d13fd539 ]
With the addition of the NUMA identity level, we increased @level by one and will run off the end of the array in the distance sort loop.
Fixed: 051f3ca02e46 ("sched/topology: Introduce NUMA identity node sched domain")
--- kernel/sched/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/topology.c +1 -1
@@ -1329,7 +1329,7 @@ void sched_init_numa(void)int level =0 ;int i, j, k; - sched_domains_numa_distance =kzalloc (sizeof (int ) * nr_node_ids,GFP_KERNEL ); + sched_domains_numa_distance =kzalloc (sizeof (int ) * (nr_node_ids +1 ),GFP_KERNEL );if (!sched_domains_numa_distance)return ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 185/237 sched/fair: Don't increase sd->balance_interval on newidle balance
In reply to Sasha LevinFrom: Valentin Schneider <[email protected]>
[ Upstream commit 3f130a37c442d5c4d66531b240ebe9abfef426b5 ]
When load_balance() fails to move some load because of task affinity, we end up increasing sd->balance_interval to delay the next periodic balance in the hopes that next time we look, that annoying pinned task(s) will be gone.
However, idle_balance() pays no attention to sd->balance_interval, yet it will still lead to an increase in balance_interval in case of pinned tasks.
If we're going through several newidle balances (e.g. we have a periodic task), this can lead to a huge increase of the balance_interval in a very small amount of time.
To prevent that, don't increase the balance interval when going through a newidle balance.
This is a similar approach to what is done in commit 58b26c4c0257 ("sched: Increment cache_nice_tries only on periodic lb"), where we disregard newidle balance and rely on periodic balance for more stable results.
--- kernel/sched/fair.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
kernel/sched/fair.c +11 -2
@@ -8819,13 +8819,22 @@ static int load_balance(int this_cpu, struct rq *this_rq, sd->nr_balance_failed =0 ; out_one_pinned: + ld_moved =0 ; + +/* +* idle_balance() disregards balance intervals, so we could repeatedly +* reach this code, which would lead to balance_interval skyrocketting +* in a short amount of time. Skip the balance_interval increase logic +* to avoid that. +*/ +if (env.idle ==CPU_NEWLY_IDLE ) + goto out; +/* tune up the balancing interval */ if (((env.flags &LBF_ALL_PINNED ) && sd->balance_interval <MAX_PINNED_INTERVAL ) || (sd->balance_interval < sd->max_interval)) sd->balance_interval *=2 ; - - ld_moved =0 ; out:return ld_moved; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 186/237 openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a277d516de5f498c91d91189717ef7e01102ad27 ]
When CONFIG_CC_OPTIMIZE_FOR_DEBUGGING is enabled, the compiler fails to optimize out a dead code path, which leads to a link failure:
net/openvswitch/conntrack.o: In function `ovs_ct_set_labels':
conntrack.c:(.text+0x2e60): undefined reference to `nf_connlabels_replace'
In this configuration, we can take a shortcut, and completely remove the contrack label code. This may also help the regular optimization.
--- net/openvswitch/conntrack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/openvswitch/conntrack.c +2 -1
@@ -1199,7 +1199,8 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key, &info->labels.mask);if (err)return err; - }else if (labels_nonzero (&info->labels.mask)) { + }else if (IS_ENABLED (CONFIG_NF_CONNTRACK_LABELS ) && +labels_nonzero (&info->labels.mask)) { err =ovs_ct_set_labels (ct, key, &info->labels.value, &info->labels.mask);if (err)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 187/237 ARM: dts: imx6sx-sdb: Fix enet phy regulator
In reply to Sasha LevinFrom: Leonard Crestez <[email protected]>
[ Upstream commit 1ad9fb750a104f51851c092edd7b3553f0218428 ]
Bindings for "fixed-regulator" only explicitly support "gpio" property, not "gpios". Fix by correcting the property name.
The enet PHYs on imx6sx-sdb needs to be explicitly reset after a power cycle, this can be handled by the phy-reset-gpios property. Sadly this is not handled on suspend: the fec driver turns phy-supply off but doesn't assert phy-reset-gpios again on resume.
Since additional phy-level work is required to support powering off the phy in suspend fix the problem by just marking the regulator as "boot-on" "always-on" so that it's never turned off. This behavior is equivalent to older releases.
Keep the phy-reset-gpios property on fec anyway because it is a correct description of board design.
This issue was exposed by commit efdfeb079cc3 ("regulator: fixed:
Convert to use GPIO descriptor only") which causes the "gpios" property to also be parsed. Before that commit the "gpios" property had no effect, PHY reset was only handled in the the bootloader.
This fixes linux-next boot failures previously reported here:
https://lore.kernel.org/patchwork/patch/982437/#1177900
https://lore.kernel.org/patchwork/patch/994091/#1178304
--- arch/arm/boot/dts/imx6sx-sdb.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6sx-sdb.dtsi +6 -1
@@ -115,7 +115,9 @@ regulator-name = "enet_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; + gpio = <&gpio2 6 GPIO_ACTIVE_LOW>; + regulator-boot-on; + regulator-always-on; }; reg_pcie_gpio: regulator-pcie-gpio {
@@ -178,6 +180,7 @@ phy-supply = <®_enet_3v3>; phy-mode = "rgmii"; phy-handle = <ðphy1>; + phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>; status = "okay"; mdio {
@@ -371,6 +374,8 @@ MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3 0x3081 MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN 0x3081 MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M 0x91 + /* phy reset */ + MX6SX_PAD_ENET2_CRS__GPIO2_IO_7 0x10b0 >; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 188/237 clk: sunxi-ng: enable so-said LDOs for A64 SoC's pll-mipi clock
In reply to Sasha LevinFrom: Icenowy Zheng <[email protected]>
[ Upstream commit 859783d1390035e29ba850963bded2b4ffdf43b5 ]
In the user manual of A64 SoC, the bit 22 and 23 of pll-mipi control register is called "LDO{1,2}_EN", and according to the BSP source code from Allwinner , the LDOs are enabled during the clock's enabling process.
The clock failed to generate output if the two LDOs are not enabled.
Add the two bits to the clock's gate bits, so that the LDOs are enabled when the PLL is enabled.
--- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu-sun50i-a64.c +6 -1
@@ -158,7 +158,12 @@ static SUNXI_CCU_NM_WITH_FRAC_GATE_LOCK(pll_gpu_clk, "pll-gpu",#define SUN50I_A64_PLL_MIPI_REG 0x040static struct ccu_nkm pll_mipi_clk = { - .enable =BIT (31 ), +/* +* The bit 23 and 22 are called "LDO{1,2}_EN" on the SoC's +* user manual, and by experiments the PLL doesn't work without +* these bits toggled. +*/ + .enable =BIT (31 ) |BIT (23 ) |BIT (22 ), .lock =BIT (28 ), .n =_SUNXI_CCU_MULT (8 ,4 ), .k =_SUNXI_CCU_MULT_MIN (4 ,2 ,2 ),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 189/237 soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit fb14ada11d62fb849fc357a25ef8016ba438ba10 ]
When the kernel is built with CONFIG_THUMB2_KERNEL we would set the kernel's resume entry point to be a function that is already built as Thumb-2 code while the boot agent doing the resume is in ARM mode, so this does not work. There is a header label defined: cpu_resume_arm which we can use to do the switching for us.
--- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/bcm/brcmstb/pm/pm-arm.c +1 -1
@@ -404,7 +404,7 @@ noinline int brcmstb_pm_s3_finish(void) {struct brcmstb_s3_params *params = ctrl.s3_params;dma_addr_t params_pa = ctrl.s3_params_pa; -phys_addr_t reentry =virt_to_phys (&cpu_resume); +phys_addr_t reentry =virt_to_phys (&cpu_resume_arm);enum bsp_initiate_command cmd;u32 flags;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 190/237 audit: print empty EXECVE args
In reply to Sasha LevinFrom: Richard Guy Briggs <[email protected]>
[ Upstream commit ea956d8be91edc702a98b7fe1f9463e7ca8c42ab ]
Empty executable arguments were being skipped when printing out the list of arguments in an EXECVE record, making it appear they were somehow lost. Include empty arguments as an itemized empty string.
Reproducer:
autrace /bin/ls "" "/etc" ausearch --start recent -m execve -i | grep EXECVE type=EXECVE msg=audit(10/03/2018 13:04:03.208:1391) : argc=3 a0=/bin/ls a2=/etc
With fix:
type=EXECVE msg=audit(10/03/2018 21:51:38.290:194) : argc=3 a0=/bin/ls a1= a2=/etc type=EXECVE msg=audit(1538617898.290:194): argc=3 a0="/bin/ls" a1="" a2="/etc"
Passes audit-testsuite. GH issue tracker at
https://github.com/linux-audit/audit-kernel/issues/99
--- kernel/auditsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/auditsc.c +1 -1
@@ -1107,7 +1107,7 @@ static void audit_log_execve_info(struct audit_context *context, }/* write as much as we can to the audit log */ -if (len_buf >0 ) { +if (len_buf >=0 ) {/* NOTE: some magic numbers here - basically if we * can't fit a reasonable amount of data into the * existing audit buffer, flush it and start with
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 191/237 sock_diag: fix autoloading of the raw_diag module
In reply to Sasha LevinFrom: Andrei Vagin <[email protected]>
[ Upstream commit c34c1287778b080ed692c0a46a8e345206cc29e6 ]
IPPROTO_RAW isn't registred as an inet protocol, so inet_protos[protocol] is always NULL for it.
--- net/core/sock.c | 1 + 1 file changed, 1 insertion(+)
net/core/sock.c +1 -0
@@ -3347,6 +3347,7 @@ int sock_load_diag_module(int family, int protocol)#ifdef CONFIG_INET if (family ==AF_INET && + protocol !=IPPROTO_RAW && !rcu_access_pointer (inet_protos[protocol]))return -ENOENT ;#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 192/237 net: bpfilter: fix iptables failure if bpfilter_umh is disabled
In reply to Sasha LevinFrom: Taehee Yoo <[email protected]>
[ Upstream commit 97adaddaa6db7a8af81b9b11e30cbe3628cd6700 ]
When iptables command is executed, ip_{set/get}sockopt() try to upload bpfilter.ko if bpfilter is enabled. if it couldn't find bpfilter.ko, command is failed.
bpfilter.ko is generated if CONFIG_BPFILTER_UMH is enabled. ip_{set/get}sockopt() only checks CONFIG_BPFILTER.
So that if CONFIG_BPFILTER is enabled and CONFIG_BPFILTER_UMH is disabled, iptables command is always failed.
test config:
CONFIG_BPFILTER=y
# CONFIG_BPFILTER_UMH is not set
test command:
%iptables -L
iptables: No chain/target/match by that name.
--- net/ipv4/ip_sockglue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv4/ip_sockglue.c +3 -3
@@ -1244,7 +1244,7 @@ int ip_setsockopt(struct sock *sk, int level,return -ENOPROTOOPT ; err =do_ip_setsockopt (sk, level, optname, optval, optlen); -#ifdef CONFIG_BPFILTER +#if IS_ENABLED (CONFIG_BPFILTER_UMH )if (optname >=BPFILTER_IPT_SO_SET_REPLACE && optname <BPFILTER_IPT_SET_MAX ) err =bpfilter_ip_set_sockopt (sk, optname, optval, optlen);
@@ -1557,7 +1557,7 @@ int ip_getsockopt(struct sock *sk, int level,int err; err =do_ip_getsockopt (sk, level, optname, optval, optlen,0 ); -#ifdef CONFIG_BPFILTER +#if IS_ENABLED (CONFIG_BPFILTER_UMH )if (optname >=BPFILTER_IPT_SO_GET_INFO && optname <BPFILTER_IPT_GET_MAX ) err =bpfilter_ip_get_sockopt (sk, optname, optval, optlen);
@@ -1594,7 +1594,7 @@ int compat_ip_getsockopt(struct sock *sk, int level, int optname, err =do_ip_getsockopt (sk, level, optname, optval, optlen,MSG_CMSG_COMPAT ); -#ifdef CONFIG_BPFILTER +#if IS_ENABLED (CONFIG_BPFILTER_UMH )if (optname >=BPFILTER_IPT_SO_GET_INFO && optname <BPFILTER_IPT_GET_MAX ) err =bpfilter_ip_get_sockopt (sk, optname, optval, optlen);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 193/237 nds32: Fix bug in bitfield.h
In reply to Sasha LevinFrom: Nickhu <[email protected]>
[ Upstream commit 9aaafac8cffa1c1edb66e19a63841b7c86be07ca ]
There two bitfield bug for perfomance counter
in bitfield.h:
PFM_CTL_offSEL1 21 --> 16 PFM_CTL_offSEL2 27 --> 22
This commit fix it.
--- arch/nds32/include/asm/bitfield.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/nds32/include/asm/bitfield.h +2 -2
@@ -692,8 +692,8 @@#define PFM_CTL_offKU1 13/* Enable user mode event counting for PFMC1 */ #define PFM_CTL_offKU2 14/* Enable user mode event counting for PFMC2 */ #define PFM_CTL_offSEL0 15/* The event selection for PFMC0 */ -#define PFM_CTL_offSEL1 21/* The event selection for PFMC1 */ -#define PFM_CTL_offSEL2 27/* The event selection for PFMC2 */ +#define PFM_CTL_offSEL1 16/* The event selection for PFMC1 */ +#define PFM_CTL_offSEL2 22/* The event selection for PFMC2 */ /* bit 28:31 reserved */ #define PFM_CTL_mskEN0 ( 0x01 << PFM_CTL_offEN0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 194/237 media: ov13858: Check for possible null pointer
In reply to Sasha LevinFrom: Chiranjeevi Rapolu <[email protected]>
[ Upstream commit 35629182eb8f931b0de6ed38c0efac58e922c801 ]
Check for possible null pointer to avoid crash.
--- drivers/media/i2c/ov13858.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/i2c/ov13858.c +4 -2
@@ -1612,7 +1612,8 @@ static int ov13858_init_controls(struct ov13858 *ov13858)OV13858_NUM_OF_LINK_FREQS -1 ,0 , link_freq_menu_items); - ov13858->link_freq->flags |=V4L2_CTRL_FLAG_READ_ONLY ; +if (ov13858->link_freq) + ov13858->link_freq->flags |=V4L2_CTRL_FLAG_READ_ONLY ; pixel_rate_max =link_freq_to_pixel_rate (link_freq_menu_items[0 ]); pixel_rate_min =link_freq_to_pixel_rate (link_freq_menu_items[1 ]);
@@ -1635,7 +1636,8 @@ static int ov13858_init_controls(struct ov13858 *ov13858) ov13858->hblank =v4l2_ctrl_new_std ( ctrl_hdlr, &ov13858_ctrl_ops,V4L2_CID_HBLANK , hblank, hblank,1 , hblank); - ov13858->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; +if (ov13858->hblank) + ov13858->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; exposure_max = mode->vts_def -8 ; ov13858->exposure = v4l2_ctrl_new_std(
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 195/237 btrfs: avoid link error with CONFIG_NO_AUTO_INLINE
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 7e17916b35797396f681a3270245fd29c1e4c250 ]
Note: this patch fixes a problem in a feature outside of btrfs ("kernel
hacking: add a config option to disable compiler auto-inlining") and is applied ahead of time due to cross-subsystem dependencies.
On 32-bit ARM with gcc-8, I see a link error with the addition of the CONFIG_NO_AUTO_INLINE option:
fs/btrfs/super.o: In function `btrfs_statfs':
super.c:(.text+0x67b8): undefined reference to __aeabi_uldivmod' super.c:(.text+0x67fc): undefined reference to __aeabi_uldivmod' super.c:(.text+0x6858): undefined reference to __aeabi_uldivmod' super.c:(.text+0x6920): undefined reference to __aeabi_uldivmod' super.c:(.text+0x693c): undefined reference to __aeabi_uldivmod' fs/btrfs/super.o:super.c:(.text+0x6958): more undefined references to __aeabi_uldivmod' follow
So far this is the only file that shows the behavior, so I'd propose to just work around it by marking the functions as 'static inline' that normally get inlined here.
The reference to __aeabi_uldivmod comes from a div_u64() which has an optimization for a constant division that uses a straight '/' operator when the result should be known to the compiler. My interpretation is that as we turn off inlining, gcc still expects the result to be constant but fails to use that constant value.
--- fs/btrfs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/super.c +3 -3
@@ -1919,7 +1919,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) }/* Used to sort the devices by max_avail(descending sort) */ -static int btrfs_cmp_device_free_bytes (const void *dev_info1, +static inline int btrfs_cmp_device_free_bytes (const void *dev_info1,const void *dev_info2) { if (((struct btrfs_device_info *)dev_info1)->max_avail >
@@ -1948,8 +1948,8 @@ static inline void btrfs_descending_sort_devices(* The helper to calc the free space on the devices that can be used to store * file data. */ -static int btrfs_calc_avail_data_space (struct btrfs_fs_info *fs_info, -u64 *free_bytes) +static inline int btrfs_calc_avail_data_space (struct btrfs_fs_info *fs_info, +u64 *free_bytes) {struct btrfs_device_info *devices_info;struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 196/237 wil6210: fix debugfs memory access alignment
In reply to Sasha LevinFrom: Ahmad Masri <[email protected]>
[ Upstream commit 84ec040d0fb25197584d28a0dedc355503cd19b9 ]
All wil6210 device memory access should be 4 bytes aligned. In io blob wil6210 did not force alignment for read function, this caused alignment fault on some platforms.
Fixing that by accessing all 4 lower bytes and return to host the requested data.
--- drivers/net/wireless/ath/wil6210/debugfs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/wil6210/debugfs.c +10 -5
@@ -662,10 +662,10 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf,enum { max_count =4096 };struct wil_blob_wrapper *wil_blob = file->private_data;struct wil6210_priv *wil = wil_blob->wil; -loff_t pos = *ppos; +loff_t aligned_pos, pos = *ppos;size_t available = wil_blob->blob.size;void *buf; -size_t ret; +size_t unaligned_bytes, aligned_count, ret;int rc; if (test_bit(wil_status_suspending, wil_blob->wil->status) ||
@@ -683,7 +683,12 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf,if (count > max_count) count = max_count; - buf =kmalloc (count,GFP_KERNEL ); +/* set pos to 4 bytes aligned */ + unaligned_bytes = pos %4 ; + aligned_pos = pos - unaligned_bytes; + aligned_count = count + unaligned_bytes; + + buf =kmalloc (aligned_count,GFP_KERNEL );if (!buf)return -ENOMEM ;
@@ -694,9 +699,9 @@ static ssize_t wil_read_file_ioblob(struct file *file, char __user *user_buf, }wil_memcpy_fromio_32 (buf, (const void __iomem *) - wil_blob->blob.data + pos, count); + wil_blob->blob.data + aligned_pos, aligned_count); - ret =copy_to_user (user_buf, buf, count); + ret =copy_to_user (user_buf, buf + unaligned_bytes, count);wil_pm_runtime_put (wil);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 197/237 wil6210: fix L2 RX status handling
In reply to Sasha LevinFrom: Maya Erez <[email protected]>
[ Upstream commit 04de15010aa42a92add66b159e3ae44b4287390f ]
L2 RX status errors should not be treated as a bitmap and the actual error values should be checked.
Print L2 errors as wil_err_ratelimited for easier debugging when such errors occurs.
--- drivers/net/wireless/ath/wil6210/txrx_edma.c | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/wil6210/txrx_edma.c +12 -11
@@ -808,23 +808,24 @@ static int wil_rx_error_check_edma(struct wil6210_priv *wil,wil_dbg_txrx (wil,"L2 RX error, l2_rx_status=0x%x\n" , l2_rx_status);/* Due to HW issue, KEY error will trigger a MIC error */ -if (l2_rx_status &WIL_RX_EDMA_ERROR_MIC ) { -wil_dbg_txrx (wil, -"L2 MIC/KEY error, dropping packet\n" ); +if (l2_rx_status ==WIL_RX_EDMA_ERROR_MIC ) { +wil_err_ratelimited (wil, +"L2 MIC/KEY error, dropping packet\n" ); stats->rx_mic_error++; } -if (l2_rx_status &WIL_RX_EDMA_ERROR_KEY ) { -wil_dbg_txrx (wil,"L2 KEY error, dropping packet\n" ); +if (l2_rx_status ==WIL_RX_EDMA_ERROR_KEY ) { +wil_err_ratelimited (wil, +"L2 KEY error, dropping packet\n" ); stats->rx_key_error++; } -if (l2_rx_status &WIL_RX_EDMA_ERROR_REPLAY ) { -wil_dbg_txrx (wil, -"L2 REPLAY error, dropping packet\n" ); +if (l2_rx_status ==WIL_RX_EDMA_ERROR_REPLAY ) { +wil_err_ratelimited (wil, +"L2 REPLAY error, dropping packet\n" ); stats->rx_replay++; } -if (l2_rx_status &WIL_RX_EDMA_ERROR_AMSDU ) { -wil_dbg_txrx (wil, -"L2 AMSDU error, dropping packet\n" ); +if (l2_rx_status ==WIL_RX_EDMA_ERROR_AMSDU ) { +wil_err_ratelimited (wil, +"L2 AMSDU error, dropping packet\n" ); stats->rx_amsdu_error++; }return -EFAULT ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 198/237 wil6210: fix RGF_CAF_ICR address for Talyn-MB
In reply to Sasha LevinFrom: Maya Erez <[email protected]>
[ Upstream commit 7c69709f8ed27197b16aa1c3f9b0744402b2fa02 ]
RGF_CAF_ICR register location has changed in Talyn-MB. Add RGF_CAF_ICR_TALYN_MB to support the new address.
--- drivers/net/wireless/ath/wil6210/main.c | 11 +++++++++-- drivers/net/wireless/ath/wil6210/wil6210.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/wil6210/main.c +9 -2
@@ -1396,8 +1396,15 @@ static void wil_pre_fw_config(struct wil6210_priv *wil)wil6210_clear_irq (wil);/* CAF_ICR - clear and mask */ /* it is W1C, clear by writing back same value */ -wil_s (wil,RGF_CAF_ICR + offsetof(struct RGF_ICR , ICR),0 ); -wil_w (wil,RGF_CAF_ICR + offsetof(struct RGF_ICR , IMV), ~0 ); +if (wil->hw_version <HW_VER_TALYN_MB ) { +wil_s (wil,RGF_CAF_ICR + offsetof(struct RGF_ICR , ICR),0 ); +wil_w (wil,RGF_CAF_ICR + offsetof(struct RGF_ICR , IMV), ~0 ); + }else { +wil_s (wil, +RGF_CAF_ICR_TALYN_MB + offsetof(struct RGF_ICR , ICR),0 ); +wil_w (wil,RGF_CAF_ICR_TALYN_MB + + offsetof(struct RGF_ICR , IMV), ~0 ); + }/* clear PAL_UNIT_ICR (potential D0->D3 leftover) * In Talyn-MB host cannot access this register due to * access control, hence PAL_UNIT_ICR is cleared by the FW
drivers/net/wireless/ath/wil6210/wil6210.h +1 -0
@@ -319,6 +319,7 @@ struct RGF_ICR {/* MAC timer, usec, for packet lifetime */ #define RGF_MAC_MTRL_COUNTER_0 (0x886aa8) +#define RGF_CAF_ICR_TALYN_MB (0x8893d4)/* struct RGF_ICR */ #define RGF_CAF_ICR (0x88946c)/* struct RGF_ICR */ #define RGF_CAF_OSC_CONTROL (0x88afa4)#define BIT_CAF_OSC_XTAL_EN BIT(0)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 199/237 wil6210: fix locking in wmi_call
In reply to Sasha LevinFrom: Lior David <[email protected]>
[ Upstream commit dc57731dbd535880fe6ced31c229262c34df7d64 ]
Switch from spin_lock to spin_lock_irqsave, because wmi_ev_lock is used inside interrupt handler.
--- drivers/net/wireless/ath/wil6210/wmi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/wil6210/wmi.c +5 -4
@@ -1639,16 +1639,17 @@ int wmi_call(struct wil6210_priv *wil, u16 cmdid, u8 mid, void *buf, u16 len, {int rc;unsigned long remain; +ulong flags;mutex_lock (&wil->wmi_mutex); -spin_lock (&wil->wmi_ev_lock); +spin_lock_irqsave (&wil->wmi_ev_lock, flags); wil->reply_id = reply_id; wil->reply_mid = mid; wil->reply_buf = reply; wil->reply_size = reply_size;reinit_completion (&wil->wmi_call); -spin_unlock (&wil->wmi_ev_lock); +spin_unlock_irqrestore (&wil->wmi_ev_lock, flags); rc =__wmi_send (wil, cmdid, mid, buf, len);if (rc)
@@ -1668,12 +1669,12 @@ int wmi_call(struct wil6210_priv *wil, u16 cmdid, u8 mid, void *buf, u16 len, } out: -spin_lock (&wil->wmi_ev_lock); +spin_lock_irqsave (&wil->wmi_ev_lock, flags); wil->reply_id =0 ; wil->reply_mid =U8_MAX ; wil->reply_buf =NULL ; wil->reply_size =0 ; -spin_unlock (&wil->wmi_ev_lock); +spin_unlock_irqrestore (&wil->wmi_ev_lock, flags);mutex_unlock (&wil->wmi_mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 200/237 ath10k: snoc: fix unbalanced clock error handling
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit 82e60d920e8ad70cd9a280ab156566755f1fe4aa ]
Similar to regulator error handling, we should only start tearing down the 'i - 1' clock when clock 'i' fails to enable. Otherwise, we might end up with an unbalanced clock, where we never successfully enabled the clock, but we try to disable it anyway.
--- drivers/net/wireless/ath/ath10k/snoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/snoc.c +1 -1
@@ -1190,7 +1190,7 @@ static int ath10k_wcn3990_clk_init(struct ath10k *ar)return 0 ; err_clock_config: -for (; i >=0 ; i--) { +for (i = i -1 ; i >=0 ; i--) { clk_info = &ar_snoc->clk[i];if (!clk_info->handle)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 201/237 wlcore: Fix the return value in case of error in 'wlcore_vendor_cmd_smart_config_start()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3419348a97bcc256238101129d69b600ceb5cc70 ]
We return 0 unconditionally at the end of 'wlcore_vendor_cmd_smart_config_start()'.
However, 'ret' is set to some error codes in several error handling paths and we already return some error codes at the beginning of the function.
Return 'ret' instead to propagate the error code.
--- drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ti/wlcore/vendor_cmd.c +1 -1
@@ -70,7 +70,7 @@ wlcore_vendor_cmd_smart_config_start(struct wiphy *wiphy, out:mutex_unlock (&wl->mutex); -return 0 ; +return ret; } static int
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 202/237 rtl8xxxu: Fix missing break in switch
In reply to Sasha LevinFrom: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit 307b00c5e695857ca92fc6a4b8ab6c48f988a1b1 ]
Add missing break statement in order to prevent the code from falling through to the default case.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -0
@@ -5691,6 +5691,7 @@ static int rtl8xxxu_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,break ;case WLAN_CIPHER_SUITE_TKIP : key->flags |=IEEE80211_KEY_FLAG_GENERATE_MMIC ; +break ;default :return -EOPNOTSUPP ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 203/237 brcmsmac: never log "tid x is not agg'able" by default
In reply to Sasha LevinFrom: Ali MJ Al-Nasrawy <[email protected]>
[ Upstream commit 96fca788e5788b7ea3b0050eb35a343637e0a465 ]
This message greatly spams the log under heavy Tx of frames with BK access class which is especially true when operating as AP. It is also not informative as the "agg'ablity" of TIDs are set once and never change.
Fix this by logging only in debug mode.
--- .../net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +2 -2
@@ -846,8 +846,8 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw, status =brcms_c_aggregatable (wl->wlc, tid);spin_unlock_bh (&wl->lock);if (!status) { -brcms_err (wl->wlc->hw->d11core, -"START: tid %d is not agg\'able\n" , tid); +brcms_dbg_ht (wl->wlc->hw->d11core, +"START: tid %d is not agg\'able\n" , tid);return -EINVAL ; }ieee80211_start_tx_ba_cb_irqsafe (vif, sta->addr, tid);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 204/237 wireless: airo: potential buffer overflow in sprintf()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 3d39e1bb1c88f32820c5f9271f2c8c2fb9a52bac ]
It looks like we wanted to print a maximum of BSSList_rid.ssidLen bytes of the ssid, but we accidentally use "%*s" (width) instead of "%.*s" (precision) so if the ssid doesn't have a NUL terminator this could lead to an overflow.
Static analysis. Not tested.
--- drivers/net/wireless/cisco/airo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/cisco/airo.c +1 -1
@@ -5462,7 +5462,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {we have to add a spin lock... */ rc =readBSSListRid (ai, doLoseSync, &BSSList_rid);while (rc ==0 && BSSList_rid.index !=cpu_to_le16 (0xffff )) { - ptr += sprintf(ptr, "%pM %*s rssi = %d", + ptr += sprintf(ptr, "%pM %.*s rssi = %d", BSSList_rid.bssid, (int)BSSList_rid.ssidLen, BSSList_rid.ssid,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 205/237 rtlwifi: rtl8192de: Fix misleading REG_MCUFWDL information
In reply to Sasha LevinFrom: Shaokun Zhang <[email protected]>
[ Upstream commit 7d129adff3afbd3a449bc3593f2064ac546d58d3 ]
RT_TRACE shows REG_MCUFWDL value as a decimal value with a '0x' prefix, which is somewhat misleading.
Fix it to print hexadecimal, as was intended.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c +1 -1
@@ -173,7 +173,7 @@ static int _rtl92d_fw_init(struct ieee80211_hw *hw) rtl_read_byte(rtlpriv, FW_MAC1_READY)); }RT_TRACE (rtlpriv,COMP_FW ,DBG_DMESG , -"Polling FW ready fail!! REG_MCUFWDL:0x%08ul\n" , +"Polling FW ready fail!! REG_MCUFWDL:0x%08x\n" ,rtl_read_dword (rtlpriv,REG_MCUFWDL ));return -1 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 206/237 net: dsa: bcm_sf2: Turn on PHY to allow successful registration
In reply to Sasha LevinFrom: Florian Fainelli <[email protected]>
[ Upstream commit c04a17d2a9ccf1eaba1c5a56f83e997540a70556 ]
We are binding to the PHY using the SF2 slave MDIO bus that we create, binding involves reading the PHY's MII_PHYSID1/2 which won't be possible if the PHY is turned off. Temporarily turn it on/off for the bus probing to succeeed. This fixes unbind/bind problems where the port connecting to that PHY would be in error since it could not connect to it.
--- drivers/net/dsa/bcm_sf2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dsa/bcm_sf2.c +4 -0
@@ -1099,12 +1099,16 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)return ret; } +bcm_sf2_gphy_enable_set (priv->dev->ds, true); + ret =bcm_sf2_mdio_register (ds);if (ret) {pr_err ("failed to register MDIO bus\n" );return ret; } +bcm_sf2_gphy_enable_set (priv->dev->ds, false); + ret =bcm_sf2_cfp_rst (priv);if (ret) {pr_err ("failed to reset CFP\n" );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 207/237 scsi: mpt3sas: Fix Sync cache command failure during driver unload
In reply to Sasha LevinFrom: Suganath Prabu <[email protected]>
[ Upstream commit 9029a72500b95578a35877a43473b82cb0386c53 ]
This is to fix SYNC CACHE and START STOP command failures with DID_NO_CONNECT during driver unload.
In driver's IO submission patch (i.e. in driver's .queuecommand()) driver won't allow any SCSI commands to the IOC when ioc->remove_host flag is set and hence SYNC CACHE commands which are issued to the target drives (where write cache is enabled) during driver unload time is failed with DID_NO_CONNECT status.
Now modified the driver to allow SYNC CACHE and START STOP commands to IOC, even when remove_host flag is set.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 36 +++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +35 -1
@@ -3791,6 +3791,40 @@ _scsih_tm_tr_complete(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,return _scsih_check_for_pending_tm (ioc, smid); } +/** _scsih_allow_scmd_to_device - check whether scmd needs to +* issue to IOC or not. +* @ioc: per adapter object +* @scmd: pointer to scsi command object +* +* Returns true if scmd can be issued to IOC otherwise returns false. +*/ +inline bool _scsih_allow_scmd_to_device (struct MPT3SAS_ADAPTER *ioc, +struct scsi_cmnd *scmd) +{ + +if (ioc->pci_error_recovery) +return false; + +if (ioc->hba_mpi_version_belonged ==MPI2_VERSION ) { +if (ioc->remove_host) +return false; + +return true; + } + +if (ioc->remove_host) { + +switch (scmd->cmnd[0 ]) { +case SYNCHRONIZE_CACHE : +case START_STOP : +return true; +default : +return false; + } + } + +return true; +}/** * _scsih_sas_control_complete - completion routine
@@ -4623,7 +4657,7 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)return 0 ; } -if (ioc->pci_error_recovery || ioc->remove_host) { +if (!(_scsih_allow_scmd_to_device (ioc, scmd))) { scmd->result =DID_NO_CONNECT <<16 ; scmd->scsi_done (scmd);return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 208/237 scsi: mpt3sas: Don't modify EEDPTagMode field setting on SAS3.5 HBA devices
In reply to Sasha LevinFrom: Suganath Prabu <[email protected]>
[ Upstream commit 6cd1bc7b9b5075d395ba0120923903873fc7ea0e ]
If EEDPTagMode field in manufacturing page11 is set then unset it. This is needed to fix a hardware bug only in SAS3/SAS2 cards. So, skipping EEDPTagMode changes in Manufacturing page11 for SAS 3.5 controllers.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +1 -1
@@ -4117,7 +4117,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc)* flag unset in NVDATA. */ mpt3sas_config_get_manufacturing_pg11 (ioc, &mpi_reply, &ioc->manu_pg11); -if (ioc->manu_pg11.EEDPTagMode ==0 ) { +if (!ioc->is_gen35_ioc && ioc->manu_pg11.EEDPTagMode ==0 ) {pr_err ("%s: overriding NVDATA EEDPTagMode setting\n" , ioc->name); ioc->manu_pg11.EEDPTagMode &= ~0x3 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 209/237 scsi: mpt3sas: Fix driver modifying persistent data in Manufacturing page11
In reply to Sasha LevinFrom: Suganath Prabu <[email protected]>
[ Upstream commit 97f35194093362a63b33caba2485521ddabe2c95 ]
Currently driver is modifying both current & NVRAM/persistent data in Manufacturing page11. Driver should change only current copy of Manufacturing page11. It should not modify the persistent data.
So removed the section of code where driver is modifying the persistent data of Manufacturing page11.
--- drivers/scsi/mpt3sas/mpt3sas_config.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_config.c +0 -4
@@ -692,10 +692,6 @@ mpt3sas_config_set_manufacturing_pg11(struct MPT3SAS_ADAPTER *ioc, r =_config_request (ioc, &mpi_request, mpi_reply,MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT , config_page,sizeof (*config_page)); - mpi_request.Action =MPI2_CONFIG_ACTION_PAGE_WRITE_NVRAM ; - r =_config_request (ioc, &mpi_request, mpi_reply, -MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT , config_page, -sizeof (*config_page)); out:return r; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 210/237 scsi: megaraid_sas: Fix msleep granularity
In reply to Sasha LevinFrom: Shivasharan S <[email protected]>
[ Upstream commit 9155cf30a3c4ef97e225d6daddf9bd4b173267e8 ]
In megasas_transition_to_ready() driver waits 180seconds for controller to change FW state. Here we are calling msleep(1) in a loop for this. As explained in timers-howto.txt, msleep(1) will actually sleep longer than 1ms. If a faulty controller is connected, we will end up waiting for much more than 180 seconds causing unnecessary delays during load.
Change the granularity of msleep() call from 1ms to 1000ms.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +2 -2
@@ -3894,12 +3894,12 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr)/* * The cur_state should not last for more than max_wait secs */ -for (i =0 ; i < (max_wait *1000 ); i++) { +for (i =0 ; i < max_wait; i++) { curr_abs_state = instance->instancet->read_fw_status_reg (instance->reg_set);if (abs_state == curr_abs_state) { -msleep (1 ); +msleep (1000 ); }else break ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 211/237 scsi: megaraid_sas: Fix goto labels in error handling
In reply to Sasha LevinFrom: Shivasharan S <[email protected]>
[ Upstream commit 8a25fa17b6ed6e6c8101e9c68a10ae68a9025f2c ]
During init, if pci_alloc_irq_vectors() fails, the driver has not yet setup the IRQs. Fix the goto labels and error handling for this case.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/megaraid/megaraid_sas_base.c +2 -3
@@ -5410,7 +5410,7 @@ static int megasas_init_fw(struct megasas_instance *instance)if (!instance->msix_vectors) { i =pci_alloc_irq_vectors (instance->pdev,1 ,1 ,PCI_IRQ_LEGACY );if (i <0 ) - goto fail_setup_irqs; + goto fail_init_adapter; }megasas_setup_reply_map (instance);
@@ -5619,9 +5619,8 @@ static int megasas_init_fw(struct megasas_instance *instance) fail_get_ld_pd_list: instance->instancet->disable_intr (instance); -fail_init_adapter:megasas_destroy_irqs (instance); -fail_setup_irqs: +fail_init_adapter:if (instance->msix_vectors)pci_free_irq_vectors (instance->pdev); instance->msix_vectors =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 212/237 scsi: lpfc: fcoe: Fix link down issue after 1000+ link bounces
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit 036cad1f1ac9ce03e2db94b8460f98eaf1e1ee4c ]
On FCoE adapters, when running link bounce test in a loop, initiator failed to login with switch switch and required driver reload to recover. Switch reached a point where all subsequent FLOGIs would be LS_RJT'd. Further testing showed the condition to be related to not performing FCF discovery between FLOGI's.
Fix by monitoring FLOGI failures and once a repeated error is seen repeat FCF discovery.
--- drivers/scsi/lpfc/lpfc_els.c | 2 ++ drivers/scsi/lpfc/lpfc_hbadisc.c | 20 ++++++++++++++++++++ drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 11 ++--------- drivers/scsi/lpfc/lpfc_sli4.h | 1 + 5 files changed, 26 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +2 -0
@@ -1157,6 +1157,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->fcf.fcf_flag &= ~FCF_DISCOVERY ; phba->hba_flag &= ~(FCF_RR_INPROG |HBA_DEVLOSS_TMO );spin_unlock_irq (&phba->hbalock); + phba->fcf.fcf_redisc_attempted =0 ;/* reset */ goto out; }if (!rc) {
@@ -1171,6 +1172,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->fcf.fcf_flag &= ~FCF_DISCOVERY ; phba->hba_flag &= ~(FCF_RR_INPROG |HBA_DEVLOSS_TMO );spin_unlock_irq (&phba->hbalock); + phba->fcf.fcf_redisc_attempted =0 ;/* reset */ goto out; } }
drivers/scsi/lpfc/lpfc_hbadisc.c +20 -0
@@ -1997,6 +1997,26 @@ int lpfc_sli4_fcf_rr_next_proc(struct lpfc_vport *vport, uint16_t fcf_index)"failover and change port state:x%x/x%x\n" , phba->pport->port_state, LPFC_VPORT_UNKNOWN); phba->pport->port_state =LPFC_VPORT_UNKNOWN ; + +if (!phba->fcf.fcf_redisc_attempted) { +lpfc_unregister_fcf (phba); + + rc =lpfc_sli4_redisc_fcf_table (phba); +if (!rc) { +lpfc_printf_log (phba,KERN_INFO ,LOG_FIP , +"3195 Rediscover FCF table\n" ); + phba->fcf.fcf_redisc_attempted =1 ; +lpfc_sli4_clear_fcf_rr_bmask (phba); + }else { +lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP , +"3196 Rediscover FCF table " +"failed. Status:x%x\n" , rc); + } + }else { +lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP , +"3197 Already rediscover FCF table " +"attempted. No more retry\n" ); + } goto stop_flogi_current_fcf; }else { lpfc_printf_log(phba, KERN_INFO, LOG_FIP | LOG_ELS,
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -5044,7 +5044,7 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,break ; }/* If fast FCF failover rescan event is pending, do nothing */ -if (phba->fcf.fcf_flag &FCF_REDISC_EVT ) { +if (phba->fcf.fcf_flag & (FCF_REDISC_EVT |FCF_REDISC_PEND )) {spin_unlock_irq (&phba->hbalock);break ; }
drivers/scsi/lpfc/lpfc_sli.c +2 -9
@@ -18435,15 +18435,8 @@ lpfc_sli4_fcf_rr_next_index_get(struct lpfc_hba *phba) goto initial_priority;lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP ,"2844 No roundrobin failover FCF available\n" ); -if (next_fcf_index >=LPFC_SLI4_FCF_TBL_INDX_MAX ) -return LPFC_FCOE_FCF_NEXT_NONE ; -else { -lpfc_printf_log (phba,KERN_WARNING ,LOG_FIP , -"3063 Only FCF available idx %d, flag %x\n" , - next_fcf_index, - phba->fcf.fcf_pri[next_fcf_index].fcf_rec.flag); -return next_fcf_index; - } + +return LPFC_FCOE_FCF_NEXT_NONE ; } if (next_fcf_index < LPFC_SLI4_FCF_TBL_INDX_MAX &&
drivers/scsi/lpfc/lpfc_sli4.h +1 -0
@@ -279,6 +279,7 @@ struct lpfc_fcf {#define FCF_REDISC_EVT 0x100/* FCF rediscovery event to worker thread */ #define FCF_REDISC_FOV 0x200/* Post FCF rediscovery fast failover */ #define FCF_REDISC_PROG (FCF_REDISC_PEND | FCF_REDISC_EVT) +uint16_t fcf_redisc_attempted;uint32_t addr_mode;uint32_t eligible_fcf_cnt;struct lpfc_fcf_rec current_rec;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 213/237 scsi: lpfc: Fix odd recovery in duplicate FLOGIs in point-to-point
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit d496b9a7246cb9813da1fe49e14edbbbf8e232d5 ]
Testing a point-to-point topology and a case of re-FLOGI without intervening link bouncing, showed an odd interaction with firmware and a resulting scenario where the driver no longer probed after accepting the new FLOGI.
Work around the firmware issue by issuing a link bounce if a FLOGI is received after the link is already up and FLOGI's accepted.
While debugging the issue, realized that some debug traces should be clarified to help in the future.
--- drivers/scsi/lpfc/lpfc.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 66 ++++++++++++++++++++++++++------ drivers/scsi/lpfc/lpfc_hbadisc.c | 9 +++++ 3 files changed, 64 insertions(+), 12 deletions(-)
drivers/scsi/lpfc/lpfc.h +1 -0
@@ -490,6 +490,7 @@ struct lpfc_vport {struct nvme_fc_local_port *localport;uint8_t nvmei_support;/* driver supports NVME Initiator */ uint32_t last_fcp_wqidx; +uint32_t rcv_flogi_cnt;/* How many unsol FLOGIs ACK'd. */ };struct hbq_s {
drivers/scsi/lpfc/lpfc_els.c +54 -12
116 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hbadisc.c +9 -0
@@ -952,6 +952,7 @@ lpfc_linkdown(struct lpfc_hba *phba) }spin_lock_irq (shost->host_lock); phba->pport->fc_flag &= ~(FC_PT2PT |FC_PT2PT_PLOGI ); + phba->pport->rcv_flogi_cnt =0 ;spin_unlock_irq (shost->host_lock); }return 0 ;
@@ -1023,6 +1024,7 @@ lpfc_linkup(struct lpfc_hba *phba) {struct lpfc_vport **vports;int i; +struct Scsi_Host *shost =lpfc_shost_from_vport (phba->pport); phba->link_state =LPFC_LINK_UP ;
@@ -1036,6 +1038,13 @@ lpfc_linkup(struct lpfc_hba *phba)lpfc_linkup_port (vports[i]);lpfc_destroy_vport_work_array (phba, vports); +/* Clear the pport flogi counter in case the link down was +* absorbed without an ACQE. No lock here - in worker thread +* and discovery is synchronized. +*/ +spin_lock_irq (shost->host_lock); + phba->pport->rcv_flogi_cnt =0 ; +spin_unlock_irq (shost->host_lock);return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 214/237 scsi: lpfc: Correct loss of fc4 type on remote port address change
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit d83ca3ea833d7a66d49225e4191c4e37cab8f079 ]
An address change for a remote port cause PRLI for the wrong protocol to be sent. The node copy done in the discovery code skipped copying the fc4 protocols supported as well.
Fix the copy logic for the address change. Beefed up log messages in this area as well.
--- drivers/scsi/lpfc/lpfc_els.c | 27 +++++++++++++++++++++++---- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++-- 2 files changed, 26 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +23 -4
@@ -1556,8 +1556,10 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,*/ new_ndlp =lpfc_findnode_wwpn (vport, &sp->portName); +/* return immediately if the WWPN matches ndlp */ if (new_ndlp == ndlp &&NLP_CHK_NODE_ACT (new_ndlp))return ndlp; +if (phba->sli_rev ==LPFC_SLI_REV4 ) { active_rrqs_xri_bitmap =mempool_alloc (phba->active_rrq_pool,GFP_KERNEL );
@@ -1566,9 +1568,13 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp, phba->cfg_rrq_xri_bitmap_sz); } -lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS , -"3178 PLOGI confirm: ndlp %p x%x: new_ndlp %p\n" , - ndlp, ndlp->nlp_DID, new_ndlp); +lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS |LOG_NODE , +"3178 PLOGI confirm: ndlp x%x x%x x%x: " +"new_ndlp x%x x%x x%x\n" , + ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_fc4_type, + (new_ndlp ? new_ndlp->nlp_DID :0 ), + (new_ndlp ? new_ndlp->nlp_flag :0 ), + (new_ndlp ? new_ndlp->nlp_fc4_type :0 ));if (!new_ndlp) { rc = memcmp(&ndlp->nlp_portname, name,
@@ -1617,6 +1623,14 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp, phba->cfg_rrq_xri_bitmap_sz); } +/* At this point in this routine, we know new_ndlp will be +* returned. however, any previous GID_FTs that were done +* would have updated nlp_fc4_type in ndlp, so we must ensure +* new_ndlp has the right value. +*/ +if (vport->fc_flag &FC_FABRIC ) + new_ndlp->nlp_fc4_type = ndlp->nlp_fc4_type; +lpfc_unreg_rpi (vport, new_ndlp); new_ndlp->nlp_DID = ndlp->nlp_DID; new_ndlp->nlp_prev_state = ndlp->nlp_prev_state;
@@ -1666,7 +1680,6 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,if (ndlp->nrport) { ndlp->nrport =NULL ;lpfc_nlp_put (ndlp); - new_ndlp->nlp_fc4_type = ndlp->nlp_fc4_type; }/* We shall actually free the ndlp with both nlp_DID and
@@ -1740,6 +1753,12 @@ lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp, active_rrqs_xri_bitmap) mempool_free(active_rrqs_xri_bitmap, phba->active_rrq_pool); + +lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS |LOG_NODE , +"3173 PLOGI confirm exit: new_ndlp x%x x%x x%x\n" , + new_ndlp->nlp_DID, new_ndlp->nlp_flag, + new_ndlp->nlp_fc4_type); +return new_ndlp; }
drivers/scsi/lpfc/lpfc_nportdisc.c +3 -2
@@ -2865,8 +2865,9 @@ lpfc_disc_state_machine(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,/* DSM in event <evt> on NPort <nlp_DID> in state <cur_state> */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_DISCOVERY ,"0211 DSM in event x%x on NPort x%x in " -"state %d Data: x%x\n" , - evt, ndlp->nlp_DID, cur_state, ndlp->nlp_flag); +"state %d Data: x%x x%x\n" , + evt, ndlp->nlp_DID, cur_state, + ndlp->nlp_flag, ndlp->nlp_fc4_type); lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM, "DSM in: evt:%d ste:%d did:x%x",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 215/237 usb: typec: tcpm: charge current handling for sink during hard reset
In reply to Sasha LevinFrom: Badhri Jagan Sridharan <[email protected]>
[ Upstream commit 157c0f2f641a9938382b092c64548ebdabfe25e0 ]
During the initial connect to a non-pd port, sink would hard reset twice before deeming that the port partner is non-pd. TCPM sets the the charge path to false during the hard reset. This causes unnecessary connects/disconnects of charge path and makes port take longer to charge from the non-pd ports. Avoid this by not setting the charge path to false unless the partner has already identified to be pd capable.
When partner is a pd port, set the charge path to false in SNK_HARD_RESET_SINK_OFF. Set the current limits to default value based of CC pull up and resume the charge path when port enters SNK_HARD_RESET_SINK_ON.
--------
Changes in V3:
Rebase on top of usb-next
Changes in V2:
Based on feedback of [email protected]
- vsafe_5v_hard_reset flag from tcpc_config is removed
- Patch only differentiates between pd port partner and non-pd port partner
V1 version of the patch is here:
https://lkml.org/lkml/2018/9/14/11
--- drivers/usb/typec/tcpm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/usb/typec/tcpm.c +8 -1
@@ -3322,7 +3322,8 @@ static void run_state_machine(struct tcpm_port *port)case SNK_HARD_RESET_SINK_OFF :memset (&port->pps_data,0 ,sizeof (port->pps_data));tcpm_set_vconn (port, false); -tcpm_set_charge (port, false); +if (port->pd_capable) +tcpm_set_charge (port, false);tcpm_set_roles (port, port->self_powered,TYPEC_SINK ,TYPEC_DEVICE );/*
@@ -3354,6 +3355,12 @@ static void run_state_machine(struct tcpm_port *port)* Similar, dual-mode ports in source mode should transition * to PE_SNK_Transition_to_default. */ +if (port->pd_capable) { +tcpm_set_current_limit (port, +tcpm_get_current_limit (port), +5000 ); +tcpm_set_charge (port, true); + }tcpm_set_attached_state (port, true);tcpm_set_state (port,SNK_STARTUP ,0 );break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 216/237 dlm: fix invalid free
In reply to Sasha LevinFrom: Tycho Andersen <[email protected]>
[ Upstream commit d968b4e240cfe39d39d80483bac8bca8716fd93c ]
dlm_config_nodes() does not allocate nodes on failure, so we should not free() nodes when it fails.
--- fs/dlm/member.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/dlm/member.c +3 -2
@@ -680,7 +680,7 @@ int dlm_ls_start(struct dlm_ls *ls) error =dlm_config_nodes (ls->ls_name, &nodes, &count);if (error <0 ) - goto fail; + goto fail_rv;spin_lock (&ls->ls_recover_lock);
@@ -712,8 +712,9 @@ int dlm_ls_start(struct dlm_ls *ls)return 0 ; fail: -kfree (rv);kfree (nodes); + fail_rv: +kfree (rv);return error; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 217/237 dlm: don't leak kernel pointer to userspace
In reply to Sasha LevinFrom: Tycho Andersen <[email protected]>
[ Upstream commit 9de30f3f7f4d31037cfbb7c787e1089c1944b3a7 ]
In copy_result_to_user(), we first create a struct dlm_lock_result, which contains a struct dlm_lksb, the last member of which is a pointer to the lvb. Unfortunately, we copy the entire struct dlm_lksb to the result struct, which is then copied to userspace at the end of the function, leaking the contents of sb_lvbptr, which is a valid kernel pointer in some cases (indeed, later in the same function the data it points to is copied to userspace).
It is an error to leak kernel pointers to userspace, as it undermines KASLR protections (see e.g. 65eea8edc31 ("floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl") for another example of this).
--- fs/dlm/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/dlm/user.c +1 -1
@@ -702,7 +702,7 @@ static int copy_result_to_user(struct dlm_user_args *ua, int compat, result.version[0 ] =DLM_DEVICE_VERSION_MAJOR ; result.version[1 ] =DLM_DEVICE_VERSION_MINOR ; result.version[2 ] =DLM_DEVICE_VERSION_PATCH ; -memcpy (&result.lksb, &ua->lksb,sizeof (struct dlm_lksb )); +memcpy (&result.lksb, &ua->lksb, offsetof(struct dlm_lksb , sb_lvbptr)); result.user_lksb = ua->user_lksb;/* FIXME: dlm1 provides for the user's bastparam/addr to not be updated
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 218/237 vrf: mark skb for multicast or link-local as enslaved to VRF
In reply to Sasha LevinFrom: Mike Manning <[email protected]>
[ Upstream commit 6f12fa775530195a501fb090d092c637f32d0cc5 ]
The skb for packets that are multicast or to a link-local address are not marked as being enslaved to a VRF, if they are received on a socket bound to the VRF. This is needed for ND and it is preferable for the kernel not to have to deal with the additional use-cases if ll or mcast packets are handled as enslaved. However, this does not allow service instances listening on unbound and bound to VRF sockets to distinguish the VRF used, if packets are sent as multicast or to a link-local address. The fix is for the VRF driver to also mark these skb as being enslaved to the VRF.
--- drivers/net/vrf.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/net/vrf.c +9 -10
@@ -993,24 +993,23 @@ static struct sk_buff *vrf_ip6_rcv(struct net_device *vrf_dev, struct sk_buff *skb) {int orig_iif = skb->skb_iif; -bool need_strict; +bool need_strict =rt6_need_strict (&ipv6_hdr (skb)->daddr); +bool is_ndisc =ipv6_ndisc_frame (skb); -/* loopback traffic; do not push through packet taps again. -* Reset pkt_type for upper layers to process skb +/* loopback, multicast & non-ND link-local traffic; do not push through +* packet taps again. Reset pkt_type for upper layers to process skb */ -if (skb->pkt_type ==PACKET_LOOPBACK ) { +if (skb->pkt_type ==PACKET_LOOPBACK || (need_strict && !is_ndisc)) { skb->dev = vrf_dev; skb->skb_iif = vrf_dev->ifindex;IP6CB (skb)->flags |=IP6SKB_L3SLAVE ; - skb->pkt_type =PACKET_HOST ; +if (skb->pkt_type ==PACKET_LOOPBACK ) + skb->pkt_type =PACKET_HOST ; goto out; } -/* if packet is NDISC or addressed to multicast or link-local -* then keep the ingress interface -*/ - need_strict =rt6_need_strict (&ipv6_hdr (skb)->daddr); -if (!ipv6_ndisc_frame (skb) && !need_strict) { +/* if packet is NDISC then keep the ingress interface */ +if (!is_ndisc) {vrf_rx_stats (vrf_dev, skb->len); skb->dev = vrf_dev; skb->skb_iif = vrf_dev->ifindex;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 219/237 clk: tegra20: Turn EMC clock gate into divider
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 514fddba845ed3a1b17e01e99cb3a2a52256a88a ]
Kernel should never gate the EMC clock as it causes immediate lockup, so removing clk-gate functionality doesn't affect anything. Turning EMC clk gate into divider allows to implement glitch-less EMC scaling, avoiding reparenting to a backup clock.
--- drivers/clk/tegra/clk-tegra20.c | 36 ++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 10 deletions(-)
drivers/clk/tegra/clk-tegra20.c +26 -10
@@ -578,7 +578,6 @@ static struct tegra_clk tegra20_clks[tegra_clk_max] __initdata = { [tegra_clk_afi] = { .dt_id = TEGRA20_CLK_AFI, .present = true }, [tegra_clk_fuse] = { .dt_id = TEGRA20_CLK_FUSE, .present = true }, [tegra_clk_kfuse] = { .dt_id = TEGRA20_CLK_KFUSE, .present = true }, - [tegra_clk_emc] = { .dt_id = TEGRA20_CLK_EMC, .present = true }, };static unsigned long tegra20_clk_measure_input_freq (void )
@@ -799,6 +798,31 @@ static struct tegra_periph_init_data tegra_periph_nodiv_clk_list[] = { TEGRA_INIT_DATA_NODIV("disp2", mux_pllpdc_clkm, CLK_SOURCE_DISP2, 30, 2, 26, 0, TEGRA20_CLK_DISP2), }; +static void __init tegra20_emc_clk_init (void ) +{ +struct clk *clk; + + clk =clk_register_mux (NULL ,"emc_mux" , mux_pllmcp_clkm, +ARRAY_SIZE (mux_pllmcp_clkm), +CLK_SET_RATE_NO_REPARENT , + clk_base +CLK_SOURCE_EMC , +30 ,2 ,0 , &emc_lock); + + clk =tegra_clk_register_mc ("mc" ,"emc_mux" , clk_base +CLK_SOURCE_EMC , + &emc_lock); + clks[TEGRA20_CLK_MC ] = clk; + +/* +* Note that 'emc_mux' source and 'emc' rate shouldn't be changed at +* the same time due to a HW bug, this won't happen because we're +* defining 'emc_mux' and 'emc' as distinct clocks. +*/ + clk =tegra_clk_register_divider ("emc" ,"emc_mux" , + clk_base +CLK_SOURCE_EMC ,CLK_IS_CRITICAL , +TEGRA_DIVIDER_INT ,0 ,8 ,1 , &emc_lock); + clks[TEGRA20_CLK_EMC ] = clk; +} +static void __init tegra20_periph_clk_init (void ) {struct tegra_periph_init_data *data;
@@ -812,15 +836,7 @@ static void __init tegra20_periph_clk_init(void) clks[TEGRA20_CLK_AC97 ] = clk;/* emc */ - clk =clk_register_mux (NULL ,"emc_mux" , mux_pllmcp_clkm, -ARRAY_SIZE (mux_pllmcp_clkm), -CLK_SET_RATE_NO_REPARENT , - clk_base +CLK_SOURCE_EMC , -30 ,2 ,0 , &emc_lock); - - clk =tegra_clk_register_mc ("mc" ,"emc_mux" , clk_base +CLK_SOURCE_EMC , - &emc_lock); - clks[TEGRA20_CLK_MC ] = clk; +tegra20_emc_clk_init ();/* dsi */ clk = tegra_clk_register_periph_gate("dsi", "pll_d", 0, clk_base, 0,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 220/237 ACPICA: Use %d for signed int print formatting instead of %u
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit f8ddf49b420112e28bdd23d7ad52d7991a0ccbe3 ]
Fix warnings found using static analysis with cppcheck, use %d printf format specifier for signed ints rather than %u
--- tools/power/acpi/tools/acpidump/apmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/power/acpi/tools/acpidump/apmain.c +1 -1
@@ -106,7 +106,7 @@ static int ap_insert_action(char *argument, u32 to_be_done) current_action++;if (current_action >AP_MAX_ACTIONS ) { -fprintf (stderr,"Too many table options (max %u)\n" , +fprintf (stderr,"Too many table options (max %d)\n" ,AP_MAX_ACTIONS );return (-1 ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 221/237 net: bcmgenet: return correct value 'ret' from bcmgenet_power_down
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 0db55093b56618088b9a1d445eb6e43b311bea33 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/broadcom/genet/bcmgenet.c: In function 'bcmgenet_power_down':drivers/net/ethernet/broadcom/genet/bcmgenet.c:1136:6: warning:
variable 'ret' set but not used [-Wunused-but-set-variable]
bcmgenet_power_down should return 'ret' instead of 0.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
@@ -1169,7 +1169,7 @@ static int bcmgenet_power_down(struct bcmgenet_priv *priv,break ; } -return 0 ; +return ret; } static void bcmgenet_power_up(struct bcmgenet_priv *priv,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 222/237 sock: Reset dst when changing sk_mark via setsockopt
In reply to Sasha LevinFrom: David Barmann <[email protected]>
[ Upstream commit 50254256f382c56bde87d970f3d0d02fdb76ec70 ]
When setting the SO_MARK socket option, if the mark changes, the dst needs to be reset so that a new route lookup is performed.
This fixes the case where an application wants to change routing by setting a new sk_mark. If this is done after some packets have already been sent, the dst is cached and has no effect.
--- net/core/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/core/sock.c +4 -2
@@ -951,10 +951,12 @@ int sock_setsockopt(struct socket *sock, int level, int optname,clear_bit (SOCK_PASSSEC , &sock->flags);break ;case SO_MARK : -if (!ns_capable (sock_net (sk)->user_ns,CAP_NET_ADMIN )) +if (!ns_capable (sock_net (sk)->user_ns,CAP_NET_ADMIN )) { ret = -EPERM ; -else + }else if (val != sk->sk_mark) { sk->sk_mark = val; +sk_dst_reset (sk); + }break ;case SO_RXQ_OVFL :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 223/237 of: unittest: allow base devicetree to have symbol metadata
In reply to Sasha LevinFrom: Frank Rowand <[email protected]>
[ Upstream commit 5babefb7f7ab1f23861336d511cc666fa45ede82 ]
The overlay metadata nodes in the FDT created from testcases.dts are not handled properly.
The __fixups__ and __local_fixups__ node were added to the live devicetree, but should not be.
Only the first property in the /__symbols__ node was added to the live devicetree if the live devicetree already contained a /__symbols node. All of the node's properties must be added.
--- drivers/of/unittest.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-)
drivers/of/unittest.c +35 -8
@@ -1067,20 +1067,44 @@ static void __init of_unittest_platform_populate(void)* of np into dup node (present in live tree) and * updates parent of children of np to dup. * -* @np: node already present in live tree +* @np: node whose properties are being added to the live tree * @dup: node present in live tree to be updated */ static void update_node_properties (struct device_node *np,struct device_node *dup) {struct property *prop; +struct property *save_next;struct device_node *child; - -for_each_property_of_node (np, prop) -of_add_property (dup, prop); +int ret;for_each_child_of_node (np, child) child->parent = dup; + +/* +* "unittest internal error: unable to add testdata property" +* +* If this message reports a property in node '/__symbols__' then +* the respective unittest overlay contains a label that has the +* same name as a label in the live devicetree. The label will +* be in the live devicetree only if the devicetree source was +* compiled with the '-@' option. If you encounter this error, +* please consider renaming __all__ of the labels in the unittest +* overlay dts files with an odd prefix that is unlikely to be +* used in a real devicetree. +*/ + +/* +* open code for_each_property_of_node() because of_add_property() +* sets prop->next to NULL +*/ +for (prop = np->properties; prop !=NULL ; prop = save_next) { + save_next = prop->next; + ret =of_add_property (dup, prop); +if (ret) +pr_err ("unittest internal error: unable to add testdata property %pOF/%s" , + np, prop->name); + } }/**
@@ -1089,18 +1113,23 @@ static void update_node_properties(struct device_node *np,* * @np: Node to attach to live tree */ -static int attach_node_and_children (struct device_node *np) +static void attach_node_and_children (struct device_node *np) {struct device_node *next, *dup, *child;unsigned long flags;const char *full_name; full_name =kasprintf (GFP_KERNEL ,"%pOF" , np); + +if (!strcmp (full_name,"/__local_fixups__" ) || + !strcmp (full_name,"/__fixups__" )) +return ; + dup =of_find_node_by_path (full_name);kfree (full_name);if (dup) {update_node_properties (np, dup); -return 0 ; +return ; } child = np->child;
@@ -1121,8 +1150,6 @@ static int attach_node_and_children(struct device_node *np)attach_node_and_children (child); child = next; } - -return 0 ; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 224/237 of: unittest: initialize args before calling of_*parse_*()
In reply to Sasha LevinFrom: Frank Rowand <[email protected]>
[ Upstream commit eeb07c573ec307c53fe2f6ac6d8d11c261f64006 ]
Callers of of_irq_parse_one() blindly use the pointer args.np without checking whether of_irq_parse_one() had an error and thus did not set the value of args.np. Initialize args to zero so that using the format "%pOF" to show the value of args.np will show "(null)" when of_irq_parse_one() has an error. This prevents the dereference of a random value.
Make the same fix for callers of of_parse_phandle_with_args() and of_parse_phandle_with_args_map().
--- drivers/of/unittest.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/of/unittest.c +13 -2
@@ -375,6 +375,7 @@ static void __init of_unittest_parse_phandle_with_args(void)for (i =0 ; i <8 ; i++) {bool passed = true; +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args (np,"phandle-list" ,"#phandle-cells" , i, &args);
@@ -428,6 +429,7 @@ static void __init of_unittest_parse_phandle_with_args(void) }/* Check for missing list property */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args (np,"phandle-list-missing" ,"#phandle-cells" ,0 , &args);unittest (rc == -ENOENT ,"expected:%i got:%i\n" , -ENOENT , rc);
@@ -436,6 +438,7 @@ static void __init of_unittest_parse_phandle_with_args(void)unittest (rc == -ENOENT ,"expected:%i got:%i\n" , -ENOENT , rc);/* Check for missing cells property */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args (np,"phandle-list" ,"#phandle-cells-missing" ,0 , &args);unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);
@@ -444,6 +447,7 @@ static void __init of_unittest_parse_phandle_with_args(void)unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);/* Check for bad phandle in list */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args (np,"phandle-list-bad-phandle" ,"#phandle-cells" ,0 , &args);unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);
@@ -452,6 +456,7 @@ static void __init of_unittest_parse_phandle_with_args(void)unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);/* Check for incorrectly formed argument list */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args (np,"phandle-list-bad-args" ,"#phandle-cells" ,1 , &args);unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);
@@ -502,6 +507,7 @@ static void __init of_unittest_parse_phandle_with_args_map(void)for (i =0 ; i <8 ; i++) {bool passed = true; +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args_map (np,"phandle-list" ,"phandle" , i, &args);
@@ -559,21 +565,25 @@ static void __init of_unittest_parse_phandle_with_args_map(void) }/* Check for missing list property */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args_map (np,"phandle-list-missing" ,"phandle" ,0 , &args);unittest (rc == -ENOENT ,"expected:%i got:%i\n" , -ENOENT , rc);/* Check for missing cells,map,mask property */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args_map (np,"phandle-list" ,"phandle-missing" ,0 , &args);unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);/* Check for bad phandle in list */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args_map (np,"phandle-list-bad-phandle" ,"phandle" ,0 , &args);unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);/* Check for incorrectly formed argument list */ +memset (&args,0 ,sizeof (args)); rc =of_parse_phandle_with_args_map (np,"phandle-list-bad-args" ,"phandle" ,1 , &args);unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);
@@ -783,7 +793,7 @@ static void __init of_unittest_parse_interrupts(void)for (i =0 ; i <4 ; i++) {bool passed = true; - args.args_count =0 ; +memset (&args,0 ,sizeof (args)); rc =of_irq_parse_one (np, i, &args); passed &= !rc;
@@ -804,7 +814,7 @@ static void __init of_unittest_parse_interrupts(void)for (i =0 ; i <4 ; i++) {bool passed = true; - args.args_count =0 ; +memset (&args,0 ,sizeof (args)); rc =of_irq_parse_one (np, i, &args);/* Test the values from tests-phandle.dtsi */
@@ -860,6 +870,7 @@ static void __init of_unittest_parse_interrupts_extended(void)for (i =0 ; i <7 ; i++) {bool passed = true; +memset (&args,0 ,sizeof (args)); rc =of_irq_parse_one (np, i, &args);/* Test the values from tests-phandle.dtsi */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 225/237 tools: bpftool: pass an argument to silence open_obj_pinned()
In reply to Sasha LevinFrom: Quentin Monnet <[email protected]>
[ Upstream commit f120919f9905a2cad9dea792a28a11fb623f72c1 ]
Function open_obj_pinned() prints error messages when it fails to open a link in the BPF virtual file system. However, in some occasions it is not desirable to print an error, for example when we parse all links under the bpffs root, and the error is due to some paths actually being symbolic links.
Example output:
# ls -l /sys/fs/bpf/
lrwxrwxrwx 1 root root 0 Oct 18 19:00 ip -> /sys/fs/bpf/tc/
drwx------ 3 root root 0 Oct 18 19:00 tc
lrwxrwxrwx 1 root root 0 Oct 18 19:00 xdp -> /sys/fs/bpf/tc/ # bpftool --bpffs prog show
Error: bpf obj get (/sys/fs/bpf): Permission denied
Error: bpf obj get (/sys/fs/bpf): Permission denied # strace -e bpf bpftool --bpffs prog show
bpf(BPF_OBJ_GET, {pathname="/sys/fs/bpf/ip", bpf_fd=0}, 72) = -1 EACCES (Permission denied)
Error: bpf obj get (/sys/fs/bpf): Permission denied
bpf(BPF_OBJ_GET, {pathname="/sys/fs/bpf/xdp", bpf_fd=0}, 72) = -1 EACCES (Permission denied)
Error: bpf obj get (/sys/fs/bpf): Permission denied
...To fix it, pass a bool as a second argument to the function, and prevent it from printing an error when the argument is set to true.
--- tools/bpf/bpftool/common.c | 15 ++++++++------- tools/bpf/bpftool/main.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-)
tools/bpf/bpftool/common.c +8 -7
@@ -130,16 +130,17 @@ static int mnt_bpffs(const char *target, char *buff, size_t bufflen)return 0 ; } -int open_obj_pinned (char *path) +int open_obj_pinned (char *path,bool quiet) {int fd; fd =bpf_obj_get (path);if (fd <0 ) { -p_err ("bpf obj get (%s): %s" , path, - errno ==EACCES && !is_bpffs (dirname (path)) ? -"directory not in bpf file system (bpffs)" : -strerror (errno)); +if (!quiet) +p_err ("bpf obj get (%s): %s" , path, + errno ==EACCES && !is_bpffs (dirname (path)) ? +"directory not in bpf file system (bpffs)" : +strerror (errno));return -1 ; }
@@ -151,7 +152,7 @@ int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type)enum bpf_obj_type type;int fd; - fd =open_obj_pinned (path); + fd =open_obj_pinned (path, false);if (fd <0 )return -1 ;
@@ -384,7 +385,7 @@ int build_pinned_obj_table(struct pinned_obj_table *tab,while ((ftse =fts_read (fts))) {if (!(ftse->fts_info &FTS_F ))continue ; - fd =open_obj_pinned (ftse->fts_path); + fd =open_obj_pinned (ftse->fts_path, true);if (fd <0 )continue ;
tools/bpf/bpftool/main.h +1 -1
@@ -126,7 +126,7 @@ int cmd_select(const struct cmd *cmds, int argc, char **argv,int get_fd_type (int fd);const char *get_fd_type_name (enum bpf_obj_type type);char *get_fdinfo (int fd,const char *key); -int open_obj_pinned (char *path); +int open_obj_pinned (char *path,bool quiet);int open_obj_pinned_any (char *path,enum bpf_obj_type exp_type);int do_pin_any (int argc,char **argv,int (*get_fd_by_id)(__u32 ));int do_pin_fd (int fd,const char *name);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 226/237 cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces
In reply to Sasha LevinFrom: Sriram R <[email protected]>
[ Upstream commit 113f3aaa81bd56aba02659786ed65cbd9cb9a6fc ]
Currently when an AP and STA interfaces are active in the same or different radios, regulatory settings are restored whenever the STA disconnects. This restores all channel information including dfs states in all radios. For example, if an AP interface is active in one radio and STA in another, when radar is detected on the AP interface, the dfs state of the channel will be changed to UNAVAILABLE. But when the STA interface disconnects, this issues a regulatory disconnect hint which restores all regulatory settings in all the radios attached and thereby losing the stored dfs state on the other radio where the channel was marked as unavailable earlier. Hence prevent such regulatory restore whenever another active beaconing interface is present in the same or other radios.
--- net/wireless/sme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/wireless/sme.c +5 -1
@@ -642,11 +642,15 @@ static bool cfg80211_is_all_idle(void)* All devices must be idle as otherwise if you are actively * scanning some new beacon hints could be learned and would * count as new regulatory hints. +* Also if there is any other active beaconing interface we +* need not issue a disconnect hint and reset any info such +* as chan dfs state, etc. */ list_for_each_entry (rdev, &cfg80211_rdev_list, list) {list_for_each_entry (wdev, &rdev->wiphy.wdev_list, list) {wdev_lock (wdev); -if (wdev->conn || wdev->current_bss) +if (wdev->conn || wdev->current_bss || +cfg80211_beaconing_iface_active (wdev)) is_all_idle = false;wdev_unlock (wdev); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 227/237 pinctrl: qcom: spmi-gpio: fix gpio-hog related boot issues
In reply to Sasha LevinFrom: Brian Masney <[email protected]>
[ Upstream commit 149a96047237574b756d872007c006acd0cc6687 ]
When attempting to setup up a gpio hog, device probing would repeatedly fail with -EPROBE_DEFERED errors. It was caused by a circular dependency between the gpio and pinctrl frameworks. If the gpio-ranges property is present in device tree, then the gpio framework will handle the gpio pin registration and eliminate the circular dependency.
See Christian Lamparter's commit a86caa9ba5d7 ("pinctrl: msm: fix gpio-hog related boot issues") for a detailed commit message that explains the issue in much more detail. The code comment in this commit came from Christian's commit.
--- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +17 -4
@@ -1028,10 +1028,23 @@ static int pmic_gpio_probe(struct platform_device *pdev)return ret; } - ret =gpiochip_add_pin_range (&state->chip,dev_name (dev),0 ,0 , npins); -if (ret) { -dev_err (dev,"failed to add pin range\n" ); - goto err_range; +/* +* For DeviceTree-supported systems, the gpio core checks the +* pinctrl's device node for the "gpio-ranges" property. +* If it is present, it takes care of adding the pin ranges +* for the driver. In this case the driver can skip ahead. +* +* In order to remain compatible with older, existing DeviceTree +* files which don't set the "gpio-ranges" property or systems that +* utilize ACPI the driver has to call gpiochip_add_pin_range(). +*/ +if (!of_property_read_bool (dev->of_node,"gpio-ranges" )) { + ret =gpiochip_add_pin_range (&state->chip,dev_name (dev),0 ,0 , + npins); +if (ret) { +dev_err (dev,"failed to add pin range\n" ); + goto err_range; + } }return 0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 228/237 pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit b40ac08ff886302a6aa457fd72e94a969f50e245 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/pinctrl/bcm/pinctrl-bcm2835.c:707:40: warning: implicit conversion from enumeration type 'enum bcm2835_pinconf_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
configs[0] = pinconf_to_config_packed(BCM2835_PINCONF_PARAM_PULL, pull);
~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~1 warning generated.
It is expected that pinctrl drivers can extend pin_config_param because of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion isn't an issue. Most drivers that take advantage of this define the PIN_CONFIG variables as constants, rather than enumerated values. Do the same thing here so that Clang no longer warns.
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +2 -4
@@ -72,10 +72,8 @@#define GPIO_REG_OFFSET (p) ((p) / 32)#define GPIO_REG_SHIFT (p) ((p) % 32) -enum bcm2835_pinconf_param { -/* argument: bcm2835_pinconf_pull */ -BCM2835_PINCONF_PARAM_PULL = (PIN_CONFIG_END +1 ), -}; +/* argument: bcm2835_pinconf_pull */ +#define BCM2835_PINCONF_PARAM_PULL (PIN_CONFIG_END + 1)struct bcm2835_pinctrl {struct device *dev;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 229/237 pinctrl: lpc18xx: Use define directive for PIN_CONFIG_GPIO_PIN_INT
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit f24bfb39975c241374cadebbd037c17960cf1412 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/pinctrl/pinctrl-lpc18xx.c:643:29: warning: implicit conversion from enumeration type 'enum lpc18xx_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"nxp,gpio-pin-interrupt", PIN_CONFIG_GPIO_PIN_INT, 0},
~ ^~~~~~~~~~~~~~~~~~~~~~~drivers/pinctrl/pinctrl-lpc18xx.c:648:12: warning: implicit conversion from enumeration type 'enum lpc18xx_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
PCONFDUMP(PIN_CONFIG_GPIO_PIN_INT, "gpio pin int", NULL, true), ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from macro 'PCONFDUMP'
.param = a, .display = b, .format = c, .has_arg = d \
^2 warnings generated.
It is expected that pinctrl drivers can extend pin_config_param because of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion isn't an issue. Most drivers that take advantage of this define the PIN_CONFIG variables as constants, rather than enumerated values. Do the same thing here so that Clang no longer warns.
--- drivers/pinctrl/pinctrl-lpc18xx.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/pinctrl/pinctrl-lpc18xx.c +2 -8
@@ -630,14 +630,8 @@ static const struct pinctrl_pin_desc lpc18xx_pins[] = { LPC18XX_PIN(i2c0_sda, PIN_I2C0_SDA), }; -/** -* enum lpc18xx_pin_config_param - possible pin configuration parameters -* @PIN_CONFIG_GPIO_PIN_INT: route gpio to the gpio pin interrupt -* controller. -*/ -enum lpc18xx_pin_config_param { -PIN_CONFIG_GPIO_PIN_INT =PIN_CONFIG_END +1 , -}; +/* PIN_CONFIG_GPIO_PIN_INT: route gpio to the gpio pin interrupt controller */ +#define PIN_CONFIG_GPIO_PIN_INT (PIN_CONFIG_END + 1)static const struct pinconf_generic_params lpc18xx_params[] = { {"nxp,gpio-pin-interrupt" ,PIN_CONFIG_GPIO_PIN_INT ,0 },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 230/237 pinctrl: zynq: Use define directive for PIN_CONFIG_IO_STANDARD
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit cd8a145a066a1a3beb0ae615c7cb2ee4217418d7 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/pinctrl/pinctrl-zynq.c:985:18: warning: implicit conversion from enumeration type 'enum zynq_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18},
~ ^~~~~~~~~~~~~~~~~~~~~drivers/pinctrl/pinctrl-zynq.c:990:16: warning: implicit conversion from enumeration type 'enum zynq_pin_config_param' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
= { PCONFDUMP(PIN_CONFIG_IOSTANDARD, "IO-standard", NULL, true),
~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~./include/linux/pinctrl/pinconf-generic.h:163:11: note: expanded from macro 'PCONFDUMP'
.param = a, .display = b, .format = c, .has_arg = d \
^2 warnings generated.
It is expected that pinctrl drivers can extend pin_config_param because of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion isn't an issue. Most drivers that take advantage of this define the PIN_CONFIG variables as constants, rather than enumerated values. Do the same thing here so that Clang no longer warns.
--- drivers/pinctrl/pinctrl-zynq.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/pinctrl/pinctrl-zynq.c +3 -6
@@ -971,15 +971,12 @@ enum zynq_io_standards {zynq_iostd_max }; -/** -* enum zynq_pin_config_param - possible pin configuration parameters -* @PIN_CONFIG_IOSTANDARD: if the pin can select an IO standard, the argument to +/* +* PIN_CONFIG_IOSTANDARD: if the pin can select an IO standard, the argument to * this parameter (on a custom format) tells the driver which alternative * IO standard to use. */ -enum zynq_pin_config_param { -PIN_CONFIG_IOSTANDARD =PIN_CONFIG_END +1 , -}; +#define PIN_CONFIG_IOSTANDARD (PIN_CONFIG_END + 1)static const struct pinconf_generic_params zynq_dt_params[] = { {"io-standard" ,PIN_CONFIG_IOSTANDARD , zynq_iostd_lvcmos18},
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 231/237 PCI: keystone: Use quirk to limit MRRS for K2G
In reply to Sasha LevinFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit 148e340c0696369fadbbddc8f4bef801ed247d71 ]
PCI controller in K2G also has a limitation that memory read request size (MRRS) must not exceed 256 bytes. Use the quirk to limit MRRS (added for K2HK, K2L and K2E) for K2G as well.
--- drivers/pci/controller/dwc/pci-keystone.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/controller/dwc/pci-keystone.c +3 -0
@@ -36,6 +36,7 @@#define PCIE_RC_K2HK 0xb008#define PCIE_RC_K2E 0xb009#define PCIE_RC_K2L 0xb00a +#define PCIE_RC_K2G 0xb00b#define to_keystone_pcie (x) dev_get_drvdata((x)->dev)
@@ -50,6 +51,8 @@ static void quirk_limit_mrrs(struct pci_dev *dev) .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2L), .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2G), + .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, { 0, }, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 232/237 nvme-pci: fix surprise removal
In reply to Sasha LevinFrom: Igor Konopko <[email protected]>
[ Upstream commit 751a0cc0cd3a0d51e6aaf6fd3b8bd31f4ecfaf3e ]
When a PCIe NVMe device is not present, nvme_dev_remove_admin() calls blk_cleanup_queue() on the admin queue, which frees the hctx for that queue. Moments later, on the same path nvme_kill_queues() calls blk_mq_unquiesce_queue() on admin queue and tries to access hctx of it, which leads to following OOPS:
Oops: 0000 [#1] SMP PTI RIP: 0010:sbitmap_any_bit_set+0xb/0x40 Call Trace: blk_mq_run_hw_queue+0xd5/0x150 blk_mq_run_hw_queues+0x3a/0x50 nvme_kill_queues+0x26/0x50 nvme_remove_namespaces+0xb2/0xc0 nvme_remove+0x60/0x140 pci_device_remove+0x3b/0xb0
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -3647,7 +3647,7 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)down_read (&ctrl->namespaces_rwsem);/* Forcibly unquiesce queues to avoid blocking dispatch */ -if (ctrl->admin_q) +if (ctrl->admin_q && !blk_queue_dying (ctrl->admin_q))blk_mq_unquiesce_queue (ctrl->admin_q);list_for_each_entry (ns, &ctrl->namespaces, list)
Signature · 7 lines
2.20.1 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sasha Levin
maintainerPATCH 233/237 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch
In reply to Sasha LevinFrom: Vignesh R <[email protected]>
[ Upstream commit baf8b9f8d260c55a86405f70a384c29cda888476 ]
Commit b682cffa3ac6 ("spi: omap2-mcspi: Set FIFO DMA trigger level to word length") broke SPI transfers where bits_per_word != 8. This is because of mimsatch between McSPI FIFO level event trigger size (SPI word length) and DMA request size(word length * maxburst). This leads to data corruption, lockup and errors like:
spi1.0: EOW timed out
Fix this by setting DMA maxburst size to 1 so that McSPI FIFO level event trigger size matches DMA request size.
--- drivers/spi/spi-omap2-mcspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-omap2-mcspi.c +2 -2
@@ -607,8 +607,8 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) cfg.dst_addr = cs->phys +OMAP2_MCSPI_TX0 ; cfg.src_addr_width = width; cfg.dst_addr_width = width; - cfg.src_maxburst = es; - cfg.dst_maxburst = es; + cfg.src_maxburst =1 ; + cfg.dst_maxburst =1 ; rx = xfer->rx_buf; tx = xfer->tx_buf;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 234/237 i2c: uniphier-f: fix timeout error after reading 8 bytes
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit c2a653deaa81f5a750c0dfcbaf9f8e5195cbe4a5 ]
I was totally screwed up in commit eaba68785c2d ("i2c: uniphier-f:
fix race condition when IRQ is cleared"). Since that commit, if the number of read bytes is multiple of the FIFO size (8, 16, 24... bytes), the STOP condition could be issued twice, depending on the timing. If this happens, the controller will go wrong, resulting in the timeout error.
It was more than 3 years ago when I wrote this driver, so my memory about this hardware was vague. Please let me correct the description in the commit log of eaba68785c2d.
Clearing the IRQ status on exiting the IRQ handler is absolutely fine. This controller makes a pause while any IRQ status is asserted. If the IRQ status is cleared first, the hardware may start the next transaction before the IRQ handler finishes what it supposed to do.
This partially reverts the bad commit with clear comments so that I will never repeat this mistake.
I also investigated what is happening at the last moment of the read mode. The UNIPHIER_FI2C_INT_RF interrupt is asserted a bit earlier (by half a period of the clock cycle) than UNIPHIER_FI2C_INT_RB.
I consulted a hardware engineer, and I got the following information:
UNIPHIER_FI2C_INT_RF
asserted at the falling edge of SCL at the 8th bit.
UNIPHIER_FI2C_INT_RB
asserted at the rising edge of SCL at the 9th (ACK) bit.
In order to avoid calling uniphier_fi2c_stop() twice, check the latter interrupt. I also commented this because it is obscure hardware internal.
--- drivers/i2c/busses/i2c-uniphier-f.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-uniphier-f.c +14 -3
@@ -173,8 +173,6 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id)"interrupt: enabled_irqs=%04x, irq_status=%04x\n" , priv->enabled_irqs, irq_status); -uniphier_fi2c_clear_irqs (priv, irq_status); -if (irq_status &UNIPHIER_FI2C_INT_STOP ) goto complete;
@@ -214,7 +212,13 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id)if (irq_status & (UNIPHIER_FI2C_INT_RF |UNIPHIER_FI2C_INT_RB )) {uniphier_fi2c_drain_rxfifo (priv); -if (!priv->len) +/* +* If the number of bytes to read is multiple of the FIFO size +* (msg->len == 8, 16, 24, ...), the INT_RF bit is set a little +* earlier than INT_RB. We wait for INT_RB to confirm the +* completion of the current message. +*/ +if (!priv->len && (irq_status &UNIPHIER_FI2C_INT_RB )) goto data_done;if (unlikely (priv->flags &UNIPHIER_FI2C_MANUAL_NACK )) {
@@ -253,6 +257,13 @@ static irqreturn_t uniphier_fi2c_interrupt(int irq, void *dev_id) } handled: +/* +* This controller makes a pause while any bit of the IRQ status is +* asserted. Clear the asserted bit to kick the controller just before +* exiting the handler. +*/ +uniphier_fi2c_clear_irqs (priv, irq_status); +spin_unlock (&priv->lock);return IRQ_HANDLED ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 235/237 mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock
In reply to Sasha LevinFrom: zhong jiang <[email protected]>
[ Upstream commit d2ab99403ee00d8014e651728a4702ea1ae5e52c ]
When adding the memory by probing memory block in sysfs interface, there is an obvious issue that we will unlock the device_hotplug_lock when fails to takes it.
That issue was introduced in Commit 8df1d0e4a265 ("mm/memory_hotplug: make add_memory() take the device_hotplug_lock")
We should drop out in time when fails to take the device_hotplug_lock.
--- drivers/base/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/memory.c +1 -1
@@ -510,7 +510,7 @@ memory_probe_store(struct device *dev, struct device_attribute *attr, ret =lock_device_hotplug_sysfs ();if (ret) - goto out; +return ret; nid =memory_add_physaddr_to_nid (phys_addr); ret = __add_memory(nid, phys_addr,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 236/237 ipv6: Fix handling of LLA with VRF and sockets bound to VRF
In reply to Sasha LevinFrom: David Ahern <[email protected]>
[ Upstream commit c2027d1e17582903e368abf5d4838b22a98f2b7b ]
A recent commit allows sockets bound to a VRF to receive ipv6 link local packets. However, it only works for UDP and worse TCP connection attempts to the LLA with the only listener bound to the VRF just hang where as before the client gets a reset and connection refused. Fix by adjusting ir_iif for LL addresses and packets received through a device enslaved to a VRF.
--- net/ipv6/tcp_ipv6.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/tcp_ipv6.c +2 -1
@@ -734,6 +734,7 @@ static void tcp_v6_init_req(struct request_sock *req,const struct sock *sk_listener, struct sk_buff *skb) { + bool l3_slave = ipv6_l3mdev_skb(TCP_SKB_CB(skb)->header.h6.flags);struct inet_request_sock *ireq =inet_rsk (req);const struct ipv6_pinfo *np =inet6_sk (sk_listener);
@@ -741,7 +742,7 @@ static void tcp_v6_init_req(struct request_sock *req, ireq->ir_v6_loc_addr =ipv6_hdr (skb)->daddr;/* So that link locals have meaning */ -if (!sk_listener->sk_bound_dev_if && +if ((!sk_listener->sk_bound_dev_if || l3_slave) &&ipv6_addr_type (&ireq->ir_v6_rmt_addr) &IPV6_ADDR_LINKLOCAL ) ireq->ir_iif =tcp_v6_iif (skb);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 237/237 cfg80211: call disconnect_wk when AP stops
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit e005bd7ddea06784c1eb91ac5bb6b171a94f3b05 ]
Since we now prevent regulatory restore during STA disconnect if concurrent AP interfaces are active, we need to reschedule this check when the AP state changes. This fixes never doing a restore when an AP is the last interface to stop. Or to put it another way: we need to re-check after anything we check here changes.
--- net/wireless/ap.c | 2 ++ net/wireless/core.h | 2 ++ net/wireless/sme.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-)
net/wireless/ap.c +2 -0
@@ -41,6 +41,8 @@ int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,cfg80211_sched_dfs_chan_update (rdev); } +schedule_work (&cfg80211_disconnect_work); +return err; }
net/wireless/core.h +2 -0
@@ -430,6 +430,8 @@ void cfg80211_process_wdev_events(struct wireless_dev *wdev);bool cfg80211_does_bw_fit_range (const struct ieee80211_freq_range *freq_range,u32 center_freq_khz,u32 bw_khz); +extern struct work_struct cfg80211_disconnect_work; +/** * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable * @wiphy: the wiphy to validate against
net/wireless/sme.c +1 -1
@@ -667,7 +667,7 @@ static void disconnect_work(struct work_struct *work)rtnl_unlock (); } -static DECLARE_WORK(cfg80211_disconnect_work, disconnect_work); +DECLARE_WORK (cfg80211_disconnect_work, disconnect_work);/*
Signature · 1 line
2.20.1