6.2.15-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 272/663 debugobject: Prevent init race with static objects
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 63a759694eed61025713b3e14dd827c8548daadc ]
Statically initialized objects are usually not initialized via the init() function of the subsystem. They are special cased and the subsystem provides a function to validate whether an object which is not yet tracked by debugobjects is statically initialized. This means the object is started to be tracked on first use, e.g. activation.
This works perfectly fine, unless there are two concurrent operations on that object. Schspa decoded the problem:
T0 T1
debug_object_assert_init(addr)
lock_hash_bucket()
obj = lookup_object(addr);
if (!obj) {
unlock_hash_bucket();
- > preemption
lock_subsytem_object(addr);
activate_object(addr)
lock_hash_bucket();
obj = lookup_object(addr);
if (!obj) {
unlock_hash_bucket();
if (is_static_object(addr))
init_and_track(addr);
lock_hash_bucket();
obj = lookup_object(addr);
obj->state = ACTIVATED;
unlock_hash_bucket();
subsys function modifies content of addr,
so static object detection does
not longer work.
unlock_subsytem_object(addr);
if (is_static_object(addr)) <- Fails
debugobject emits a warning and invokes the fixup function which
reinitializes the already active object in the worst case.This race exists forever, but was never observed until mod_timer() got a debug_object_assert_init() added which is outside of the timer base lock held section right at the beginning of the function to cover the lockless early exit points too.
Rework the code so that the lookup, the static object check and the tracking object association happens atomically under the hash bucket lock. This prevents the issue completely as all callers are serialized on the hash bucket lock and therefore cannot observe inconsistent state.
--- lib/debugobjects.c | 125 ++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 59 deletions(-)
lib/debugobjects.c +66 -59
@@ -216,10 +216,6 @@ static struct debug_obj *__alloc_object(struct hlist_head *list)return obj; } -/* -* Allocate a new object. If the pool is empty, switch off the debugger. -* Must be called with interrupts disabled. -*/ static struct debug_obj *alloc_object (void *addr,struct debug_bucket *b,const struct debug_obj_descr *descr) {
@@ -552,11 +548,49 @@ static void debug_object_is_on_stack(void *addr, int onstack)WARN_ON (1 ); } +static struct debug_obj *lookup_object_or_alloc (void *addr,struct debug_bucket *b, +const struct debug_obj_descr *descr, +bool onstack,bool alloc_ifstatic) +{ +struct debug_obj *obj =lookup_object (addr, b); +enum debug_obj_state state =ODEBUG_STATE_NONE ; + +if (likely (obj)) +return obj; + +/* +* debug_object_init() unconditionally allocates untracked +* objects. It does not matter whether it is a static object or +* not. +* +* debug_object_assert_init() and debug_object_activate() allow +* allocation only if the descriptor callback confirms that the +* object is static and considered initialized. For non-static +* objects the allocation needs to be done from the fixup callback. +*/ +if (unlikely (alloc_ifstatic)) { +if (!descr->is_static_object || !descr->is_static_object (addr)) +return ERR_PTR (-ENOENT ); +/* Statically allocated objects are considered initialized */ + state =ODEBUG_STATE_INIT ; + } + + obj =alloc_object (addr, b, descr); +if (likely (obj)) { + obj->state = state; +debug_object_is_on_stack (addr, onstack); +return obj; + } + +/* Out of memory. Do the cleanup outside of the locked region */ + debug_objects_enabled =0 ; +return NULL ; +} +static void __debug_object_init (void *addr,const struct debug_obj_descr *descr,int onstack) {enum debug_obj_state state; -bool check_stack = false;struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;
@@ -572,16 +606,11 @@ __debug_object_init(void *addr, const struct debug_obj_descr *descr, int onstackraw_spin_lock_irqsave (&db->lock, flags); - obj =lookup_object (addr, db); -if (!obj) { - obj =alloc_object (addr, db, descr); -if (!obj) { - debug_objects_enabled =0 ; -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_objects_oom (); -return ; - } - check_stack = true; + obj =lookup_object_or_alloc (addr, db, descr, onstack, false); +if (unlikely (!obj)) { +raw_spin_unlock_irqrestore (&db->lock, flags); +debug_objects_oom (); +return ; }switch (obj->state) {
@@ -607,8 +636,6 @@ __debug_object_init(void *addr, const struct debug_obj_descr *descr, int onstack }raw_spin_unlock_irqrestore (&db->lock, flags); -if (check_stack) -debug_object_is_on_stack (addr, onstack); }/**
@@ -648,14 +675,12 @@ EXPORT_SYMBOL_GPL(debug_object_init_on_stack);*/ int debug_object_activate (void *addr,const struct debug_obj_descr *descr) { +struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr };enum debug_obj_state state;struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;int ret; -struct debug_obj o = { .object = addr, - .state =ODEBUG_STATE_NOTAVAILABLE , - .descr = descr };if (!debug_objects_enabled)return 0 ;
@@ -664,8 +689,8 @@ int debug_object_activate(void *addr, const struct debug_obj_descr *descr)raw_spin_lock_irqsave (&db->lock, flags); - obj =lookup_object (addr, db); -if (obj) { + obj =lookup_object_or_alloc (addr, db, descr, false, true); +if (likely (!IS_ERR_OR_NULL (obj))) {bool print_object = false;switch (obj->state) {
@@ -698,24 +723,16 @@ int debug_object_activate(void *addr, const struct debug_obj_descr *descr)raw_spin_unlock_irqrestore (&db->lock, flags); -/* -* We are here when a static object is activated. We -* let the type specific code confirm whether this is -* true or not. if true, we just make sure that the -* static object is tracked in the object tracker. If -* not, this must be a bug, so we try to fix it up. -*/ -if (descr->is_static_object && descr->is_static_object (addr)) { -/* track this static object */ -debug_object_init (addr, descr); -debug_object_activate (addr, descr); - }else { -debug_print_object (&o,"activate" ); - ret =debug_object_fixup (descr->fixup_activate, addr, -ODEBUG_STATE_NOTAVAILABLE ); -return ret ?0 : -EINVAL ; +/* If NULL the allocation has hit OOM */ +if (!obj) { +debug_objects_oom (); +return 0 ; } -return 0 ; + +/* Object is neither static nor tracked. It's not initialized */ +debug_print_object (&o,"activate" ); + ret =debug_object_fixup (descr->fixup_activate, addr,ODEBUG_STATE_NOTAVAILABLE ); +return ret ?0 : -EINVAL ; }EXPORT_SYMBOL_GPL (debug_object_activate);
@@ -869,6 +886,7 @@ EXPORT_SYMBOL_GPL(debug_object_free);*/ void debug_object_assert_init (void *addr,const struct debug_obj_descr *descr) { +struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr };struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;
@@ -879,31 +897,20 @@ void debug_object_assert_init(void *addr, const struct debug_obj_descr *descr) db =get_bucket ((unsigned long ) addr);raw_spin_lock_irqsave (&db->lock, flags); + obj =lookup_object_or_alloc (addr, db, descr, false, true); +raw_spin_unlock_irqrestore (&db->lock, flags); +if (likely (!IS_ERR_OR_NULL (obj))) +return ; - obj =lookup_object (addr, db); +/* If NULL the allocation has hit OOM */ if (!obj) { -struct debug_obj o = { .object = addr, - .state =ODEBUG_STATE_NOTAVAILABLE , - .descr = descr }; - -raw_spin_unlock_irqrestore (&db->lock, flags); -/* -* Maybe the object is static, and we let the type specific -* code confirm. Track this static object if true, else invoke -* fixup. -*/ -if (descr->is_static_object && descr->is_static_object (addr)) { -/* Track this static object */ -debug_object_init (addr, descr); - }else { -debug_print_object (&o,"assert_init" ); -debug_object_fixup (descr->fixup_assert_init, addr, -ODEBUG_STATE_NOTAVAILABLE ); - } +debug_objects_oom ();return ; } -raw_spin_unlock_irqrestore (&db->lock, flags); +/* Object is neither tracked nor static. It's not initialized. */ +debug_print_object (&o,"assert_init" ); +debug_object_fixup (descr->fixup_assert_init, addr,ODEBUG_STATE_NOTAVAILABLE ); }EXPORT_SYMBOL_GPL (debug_object_assert_init);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 273/663 drm/i915: Make intel_get_crtc_new_encoder() less oopsy
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit 631420b06597a33c72b6dcef78d1c2dea17f452d ]
The point of the WARN was to print something, not oops straight up. Currently that is precisely what happens if we can't find the connector for the crtc in the atomic state. Get the dev pointer from the atomic state instead of the potentially NULL encoder to avoid that.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -1090,7 +1090,7 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state, num_encoders++; } -drm_WARN (encoder->base.dev, num_encoders !=1 , +drm_WARN (state->base.dev, num_encoders !=1 ,"%d encoders for pipe %c\n" , num_encoders,pipe_name (master_crtc->pipe));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 274/663 tick/common: Align tick period with the HZ tick.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit e9523a0d81899361214d118ad60ef76f0e92f71d ]
With HIGHRES enabled tick_sched_timer() is programmed every jiffy to expire the timer_list timers. This timer is programmed accurate in respect to CLOCK_MONOTONIC so that 0 seconds and nanoseconds is the first tick and the next one is 1000/CONFIG_HZ ms later. For HZ=250 it is every 4 ms and so based on the current time the next tick can be computed.
This accuracy broke since the commit mentioned below because the jiffy based clocksource is initialized with higher accuracy in read_persistent_wall_and_boot_offset(). This higher accuracy is inherited during the setup in tick_setup_device(). The timer still fires every 4ms with HZ=250 but timer is no longer aligned with CLOCK_MONOTONIC with 0 as it origin but has an offset in the us/ns part of the timestamp. The offset differs with every boot and makes it impossible for user land to align with the tick.
Align the tick period with CLOCK_MONOTONIC ensuring that it is always a multiple of 1000/CONFIG_HZ ms.
--- kernel/time/tick-common.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
kernel/time/tick-common.c +11 -1
@@ -218,9 +218,19 @@ static void tick_setup_device(struct tick_device *td,* this cpu: */ if (tick_do_timer_cpu ==TICK_DO_TIMER_BOOT ) { +ktime_t next_p; +u32 rem; + tick_do_timer_cpu = cpu; - tick_next_period =ktime_get (); + next_p =ktime_get (); +div_u64_rem (next_p,TICK_NSEC , &rem); +if (rem) { + next_p -= rem; + next_p +=TICK_NSEC ; + } + + tick_next_period = next_p;#ifdef CONFIG_NO_HZ_FULL /* * The boot CPU may be nohz_full, in which case set
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 275/663 ACPI: bus: Ensure that notify handlers are not running after removal
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit faae443738c6f0dac9b0d3d11d108f6911a989a9 ]
Currently, acpi_device_remove_notify_handler() may return while the notify handler being removed is still running which may allow the module holding that handler to be torn down prematurely.
Address this issue by making acpi_device_remove_notify_handler() wait for the handling of all the ACPI events in progress to complete before returning.
--- drivers/acpi/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/bus.c +1 -0
@@ -589,6 +589,7 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device,acpi_remove_notify_handler (device->handle, type, acpi_notify_device); } +acpi_os_wait_events_complete (); }/* Handle events targeting \_SB device (at present only graceful shutdown) */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 276/663 cpufreq: use correct unit when verify cur freq
In reply to Greg Kroah-HartmanFrom: Sanjay Chandrashekara <[email protected]>
[ Upstream commit 44295af5019f1997d038ad2611086a2d1e2af167 ]
cpufreq_verify_current_freq checks() if the frequency returned by the hardware has a slight delta with the valid frequency value last set and returns "policy->cur" if the delta is within "1 MHz". In the comparison, "policy->cur" is in "kHz" but it's compared against HZ_PER_MHZ. So, the comparison range becomes "1 GHz".
Fix this by comparing against KHZ_PER_MHZ instead of HZ_PER_MHZ.
--- drivers/cpufreq/cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +1 -1
@@ -1727,7 +1727,7 @@ static unsigned int cpufreq_verify_current_freq(struct cpufreq_policy *policy, b* MHz. In such cases it is better to avoid getting into * unnecessary frequency updates. */ -if (abs (policy->cur - new_freq) <HZ_PER_MHZ ) +if (abs (policy->cur - new_freq) <KHZ_PER_MHZ )return policy->cur;cpufreq_out_of_sync (policy, new_freq);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 277/663 rpmsg: glink: Propagate TX failures in intentless mode as well
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 7a68f9fa97357a0f2073c9c31ed4101da4fce93e ]
As support for splitting transmission over several messages using TX_DATA_CONT was introduced it does not immediately return the return value of qcom_glink_tx().
The result is that in the intentless case (i.e. intent == NULL), the code will continue to send all additional chunks. This is wasteful, and it's possible that the send operation could incorrectly indicate success, if the last chunk fits in the TX fifo.
Fix the condition.
--- drivers/rpmsg/qcom_glink_native.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/rpmsg/qcom_glink_native.c +6 -4
@@ -1348,8 +1348,9 @@ static int __qcom_glink_send(struct glink_channel *channel, ret =qcom_glink_tx (glink, &req,sizeof (req), data, chunk_size, wait);/* Mark intent available if we failed */ -if (ret && intent) { - intent->in_use = false; +if (ret) { +if (intent) + intent->in_use = false;return ret; }
@@ -1370,8 +1371,9 @@ static int __qcom_glink_send(struct glink_channel *channel, chunk_size, wait);/* Mark intent available if we failed */ -if (ret && intent) { - intent->in_use = false; +if (ret) { +if (intent) + intent->in_use = false;break ; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 278/663 hwmon: (pmbus/fsp-3y) Fix functionality bitmask in FSP-3Y YM-2151E
In reply to Greg Kroah-HartmanFrom: Tomáš Pecka <[email protected]>
[ Upstream commit 93822f5161a2dc57a60b95b35b3cb8589f53413e ]
The bit flags in pmbus_driver_info functionality for YM-2151E chip were joined with a comma operator instead of a bitwise OR. This means that the last constant PMBUS_HAVE_IIN was not OR-ed with the other PM_BUS_HAVE_* constants for this page but it initialized the next element of the func array (which was not accessed from anywhere because of the number of pages).
However, there is no need for setting PMBUS_HAVE_IIN in the 5Vsb page because this command does not seem to be paged. Obviously, the device only has one IIN sensor, so it doesn't make sense to query it again from the second page.
--- drivers/hwmon/pmbus/fsp-3y.c | 1 - 1 file changed, 1 deletion(-)
drivers/hwmon/pmbus/fsp-3y.c +0 -1
@@ -180,7 +180,6 @@ static struct pmbus_driver_info fsp3y_info[] = { PMBUS_HAVE_FAN12, .func[YM2151_PAGE_5VSB_LOG ] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT, -PMBUS_HAVE_IIN , .read_word_data = fsp3y_read_word_data, .read_byte_data = fsp3y_read_byte_data, },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 279/663 platform/chrome: cros_typec_switch: Add missing fwnode_handle_put()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit dc70234c408c644505a24362b0f095f713e4697e ]
In cros_typec_register_switches(), we should add fwnode_handle_put() when break out of the iteration device_for_each_child_node() as it will automatically increase and decrease the refcounter.
--- drivers/platform/chrome/cros_typec_switch.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/chrome/cros_typec_switch.c +1 -0
@@ -268,6 +268,7 @@ static int cros_typec_register_switches(struct cros_typec_switch_data *sdata)return 0 ; err_switch: +fwnode_handle_put (fwnode);cros_typec_unregister_switches (sdata);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 280/663 wifi: ath6kl: minor fix for allocation size
In reply to Greg Kroah-HartmanFrom: Alexey V. Vissarionov <[email protected]>
[ Upstream commit 778f83f889e7fca37780d9640fcbd0229ae38eaa ]
Although the "param" pointer occupies more or equal space compared to "*param", the allocation size should use the size of variable itself.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/bmi.c +1 -1
@@ -246,7 +246,7 @@ int ath6kl_bmi_execute(struct ath6kl *ar, u32 addr, u32 *param)return -EACCES ; } - size =sizeof (cid) +sizeof (addr) +sizeof (param); + size =sizeof (cid) +sizeof (addr) +sizeof (*param);if (size > ar->bmi.max_cmd_size) {WARN_ON (1 );return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 281/663 wifi: ath9k: hif_usb: fix memory leak of remain_skbs
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 7654cc03eb699297130b693ec34e25f77b17c947 ]
hif_dev->remain_skb is allocated and used exclusively in ath9k_hif_usb_rx_stream(). It is implied that an allocated remain_skb is processed and subsequently freed (in error paths) only during the next call of ath9k_hif_usb_rx_stream().
So, if the urbs are deallocated between those two calls due to the device deinitialization or suspend, it is possible that ath9k_hif_usb_rx_stream() is not called next time and the allocated remain_skb is leaked. Our local Syzkaller instance was able to trigger that.
remain_skb makes sense when receiving two consecutive urbs which are logically linked together, i.e. a specific data field from the first skb indicates a cached skb to be allocated, memcpy'd with some data and subsequently processed in the next call to ath9k_hif_usb_rx_stream(). Urbs deallocation supposedly makes that link irrelevant so we need to free the cached skb in those cases.
Fix the leak by introducing a function to explicitly free remain_skb (if it is not NULL) when the rx urbs have been deallocated. remain_skb is NULL when it has not been allocated at all (hif_dev struct is kzalloced) or when it has been processed in next call to ath9k_hif_usb_rx_stream().
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/hif_usb.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/net/wireless/ath/ath9k/hif_usb.c +19 -0
@@ -534,6 +534,24 @@ static struct ath9k_htc_hif hif_usb = { .send = hif_usb_send, }; +/* Need to free remain_skb allocated in ath9k_hif_usb_rx_stream +* in case ath9k_hif_usb_rx_stream wasn't called next time to +* process the buffer and subsequently free it. +*/ +static void ath9k_hif_usb_free_rx_remain_skb (struct hif_device_usb *hif_dev) +{ +unsigned long flags; + +spin_lock_irqsave (&hif_dev->rx_lock, flags); +if (hif_dev->remain_skb) { +dev_kfree_skb_any (hif_dev->remain_skb); + hif_dev->remain_skb =NULL ; + hif_dev->rx_remain_len =0 ; +RX_STAT_INC (hif_dev, skb_dropped); + } +spin_unlock_irqrestore (&hif_dev->rx_lock, flags); +} +static void ath9k_hif_usb_rx_stream (struct hif_device_usb *hif_dev,struct sk_buff *skb) {
@@ -868,6 +886,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev)static void ath9k_hif_usb_dealloc_rx_urbs (struct hif_device_usb *hif_dev) {usb_kill_anchored_urbs (&hif_dev->rx_submitted); +ath9k_hif_usb_free_rx_remain_skb (hif_dev); }static int ath9k_hif_usb_alloc_rx_urbs (struct hif_device_usb *hif_dev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 282/663 wifi: ath11k: Use platform_get_irq() to get the interrupt
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit f117276638b7600b981b3fe28550823cfbe1ef23 ]
As of commit a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core"), we need to use platform_get_irq() instead of platform_get_resource() to get our IRQs because platform_get_resource() simply won't get them anymore.
This was already fixed in several other Atheros WiFi drivers, apparently in response to Zeal Robot reports. An example of another fix is commit 9503a1fc123d ("ath9k: Use platform_get_irq() to get the interrupt"). ath11k seems to have been missed in this effort, though.
Without this change, WiFi wasn't coming up on my Qualcomm sc7280-based hardware. Specifically, "platform_get_resource(pdev, IORESOURCE_IRQ, i)" was failing even for i=0.
Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1
--- drivers/net/wireless/ath/ath11k/ahb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +4 -4
@@ -859,11 +859,11 @@ static int ath11k_ahb_setup_msi_resources(struct ath11k_base *ab) ab->pci.msi.ep_base_data = int_prop +32 ;for (i =0 ; i < ab->pci.msi.config->total_vectors; i++) { - res =platform_get_resource (pdev,IORESOURCE_IRQ , i); -if (!res) -return -ENODEV ; + ret =platform_get_irq (pdev, i); +if (ret <0 ) +return ret; - ab->pci.msi.irqs[i] = res->start; + ab->pci.msi.irqs[i] = ret; }set_bit (ATH11K_FLAG_MULTI_MSI_VECTORS , &ab->dev_flags);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 283/663 wifi: ath5k: Use platform_get_irq() to get the interrupt
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 95c95251d0547b46d6571e4fbd51b42865c15a4a ]
As of commit a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core"), we need to use platform_get_irq() instead of platform_get_resource() to get our IRQs because platform_get_resource() simply won't get them anymore.
This was already fixed in several other Atheros WiFi drivers, apparently in response to Zeal Robot reports. An example of another fix is commit 9503a1fc123d ("ath9k: Use platform_get_irq() to get the interrupt"). ath5k seems to have been missed in this effort, though.
--- drivers/net/wireless/ath/ath5k/ahb.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath5k/ahb.c +4 -6
@@ -113,15 +113,13 @@ static int ath_ahb_probe(struct platform_device *pdev) goto err_out; } - res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); -if (res ==NULL ) { -dev_err (&pdev->dev,"no IRQ resource found\n" ); - ret = -ENXIO ; + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) { +dev_err (&pdev->dev,"no IRQ resource found: %d\n" , irq); + ret = irq; goto err_iounmap; } - irq = res->start; - hw =ieee80211_alloc_hw (sizeof (struct ath5k_hw ), &ath5k_hw_ops);if (hw ==NULL ) {dev_err (&pdev->dev,"no memory for ieee80211_hw\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 284/663 wifi: ath5k: fix an off by one check in ath5k_eeprom_read_freq_list()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4c856ee12df85aabd437c3836ed9f68d94268358 ]
This loop checks that i < max at the start of loop but then it does i++ which could put it past the end of the array. It's harmless to check again and prevent a potential out of bounds.
--- drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath5k/eeprom.c +1 -1
@@ -529,7 +529,7 @@ ath5k_eeprom_read_freq_list(struct ath5k_hw *ah, int *offset, int max, ee->ee_n_piers[mode]++; freq2 = (val >>8 ) &0xff ; -if (!freq2) +if (!freq2 || i >= max)break ; pc[i++].freq = ath5k_eeprom_bin2freq(ee,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 285/663 wifi: ath11k: fix SAC bug on peer addition with sta band migration
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit 60b7d62ba8cdbd073997bff0f1cdae8d844002c0 ]
Fix sleep in atomic context warning detected by Smatch static checker analyzer.
Following the locking pattern for peer_rhash_add lock tbl_mtx_lock mutex always even if sta is not transitioning to another band. This is peer_add function and a more secure locking should not cause performance regression.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/peer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/peer.c +3 -2
@@ -382,22 +382,23 @@ int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif,return -ENOBUFS ; } +mutex_lock (&ar->ab->tbl_mtx_lock);spin_lock_bh (&ar->ab->base_lock); peer =ath11k_peer_find_by_addr (ar->ab, param->peer_addr);if (peer) {if (peer->vdev_id == param->vdev_id) {spin_unlock_bh (&ar->ab->base_lock); +mutex_unlock (&ar->ab->tbl_mtx_lock);return -EINVAL ; }/* Assume sta is transitioning to another band. * Remove here the peer from rhash. */ -mutex_lock (&ar->ab->tbl_mtx_lock);ath11k_peer_rhash_delete (ar->ab, peer); -mutex_unlock (&ar->ab->tbl_mtx_lock); }spin_unlock_bh (&ar->ab->base_lock); +mutex_unlock (&ar->ab->tbl_mtx_lock); ret =ath11k_wmi_send_peer_create_cmd (ar, param);if (ret) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 286/663 wifi: rtl8xxxu: Remove always true condition in rtl8xxxu_print_chipinfo
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
[ Upstream commit b9b1e4fe2957f361c86e288ecf373dc7895cf7c7 ]
Fix a new smatch warning:drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c:1580 rtl8xxxu_print_chipinfo() warn: always true condition '(priv->chip_cut <= 15) => (0-15 <= 15)'
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -5
@@ -1574,11 +1574,7 @@ rtl8xxxu_set_spec_sifs(struct rtl8xxxu_priv *priv, u16 cck, u16 ofdm)static void rtl8xxxu_print_chipinfo (struct rtl8xxxu_priv *priv) {struct device *dev = &priv->udev->dev; -char cut ='?' ; - -/* Currently always true: chip_cut is 4 bits. */ -if (priv->chip_cut <=15 ) - cut ='A' + priv->chip_cut; +char cut ='A' + priv->chip_cut; dev_info(dev, "RTL%s rev %c (%s) %iT%iR, TX queues %i, WiFi=%i, BT=%i, GPS=%i, HI PA=%i\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 287/663 wifi: brcmfmac: support CQM RSSI notification with older firmware
In reply to Greg Kroah-HartmanFrom: John Keeping <[email protected]>
[ Upstream commit ec52d77d077529f198fd874c550a26b9cc86a331 ]
Using the BCM4339 firmware from linux-firmware (version "BCM4339/2 wl0:
Sep 5 2019 11:05:52 version 6.37.39.113 (r722271 CY)" from cypress/cyfmac4339-sdio.bin) the RSSI respose is only 4 bytes, which results in an error being logged.
It seems that older devices send only the RSSI field and neither SNR nor noise is included. Handle this by accepting a 4 byte message and reading only the RSSI from it.
--- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +8 -6
@@ -6494,18 +6494,20 @@ static s32 brcmf_notify_rssi(struct brcmf_if *ifp, {struct brcmf_cfg80211_vif *vif = ifp->vif;struct brcmf_rssi_be *info = data; -s32 rssi, snr, noise; +s32 rssi, snr =0 , noise =0 ;s32 low, high, last; -if (e->datalen <sizeof (*info)) { +if (e->datalen >=sizeof (*info)) { + rssi =be32_to_cpu (info->rssi); + snr =be32_to_cpu (info->snr); + noise =be32_to_cpu (info->noise); + }else if (e->datalen >=sizeof (rssi)) { + rssi =be32_to_cpu (*(__be32 *)data); + }else {brcmf_err ("insufficient RSSI event data\n" );return 0 ; } - rssi =be32_to_cpu (info->rssi); - snr =be32_to_cpu (info->snr); - noise =be32_to_cpu (info->noise); - low = vif->cqm_rssi_low; high = vif->cqm_rssi_high; last = vif->cqm_rssi_last;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 288/663 wifi: ath6kl: reduce WARN to dev_dbg() in callback
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 75c4a8154cb6c7239fb55d5550f481f6765fb83c ]
The warn is triggered on a known race condition, documented in the code above the test, that is correctly handled. Using WARN() hinders automated testing. Reducing severity.
--- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath6kl/htc_pipe.c +2 -2
@@ -960,8 +960,8 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,* Thus the possibility of ar->htc_target being NULL * via ath6kl_recv_complete -> ath6kl_usb_io_comp_work. */ -if (WARN_ON_ONCE (!target)) { -ath6kl_err ("Target not yet initialized\n" ); +if (!target) { +ath6kl_dbg (ATH6KL_DBG_HTC ,"Target not yet initialized\n" ); status = -EINVAL ; goto free_skb; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 289/663 tools: bpftool: Remove invalid \ json escape
In reply to Greg Kroah-HartmanFrom: Luis Gerhorst <[email protected]>
[ Upstream commit c679bbd611c08b0559ffae079330bc4e5574696a ]
RFC8259 ("The JavaScript Object Notation (JSON) Data Interchange Format") only specifies \", \\, \/, \b, \f, \n, \r, and \r as valid two-character escape sequences. This does not include \', which is not required in JSON because it exclusively uses double quotes as string separators.
Solidus (/) may be escaped, but does not have to. Only reverse solidus (\), double quotes ("), and the control characters have to be escaped. Therefore, with this fix, bpftool correctly supports all valid two-character escape sequences (but still does not support characters that require multi-character escape sequences).
Witout this fix, attempting to load a JSON file generated by bpftool using Python 3.10.6's default json.load() may fail with the error "Invalid \escape" if the file contains the invalid escaped single quote (\').
--- tools/bpf/bpftool/json_writer.c | 3 --- 1 file changed, 3 deletions(-)
tools/bpf/bpftool/json_writer.c +0 -3
@@ -80,9 +80,6 @@ static void jsonw_puts(json_writer_t *self, const char *str)case '"' :fputs ("\\\"" , self->out);break ; -case '\'' : -fputs ("\\\'" , self->out); -break ;default :putc (*str, self->out); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 290/663 wifi: rtw88: mac: Return the original error from rtw_pwr_seq_parser()
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit b7ed9fa2cb76ca7a3c3cd4a6d35748fe1fbda9f6 ]
rtw_pwr_seq_parser() calls rtw_sub_pwr_seq_parser() which can either return -EBUSY, -EINVAL or 0. Propagate the original error code instead of unconditionally returning -EBUSY in case of an error.
--- drivers/net/wireless/realtek/rtw88/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/mac.c +1 -1
@@ -233,7 +233,7 @@ static int rtw_pwr_seq_parser(struct rtw_dev *rtwdev, ret =rtw_sub_pwr_seq_parser (rtwdev, intf_mask, cut_mask, cmd);if (ret) -return -EBUSY ; +return ret; idx++; }while (1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 291/663 wifi: rtw88: mac: Return the original error from rtw_mac_power_switch()
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 15c8e267dfa62f207ee1db666c822324e3362b84 ]
rtw_mac_power_switch() calls rtw_pwr_seq_parser() which can return -EINVAL, -EBUSY or 0. Propagate the original error code instead of unconditionally returning -EINVAL in case of an error.
--- drivers/net/wireless/realtek/rtw88/mac.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/mac.c +4 -2
@@ -247,6 +247,7 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)const struct rtw_pwr_seq_cmd **pwr_seq;u8 rpwm;bool cur_pwr; +int ret;if (rtw_chip_wcpu_11ac (rtwdev)) { rpwm =rtw_read8 (rtwdev, rtwdev->hci.rpwm_addr);
@@ -270,8 +271,9 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)return -EALREADY ; pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; -if (rtw_pwr_seq_parser (rtwdev, pwr_seq)) -return -EINVAL ; + ret =rtw_pwr_seq_parser (rtwdev, pwr_seq); +if (ret) +return ret;if (pwr_on)set_bit (RTW_FLAG_POWERON , rtwdev->flags);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 292/663 bpf: take into account liveness when propagating precision
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 52c2b005a3c18c565fc70cfd0ca49375f301e952 ]
When doing state comparison, if old state has register that is not marked as REG_LIVE_READ, then we just skip comparison, regardless what's the state of corresponing register in current state. This is because not REG_LIVE_READ register is irrelevant for further program execution and correctness. All good here.
But when we get to precision propagation, after two states were declared equivalent, we don't take into account old register's liveness, and thus attempt to propagate precision for register in current state even if that register in old state was not REG_LIVE_READ anymore. This is bad, because register in current state could be anything at all and this could cause -EFAULT due to internal logic bugs.
Fix by taking into account REG_LIVE_READ liveness mark to keep the logic in state comparison in sync with precision propagation.
--- kernel/bpf/verifier.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +4 -2
@@ -13674,7 +13674,8 @@ static int propagate_precision(struct bpf_verifier_env *env, state_reg = state->regs;for (i =0 ; i <BPF_REG_FP ; i++, state_reg++) {if (state_reg->type !=SCALAR_VALUE || - !state_reg->precise) + !state_reg->precise || + !(state_reg->live ®_LIVE_READ ))continue ;if (env->log.level &BPF_LOG_LEVEL2 )verbose (env,"frame %d: propagating r%d\n" , i, fr);
@@ -13688,7 +13689,8 @@ static int propagate_precision(struct bpf_verifier_env *env,continue ; state_reg = &state->stack[i].spilled_ptr;if (state_reg->type !=SCALAR_VALUE || - !state_reg->precise) + !state_reg->precise || + !(state_reg->live ®_LIVE_READ ))continue ;if (env->log.level &BPF_LOG_LEVEL2 ) verbose(env, "frame %d: propagating fp%d\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 293/663 bpf: fix precision propagation verbose logging
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 34f0677e7afd3a292bc1aadda7ce8e35faedb204 ]
Fix wrong order of frame index vs register/slot index in precision propagation verbose (level 2) output. It's wrong and very confusing as is.
--- kernel/bpf/verifier.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +2 -2
@@ -13678,7 +13678,7 @@ static int propagate_precision(struct bpf_verifier_env *env, !(state_reg->live & REG_LIVE_READ))continue ;if (env->log.level &BPF_LOG_LEVEL2 ) -verbose (env,"frame %d: propagating r%d\n" , i, fr); +verbose (env,"frame %d: propagating r%d\n" , fr, i); err =mark_chain_precision_frame (env, fr, i);if (err <0 )return err;
@@ -13694,7 +13694,7 @@ static int propagate_precision(struct bpf_verifier_env *env,continue ;if (env->log.level &BPF_LOG_LEVEL2 )verbose (env,"frame %d: propagating fp%d\n" , - (-i -1 ) *BPF_REG_SIZE , fr); + fr, (-i -1 ) *BPF_REG_SIZE ); err =mark_chain_precision_stack_frame (env, fr, i);if (err <0 )return err;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 294/663 crypto: qat - fix concurrency issue when device state changes
In reply to Greg Kroah-HartmanFrom: Shashank Gupta <[email protected]>
[ Upstream commit 1bdc85550a2b59bb7f62ead7173134e66dd2d60e ]
The sysfs state attribute is not protected against race conditions. If multiple processes perform a device state transition on the same device in parallel, unexpected behaviors might occur.
For transitioning the device state, adf_sysfs.c calls the functions adf_dev_init(), adf_dev_start(), adf_dev_stop() and adf_dev_shutdown() which are unprotected and interdependent on each other. To perform a state transition, these functions needs to be called in a specific order:
* device up: adf_dev_init() -> adf_dev_start()
* device down: adf_dev_stop() -> adf_dev_shutdown()
This change introduces the functions adf_dev_up() and adf_dev_down() which wrap the state machine functions and protect them with a per-device lock. These are then used in adf_sysfs.c instead of the individual state transition functions.
--- .../crypto/qat/qat_common/adf_accel_devices.h | 1 + .../crypto/qat/qat_common/adf_common_drv.h | 3 + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 2 + drivers/crypto/qat/qat_common/adf_init.c | 64 +++++++++++++++++++ drivers/crypto/qat/qat_common/adf_sysfs.c | 23 +------ 5 files changed, 73 insertions(+), 20 deletions(-)
drivers/crypto/qat/qat_common/adf_accel_devices.h +1 -0
@@ -310,6 +310,7 @@ struct adf_accel_dev {u8 pf_compat_ver; } vf; }; +struct mutex state_lock;/* protect state of the device */ bool is_vf;u32 accel_id; };
drivers/crypto/qat/qat_common/adf_common_drv.h +3 -0
@@ -58,6 +58,9 @@ void adf_dev_stop(struct adf_accel_dev *accel_dev);void adf_dev_shutdown (struct adf_accel_dev *accel_dev);int adf_dev_shutdown_cache_cfg (struct adf_accel_dev *accel_dev); +int adf_dev_up (struct adf_accel_dev *accel_dev,bool init_config); +int adf_dev_down (struct adf_accel_dev *accel_dev,bool cache_config); +void adf_devmgr_update_class_index (struct adf_hw_device_data *hw_data);void adf_clean_vf_map (bool );
drivers/crypto/qat/qat_common/adf_dev_mgr.c +2 -0
@@ -223,6 +223,7 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev, map->attached = true;list_add_tail (&map->list, &vfs_table); } +mutex_init (&accel_dev->state_lock); unlock:mutex_unlock (&table_lock);return ret;
@@ -269,6 +270,7 @@ void adf_devmgr_rm_dev(struct adf_accel_dev *accel_dev, } } unlock: +mutex_destroy (&accel_dev->state_lock);list_del (&accel_dev->list);mutex_unlock (&table_lock); }
drivers/crypto/qat/qat_common/adf_init.c +64 -0
67 lines not on this page · raw message
drivers/crypto/qat/qat_common/adf_sysfs.c +3 -20
@@ -50,38 +50,21 @@ static ssize_t state_store(struct device *dev, struct device_attribute *attr,switch (ret) {case DEV_DOWN : -if (!adf_dev_started (accel_dev)) { -dev_info (dev,"Device qat_dev%d already down\n" , - accel_id); -return -EINVAL ; - } -dev_info (dev,"Stopping device qat_dev%d\n" , accel_id); - ret =adf_dev_shutdown_cache_cfg (accel_dev); + ret =adf_dev_down (accel_dev, true);if (ret <0 )return -EINVAL ;break ;case DEV_UP : -if (adf_dev_started (accel_dev)) { -dev_info (dev,"Device qat_dev%d already up\n" , - accel_id); -return -EINVAL ; - } -dev_info (dev,"Starting device qat_dev%d\n" , accel_id); - ret =GET_HW_DATA (accel_dev)->dev_config (accel_dev); -if (!ret) - ret =adf_dev_init (accel_dev); -if (!ret) - ret =adf_dev_start (accel_dev); - + ret =adf_dev_up (accel_dev, true);if (ret <0 ) {dev_err (dev,"Failed to start device qat_dev%d\n" , accel_id); -adf_dev_shutdown_cache_cfg (accel_dev); +adf_dev_down (accel_dev, true);return ret; }break ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 295/663 scm: fix MSG_CTRUNC setting condition for SO_PASSSEC
In reply to Greg Kroah-HartmanFrom: Alexander Mikhalitsyn <[email protected]>
[ Upstream commit a02d83f9947d8f71904eda4de046630c3eb6802c ]
Currently, kernel would set MSG_CTRUNC flag if msg_control buffer wasn't provided and SO_PASSCRED was set or if there was pending SCM_RIGHTS.
For some reason we have no corresponding check for SO_PASSSEC.
In the recvmsg(2) doc we have:
MSG_CTRUNC
indicates that some control data was discarded due to lack of space in the buffer for ancillary data.
So, we need to set MSG_CTRUNC flag for all types of SCM.
This change can break applications those don't check MSG_CTRUNC flag.
v2:
- commit message was rewritten according to Eric's suggestion
--- include/net/scm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
include/net/scm.h +12 -1
@@ -105,16 +105,27 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc } } } + +static inline bool scm_has_secdata (struct socket *sock) +{ +return test_bit (SOCK_PASSSEC , &sock->flags); +}#else static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) { } + +static inline bool scm_has_secdata (struct socket *sock) +{ +return false; +}#endif /* CONFIG_SECURITY_NETWORK */ static __inline__void scm_recv (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm,int flags) {if (!msg->msg_control) { -if (test_bit (SOCK_PASSCRED , &sock->flags) || scm->fp) +if (test_bit (SOCK_PASSCRED , &sock->flags) || scm->fp || +scm_has_secdata (sock)) msg->msg_flags |=MSG_CTRUNC ;scm_destroy (scm);return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 296/663 wifi: ath11k: fix deinitialization of firmware resources
In reply to Greg Kroah-HartmanFrom: Aditya Kumar Singh <[email protected]>
[ Upstream commit 5a78ac33e3cb8822da64dd1af196e83664b332b0 ]
Currently, in ath11k_ahb_fw_resources_init(), iommu domain mapping is done only for the chipsets having fixed firmware memory. Also, for such chipsets, mapping is done only if it does not have TrustZone support.
During deinitialization, only if TrustZone support is not there, iommu is unmapped back. However, for non fixed firmware memory chipsets, TrustZone support is not there and this makes the condition check to true and it tries to unmap the memory which was not mapped during initialization.
This leads to the following trace -
[ 83.198790] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000008 [ 83.259537] Modules linked in: ath11k_ahb ath11k qmi_helpers .. snip .. [ 83.280286] pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 83.287228] pc : __iommu_unmap+0x30/0x140 [ 83.293907] lr : iommu_unmap+0x5c/0xa4 [ 83.298072] sp : ffff80000b3abad0 .. snip .. [ 83.369175] Call trace: [ 83.376282] __iommu_unmap+0x30/0x140 [ 83.378541] iommu_unmap+0x5c/0xa4 [ 83.382360] ath11k_ahb_fw_resource_deinit.part.12+0x2c/0xac [ath11k_ahb] [ 83.385666] ath11k_ahb_free_resources+0x140/0x17c [ath11k_ahb] [ 83.392521] ath11k_ahb_shutdown+0x34/0x40 [ath11k_ahb] [ 83.398248] platform_shutdown+0x20/0x2c [ 83.403455] device_shutdown+0x16c/0x1c4 [ 83.407621] kernel_restart_prepare+0x34/0x3c [ 83.411529] kernel_restart+0x14/0x74 [ 83.415781] __do_sys_reboot+0x1c4/0x22c [ 83.419427] __arm64_sys_reboot+0x1c/0x24 [ 83.423420] invoke_syscall+0x44/0xfc [ 83.427326] el0_svc_common.constprop.3+0xac/0xe8 [ 83.430974] do_el0_svc+0xa0/0xa8 [ 83.435659] el0_svc+0x1c/0x44 [ 83.438957] el0t_64_sync_handler+0x60/0x144 [ 83.441910] el0t_64_sync+0x15c/0x160 [ 83.446343] Code: aa0103f4 f9400001 f90027a1 d2800001 (f94006a0) [ 83.449903] ---[ end trace 0000000000000000 ]---
This can be reproduced by probing an AHB chipset which is not having a fixed memory region. During reboot (or rmmod) trace can be seen.
Fix this issue by adding a condition check on firmware fixed memory hw_param as done in the counter initialization function.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/ahb.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ath/ath11k/ahb.c +6 -0
@@ -1063,6 +1063,12 @@ static int ath11k_ahb_fw_resource_deinit(struct ath11k_base *ab)struct iommu_domain *iommu;size_t unmapped_size; +/* Chipsets not requiring MSA would have not initialized +* MSA resources, return success in such cases. +*/ +if (!ab->hw_params.fixed_fw_mem) +return 0 ; +if (ab_ahb->fw.use_tz)return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 297/663 selftests/bpf: Fix a fd leak in an error path in network_helpers.c
In reply to Greg Kroah-HartmanFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 226efec2b0efad60d4a6c4b2c3a8710dafc4dc21 ]
In __start_server, it leaks a fd when setsockopt(SO_REUSEPORT) fails. This patch fixes it.
--- tools/testing/selftests/bpf/network_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/network_helpers.c +1 -1
@@ -95,7 +95,7 @@ static int __start_server(int type, int protocol, const struct sockaddr *addr,if (reuseport &&setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &on,sizeof (on))) {log_err ("Failed to set SO_REUSEPORT" ); -return -1 ; + goto error_close; }if (bind (fd, addr, addrlen) <0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 298/663 bpf: Remove misleading spec_v1 check on var-offset stack read
In reply to Greg Kroah-HartmanFrom: Luis Gerhorst <[email protected]>
[ Upstream commit 082cdc69a4651dd2a77539d69416a359ed1214f5 ]
For every BPF_ADD/SUB involving a pointer, adjust_ptr_min_max_vals() ensures that the resulting pointer has a constant offset if bypass_spec_v1 is false. This is ensured by calling sanitize_check_bounds() which in turn calls check_stack_access_for_ptr_arithmetic(). There, -EACCESS is returned if the register's offset is not constant, thereby rejecting the program.
In summary, an unprivileged user must never be able to create stack pointers with a variable offset. That is also the case, because a respective check in check_stack_write() is missing. If they were able to create a variable-offset pointer, users could still use it in a stack-write operation to trigger unsafe speculative behavior [1].
Because unprivileged users must already be prevented from creating variable-offset stack pointers, viable options are to either remove this check (replacing it with a clarifying comment), or to turn it into a "verifier BUG"-message, also adding a similar check in check_stack_write() (for consistency, as a second-level defense). This patch implements the first option to reduce verifier bloat.
This check was introduced by commit 01f810ace9ed ("bpf: Allow variable-offset stack access") which correctly notes that "variable-offset reads and writes are disallowed (they were already disallowed for the indirect access case) because the speculative execution checking code doesn't support them". However, it does not further discuss why the check in check_stack_read() is necessary. The code which made this check obsolete was also introduced in this commit.
I have compiled ~650 programs from the Linux selftests, Linux samples, Cilium, and libbpf/examples projects and confirmed that none of these trigger the check in check_stack_read() [2]. Instead, all of these programs are, as expected, already rejected when constructing the variable-offset pointers. Note that the check in check_stack_access_for_ptr_arithmetic() also prints "off=%d" while the code removed by this patch does not (the error removed does not appear in the "verification_error" values). For reproducibility, the repository linked includes the raw data and scripts used to create the plot.
[1] https://arxiv.org/pdf/1807.03757.pdf
[2] https://gitlab.cs.fau.de/un65esoq/bpf-spectre/-/raw/53dc19fcf459c186613b1156a81504b39c8d49db/data/plots/23-02-26_23-56_bpftool/bpftool/0004-errors.pdf?inline=false
--- kernel/bpf/verifier.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
kernel/bpf/verifier.c +6 -10
@@ -3895,17 +3895,13 @@ static int check_stack_read(struct bpf_verifier_env *env, }/* Variable offset is prohibited for unprivileged mode for simplicity * since it requires corresponding support in Spectre masking for stack -* ALU. See also retrieve_ptr_limit(). +* ALU. See also retrieve_ptr_limit(). The check in +* check_stack_access_for_ptr_arithmetic() called by +* adjust_ptr_min_max_vals() prevents users from creating stack pointers +* with variable offsets, therefore no check is required here. Further, +* just checking it here would be insufficient as speculative stack +* writes could still lead to unsafe speculative behaviour. */ -if (!env->bypass_spec_v1 && var_off) { -char tn_buf[48 ]; - -tnum_strn (tn_buf,sizeof (tn_buf), reg->var_off); -verbose (env,"R%d variable offset stack access prohibited for !root, var_off=%s\n" , - ptr_regno, tn_buf); -return -EACCES ; - } -if (!var_off) { off += reg->var_off.value; err = check_stack_read_fixed_off(env, state, off, size,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 299/663 net: pcs: xpcs: remove double-read of link state when using AN
In reply to Greg Kroah-HartmanFrom: Russell King (Oracle) <[email protected]>
[ Upstream commit ef63461caf427a77a04620d74ba90035a712af9c ]
Phylink does not want the current state of the link when reading the PCS link state - it wants the latched state. Don't double-read the MII status register. Phylink will re-read as necessary to capture transient link-down events as of dbae3388ea9c ("net: phylink: Force retrigger in case of latched link-fail indicator").
The above referenced commit is a dependency for this change, and thus this change should not be backported to any kernel that does not contain the above referenced commit.
--- drivers/net/pcs/pcs-xpcs.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/net/pcs/pcs-xpcs.c +2 -11
@@ -323,7 +323,7 @@ static int xpcs_read_fault_c73(struct dw_xpcs *xpcs,return 0 ; } -static int xpcs_read_link_c73 (struct dw_xpcs *xpcs,bool an) +static int xpcs_read_link_c73 (struct dw_xpcs *xpcs) {bool link = true;int ret;
@@ -335,15 +335,6 @@ static int xpcs_read_link_c73(struct dw_xpcs *xpcs, bool an)if (!(ret &MDIO_STAT1_LSTATUS )) link = false; -if (an) { - ret =xpcs_read (xpcs,MDIO_MMD_AN ,MDIO_STAT1 ); -if (ret <0 ) -return ret; - -if (!(ret &MDIO_STAT1_LSTATUS )) - link = false; - } -return link; }
@@ -937,7 +928,7 @@ static int xpcs_get_state_c73(struct dw_xpcs *xpcs,int ret;/* Link needs to be read first ... */ - state->link =xpcs_read_link_c73 (xpcs, state->an_enabled) >0 ?1 :0 ; + state->link =xpcs_read_link_c73 (xpcs) >0 ?1 :0 ;/* ... and then we check the faults. */ ret =xpcs_read_fault_c73 (xpcs, state);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 300/663 vlan: partially enable SIOCSHWTSTAMP in container
In reply to Greg Kroah-HartmanFrom: Vadim Fedorenko <[email protected]>
[ Upstream commit 731b73dba359e3ff00517c13aa0daa82b34ff466 ]
Setting timestamp filter was explicitly disabled on vlan devices in containers because it might affect other processes on the host. But it's absolutely legit in case when real device is in the same namespace.
--- net/8021q/vlan_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/8021q/vlan_dev.c +1 -1
@@ -365,7 +365,7 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)switch (cmd) {case SIOCSHWTSTAMP : -if (!net_eq (dev_net (dev), &init_net)) +if (!net_eq (dev_net (dev),dev_net (real_dev)))break ; fallthrough;case SIOCGMIIPHY :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 301/663 net/packet: annotate accesses to po->xmit
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit b9d83ab8a708f23a4001d60e9d8d0b3be3d9f607 ]
po->xmit can be set from setsockopt(PACKET_QDISC_BYPASS), while read locklessly.
Use READ_ONCE()/WRITE_ONCE() to avoid potential load/store tearing issues.
--- net/packet/af_packet.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/packet/af_packet.c +8 -4
@@ -307,7 +307,8 @@ static void packet_cached_dev_reset(struct packet_sock *po)static bool packet_use_direct_xmit (const struct packet_sock *po) { -return po->xmit == packet_direct_xmit; +/* Paired with WRITE_ONCE() in packet_setsockopt() */ +return READ_ONCE (po->xmit) == packet_direct_xmit; }static u16 packet_pick_tx_queue (struct sk_buff *skb)
@@ -2867,7 +2868,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)packet_inc_pending (&po->tx_ring); status =TP_STATUS_SEND_REQUEST ; - err = po->xmit (skb); +/* Paired with WRITE_ONCE() in packet_setsockopt() */ + err =READ_ONCE (po->xmit)(skb);if (unlikely (err !=0 )) {if (err >0 ) err =net_xmit_errno (err);
@@ -3070,7 +3072,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)virtio_net_hdr_set_proto (skb, &vnet_hdr); } - err = po->xmit (skb); +/* Paired with WRITE_ONCE() in packet_setsockopt() */ + err =READ_ONCE (po->xmit)(skb);if (unlikely (err !=0 )) {if (err >0 ) err =net_xmit_errno (err);
@@ -4007,7 +4010,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval,if (copy_from_sockptr (&val, optval,sizeof (val)))return -EFAULT ; - po->xmit = val ? packet_direct_xmit : dev_queue_xmit; +/* Paired with all lockless reads of po->xmit */ +WRITE_ONCE (po->xmit, val ? packet_direct_xmit : dev_queue_xmit);return 0 ; }default :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 302/663 net/packet: convert po->origdev to an atomic flag
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ee5675ecdf7a4e713ed21d98a70c2871d6ebed01 ]
syzbot/KCAN reported that po->origdev can be read
while another thread is changing its value.
We can avoid this splat by converting this field
to an actual bit.
Following patches will convert remaining 1bit fields.
--- net/packet/af_packet.c | 10 ++++------ net/packet/diag.c | 2 +- net/packet/internal.h | 22 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 8 deletions(-)
net/packet/af_packet.c +4 -6
@@ -2186,7 +2186,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, sll = &PACKET_SKB_CB (skb)->sa.ll; sll->sll_hatype = dev->type; sll->sll_pkttype = skb->pkt_type; -if (unlikely (po->origdev)) +if (unlikely (packet_sock_flag (po,PACKET_SOCK_ORIGDEV ))) sll->sll_ifindex = orig_dev->ifindex;else sll->sll_ifindex = dev->ifindex;
@@ -2461,7 +2461,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, sll->sll_hatype = dev->type; sll->sll_protocol = skb->protocol; sll->sll_pkttype = skb->pkt_type; -if (unlikely (po->origdev)) +if (unlikely (packet_sock_flag (po,PACKET_SOCK_ORIGDEV ))) sll->sll_ifindex = orig_dev->ifindex;else sll->sll_ifindex = dev->ifindex;
@@ -3914,9 +3914,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval,if (copy_from_sockptr (&val, optval,sizeof (val)))return -EFAULT ; -lock_sock (sk); - po->origdev = !!val; -release_sock (sk); +packet_sock_flag_set (po,PACKET_SOCK_ORIGDEV , val);return 0 ; }case PACKET_VNET_HDR :
@@ -4065,7 +4063,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, val = po->auxdata;break ;case PACKET_ORIGDEV : - val = po->origdev; + val =packet_sock_flag (po,PACKET_SOCK_ORIGDEV );break ;case PACKET_VNET_HDR : val = po->has_vnet_hdr;
net/packet/diag.c +1 -1
@@ -25,7 +25,7 @@ static int pdiag_put_info(const struct packet_sock *po, struct sk_buff *nlskb) pinfo.pdi_flags |=PDI_RUNNING ;if (po->auxdata) pinfo.pdi_flags |=PDI_AUXDATA ; -if (po->origdev) +if (packet_sock_flag (po,PACKET_SOCK_ORIGDEV )) pinfo.pdi_flags |=PDI_ORIGDEV ;if (po->has_vnet_hdr) pinfo.pdi_flags |=PDI_VNETHDR ;
net/packet/internal.h +21 -1
@@ -116,9 +116,9 @@ struct packet_sock {int copy_thresh;spinlock_t bind_lock;struct mutex pg_vec_lock; +unsigned long flags;unsigned int running;/* bind_lock must be held */ unsigned int auxdata:1, /* writer must hold sock lock */ - origdev:1, has_vnet_hdr:1, tp_loss:1, tp_tx_has_off:1;
@@ -144,4 +144,24 @@ static inline struct packet_sock *pkt_sk(struct sock *sk) return (struct packet_sock *)sk; } +enum packet_sock_flags { +PACKET_SOCK_ORIGDEV , +}; + +static inline void packet_sock_flag_set (struct packet_sock *po, +enum packet_sock_flags flag, +bool val) +{ +if (val) +set_bit (flag, &po->flags); +else +clear_bit (flag, &po->flags); +} + +static inline bool packet_sock_flag (const struct packet_sock *po, +enum packet_sock_flags flag) +{ +return test_bit (flag, &po->flags); +} +#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 303/663 net/packet: convert po->auxdata to an atomic flag
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit fd53c297aa7b077ae98a3d3d2d3aa278a1686ba6 ]
po->auxdata can be read while another thread is changing its value, potentially raising KCSAN splat.
Convert it to PACKET_SOCK_AUXDATA flag.
--- net/packet/af_packet.c | 8 +++----- net/packet/diag.c | 2 +- net/packet/internal.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-)
net/packet/af_packet.c +3 -5
@@ -3516,7 +3516,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); } -if (pkt_sk (sk)->auxdata) { +if (packet_sock_flag (pkt_sk (sk),PACKET_SOCK_AUXDATA )) {struct tpacket_auxdata aux; aux.tp_status =TP_STATUS_USER ;
@@ -3900,9 +3900,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval,if (copy_from_sockptr (&val, optval,sizeof (val)))return -EFAULT ; -lock_sock (sk); - po->auxdata = !!val; -release_sock (sk); +packet_sock_flag_set (po,PACKET_SOCK_AUXDATA , val);return 0 ; }case PACKET_ORIGDEV :
@@ -4060,7 +4058,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,break ;case PACKET_AUXDATA : - val = po->auxdata; + val =packet_sock_flag (po,PACKET_SOCK_AUXDATA );break ;case PACKET_ORIGDEV : val =packet_sock_flag (po,PACKET_SOCK_ORIGDEV );
net/packet/diag.c +1 -1
@@ -23,7 +23,7 @@ static int pdiag_put_info(const struct packet_sock *po, struct sk_buff *nlskb) pinfo.pdi_flags =0 ;if (po->running) pinfo.pdi_flags |=PDI_RUNNING ; -if (po->auxdata) +if (packet_sock_flag (po,PACKET_SOCK_AUXDATA )) pinfo.pdi_flags |=PDI_AUXDATA ;if (packet_sock_flag (po,PACKET_SOCK_ORIGDEV )) pinfo.pdi_flags |=PDI_ORIGDEV ;
net/packet/internal.h +2 -2
@@ -118,8 +118,7 @@ struct packet_sock {struct mutex pg_vec_lock;unsigned long flags;unsigned int running;/* bind_lock must be held */ - unsigned int auxdata:1, /* writer must hold sock lock */ - has_vnet_hdr:1, + unsigned int has_vnet_hdr:1, /* writer must hold sock lock */ tp_loss:1, tp_tx_has_off:1;int pressure;
@@ -146,6 +145,7 @@ static inline struct packet_sock *pkt_sk(struct sock *sk)enum packet_sock_flags {PACKET_SOCK_ORIGDEV , +PACKET_SOCK_AUXDATA , }; static inline void packet_sock_flag_set(struct packet_sock *po,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 304/663 libbpf: Fix ld_imm64 copy logic for ksym in light skeleton.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit a506d6ce1dd184051037dc9d26c3eb187c9fe625 ]
Unlike normal libbpf the light skeleton 'loader' program is doing btf_find_by_name_kind() call at run-time to find ksym in the kernel and populate its {btf_id, btf_obj_fd} pair in ld_imm64 insn. To avoid doing the search multiple times for the same ksym it remembers the first patched ld_imm64 insn and copies {btf_id, btf_obj_fd} from it into subsequent ld_imm64 insn. Fix a bug in copying logic, since it may incorrectly clear BPF_PSEUDO_BTF_ID flag.
Also replace always true if (btf_obj_fd >= 0) check with unconditional JMP_JA to clarify the code.
--- tools/lib/bpf/gen_loader.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
tools/lib/bpf/gen_loader.c +6 -4
@@ -804,11 +804,13 @@ static void emit_relo_ksym_btf(struct bpf_gen *gen, struct ksym_relo_desc *relo,return ;/* try to copy from existing ldimm64 insn */ if (kdesc->ref >1 ) { -move_blob2blob (gen, insn + offsetof(struct bpf_insn , imm),4 , - kdesc->insn + offsetof(struct bpf_insn , imm));move_blob2blob (gen, insn +sizeof (struct bpf_insn ) + offsetof(struct bpf_insn , imm),4 , kdesc->insn +sizeof (struct bpf_insn ) + offsetof(struct bpf_insn , imm)); -/* jump over src_reg adjustment if imm is not 0, reuse BPF_REG_0 from move_blob2blob */ +move_blob2blob (gen, insn + offsetof(struct bpf_insn , imm),4 , + kdesc->insn + offsetof(struct bpf_insn , imm)); +/* jump over src_reg adjustment if imm (btf_id) is not 0, reuse BPF_REG_0 from move_blob2blob +* If btf_id is zero, clear BPF_PSEUDO_BTF_ID flag in src_reg of ld_imm64 insn +*/ emit (gen,BPF_JMP_IMM (BPF_JNE ,BPF_REG_0 ,0 ,3 )); goto clear_src_reg; }
@@ -831,7 +833,7 @@ static void emit_relo_ksym_btf(struct bpf_gen *gen, struct ksym_relo_desc *relo,emit (gen,BPF_STX_MEM (BPF_W ,BPF_REG_8 ,BPF_REG_7 ,sizeof (struct bpf_insn ) + offsetof(struct bpf_insn , imm)));/* skip src_reg adjustment */ -emit (gen,BPF_JMP_IMM (BPF_JSGE ,BPF_REG_7 ,0 ,3 )); +emit (gen,BPF_JMP_IMM (BPF_JA ,0 ,0 ,3 )); clear_src_reg:/* clear bpf_object__relocate_data's src_reg assignment, otherwise we get a verifier failure */ reg_mask =src_reg_mask ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 305/663 net: dsa: qca8k: remove assignment of an_enabled in pcs_get_state()
In reply to Greg Kroah-HartmanFrom: Russell King (Oracle) <[email protected]>
[ Upstream commit 9ef70d0130f282638b28cfce24222f71ada00c9c ]
pcs_get_state() implementations are not supposed to alter an_enabled. Remove this assignment.
--- drivers/net/dsa/qca/qca8k-8xxx.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/dsa/qca/qca8k-8xxx.c +0 -1
@@ -1427,7 +1427,6 @@ static void qca8k_pcs_get_state(struct phylink_pcs *pcs, state->link = !!(reg &QCA8K_PORT_STATUS_LINK_UP ); state->an_complete = state->link; - state->an_enabled = !!(reg &QCA8K_PORT_STATUS_LINK_AUTO ); state->duplex = (reg &QCA8K_PORT_STATUS_DUPLEX ) ?DUPLEX_FULL :DUPLEX_HALF ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 306/663 netfilter: keep conntrack reference until IPsecv6 policy checks are done
In reply to Greg Kroah-HartmanFrom: Madhu Koriginja <[email protected]>
[ Upstream commit b0e214d212030fe497d4d150bb3474e50ad5d093 ]
Keep the conntrack reference until policy checks have been performed for IPsec V6 NAT support, just like ipv4.
The reference needs to be dropped before a packet is queued to avoid having the conntrack module unloadable.
--- net/dccp/ipv6.c | 1 + net/ipv6/ip6_input.c | 14 ++++++-------- net/ipv6/raw.c | 5 ++--- net/ipv6/tcp_ipv6.c | 2 ++ net/ipv6/udp.c | 2 ++ 5 files changed, 13 insertions(+), 11 deletions(-)
net/dccp/ipv6.c +1 -0
@@ -783,6 +783,7 @@ static int dccp_v6_rcv(struct sk_buff *skb)if (!xfrm6_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_and_relse; +nf_reset_ct (skb);return __sk_receive_skb (sk, skb,1 , dh->dccph_doff *4 , refcounted) ?-1 :0 ;
net/ipv6/ip6_input.c +6 -8
@@ -404,10 +404,6 @@ void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr,/* Only do this once for first final protocol */ have_final = true; -/* Free reference early: we don't need it any more, -and it may hold ip_conntrack module loaded -indefinitely. */ -nf_reset_ct (skb);skb_postpull_rcsum (skb,skb_network_header (skb),skb_network_header_len (skb));
@@ -430,10 +426,12 @@ void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr, goto discard; } } -if (!(ipprot->flags &INET6_PROTO_NOPOLICY ) && - !xfrm6_policy_check (NULL ,XFRM_POLICY_IN , skb)) { -SKB_DR_SET (reason,XFRM_POLICY ); - goto discard; +if (!(ipprot->flags &INET6_PROTO_NOPOLICY )) { +if (!xfrm6_policy_check (NULL ,XFRM_POLICY_IN , skb)) { +SKB_DR_SET (reason,XFRM_POLICY ); + goto discard; + } +nf_reset_ct (skb); } ret = INDIRECT_CALL_2(ipprot->handler, tcp_v6_rcv, udpv6_rcv,
net/ipv6/raw.c +2 -3
@@ -193,10 +193,8 @@ static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)struct sk_buff *clone =skb_clone (skb,GFP_ATOMIC );/* Not releasing hash table! */ -if (clone) { -nf_reset_ct (clone); +if (clone)rawv6_rcv (sk, clone); - } } }rcu_read_unlock ();
@@ -387,6 +385,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)kfree_skb (skb);return NET_RX_DROP ; } +nf_reset_ct (skb);if (!rp->checksum) skb->ip_summed =CHECKSUM_UNNECESSARY ;
net/ipv6/tcp_ipv6.c +2 -0
@@ -1721,6 +1721,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)if (drop_reason) goto discard_and_relse; +nf_reset_ct (skb); +if (tcp_filter (sk, skb)) { drop_reason =SKB_DROP_REASON_SOCKET_FILTER ; goto discard_and_relse;
net/ipv6/udp.c +2 -0
@@ -704,6 +704,7 @@ static int udpv6_queue_rcv_one_skb(struct sock *sk, struct sk_buff *skb) drop_reason =SKB_DROP_REASON_XFRM_POLICY ; goto drop; } +nf_reset_ct (skb);if (static_branch_unlikely (&udpv6_encap_needed_key) && up->encap_type) {int (*encap_rcv)(struct sock *sk,struct sk_buff *skb);
@@ -1027,6 +1028,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,if (!xfrm6_policy_check (NULL ,XFRM_POLICY_IN , skb)) goto discard; +nf_reset_ct (skb);if (udp_lib_checksum_complete (skb)) goto csum_error;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 307/663 bpf: return long from bpf_map_ops funcs
In reply to Greg Kroah-HartmanFrom: JP Kobryn <[email protected]>
[ Upstream commit d7ba4cc900bf1eea2d8c807c6b1fc6bd61f41237 ]
This patch changes the return types of bpf_map_ops functions to long, where previously int was returned. Using long allows for bpf programs to maintain the sign bit in the absence of sign extension during situations where inlined bpf helper funcs make calls to the bpf_map_ops funcs and a negative error is returned.
The definitions of the helper funcs are generated from comments in the bpf uapi header at include/uapi/linux/bpf.h. The return type of these helpers was previously changed from int to long in commit bdb7b79b4ce8. For any case where one of the map helpers call the bpf_map_ops funcs that are still returning 32-bit int, a compiler might not include sign extension instructions to properly convert the 32-bit negative value a 64-bit negative value.
For example:
bpf assembly excerpt of an inlined helper calling a kernel function and checking for a specific error:
; err = bpf_map_update_elem(&mymap, &key, &val, BPF_NOEXIST);
...
46: call 0xffffffffe103291c ; htab_map_update_elem
; if (err && err != -EEXIST) {
4b: cmp $0xffffffffffffffef,%rax ; cmp -EEXIST,%rax
kernel function assembly excerpt of return value from htab_map_update_elem returning 32-bit int:
movl $0xffffffef, %r9d
...
movl %r9d, %eax
...results in the comparison:
cmp $0xffffffffffffffef, $0x00000000ffffffef
--- include/linux/bpf.h | 14 ++++++------- include/linux/filter.h | 6 +++--- kernel/bpf/arraymap.c | 12 ++++++------ kernel/bpf/bloom_filter.c | 12 ++++++------ kernel/bpf/bpf_cgrp_storage.c | 6 +++--- kernel/bpf/bpf_inode_storage.c | 6 +++--- kernel/bpf/bpf_struct_ops.c | 6 +++--- kernel/bpf/bpf_task_storage.c | 6 +++--- kernel/bpf/cpumap.c | 8 ++++---- kernel/bpf/devmap.c | 24 +++++++++++------------ kernel/bpf/hashtab.c | 36 +++++++++++++++++----------------- kernel/bpf/local_storage.c | 6 +++--- kernel/bpf/lpm_trie.c | 6 +++--- kernel/bpf/queue_stack_maps.c | 22 ++++++++++----------- kernel/bpf/reuseport_array.c | 2 +- kernel/bpf/ringbuf.c | 6 +++--- kernel/bpf/stackmap.c | 6 +++--- kernel/bpf/verifier.c | 14 ++++++------- net/core/bpf_sk_storage.c | 6 +++--- net/core/sock_map.c | 8 ++++---- net/xdp/xskmap.c | 8 ++++---- 21 files changed, 110 insertions(+), 110 deletions(-)
include/linux/bpf.h +7 -7
@@ -95,11 +95,11 @@ struct bpf_map_ops {/* funcs callable from userspace and from eBPF programs */ void *(*map_lookup_elem)(struct bpf_map *map,void *key); -int (*map_update_elem)(struct bpf_map *map,void *key,void *value,u64 flags); -int (*map_delete_elem)(struct bpf_map *map,void *key); -int (*map_push_elem)(struct bpf_map *map,void *value,u64 flags); -int (*map_pop_elem)(struct bpf_map *map,void *value); -int (*map_peek_elem)(struct bpf_map *map,void *value); +long (*map_update_elem)(struct bpf_map *map,void *key,void *value,u64 flags); +long (*map_delete_elem)(struct bpf_map *map,void *key); +long (*map_push_elem)(struct bpf_map *map,void *value,u64 flags); +long (*map_pop_elem)(struct bpf_map *map,void *value); +long (*map_peek_elem)(struct bpf_map *map,void *value);void *(*map_lookup_percpu_elem)(struct bpf_map *map,void *key,u32 cpu);/* funcs called by prog_array and perf_event_array map */
@@ -138,7 +138,7 @@ struct bpf_map_ops {struct bpf_local_storage __rcu ** (*map_owner_storage_ptr)(void *owner);/* Misc helpers.*/ -int (*map_redirect)(struct bpf_map *map,u64 key,u64 flags); +long (*map_redirect)(struct bpf_map *map,u64 key,u64 flags);/* map_meta_equal must be implemented for maps that can be * used as an inner map. It is a runtime check to ensure
@@ -156,7 +156,7 @@ struct bpf_map_ops {int (*map_set_for_each_callback_args)(struct bpf_verifier_env *env,struct bpf_func_state *caller,struct bpf_func_state *callee); -int (*map_for_each_callback)(struct bpf_map *map, +long (*map_for_each_callback)(struct bpf_map *map,bpf_callback_t callback_fn,void *callback_ctx,u64 flags);
include/linux/filter.h +3 -3
@@ -1503,9 +1503,9 @@ static inline bool bpf_sk_lookup_run_v6(struct net *net, int protocol, }#endif /* IS_ENABLED(CONFIG_IPV6) */ -static __always_inline int __bpf_xdp_redirect_map(struct bpf_map *map, u64 index, -u64 flags,const u64 flag_mask, -void *lookup_elem (struct bpf_map *map,u32 key)) +static __always_inline long __bpf_xdp_redirect_map (struct bpf_map *map,u64 index, +u64 flags,const u64 flag_mask, +void *lookup_elem (struct bpf_map *map,u32 key)) {struct bpf_redirect_info *ri =this_cpu_ptr (&bpf_redirect_info);const u64 action_mask =XDP_ABORTED |XDP_DROP |XDP_PASS |XDP_TX ;
kernel/bpf/arraymap.c +6 -6
@@ -307,8 +307,8 @@ static int array_map_get_next_key(struct bpf_map *map, void *key, void *next_key }/* Called from syscall or from eBPF program */ -static int array_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long array_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) { struct bpf_array *array = container_of(map, struct bpf_array, map);u32 index = *(u32 *)key;
@@ -386,7 +386,7 @@ int bpf_percpu_array_update(struct bpf_map *map, void *key, void *value, }/* Called from syscall or from eBPF program */ -static int array_map_delete_elem (struct bpf_map *map,void *key) +static long array_map_delete_elem (struct bpf_map *map,void *key) {return -EINVAL ; }
@@ -686,8 +686,8 @@ static const struct bpf_iter_seq_info iter_seq_info = { .seq_priv_size = sizeof(struct bpf_iter_seq_array_map_info), }; -static int bpf_for_each_array_elem (struct bpf_map *map,bpf_callback_t callback_fn, -void *callback_ctx,u64 flags) +static long bpf_for_each_array_elem (struct bpf_map *map,bpf_callback_t callback_fn, +void *callback_ctx,u64 flags) {u32 i, key, num_elems =0 ;struct bpf_array *array;
@@ -847,7 +847,7 @@ int bpf_fd_array_map_update_elem(struct bpf_map *map, struct file *map_file,return 0 ; } -static int fd_array_map_delete_elem (struct bpf_map *map,void *key) +static long fd_array_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_array *array = container_of(map, struct bpf_array, map);void *old_ptr;
kernel/bpf/bloom_filter.c +6 -6
@@ -41,7 +41,7 @@ static u32 hash(struct bpf_bloom_filter *bloom, void *value,return h & bloom->bitset_mask; } -static int bloom_map_peek_elem (struct bpf_map *map,void *value) +static long bloom_map_peek_elem (struct bpf_map *map,void *value) {struct bpf_bloom_filter *bloom = container_of(map, struct bpf_bloom_filter, map);
@@ -56,7 +56,7 @@ static int bloom_map_peek_elem(struct bpf_map *map, void *value)return 0 ; } -static int bloom_map_push_elem (struct bpf_map *map,void *value,u64 flags) +static long bloom_map_push_elem (struct bpf_map *map,void *value,u64 flags) {struct bpf_bloom_filter *bloom = container_of(map, struct bpf_bloom_filter, map);
@@ -73,12 +73,12 @@ static int bloom_map_push_elem(struct bpf_map *map, void *value, u64 flags)return 0 ; } -static int bloom_map_pop_elem (struct bpf_map *map,void *value) +static long bloom_map_pop_elem (struct bpf_map *map,void *value) {return -EOPNOTSUPP ; } -static int bloom_map_delete_elem (struct bpf_map *map,void *value) +static long bloom_map_delete_elem (struct bpf_map *map,void *value) {return -EOPNOTSUPP ; }
@@ -177,8 +177,8 @@ static void *bloom_map_lookup_elem(struct bpf_map *map, void *key)return ERR_PTR (-EINVAL ); } -static int bloom_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 flags) +static long bloom_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 flags) {/* The eBPF program should use map_push_elem instead */ return -EINVAL ;
kernel/bpf/bpf_cgrp_storage.c +3 -3
@@ -100,8 +100,8 @@ static void *bpf_cgrp_storage_lookup_elem(struct bpf_map *map, void *key)return sdata ? sdata->data :NULL ; } -static int bpf_cgrp_storage_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags) +static long bpf_cgrp_storage_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags) {struct bpf_local_storage_data *sdata;struct cgroup *cgroup;
@@ -132,7 +132,7 @@ static int cgroup_storage_delete(struct cgroup *cgroup, struct bpf_map *map)return 0 ; } -static int bpf_cgrp_storage_delete_elem (struct bpf_map *map,void *key) +static long bpf_cgrp_storage_delete_elem (struct bpf_map *map,void *key) {struct cgroup *cgroup;int err, fd;
kernel/bpf/bpf_inode_storage.c +3 -3
@@ -97,8 +97,8 @@ static void *bpf_fd_inode_storage_lookup_elem(struct bpf_map *map, void *key)return sdata ? sdata->data :NULL ; } -static int bpf_fd_inode_storage_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags) +static long bpf_fd_inode_storage_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags) {struct bpf_local_storage_data *sdata;struct file *f;
@@ -133,7 +133,7 @@ static int inode_storage_delete(struct inode *inode, struct bpf_map *map)return 0 ; } -static int bpf_fd_inode_storage_delete_elem (struct bpf_map *map,void *key) +static long bpf_fd_inode_storage_delete_elem (struct bpf_map *map,void *key) {struct file *f;int fd, err;
kernel/bpf/bpf_struct_ops.c +3 -3
@@ -349,8 +349,8 @@ int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks, model, flags, tlinks, NULL); } -static int bpf_struct_ops_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 flags) +static long bpf_struct_ops_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 flags) {struct bpf_struct_ops_map *st_map = (struct bpf_struct_ops_map *)map;const struct bpf_struct_ops *st_ops = st_map->st_ops;
@@ -524,7 +524,7 @@ static int bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,return err; } -static int bpf_struct_ops_map_delete_elem (struct bpf_map *map,void *key) +static long bpf_struct_ops_map_delete_elem (struct bpf_map *map,void *key) {enum bpf_struct_ops_state prev_state;struct bpf_struct_ops_map *st_map;
kernel/bpf/bpf_task_storage.c +3 -3
@@ -127,8 +127,8 @@ static void *bpf_pid_task_storage_lookup_elem(struct bpf_map *map, void *key)return ERR_PTR (err); } -static int bpf_pid_task_storage_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags) +static long bpf_pid_task_storage_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags) {struct bpf_local_storage_data *sdata;struct task_struct *task;
@@ -180,7 +180,7 @@ static int task_storage_delete(struct task_struct *task, struct bpf_map *map,return 0 ; } -static int bpf_pid_task_storage_delete_elem (struct bpf_map *map,void *key) +static long bpf_pid_task_storage_delete_elem (struct bpf_map *map,void *key) {struct task_struct *task;unsigned int f_flags;
kernel/bpf/cpumap.c +4 -4
@@ -540,7 +540,7 @@ static void __cpu_map_entry_replace(struct bpf_cpu_map *cmap, } } -static int cpu_map_delete_elem (struct bpf_map *map,void *key) +static long cpu_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_cpu_map *cmap = container_of(map, struct bpf_cpu_map, map);u32 key_cpu = *(u32 *)key;
@@ -553,8 +553,8 @@ static int cpu_map_delete_elem(struct bpf_map *map, void *key)return 0 ; } -static int cpu_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long cpu_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) { struct bpf_cpu_map *cmap = container_of(map, struct bpf_cpu_map, map);struct bpf_cpumap_val cpumap_value = {};
@@ -667,7 +667,7 @@ static int cpu_map_get_next_key(struct bpf_map *map, void *key, void *next_key)return 0 ; } -static int cpu_map_redirect (struct bpf_map *map,u64 index,u64 flags) +static long cpu_map_redirect (struct bpf_map *map,u64 index,u64 flags) {return __bpf_xdp_redirect_map (map, index, flags,0 , __cpu_map_lookup_elem);
kernel/bpf/devmap.c +12 -12
@@ -799,7 +799,7 @@ static void __dev_map_entry_free(struct rcu_head *rcu)kfree (dev); } -static int dev_map_delete_elem (struct bpf_map *map,void *key) +static long dev_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);struct bpf_dtab_netdev *old_dev;
@@ -814,7 +814,7 @@ static int dev_map_delete_elem(struct bpf_map *map, void *key)return 0 ; } -static int dev_map_hash_delete_elem (struct bpf_map *map,void *key) +static long dev_map_hash_delete_elem (struct bpf_map *map,void *key) { struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);struct bpf_dtab_netdev *old_dev;
@@ -885,8 +885,8 @@ static struct bpf_dtab_netdev *__dev_map_alloc_node(struct net *net,return ERR_PTR (-EINVAL ); } -static int __dev_map_update_elem (struct net *net,struct bpf_map *map, -void *key,void *value,u64 map_flags) +static long __dev_map_update_elem (struct net *net,struct bpf_map *map, +void *key,void *value,u64 map_flags) { struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);struct bpf_dtab_netdev *dev, *old_dev;
@@ -925,15 +925,15 @@ static int __dev_map_update_elem(struct net *net, struct bpf_map *map,return 0 ; } -static int dev_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long dev_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) {return __dev_map_update_elem (current->nsproxy->net_ns, map, key, value, map_flags); } -static int __dev_map_hash_update_elem (struct net *net,struct bpf_map *map, -void *key,void *value,u64 map_flags) +static long __dev_map_hash_update_elem (struct net *net,struct bpf_map *map, +void *key,void *value,u64 map_flags) { struct bpf_dtab *dtab = container_of(map, struct bpf_dtab, map);struct bpf_dtab_netdev *dev, *old_dev;
@@ -985,21 +985,21 @@ static int __dev_map_hash_update_elem(struct net *net, struct bpf_map *map,return err; } -static int dev_map_hash_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long dev_map_hash_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) {return __dev_map_hash_update_elem (current->nsproxy->net_ns, map, key, value, map_flags); } -static int dev_map_redirect (struct bpf_map *map,u64 ifindex,u64 flags) +static long dev_map_redirect (struct bpf_map *map,u64 ifindex,u64 flags) {return __bpf_xdp_redirect_map (map, ifindex, flags,BPF_F_BROADCAST |BPF_F_EXCLUDE_INGRESS , __dev_map_lookup_elem); } -static int dev_hash_map_redirect (struct bpf_map *map,u64 ifindex,u64 flags) +static long dev_hash_map_redirect (struct bpf_map *map,u64 ifindex,u64 flags) { return __bpf_xdp_redirect_map(map, ifindex, flags, BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS,
kernel/bpf/hashtab.c +18 -18
@@ -1057,8 +1057,8 @@ static int check_flags(struct bpf_htab *htab, struct htab_elem *l_old, }/* Called from syscall or from eBPF program */ -static int htab_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long htab_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct htab_elem *l_new =NULL , *l_old;
@@ -1159,8 +1159,8 @@ static void htab_lru_push_free(struct bpf_htab *htab, struct htab_elem *elem)bpf_lru_push_free (&htab->lru, &elem->lru_node); } -static int htab_lru_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long htab_lru_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct htab_elem *l_new, *l_old =NULL ;
@@ -1226,9 +1226,9 @@ static int htab_lru_map_update_elem(struct bpf_map *map, void *key, void *value,return ret; } -static int __htab_percpu_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags, -bool onallcpus) +static long __htab_percpu_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags, +bool onallcpus) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct htab_elem *l_new =NULL , *l_old;
@@ -1281,9 +1281,9 @@ static int __htab_percpu_map_update_elem(struct bpf_map *map, void *key,return ret; } -static int __htab_lru_percpu_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags, -bool onallcpus) +static long __htab_lru_percpu_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags, +bool onallcpus) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct htab_elem *l_new =NULL , *l_old;
@@ -1348,21 +1348,21 @@ static int __htab_lru_percpu_map_update_elem(struct bpf_map *map, void *key,return ret; } -static int htab_percpu_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags) +static long htab_percpu_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags) {return __htab_percpu_map_update_elem (map, key, value, map_flags, false); } -static int htab_lru_percpu_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags) +static long htab_lru_percpu_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags) {return __htab_lru_percpu_map_update_elem (map, key, value, map_flags, false); }/* Called from syscall or from eBPF program */ -static int htab_map_delete_elem (struct bpf_map *map,void *key) +static long htab_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct hlist_nulls_head *head;
@@ -1398,7 +1398,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key)return ret; } -static int htab_lru_map_delete_elem (struct bpf_map *map,void *key) +static long htab_lru_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct hlist_nulls_head *head;
@@ -2119,8 +2119,8 @@ static const struct bpf_iter_seq_info iter_seq_info = { .seq_priv_size = sizeof(struct bpf_iter_seq_hash_map_info), }; -static int bpf_for_each_hash_elem (struct bpf_map *map,bpf_callback_t callback_fn, -void *callback_ctx,u64 flags) +static long bpf_for_each_hash_elem (struct bpf_map *map,bpf_callback_t callback_fn, +void *callback_ctx,u64 flags) { struct bpf_htab *htab = container_of(map, struct bpf_htab, map);struct hlist_nulls_head *head;
kernel/bpf/local_storage.c +3 -3
@@ -141,8 +141,8 @@ static void *cgroup_storage_lookup_elem(struct bpf_map *_map, void *key)return &READ_ONCE (storage->buf)->data[0 ]; } -static int cgroup_storage_update_elem (struct bpf_map *map,void *key, -void *value,u64 flags) +static long cgroup_storage_update_elem (struct bpf_map *map,void *key, +void *value,u64 flags) {struct bpf_cgroup_storage *storage;struct bpf_storage_buffer *new;
@@ -348,7 +348,7 @@ static void cgroup_storage_map_free(struct bpf_map *_map)bpf_map_area_free (map); } -static int cgroup_storage_delete_elem (struct bpf_map *map,void *key) +static long cgroup_storage_delete_elem (struct bpf_map *map,void *key) {return -EINVAL ; }
kernel/bpf/lpm_trie.c +3 -3
@@ -300,8 +300,8 @@ static struct lpm_trie_node *lpm_trie_node_alloc(const struct lpm_trie *trie, }/* Called from syscall or from eBPF program */ -static int trie_update_elem (struct bpf_map *map, -void *_key,void *value,u64 flags) +static long trie_update_elem (struct bpf_map *map, +void *_key,void *value,u64 flags) { struct lpm_trie *trie = container_of(map, struct lpm_trie, map);struct lpm_trie_node *node, *im_node =NULL , *new_node =NULL ;
@@ -431,7 +431,7 @@ static int trie_update_elem(struct bpf_map *map, }/* Called from syscall or from eBPF program */ -static int trie_delete_elem (struct bpf_map *map,void *_key) +static long trie_delete_elem (struct bpf_map *map,void *_key) { struct lpm_trie *trie = container_of(map, struct lpm_trie, map);struct bpf_lpm_trie_key *key = _key;
kernel/bpf/queue_stack_maps.c +11 -11
@@ -95,7 +95,7 @@ static void queue_stack_map_free(struct bpf_map *map)bpf_map_area_free (qs); } -static int __queue_map_get (struct bpf_map *map,void *value,bool delete) +static long __queue_map_get (struct bpf_map *map,void *value,bool delete) {struct bpf_queue_stack *qs =bpf_queue_stack (map);unsigned long flags;
@@ -124,7 +124,7 @@ static int __queue_map_get(struct bpf_map *map, void *value, bool delete) } -static int __stack_map_get (struct bpf_map *map,void *value,bool delete) +static long __stack_map_get (struct bpf_map *map,void *value,bool delete) {struct bpf_queue_stack *qs =bpf_queue_stack (map);unsigned long flags;
@@ -156,32 +156,32 @@ static int __stack_map_get(struct bpf_map *map, void *value, bool delete) }/* Called from syscall or from eBPF program */ -static int queue_map_peek_elem (struct bpf_map *map,void *value) +static long queue_map_peek_elem (struct bpf_map *map,void *value) {return __queue_map_get (map, value, false); }/* Called from syscall or from eBPF program */ -static int stack_map_peek_elem (struct bpf_map *map,void *value) +static long stack_map_peek_elem (struct bpf_map *map,void *value) {return __stack_map_get (map, value, false); }/* Called from syscall or from eBPF program */ -static int queue_map_pop_elem (struct bpf_map *map,void *value) +static long queue_map_pop_elem (struct bpf_map *map,void *value) {return __queue_map_get (map, value, true); }/* Called from syscall or from eBPF program */ -static int stack_map_pop_elem (struct bpf_map *map,void *value) +static long stack_map_pop_elem (struct bpf_map *map,void *value) {return __stack_map_get (map, value, true); }/* Called from syscall or from eBPF program */ -static int queue_stack_map_push_elem (struct bpf_map *map,void *value, -u64 flags) +static long queue_stack_map_push_elem (struct bpf_map *map,void *value, +u64 flags) {struct bpf_queue_stack *qs =bpf_queue_stack (map);unsigned long irq_flags;
@@ -227,14 +227,14 @@ static void *queue_stack_map_lookup_elem(struct bpf_map *map, void *key) }/* Called from syscall or from eBPF program */ -static int queue_stack_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 flags) +static long queue_stack_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 flags) {return -EINVAL ; }/* Called from syscall or from eBPF program */ -static int queue_stack_map_delete_elem (struct bpf_map *map,void *key) +static long queue_stack_map_delete_elem (struct bpf_map *map,void *key) {return -EINVAL ; }
kernel/bpf/reuseport_array.c +1 -1
@@ -59,7 +59,7 @@ static void *reuseport_array_lookup_elem(struct bpf_map *map, void *key) }/* Called from syscall only */ -static int reuseport_array_delete_elem (struct bpf_map *map,void *key) +static long reuseport_array_delete_elem (struct bpf_map *map,void *key) {struct reuseport_array *array =reuseport_array (map);u32 index = *(u32 *)key;
kernel/bpf/ringbuf.c +3 -3
@@ -241,13 +241,13 @@ static void *ringbuf_map_lookup_elem(struct bpf_map *map, void *key)return ERR_PTR (-ENOTSUPP ); } -static int ringbuf_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 flags) +static long ringbuf_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 flags) {return -ENOTSUPP ; } -static int ringbuf_map_delete_elem (struct bpf_map *map,void *key) +static long ringbuf_map_delete_elem (struct bpf_map *map,void *key) {return -ENOTSUPP ; }
kernel/bpf/stackmap.c +3 -3
@@ -618,14 +618,14 @@ static int stack_map_get_next_key(struct bpf_map *map, void *key,return 0 ; } -static int stack_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long stack_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) {return -EINVAL ; }/* Called from syscall or from eBPF program */ -static int stack_map_delete_elem (struct bpf_map *map,void *key) +static long stack_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_stack_map *smap = container_of(map, struct bpf_stack_map, map);struct stack_map_bucket *old_bucket;
kernel/bpf/verifier.c +7 -7
@@ -16113,21 +16113,21 @@ static int do_misc_fixups(struct bpf_verifier_env *env)BUILD_BUG_ON (!__same_type (ops->map_lookup_elem, (void *(*)(struct bpf_map *map,void *key))NULL ));BUILD_BUG_ON (!__same_type (ops->map_delete_elem, - (int (*)(struct bpf_map *map,void *key))NULL )); + (long (*)(struct bpf_map *map,void *key))NULL ));BUILD_BUG_ON (!__same_type (ops->map_update_elem, - (int (*)(struct bpf_map *map,void *key,void *value, + (long (*)(struct bpf_map *map,void *key,void *value,u64 flags))NULL ));BUILD_BUG_ON (!__same_type (ops->map_push_elem, - (int (*)(struct bpf_map *map,void *value, + (long (*)(struct bpf_map *map,void *value,u64 flags))NULL ));BUILD_BUG_ON (!__same_type (ops->map_pop_elem, - (int (*)(struct bpf_map *map,void *value))NULL )); + (long (*)(struct bpf_map *map,void *value))NULL ));BUILD_BUG_ON (!__same_type (ops->map_peek_elem, - (int (*)(struct bpf_map *map,void *value))NULL )); + (long (*)(struct bpf_map *map,void *value))NULL ));BUILD_BUG_ON (!__same_type (ops->map_redirect, - (int (*)(struct bpf_map *map,u64 index,u64 flags))NULL )); + (long (*)(struct bpf_map *map,u64 index,u64 flags))NULL ));BUILD_BUG_ON (!__same_type (ops->map_for_each_callback, - (int (*)(struct bpf_map *map, + (long (*)(struct bpf_map *map,bpf_callback_t callback_fn,void *callback_ctx,u64 flags))NULL ));
net/core/bpf_sk_storage.c +3 -3
@@ -100,8 +100,8 @@ static void *bpf_fd_sk_storage_lookup_elem(struct bpf_map *map, void *key)return ERR_PTR (err); } -static int bpf_fd_sk_storage_update_elem (struct bpf_map *map,void *key, -void *value,u64 map_flags) +static long bpf_fd_sk_storage_update_elem (struct bpf_map *map,void *key, +void *value,u64 map_flags) {struct bpf_local_storage_data *sdata;struct socket *sock;
@@ -120,7 +120,7 @@ static int bpf_fd_sk_storage_update_elem(struct bpf_map *map, void *key,return err; } -static int bpf_fd_sk_storage_delete_elem (struct bpf_map *map,void *key) +static long bpf_fd_sk_storage_delete_elem (struct bpf_map *map,void *key) {struct socket *sock;int fd, err;
net/core/sock_map.c +4 -4
@@ -437,7 +437,7 @@ static void sock_map_delete_from_link(struct bpf_map *map, struct sock *sk,__sock_map_delete (stab, sk, link_raw); } -static int sock_map_delete_elem (struct bpf_map *map,void *key) +static long sock_map_delete_elem (struct bpf_map *map,void *key) { struct bpf_stab *stab = container_of(map, struct bpf_stab, map);u32 i = *(u32 *)key;
@@ -587,8 +587,8 @@ int sock_map_update_elem_sys(struct bpf_map *map, void *key, void *value,return ret; } -static int sock_map_update_elem (struct bpf_map *map,void *key, -void *value,u64 flags) +static long sock_map_update_elem (struct bpf_map *map,void *key, +void *value,u64 flags) {struct sock *sk = (struct sock *)value;int ret;
@@ -916,7 +916,7 @@ static void sock_hash_delete_from_link(struct bpf_map *map, struct sock *sk,raw_spin_unlock_bh (&bucket->lock); } -static int sock_hash_delete_elem (struct bpf_map *map,void *key) +static long sock_hash_delete_elem (struct bpf_map *map,void *key) { struct bpf_shtab *htab = container_of(map, struct bpf_shtab, map);u32 hash, key_size = map->key_size;
net/xdp/xskmap.c +4 -4
@@ -150,8 +150,8 @@ static void *xsk_map_lookup_elem_sys_only(struct bpf_map *map, void *key)return ERR_PTR (-EOPNOTSUPP ); } -static int xsk_map_update_elem (struct bpf_map *map,void *key,void *value, -u64 map_flags) +static long xsk_map_update_elem (struct bpf_map *map,void *key,void *value, +u64 map_flags) { struct xsk_map *m = container_of(map, struct xsk_map, map);struct xdp_sock __rcu **map_entry;
@@ -211,7 +211,7 @@ static int xsk_map_update_elem(struct bpf_map *map, void *key, void *value,return err; } -static int xsk_map_delete_elem (struct bpf_map *map,void *key) +static long xsk_map_delete_elem (struct bpf_map *map,void *key) { struct xsk_map *m = container_of(map, struct xsk_map, map);struct xdp_sock __rcu **map_entry;
@@ -231,7 +231,7 @@ static int xsk_map_delete_elem(struct bpf_map *map, void *key)return 0 ; } -static int xsk_map_redirect (struct bpf_map *map,u64 index,u64 flags) +static long xsk_map_redirect (struct bpf_map *map,u64 index,u64 flags) {return __bpf_xdp_redirect_map (map, index, flags,0 , __xsk_map_lookup_elem);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 308/663 bpf: Fix __reg_bound_offset 64->32 var_off subreg propagation
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
[ Upstream commit 7be14c1c9030f73cc18b4ff23b78a0a081f16188 ]
Xu reports that after commit 3f50f132d840 ("bpf: Verifier, do explicit ALU32 bounds tracking"), the following BPF program is rejected by the verifier:
0: (61) r2 = *(u32 *)(r1 +0) ; R2_w=pkt(off=0,r=0,imm=0)
1: (61) r3 = *(u32 *)(r1 +4) ; R3_w=pkt_end(off=0,imm=0)
2: (bf) r1 = r2
3: (07) r1 += 1
4: (2d) if r1 > r3 goto pc+8
5: (71) r1 = *(u8 *)(r2 +0) ; R1_w=scalar(umax=255,var_off=(0x0; 0xff))
6: (18) r0 = 0x7fffffffffffff10
8: (0f) r1 += r0 ; R1_w=scalar(umin=0x7fffffffffffff10,umax=0x800000000000000f)
9: (18) r0 = 0x8000000000000000
11: (07) r0 += 1
12: (ad) if r0 < r1 goto pc-2
13: (b7) r0 = 0
14: (95) exit
And the verifier log says:
func#0 @0
0: R1=ctx(off=0,imm=0) R10=fp0
0: (61) r2 = *(u32 *)(r1 +0) ; R1=ctx(off=0,imm=0) R2_w=pkt(off=0,r=0,imm=0) 1: (61) r3 = *(u32 *)(r1 +4) ; R1=ctx(off=0,imm=0) R3_w=pkt_end(off=0,imm=0) 2: (bf) r1 = r2 ; R1_w=pkt(off=0,r=0,imm=0) R2_w=pkt(off=0,r=0,imm=0) 3: (07) r1 += 1 ; R1_w=pkt(off=1,r=0,imm=0) 4: (2d) if r1 > r3 goto pc+8 ; R1_w=pkt(off=1,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) 5: (71) r1 = *(u8 *)(r2 +0) ; R1_w=scalar(umax=255,var_off=(0x0; 0xff)) R2_w=pkt(off=0,r=1,imm=0) 6: (18) r0 = 0x7fffffffffffff10 ; R0_w=9223372036854775568 8: (0f) r1 += r0 ; R0_w=9223372036854775568 R1_w=scalar(umin=9223372036854775568,umax=9223372036854775823,s32_min=-240,s32_max=15) 9: (18) r0 = 0x8000000000000000 ; R0_w=-9223372036854775808 11: (07) r0 += 1 ; R0_w=-9223372036854775807 12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775807 R1_w=scalar(umin=9223372036854775568,umax=9223372036854775809) 13: (b7) r0 = 0 ; R0_w=0
14: (95) exit
from 12 to 11: R0_w=-9223372036854775807 R1_w=scalar(umin=9223372036854775810,umax=9223372036854775823,var_off=(0x8000000000000000; 0xffffffff)) R2_w=pkt(off=0,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775806
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775806 R1_w=scalar(umin=9223372036854775810,umax=9223372036854775810,var_off=(0x8000000000000000; 0xffffffff))
13: safe
[...]
from 12 to 11: R0_w=-9223372036854775795 R1=scalar(umin=9223372036854775822,umax=9223372036854775823,var_off=(0x8000000000000000; 0xffffffff)) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775794
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775794 R1=scalar(umin=9223372036854775822,umax=9223372036854775822,var_off=(0x8000000000000000; 0xffffffff))
13: safe
from 12 to 11: R0_w=-9223372036854775794 R1=scalar(umin=9223372036854775823,umax=9223372036854775823,var_off=(0x8000000000000000; 0xffffffff)) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775793
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775793 R1=scalar(umin=9223372036854775823,umax=9223372036854775823,var_off=(0x8000000000000000; 0xffffffff))
13: safe
from 12 to 11: R0_w=-9223372036854775793 R1=scalar(umin=9223372036854775824,umax=9223372036854775823,var_off=(0x8000000000000000; 0xffffffff)) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775792
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775792 R1=scalar(umin=9223372036854775824,umax=9223372036854775823,var_off=(0x8000000000000000; 0xffffffff))
13: safe
[...]
The 64bit umin=9223372036854775810 bound continuously bumps by +1 while umax=9223372036854775823 stays as-is until the verifier complexity limit is reached and the program gets finally rejected. During this simulation, the umin also eventually surpasses umax. Looking at the first 'from 12 to 11' output line from the loop, R1 has the following state:
R1_w=scalar(umin=0x8000000000000002 (9223372036854775810),
umax=0x800000000000000f (9223372036854775823),
var_off=(0x8000000000000000;
0xffffffff))The var_off has technically not an inconsistent state but it's very imprecise and far off surpassing 64bit umax bounds whereas the expected output with refined known bits in var_off should have been like:
R1_w=scalar(umin=0x8000000000000002 (9223372036854775810),
umax=0x800000000000000f (9223372036854775823),
var_off=(0x8000000000000000;
0xf))In the above log, var_off stays as var_off=(0x8000000000000000; 0xffffffff) and does not converge into a narrower mask where more bits become known, eventually transforming R1 into a constant upon umin=9223372036854775823, umax=9223372036854775823 case where the verifier would have terminated and let the program pass.
The __reg_combine_64_into_32() marks the subregister unknown and propagates 64bit {s,u}min/{s,u}max bounds to their 32bit equivalents iff they are within the 32bit universe. The question came up whether __reg_combine_64_into_32() should special case the situation that when 64bit {s,u}min bounds have the same value as 64bit {s,u}max bounds to then assign the latter as well to the 32bit reg->{s,u}32_{min,max}_value. As can be seen from the above example however, that is just /one/ special case and not a /generic/ solution given above example would still not be addressed this way and remain at an imprecise var_off=(0x8000000000000000; 0xffffffff).
The improvement is needed in __reg_bound_offset() to refine var32_off with the updated var64_off instead of the prior reg->var_off. The reg_bounds_sync() code first refines information about the register's min/max bounds via __update_reg_bounds() from the current var_off, then in __reg_deduce_bounds() from sign bit and with the potentially learned bits from bounds it'll update the var_off tnum in __reg_bound_offset(). For example, intersecting with the old var_off might have improved bounds slightly, e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), then new var_off will then result in (0; 0x7f...fc). The intersected var64_off holds then the universe which is a superset of var32_off. The point for the latter is not to broaden, but to further refine known bits based on the intersection of var_off with 32 bit bounds, so that we later construct the final var_off from upper and lower 32 bits. The final __update_reg_bounds() can then potentially still slightly refine bounds if more bits became known from the new var_off.
After the improvement, we can see R1 converging successively:
func#0 @0
0: R1=ctx(off=0,imm=0) R10=fp0
0: (61) r2 = *(u32 *)(r1 +0) ; R1=ctx(off=0,imm=0) R2_w=pkt(off=0,r=0,imm=0) 1: (61) r3 = *(u32 *)(r1 +4) ; R1=ctx(off=0,imm=0) R3_w=pkt_end(off=0,imm=0) 2: (bf) r1 = r2 ; R1_w=pkt(off=0,r=0,imm=0) R2_w=pkt(off=0,r=0,imm=0) 3: (07) r1 += 1 ; R1_w=pkt(off=1,r=0,imm=0) 4: (2d) if r1 > r3 goto pc+8 ; R1_w=pkt(off=1,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) 5: (71) r1 = *(u8 *)(r2 +0) ; R1_w=scalar(umax=255,var_off=(0x0; 0xff)) R2_w=pkt(off=0,r=1,imm=0) 6: (18) r0 = 0x7fffffffffffff10 ; R0_w=9223372036854775568 8: (0f) r1 += r0 ; R0_w=9223372036854775568 R1_w=scalar(umin=9223372036854775568,umax=9223372036854775823,s32_min=-240,s32_max=15) 9: (18) r0 = 0x8000000000000000 ; R0_w=-9223372036854775808 11: (07) r0 += 1 ; R0_w=-9223372036854775807 12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775807 R1_w=scalar(umin=9223372036854775568,umax=9223372036854775809) 13: (b7) r0 = 0 ; R0_w=0
14: (95) exit
from 12 to 11: R0_w=-9223372036854775807 R1_w=scalar(umin=9223372036854775810,umax=9223372036854775823,var_off=(0x8000000000000000; 0xf),s32_min=0,s32_max=15,u32_max=15) R2_w=pkt(off=0,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775806
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775806 R1_w=-9223372036854775806
13: safe
from 12 to 11: R0_w=-9223372036854775806 R1_w=scalar(umin=9223372036854775811,umax=9223372036854775823,var_off=(0x8000000000000000; 0xf),s32_min=0,s32_max=15,u32_max=15) R2_w=pkt(off=0,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775805
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775805 R1_w=-9223372036854775805
13: safe
[...]
from 12 to 11: R0_w=-9223372036854775798 R1=scalar(umin=9223372036854775819,umax=9223372036854775823,var_off=(0x8000000000000008; 0x7),s32_min=8,s32_max=15,u32_min=8,u32_max=15) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775797
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775797 R1=-9223372036854775797
13: safe
from 12 to 11: R0_w=-9223372036854775797 R1=scalar(umin=9223372036854775820,umax=9223372036854775823,var_off=(0x800000000000000c; 0x3),s32_min=12,s32_max=15,u32_min=12,u32_max=15) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775796
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775796 R1=-9223372036854775796
13: safe
from 12 to 11: R0_w=-9223372036854775796 R1=scalar(umin=9223372036854775821,umax=9223372036854775823,var_off=(0x800000000000000c; 0x3),s32_min=12,s32_max=15,u32_min=12,u32_max=15) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775795
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775795 R1=-9223372036854775795
13: safe
from 12 to 11: R0_w=-9223372036854775795 R1=scalar(umin=9223372036854775822,umax=9223372036854775823,var_off=(0x800000000000000e; 0x1),s32_min=14,s32_max=15,u32_min=14,u32_max=15) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775794
12: (ad) if r0 < r1 goto pc-2 ; R0_w=-9223372036854775794 R1=-9223372036854775794
13: safe
from 12 to 11: R0_w=-9223372036854775794 R1=-9223372036854775793 R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0
11: (07) r0 += 1 ; R0_w=-9223372036854775793
12: (ad) if r0 < r1 goto pc-2
last_idx 12 first_idx 12
parent didn't have regs=1 stack=0 marks: R0_rw=P-9223372036854775801 R1_r=scalar(umin=9223372036854775815,umax=9223372036854775823,var_off=(0x8000000000000000; 0xf),s32_min=0,s32_max=15,u32_max=15) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0 last_idx 11 first_idx 11
regs=1 stack=0 before 11: (07) r0 += 1
parent didn't have regs=1 stack=0 marks: R0_rw=P-9223372036854775805 R1_rw=scalar(umin=9223372036854775812,umax=9223372036854775823,var_off=(0x8000000000000000; 0xf),s32_min=0,s32_max=15,u32_max=15) R2_w=pkt(off=0,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) R10=fp0 last_idx 12 first_idx 0
regs=1 stack=0 before 12: (ad) if r0 < r1 goto pc-2
regs=1 stack=0 before 11: (07) r0 += 1
regs=1 stack=0 before 12: (ad) if r0 < r1 goto pc-2
regs=1 stack=0 before 11: (07) r0 += 1
regs=1 stack=0 before 12: (ad) if r0 < r1 goto pc-2
regs=1 stack=0 before 11: (07) r0 += 1
regs=1 stack=0 before 9: (18) r0 = 0x8000000000000000
last_idx 12 first_idx 12
parent didn't have regs=2 stack=0 marks: R0_rw=P-9223372036854775801 R1_r=Pscalar(umin=9223372036854775815,umax=9223372036854775823,var_off=(0x8000000000000000; 0xf),s32_min=0,s32_max=15,u32_max=15) R2=pkt(off=0,r=1,imm=0) R3=pkt_end(off=0,imm=0) R10=fp0 last_idx 11 first_idx 11
regs=2 stack=0 before 11: (07) r0 += 1
parent didn't have regs=2 stack=0 marks: R0_rw=P-9223372036854775805 R1_rw=Pscalar(umin=9223372036854775812,umax=9223372036854775823,var_off=(0x8000000000000000; 0xf),s32_min=0,s32_max=15,u32_max=15) R2_w=pkt(off=0,r=1,imm=0) R3_w=pkt_end(off=0,imm=0) R10=fp0 last_idx 12 first_idx 0
regs=2 stack=0 before 12: (ad) if r0 < r1 goto pc-2
regs=2 stack=0 before 11: (07) r0 += 1
regs=2 stack=0 before 12: (ad) if r0 < r1 goto pc-2
regs=2 stack=0 before 11: (07) r0 += 1
regs=2 stack=0 before 12: (ad) if r0 < r1 goto pc-2
regs=2 stack=0 before 11: (07) r0 += 1
regs=2 stack=0 before 9: (18) r0 = 0x8000000000000000
regs=2 stack=0 before 8: (0f) r1 += r0
regs=3 stack=0 before 6: (18) r0 = 0x7fffffffffffff10
regs=2 stack=0 before 5: (71) r1 = *(u8 *)(r2 +0)
13: safe
from 4 to 13: safe
verification time 322 usec
stack depth 0
processed 56 insns (limit 1000000) max_states_per_insn 1 total_states 3 peak_states 3 mark_read 1
This also fixes up a test case along with this improvement where we match on the verifier log. The updated log now has a refined var_off, too.
--- kernel/bpf/verifier.c | 6 +++--- tools/testing/selftests/bpf/prog_tests/align.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
kernel/bpf/verifier.c +3 -3
@@ -1769,9 +1769,9 @@ static void __reg_bound_offset(struct bpf_reg_state *reg)struct tnum var64_off =tnum_intersect (reg->var_off,tnum_range (reg->umin_value, reg->umax_value)); -struct tnum var32_off =tnum_intersect (tnum_subreg (reg->var_off), -tnum_range (reg->u32_min_value, - reg->u32_max_value)); +struct tnum var32_off =tnum_intersect (tnum_subreg (var64_off), +tnum_range (reg->u32_min_value, + reg->u32_max_value)); reg->var_off =tnum_or (tnum_clear_subreg (var64_off), var32_off); }
tools/testing/selftests/bpf/prog_tests/align.c +2 -2
@@ -575,14 +575,14 @@ static struct bpf_align_test tests[] = {/* New unknown value in R7 is (4n), >= 76 */ {14, "R7_w=scalar(umin=76,umax=1096,var_off=(0x0; 0x7fc))"},/* Adding it to packet pointer gives nice bounds again */ - {16, "R5_w=pkt(id=3,off=0,r=0,umin=2,umax=1082,var_off=(0x2; 0xfffffffc)"}, + {16, "R5_w=pkt(id=3,off=0,r=0,umin=2,umax=1082,var_off=(0x2; 0x7fc)"},/* At the time the word size load is performed from R5, * its total fixed offset is NET_IP_ALIGN + reg->off (0) * which is 2. Then the variable offset is (4n+2), so * the total offset is 4-byte aligned and meets the * load's requirements. */ - {20, "R5=pkt(id=3,off=0,r=4,umin=2,umax=1082,var_off=(0x2; 0xfffffffc)"}, + {20, "R5=pkt(id=3,off=0,r=4,umin=2,umax=1082,var_off=(0x2; 0x7fc)"}, }, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 309/663 scsi: target: Move sess cmd counter to new struct
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit becd9be6069e7b183c084f460f0eb363e43cc487 ]
iSCSI needs to wait on outstanding commands like how SRP and the FC/FCoE drivers do. It can't use target_stop_session() because for MCS support we can't stop the entire session during recovery because if other connections are OK then we want to be able to continue to execute I/O on them.
Move the per session cmd counters to a new struct so iSCSI can allocate them per connection. The xcopy code can also just not allocate in the future since it doesn't need to track commands.
Stable-dep-of: 395cee83d02d ("scsi: target: iscsit: Stop/wait on cmds during conn close")
--- drivers/target/target_core_tpg.c | 2 +- drivers/target/target_core_transport.c | 135 ++++++++++++++++------- include/target/iscsi/iscsi_target_core.h | 1 + include/target/target_core_base.h | 13 ++- 4 files changed, 107 insertions(+), 44 deletions(-)
drivers/target/target_core_tpg.c +1 -1
@@ -328,7 +328,7 @@ static void target_shutdown_sessions(struct se_node_acl *acl) restart:spin_lock_irqsave (&acl->nacl_sess_lock, flags);list_for_each_entry (sess, &acl->acl_sess_list, sess_acl_list) { -if (atomic_read (&sess->stopped)) +if (sess->cmd_cnt &&atomic_read (&sess->cmd_cnt->stopped))continue ;list_del_init (&sess->sess_acl_list);
drivers/target/target_core_transport.c +96 -39
201 lines not on this page · raw message
include/target/iscsi/iscsi_target_core.h +1 -0
@@ -600,6 +600,7 @@ struct iscsit_conn {struct iscsi_tpg_np *tpg_np;/* Pointer to parent session */ struct iscsit_session *sess; +struct target_cmd_counter *cmd_cnt;int bitmap_id;int rx_thread_active;struct task_struct *rx_thread;
include/target/target_core_base.h +9 -4
@@ -494,6 +494,7 @@ struct se_cmd {struct se_lun *se_lun;/* Only used for internal passthrough and legacy TCM fabric modules */ struct se_session *se_sess; +struct target_cmd_counter *cmd_cnt;struct se_tmr_req *se_tmr_req;struct llist_node se_cmd_list;struct completion *free_compl;
@@ -619,22 +620,26 @@ static inline struct se_node_acl *fabric_stat_to_nacl(struct config_item *item) acl_fabric_stat_group); } -struct se_session { +struct target_cmd_counter { +struct percpu_ref refcnt; +wait_queue_head_t refcnt_wq; +struct completion stop_done;atomic_t stopped; +}; + +struct se_session {u64 sess_bin_isid;enum target_prot_op sup_prot_ops;enum target_prot_type sess_prot_type;struct se_node_acl *se_node_acl;struct se_portal_group *se_tpg;void *fabric_sess_ptr; -struct percpu_ref cmd_count;struct list_head sess_list;struct list_head sess_acl_list;spinlock_t sess_cmd_lock; -wait_queue_head_t cmd_count_wq; -struct completion stop_done;void *sess_cmd_map;struct sbitmap_queue sess_tag_pool; +struct target_cmd_counter *cmd_cnt; };struct se_device ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 310/663 scsi: target: Move cmd counter allocation
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 4edba7e4a8f39112398d3cda94128a8e13a7d527 ]
iSCSI needs to allocate its cmd counter per connection for MCS support where we need to stop and wait on commands running on a connection instead of per session. This moves the cmd counter allocation to target_setup_session() which is used by drivers that need the stop+wait behavior per session.
xcopy doesn't need stop+wait at all, so we will be OK moving the cmd counter allocation outside of transport_init_session().
Stable-dep-of: 395cee83d02d ("scsi: target: iscsit: Stop/wait on cmds during conn close")
--- drivers/target/iscsi/iscsi_target_login.c | 10 +++++ drivers/target/target_core_internal.h | 1 - drivers/target/target_core_transport.c | 55 +++++++++++------------ drivers/target/target_core_xcopy.c | 15 +------ include/target/target_core_fabric.h | 4 +- 5 files changed, 42 insertions(+), 43 deletions(-)
drivers/target/iscsi/iscsi_target_login.c +10 -0
@@ -324,8 +324,18 @@ static int iscsi_login_zero_tsih_s1( goto free_ops; } +/* +* This is temp for iser. It will be moved to per conn in later +* patches for iscsi. +*/ + sess->se_sess->cmd_cnt =target_alloc_cmd_counter (); +if (!sess->se_sess->cmd_cnt) + goto free_se_sess; +return 0 ; +free_se_sess: +transport_free_session (sess->se_sess); free_ops:kfree (sess->sess_ops); free_id:
drivers/target/target_core_internal.h +0 -1
@@ -138,7 +138,6 @@ int init_se_kmem_caches(void);void release_se_kmem_caches (void );u32 scsi_get_new_index (scsi_index_t );void transport_subsystem_check_init (void ); -void transport_uninit_session (struct se_session *);unsigned char *transport_dump_cmd_direction (struct se_cmd *);void transport_dump_dev_state (struct se_device *,char *,int *); void transport_dump_dev_info(struct se_device *, struct se_lun *,
drivers/target/target_core_transport.c +27 -28
126 lines not on this page · raw message
drivers/target/target_core_xcopy.c +2 -13
@@ -461,8 +461,6 @@ static const struct target_core_fabric_ops xcopy_pt_tfo = {int target_xcopy_setup_pt (void ) { -int ret; - xcopy_wq =alloc_workqueue ("xcopy_wq" ,WQ_MEM_RECLAIM ,0 );if (!xcopy_wq) {pr_err ("Unable to allocate xcopy_wq\n" );
@@ -479,9 +477,7 @@ int target_xcopy_setup_pt(void)INIT_LIST_HEAD (&xcopy_pt_nacl.acl_list);INIT_LIST_HEAD (&xcopy_pt_nacl.acl_sess_list);memset (&xcopy_pt_sess,0 ,sizeof (struct se_session )); - ret =transport_init_session (&xcopy_pt_sess); -if (ret <0 ) - goto destroy_wq; +transport_init_session (&xcopy_pt_sess); xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg; xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;
@@ -490,19 +486,12 @@ int target_xcopy_setup_pt(void) xcopy_pt_sess.se_node_acl = &xcopy_pt_nacl;return 0 ; - -destroy_wq: -destroy_workqueue (xcopy_wq); - xcopy_wq =NULL ; -return ret; }void target_xcopy_release_pt (void ) { -if (xcopy_wq) { +if (xcopy_wq)destroy_workqueue (xcopy_wq); -transport_uninit_session (&xcopy_pt_sess); - } }/*
include/target/target_core_fabric.h +3 -1
@@ -133,7 +133,9 @@ struct se_session *target_setup_session(struct se_portal_group *, struct se_session *, void *));void target_remove_session (struct se_session *); -int transport_init_session (struct se_session *se_sess); +struct target_cmd_counter *target_alloc_cmd_counter (void ); + +void transport_init_session (struct se_session *se_sess);struct se_session *transport_alloc_session (enum target_prot_op );int transport_alloc_session_tags (struct se_session *,unsigned int ,unsigned int );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 311/663 scsi: target: Pass in cmd counter to use during cmd setup
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 8e288be8606ad87c1726618eacfb8fbd3ab4b806 ]
Allow target_get_sess_cmd() users to pass in the cmd counter they want to use. Right now we pass in the session's cmd counter but in a subsequent commit iSCSI will switch from per session to per conn.
Stable-dep-of: 395cee83d02d ("scsi: target: iscsit: Stop/wait on cmds during conn close")
--- drivers/target/iscsi/iscsi_target.c | 10 +++++---- drivers/target/target_core_transport.c | 28 ++++++++++++-------------- drivers/target/target_core_xcopy.c | 8 ++++---- drivers/usb/gadget/function/f_tcm.c | 4 ++-- include/target/target_core_fabric.h | 8 +++++--- 5 files changed, 30 insertions(+), 28 deletions(-)
drivers/target/iscsi/iscsi_target.c +6 -4
@@ -1190,9 +1190,10 @@ int iscsit_setup_scsi_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd,* Initialize struct se_cmd descriptor from target_core_mod infrastructure */ __target_init_cmd (&cmd->se_cmd, &iscsi_ops, - conn->sess->se_sess,be32_to_cpu (hdr->data_length), - cmd->data_direction, sam_task_attr, - cmd->sense_buffer +2 ,scsilun_to_int (&hdr->lun)); + conn->sess->se_sess,be32_to_cpu (hdr->data_length), + cmd->data_direction, sam_task_attr, + cmd->sense_buffer +2 ,scsilun_to_int (&hdr->lun), + conn->sess->se_sess->cmd_cnt); pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x," " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
@@ -2055,7 +2056,8 @@ iscsit_handle_task_mgt_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd,__target_init_cmd (&cmd->se_cmd, &iscsi_ops, conn->sess->se_sess,0 ,DMA_NONE ,TCM_SIMPLE_TAG , cmd->sense_buffer +2 , -scsilun_to_int (&hdr->lun)); +scsilun_to_int (&hdr->lun), + conn->sess->se_sess->cmd_cnt);target_get_sess_cmd (&cmd->se_cmd, true);
drivers/target/target_core_transport.c +13 -15
@@ -1441,14 +1441,12 @@ target_cmd_size_check(struct se_cmd *cmd, unsigned int size)* * Preserves the value of @cmd->tag. */ -void __target_init_cmd ( -struct se_cmd *cmd, -const struct target_core_fabric_ops *tfo, -struct se_session *se_sess, -u32 data_length, -int data_direction, -int task_attr, -unsigned char *sense_buffer,u64 unpacked_lun) +void __target_init_cmd (struct se_cmd *cmd, +const struct target_core_fabric_ops *tfo, +struct se_session *se_sess,u32 data_length, +int data_direction,int task_attr, +unsigned char *sense_buffer,u64 unpacked_lun, +struct target_cmd_counter *cmd_cnt) {INIT_LIST_HEAD (&cmd->se_delayed_node);INIT_LIST_HEAD (&cmd->se_qf_node);
@@ -1468,6 +1466,7 @@ void __target_init_cmd( cmd->sam_task_attr = task_attr; cmd->sense_buffer = sense_buffer; cmd->orig_fe_lun = unpacked_lun; + cmd->cmd_cnt = cmd_cnt;if (!(cmd->se_cmd_flags &SCF_USE_CPUID )) cmd->cpuid =raw_smp_processor_id ();
@@ -1687,7 +1686,8 @@ int target_init_cmd(struct se_cmd *se_cmd, struct se_session *se_sess,* target_core_fabric_ops->queue_status() callback */ __target_init_cmd (se_cmd, se_tpg->se_tpg_tfo, se_sess, data_length, - data_dir, task_attr, sense, unpacked_lun); + data_dir, task_attr, sense, unpacked_lun, + se_sess->cmd_cnt);/* * Obtain struct se_cmd->cmd_kref reference. A second kref_get here is
@@ -1982,7 +1982,8 @@ int target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,BUG_ON (!se_tpg);__target_init_cmd (se_cmd, se_tpg->se_tpg_tfo, se_sess, -0 ,DMA_NONE ,TCM_SIMPLE_TAG , sense, unpacked_lun); +0 ,DMA_NONE ,TCM_SIMPLE_TAG , sense, unpacked_lun, + se_sess->cmd_cnt);/* * FIXME: Currently expect caller to handle se_cmd->se_tmr_req * allocation failure.
@@ -2986,7 +2987,6 @@ EXPORT_SYMBOL(transport_generic_free_cmd);*/ int target_get_sess_cmd (struct se_cmd *se_cmd,bool ack_kref) { -struct se_session *se_sess = se_cmd->se_sess;int ret =0 ;/*
@@ -3003,11 +3003,9 @@ int target_get_sess_cmd(struct se_cmd *se_cmd, bool ack_kref)* Users like xcopy do not use counters since they never do a stop * and wait. */ -if (se_sess->cmd_cnt) { -if (!percpu_ref_tryget_live (&se_sess->cmd_cnt->refcnt)) +if (se_cmd->cmd_cnt) { +if (!percpu_ref_tryget_live (&se_cmd->cmd_cnt->refcnt)) ret = -ESHUTDOWN ; -else - se_cmd->cmd_cnt = se_sess->cmd_cnt; }if (ret && ack_kref)target_put_sess_cmd (se_cmd);
drivers/target/target_core_xcopy.c +4 -4
@@ -591,8 +591,8 @@ static int target_xcopy_read_source( (unsigned long long)src_lba, transfer_length_block, src_bytes);__target_init_cmd (se_cmd, &xcopy_pt_tfo, &xcopy_pt_sess, src_bytes, -DMA_FROM_DEVICE ,0 , &xpt_cmd.sense_buffer[0 ],0 ); - +DMA_FROM_DEVICE ,0 , &xpt_cmd.sense_buffer[0 ],0 , +NULL ); rc =target_xcopy_setup_pt_cmd (&xpt_cmd, xop, src_dev, &cdb[0 ], remote_port);if (rc <0 ) {
@@ -636,8 +636,8 @@ static int target_xcopy_write_destination( (unsigned long long)dst_lba, transfer_length_block, dst_bytes);__target_init_cmd (se_cmd, &xcopy_pt_tfo, &xcopy_pt_sess, dst_bytes, -DMA_TO_DEVICE ,0 , &xpt_cmd.sense_buffer[0 ],0 ); - +DMA_TO_DEVICE ,0 , &xpt_cmd.sense_buffer[0 ],0 , +NULL ); rc =target_xcopy_setup_pt_cmd (&xpt_cmd, xop, dst_dev, &cdb[0 ], remote_port);if (rc <0 ) {
drivers/usb/gadget/function/f_tcm.c +2 -2
@@ -1054,7 +1054,7 @@ static void usbg_cmd_work(struct work_struct *work) tv_nexus->tvn_se_sess->se_tpg->se_tpg_tfo, tv_nexus->tvn_se_sess, cmd->data_len,DMA_NONE , cmd->prio_attr, cmd->sense_iu.sense, - cmd->unpacked_lun); + cmd->unpacked_lun, NULL); goto out; }
@@ -1183,7 +1183,7 @@ static void bot_cmd_work(struct work_struct *work) tv_nexus->tvn_se_sess->se_tpg->se_tpg_tfo, tv_nexus->tvn_se_sess, cmd->data_len,DMA_NONE , cmd->prio_attr, cmd->sense_iu.sense, - cmd->unpacked_lun); + cmd->unpacked_lun, NULL); goto out; }
include/target/target_core_fabric.h +5 -3
@@ -151,9 +151,11 @@ void transport_deregister_session_configfs(struct se_session *);void transport_deregister_session (struct se_session *); -void __target_init_cmd (struct se_cmd *, -const struct target_core_fabric_ops *, -struct se_session *,u32 ,int ,int ,unsigned char *,u64 ); +void __target_init_cmd (struct se_cmd *cmd, +const struct target_core_fabric_ops *tfo, +struct se_session *sess,u32 data_length,int data_direction, +int task_attr,unsigned char *sense_buffer,u64 unpacked_lun, +struct target_cmd_counter *cmd_cnt);int target_init_cmd (struct se_cmd *se_cmd,struct se_session *se_sess,unsigned char *sense,u64 unpacked_lun,u32 data_length,int task_attr,int data_dir,int flags);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 312/663 scsi: target: iscsit: isert: Alloc per conn cmd counter
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 6d256bee602b131bd4fbc92863b6a1210bcf6325 ]
This has iscsit allocate a per conn cmd counter and converts iscsit/isert to use it instead of the per session one.
Stable-dep-of: 395cee83d02d ("scsi: target: iscsit: Stop/wait on cmds during conn close")
--- drivers/infiniband/ulp/isert/ib_isert.c | 4 ++-- drivers/target/iscsi/iscsi_target.c | 4 ++-- drivers/target/iscsi/iscsi_target_login.c | 17 +++++++---------- drivers/target/target_core_transport.c | 9 ++++++--- include/target/target_core_fabric.h | 3 +++ 5 files changed, 20 insertions(+), 17 deletions(-)
drivers/infiniband/ulp/isert/ib_isert.c +2 -2
@@ -2506,8 +2506,8 @@ isert_wait4cmds(struct iscsit_conn *conn)isert_info ("iscsit_conn %p\n" , conn);if (conn->sess) { -target_stop_session (conn->sess->se_sess); -target_wait_for_sess_cmds (conn->sess->se_sess); +target_stop_cmd_counter (conn->cmd_cnt); +target_wait_for_cmds (conn->cmd_cnt); } }
drivers/target/iscsi/iscsi_target.c +2 -2
@@ -1193,7 +1193,7 @@ int iscsit_setup_scsi_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd, conn->sess->se_sess,be32_to_cpu (hdr->data_length), cmd->data_direction, sam_task_attr, cmd->sense_buffer +2 ,scsilun_to_int (&hdr->lun), - conn->sess->se_sess->cmd_cnt); + conn->cmd_cnt); pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x," " ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,
@@ -2057,7 +2057,7 @@ iscsit_handle_task_mgt_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd, conn->sess->se_sess,0 ,DMA_NONE ,TCM_SIMPLE_TAG , cmd->sense_buffer +2 ,scsilun_to_int (&hdr->lun), - conn->sess->se_sess->cmd_cnt); + conn->cmd_cnt);target_get_sess_cmd (&cmd->se_cmd, true);
drivers/target/iscsi/iscsi_target_login.c +7 -10
@@ -324,18 +324,8 @@ static int iscsi_login_zero_tsih_s1( goto free_ops; } -/* -* This is temp for iser. It will be moved to per conn in later -* patches for iscsi. -*/ - sess->se_sess->cmd_cnt =target_alloc_cmd_counter (); -if (!sess->se_sess->cmd_cnt) - goto free_se_sess; -return 0 ; -free_se_sess: -transport_free_session (sess->se_sess); free_ops:kfree (sess->sess_ops); free_id:
@@ -1157,8 +1147,14 @@ static struct iscsit_conn *iscsit_alloc_conn(struct iscsi_np *np) goto free_conn_cpumask; } + conn->cmd_cnt =target_alloc_cmd_counter (); +if (!conn->cmd_cnt) + goto free_conn_allowed_cpumask; +return conn; +free_conn_allowed_cpumask: +free_cpumask_var (conn->allowed_cpumask); free_conn_cpumask:free_cpumask_var (conn->conn_cpumask); free_conn_ops:
@@ -1172,6 +1168,7 @@ static struct iscsit_conn *iscsit_alloc_conn(struct iscsi_np *np)void iscsit_free_conn (struct iscsit_conn *conn) { +target_free_cmd_counter (conn->cmd_cnt);free_cpumask_var (conn->allowed_cpumask);free_cpumask_var (conn->conn_cpumask);kfree (conn->conn_ops);
drivers/target/target_core_transport.c +6 -3
@@ -254,7 +254,7 @@ struct target_cmd_counter *target_alloc_cmd_counter(void) }EXPORT_SYMBOL_GPL (target_alloc_cmd_counter); -static void target_free_cmd_counter (struct target_cmd_counter *cmd_cnt) +void target_free_cmd_counter (struct target_cmd_counter *cmd_cnt) {/* * Drivers like loop do not call target_stop_session during session
@@ -265,6 +265,7 @@ static void target_free_cmd_counter(struct target_cmd_counter *cmd_cnt)percpu_ref_exit (&cmd_cnt->refcnt); } +EXPORT_SYMBOL_GPL (target_free_cmd_counter);/** * transport_init_session - initialize a session object
@@ -3170,13 +3171,14 @@ static void target_stop_cmd_counter_confirm(struct percpu_ref *ref)* target_stop_cmd_counter - Stop new IO from being added to the counter. * @cmd_cnt: counter to stop */ -static void target_stop_cmd_counter (struct target_cmd_counter *cmd_cnt) +void target_stop_cmd_counter (struct target_cmd_counter *cmd_cnt) {pr_debug ("Stopping command counter.\n" );if (!atomic_cmpxchg (&cmd_cnt->stopped,0 ,1 ))percpu_ref_kill_and_confirm (&cmd_cnt->refcnt, target_stop_cmd_counter_confirm); } +EXPORT_SYMBOL_GPL (target_stop_cmd_counter);/** * target_stop_session - Stop new IO from being queued on the session.
@@ -3192,7 +3194,7 @@ EXPORT_SYMBOL(target_stop_session);* target_wait_for_cmds - Wait for outstanding cmds. * @cmd_cnt: counter to wait for active I/O for. */ -static void target_wait_for_cmds (struct target_cmd_counter *cmd_cnt) +void target_wait_for_cmds (struct target_cmd_counter *cmd_cnt) {int ret;
@@ -3208,6 +3210,7 @@ static void target_wait_for_cmds(struct target_cmd_counter *cmd_cnt)wait_for_completion (&cmd_cnt->stop_done);pr_debug ("Waiting for cmds done.\n" ); } +EXPORT_SYMBOL_GPL (target_wait_for_cmds);/** * target_wait_for_sess_cmds - Wait for outstanding commands
include/target/target_core_fabric.h +3 -0
@@ -133,7 +133,10 @@ struct se_session *target_setup_session(struct se_portal_group *, struct se_session *, void *));void target_remove_session (struct se_session *); +void target_stop_cmd_counter (struct target_cmd_counter *cmd_cnt); +void target_wait_for_cmds (struct target_cmd_counter *cmd_cnt);struct target_cmd_counter *target_alloc_cmd_counter (void ); +void target_free_cmd_counter (struct target_cmd_counter *cmd_cnt);void transport_init_session (struct se_session *se_sess);struct se_session *transport_alloc_session (enum target_prot_op );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 313/663 scsi: target: iscsit: Stop/wait on cmds during conn close
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 395cee83d02de3073211b04fc85724f4abc663ad ]
This fixes a bug added in commit f36199355c64 ("scsi: target: iscsi: Fix cmd abort fabric stop race").
If we have multiple sessions to the same se_device we can hit a race where a LUN_RESET on one session cleans up the se_cmds from under another session which is being closed. This results in the closing session freeing its conn/session structs while they are still in use.
The bug is:
1. Session1 has IO se_cmd1.
2. Session2 can also have se_cmds for I/O and optionally TMRs for ABORTS but then gets a LUN_RESET.
3. The LUN_RESET on session2 sees the se_cmds on session1 and during the drain stages marks them all with CMD_T_ABORTED.
4. session1 is now closed so iscsit_release_commands_from_conn() only sees se_cmds with the CMD_T_ABORTED bit set and returns immediately even though we have outstanding commands.
5. session1's connection and session are freed.
6. The backend request for se_cmd1 completes and it accesses the freed connection/session.
This hooks the iscsit layer into the cmd counter code, so we can wait for all outstanding se_cmds before freeing the connection.
--- drivers/target/iscsi/iscsi_target.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/target/iscsi/iscsi_target.c +10 -0
@@ -4245,6 +4245,16 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn)iscsit_free_cmd (cmd, true); } + +/* +* Wait on commands that were cleaned up via the aborted_task path. +* LLDs that implement iscsit_wait_conn will already have waited for +* commands. +*/ +if (!conn->conn_transport->iscsit_wait_conn) { +target_stop_cmd_counter (conn->cmd_cnt); +target_wait_for_cmds (conn->cmd_cnt); + } } static void iscsit_stop_timers_for_cmds(
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 314/663 scsi: target: Fix multiple LUN_RESET handling
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 673db054d7a2b5a470d7a25baf65956d005ad729 ]
This fixes a bug where an initiator thinks a LUN_RESET has cleaned up running commands when it hasn't. The bug was added in commit 51ec502a3266 ("target: Delete tmr from list before processing").
The problem occurs when:
1. We have N I/O cmds running in the target layer spread over 2 sessions.
2. The initiator sends a LUN_RESET for each session.
3. session1's LUN_RESET loops over all the running commands from both sessions and moves them to its local drain_task_list.
4. session2's LUN_RESET does not see the LUN_RESET from session1 because the commit above has it remove itself. session2 also does not see any commands since the other reset moved them off the state lists.
5. sessions2's LUN_RESET will then complete with a successful response.
6. sessions2's inititor believes the running commands on its session are now cleaned up due to the successful response and cleans up the running commands from its side. It then restarts them.
7. The commands do eventually complete on the backend and the target starts to return aborted task statuses for them. The initiator will either throw a invalid ITT error or might accidentally lookup a new task if the ITT has been reallocated already.
Fix the bug by reverting the patch, and serialize the execution of LUN_RESETs and Preempt and Aborts.
Also prevent us from waiting on LUN_RESETs in core_tmr_drain_tmr_list, because it turns out the original patch fixed a bug that was not mentioned. For LUN_RESET1 core_tmr_drain_tmr_list can see a second LUN_RESET and wait on it. Then the second reset will run core_tmr_drain_tmr_list and see the first reset and wait on it resulting in a deadlock.
--- drivers/target/target_core_device.c | 1 + drivers/target/target_core_tmr.c | 26 +++++++++++++++++++++++--- include/target/target_core_base.h | 1 + 3 files changed, 25 insertions(+), 3 deletions(-)
drivers/target/target_core_device.c +1 -0
@@ -782,6 +782,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)spin_lock_init (&dev->t10_alua.lba_map_lock);INIT_WORK (&dev->delayed_cmd_work, target_do_delayed_work); +mutex_init (&dev->lun_reset_mutex); dev->t10_wwn.t10_dev = dev;/*
drivers/target/target_core_tmr.c +23 -3
@@ -188,14 +188,23 @@ static void core_tmr_drain_tmr_list(* LUN_RESET tmr.. */ spin_lock_irqsave (&dev->se_tmr_lock, flags); -if (tmr) -list_del_init (&tmr->tmr_list);list_for_each_entry_safe (tmr_p, tmr_pp, &dev->dev_tmr_list, tmr_list) { +if (tmr_p == tmr) +continue ; + cmd = tmr_p->task_cmd;if (!cmd) {pr_err ("Unable to locate struct se_cmd for TMR\n" );continue ; } + +/* +* We only execute one LUN_RESET at a time so we can't wait +* on them below. +*/ +if (tmr_p->function ==TMR_LUN_RESET ) +continue ; +/* * If this function was called with a valid pr_res_key * parameter (eg: for PROUT PREEMPT_AND_ABORT service action
@@ -379,14 +388,25 @@ int core_tmr_lun_reset( tmr_nacl->initiatorname); } } + + +/* +* We only allow one reset or preempt and abort to execute at a time +* to prevent one call from claiming all the cmds causing a second +* call from returning while cmds it should have waited on are still +* running. +*/ +mutex_lock (&dev->lun_reset_mutex); +pr_debug ("LUN_RESET: %s starting for [%s], tas: %d\n" , (preempt_and_abort_list) ?"Preempt" :"TMR" , dev->transport->name, tas); -core_tmr_drain_tmr_list (dev, tmr, preempt_and_abort_list);core_tmr_drain_state_list (dev, prout_cmd, tmr_sess, tas, preempt_and_abort_list); +mutex_unlock (&dev->lun_reset_mutex); +/* * Clear any legacy SPC-2 reservation when called during * LOGICAL UNIT RESET
include/target/target_core_base.h +1 -0
@@ -872,6 +872,7 @@ struct se_device {struct rcu_head rcu_head;int queue_cnt;struct se_device_queue *queues; +struct mutex lun_reset_mutex; };struct target_opcode_descriptor {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 315/663 scsi: target: iscsit: Fix TAS handling during conn cleanup
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit cc79da306ebb2edb700c3816b90219223182ac3c ]
Fix a bug added in commit f36199355c64 ("scsi: target: iscsi: Fix cmd abort fabric stop race").
If CMD_T_TAS is set on the se_cmd we must call iscsit_free_cmd() to do the last put on the cmd and free it, because the connection is down and we will not up sending the response and doing the put from the normal I/O path.
Add a check for CMD_T_TAS in iscsit_release_commands_from_conn() so we now detect this case and run iscsit_free_cmd().
--- drivers/target/iscsi/iscsi_target.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/target/iscsi/iscsi_target.c +9 -7
@@ -4220,9 +4220,12 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn)list_for_each_entry_safe (cmd, cmd_tmp, &tmp_list, i_conn_node) {struct se_cmd *se_cmd = &cmd->se_cmd; -if (se_cmd->se_tfo !=NULL ) { -spin_lock_irq (&se_cmd->t_state_lock); -if (se_cmd->transport_state &CMD_T_ABORTED ) { +if (!se_cmd->se_tfo) +continue ; + +spin_lock_irq (&se_cmd->t_state_lock); +if (se_cmd->transport_state &CMD_T_ABORTED ) { +if (!(se_cmd->transport_state &CMD_T_TAS ))/* * LIO's abort path owns the cleanup for this, * so put it back on the list and let
@@ -4230,11 +4233,10 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn)*/ list_move_tail (&cmd->i_conn_node, &conn->conn_cmd_list); - }else { - se_cmd->transport_state |=CMD_T_FABRIC_STOP ; - } -spin_unlock_irq (&se_cmd->t_state_lock); + }else { + se_cmd->transport_state |=CMD_T_FABRIC_STOP ; } +spin_unlock_irq (&se_cmd->t_state_lock); }spin_unlock_bh (&conn->cmd_lock);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 316/663 scsi: megaraid: Fix mega_cmd_done() CMDID_INT_CMDS
In reply to Greg Kroah-HartmanFrom: Danila Chernetsov <[email protected]>
[ Upstream commit 75cb113cd43f06aaf4f1bda0069cfd5b98e909eb ]
When cmdid == CMDID_INT_CMDS, the 'cmds' pointer is NULL but is dereferenced below.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/scsi/megaraid.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/megaraid.c +1 -0
@@ -1441,6 +1441,7 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)*/ if (cmdid ==CMDID_INT_CMDS ) { scb = &adapter->int_scb; + cmd = scb->cmd;list_del_init (&scb->list); scb->state =SCB_FREE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 317/663 net: sunhme: Fix uninitialized return code
In reply to Greg Kroah-HartmanFrom: Sean Anderson <[email protected]>
[ Upstream commit d61157414d0a591d10d27d0ce5873916614e5e31 ]
Fix an uninitialized return code if we never found a qfe slot. It would be a bug if we ever got into this situation, but it's good to return something tracable.
--- drivers/net/ethernet/sun/sunhme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/sun/sunhme.c +1 -1
@@ -2834,7 +2834,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,int i, qfe_slot =-1 ;char prom_name[64 ];u8 addr[ETH_ALEN ]; -int err; +int err = -ENODEV ;/* Now make sure pci_dev cookie is there. */ #ifdef CONFIG_SPARC
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 318/663 f2fs: handle dqget error in f2fs_transfer_project_quota()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 8051692f5f23260215bfe9a72e712d93606acc5f ]
We should set the error code when dqget() failed.
--- fs/f2fs/file.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
fs/f2fs/file.c +8 -7
@@ -3013,15 +3013,16 @@ int f2fs_transfer_project_quota(struct inode *inode, kprojid_t kprojid)struct dquot *transfer_to[MAXQUOTAS ] = {};struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct super_block *sb = sbi->sb; -int err =0 ; +int err; transfer_to[PRJQUOTA ] =dqget (sb,make_kqid_projid (kprojid)); -if (!IS_ERR (transfer_to[PRJQUOTA ])) { - err =__dquot_transfer (inode, transfer_to); -if (err) -set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); -dqput (transfer_to[PRJQUOTA ]); - } +if (IS_ERR (transfer_to[PRJQUOTA ])) +return PTR_ERR (transfer_to[PRJQUOTA ]); + + err =__dquot_transfer (inode, transfer_to); +if (err) +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +dqput (transfer_to[PRJQUOTA ]);return err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 319/663 f2fs: fix uninitialized skipped_gc_rwsem
In reply to Greg Kroah-HartmanFrom: Yonggil Song <[email protected]>
[ Upstream commit c17caf0ba3aa3411b96c71b4ce24be1040b8f3e8 ]
When f2fs skipped a gc round during victim migration, there was a bug which would skip all upcoming gc rounds unconditionally because skipped_gc_rwsem was not initialized. It fixes the bug by correctly initializing the skipped_gc_rwsem inside the gc loop.
--- fs/f2fs/gc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/gc.c +1 -1
@@ -1795,8 +1795,8 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control) prefree_segments(sbi)); cpc.reason =__get_cp_reason (sbi); - sbi->skipped_gc_rwsem =0 ; gc_more: + sbi->skipped_gc_rwsem =0 ;if (unlikely (!(sbi->sb->s_flags &SB_ACTIVE ))) { ret = -EINVAL ; goto stop;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 320/663 f2fs: apply zone capacity to all zone type
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 0b37ed21e3367539b79284e0b0af2246ffcf0dca ]
If we manage the zone capacity per zone type, it'll break the GC assumption. And, the current logic complains valid block count mismatch. Let's apply zone capacity to all zone type, if specified.
--- fs/f2fs/segment.c | 65 +++-------------------------------------------- fs/f2fs/segment.h | 3 +++ 2 files changed, 7 insertions(+), 61 deletions(-)
fs/f2fs/segment.c +4 -61
@@ -4951,48 +4951,6 @@ int f2fs_check_write_pointer(struct f2fs_sb_info *sbi)return 0 ; } -static bool is_conv_zone (struct f2fs_sb_info *sbi,unsigned int zone_idx, -unsigned int dev_idx) -{ -if (!bdev_is_zoned (FDEV (dev_idx).bdev)) -return true; -return !test_bit (zone_idx,FDEV (dev_idx).blkz_seq); -} - -/* Return the zone index in the given device */ -static unsigned int get_zone_idx (struct f2fs_sb_info *sbi,unsigned int secno, -int dev_idx) -{ -block_t sec_start_blkaddr =START_BLOCK (sbi,GET_SEG_FROM_SEC (sbi, secno)); - -return (sec_start_blkaddr -FDEV (dev_idx).start_blk) >> - sbi->log_blocks_per_blkz; -} - -/* -* Return the usable segments in a section based on the zone's -* corresponding zone capacity. Zone is equal to a section. -*/ -static inline unsigned int f2fs_usable_zone_segs_in_sec ( -struct f2fs_sb_info *sbi,unsigned int segno) -{ -unsigned int dev_idx, zone_idx; - - dev_idx =f2fs_target_device_index (sbi,START_BLOCK (sbi, segno)); - zone_idx =get_zone_idx (sbi,GET_SEC_FROM_SEG (sbi, segno), dev_idx); - -/* Conventional zone's capacity is always equal to zone size */ -if (is_conv_zone (sbi, zone_idx, dev_idx)) -return sbi->segs_per_sec; - -if (!sbi->unusable_blocks_per_sec) -return sbi->segs_per_sec; - -/* Get the segment count beyond zone capacity block */ -return sbi->segs_per_sec - (sbi->unusable_blocks_per_sec >> - sbi->log_blocks_per_seg); -} -/* * Return the number of usable blocks in a segment. The number of blocks * returned is always equal to the number of blocks in a segment for
@@ -5005,23 +4963,13 @@ static inline unsigned int f2fs_usable_zone_blks_in_seg( struct f2fs_sb_info *sbi, unsigned int segno) {block_t seg_start, sec_start_blkaddr, sec_cap_blkaddr; -unsigned int zone_idx, dev_idx, secno; - - secno =GET_SEC_FROM_SEG (sbi, segno); - seg_start =START_BLOCK (sbi, segno); - dev_idx =f2fs_target_device_index (sbi, seg_start); - zone_idx =get_zone_idx (sbi, secno, dev_idx); - -/* -* Conventional zone's capacity is always equal to zone size, -* so, blocks per segment is unchanged. -*/ -if (is_conv_zone (sbi, zone_idx, dev_idx)) -return sbi->blocks_per_seg; +unsigned int secno;if (!sbi->unusable_blocks_per_sec)return sbi->blocks_per_seg; + secno =GET_SEC_FROM_SEG (sbi, segno); + seg_start =START_BLOCK (sbi, segno); sec_start_blkaddr =START_BLOCK (sbi,GET_SEG_FROM_SEC (sbi, secno)); sec_cap_blkaddr = sec_start_blkaddr +CAP_BLKS_PER_SEC (sbi);
@@ -5055,11 +5003,6 @@ static inline unsigned int f2fs_usable_zone_blks_in_seg(struct f2fs_sb_info *sbi return 0; } -static inline unsigned int f2fs_usable_zone_segs_in_sec (struct f2fs_sb_info *sbi, -unsigned int segno) -{ -return 0 ; -}#endif unsigned int f2fs_usable_blks_in_seg (struct f2fs_sb_info *sbi,unsigned int segno)
@@ -5074,7 +5017,7 @@ unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi, unsigned int segno) {if (f2fs_sb_has_blkzoned (sbi)) -return f2fs_usable_zone_segs_in_sec (sbi, segno); +return CAP_SEGS_PER_SEC (sbi);return sbi->segs_per_sec; }
fs/f2fs/segment.h +3 -0
@@ -104,6 +104,9 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,#define CAP_BLKS_PER_SEC (sbi) \ ((sbi)->segs_per_sec * (sbi)->blocks_per_seg - \ (sbi)->unusable_blocks_per_sec) +#define CAP_SEGS_PER_SEC (sbi) \ + ((sbi)->segs_per_sec - ((sbi)->unusable_blocks_per_sec >>\ + (sbi)->log_blocks_per_seg))#define GET_SEC_FROM_SEG (sbi, segno) \ (((segno) == -1) ? -1: (segno) / (sbi)->segs_per_sec)#define GET_SEG_FROM_SEC (sbi, secno) \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 321/663 f2fs: compress: fix to call f2fs_wait_on_page_writeback() in f2fs_write_raw_pages()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit babedcbac164cec970872b8097401ca913a80e61 ]
BUG_ON() will be triggered when writing files concurrently, because the same page is writtenback multiple times.
1597 void folio_end_writeback(struct folio *folio)
1598 {
......
1618 if (!__folio_end_writeback(folio))
1619 BUG();
......1625 }
kernel BUG at mm/filemap.c:1619!
Call Trace: <TASK> f2fs_write_end_io+0x1a0/0x370 blk_update_request+0x6c/0x410 blk_mq_end_request+0x15/0x130 blk_complete_reqs+0x3c/0x50 __do_softirq+0xb8/0x29b ? sort_range+0x20/0x20 run_ksoftirqd+0x19/0x20 smpboot_thread_fn+0x10b/0x1d0 kthread+0xde/0x110 ? kthread_complete_and_exit+0x20/0x20 ret_from_fork+0x22/0x30 </TASK>
Below is the concurrency scenario:
[Process A] [Process B] [Process C]f2fs_write_raw_pages()
- redirty_page_for_writepage()
- unlock page()
f2fs_do_write_data_page()
- lock_page()
- clear_page_dirty_for_io()
- set_page_writeback() [1st writeback]
.....
- unlock page()
generic_perform_write()
- f2fs_write_begin()
- wait_for_stable_page()
- f2fs_write_end()
- set_page_dirty()
- lock_page()
- f2fs_do_write_data_page()
- set_page_writeback() [2st writeback]
This problem was introduced by the previous commit 7377e853967b ("f2fs:
compress: fix potential deadlock of compress file"). All pagelocks were released in f2fs_write_raw_pages(), but whether the page was in the writeback state was ignored in the subsequent writing process. Let's fix it by waiting for the page to writeback before writing.
--- fs/f2fs/compress.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/f2fs/compress.c +6 -0
@@ -1459,6 +1459,12 @@ static int f2fs_write_raw_pages(struct compress_ctx *cc,if (!PageDirty (cc->rpages[i])) goto continue_unlock; +if (PageWriteback (cc->rpages[i])) { +if (wbc->sync_mode ==WB_SYNC_NONE ) + goto continue_unlock; +f2fs_wait_on_page_writeback (cc->rpages[i],DATA , true, true); + } +if (!clear_page_dirty_for_io (cc->rpages[i])) goto continue_unlock;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 322/663 f2fs: fix scheduling while atomic in decompression path
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 1aa161e43106d46ca8e9a86f4aa28d420258134b ]
[ 16.945668][ C0] Call trace: [ 16.945678][ C0] dump_backtrace+0x110/0x204 [ 16.945706][ C0] dump_stack_lvl+0x84/0xbc [ 16.945735][ C0] __schedule_bug+0xb8/0x1ac [ 16.945756][ C0] __schedule+0x724/0xbdc [ 16.945778][ C0] schedule+0x154/0x258 [ 16.945793][ C0] bit_wait_io+0x48/0xa4 [ 16.945808][ C0] out_of_line_wait_on_bit+0x114/0x198 [ 16.945824][ C0] __sync_dirty_buffer+0x1f8/0x2e8 [ 16.945853][ C0] __f2fs_commit_super+0x140/0x1f4 [ 16.945881][ C0] f2fs_commit_super+0x110/0x28c [ 16.945898][ C0] f2fs_handle_error+0x1f4/0x2f4 [ 16.945917][ C0] f2fs_decompress_cluster+0xc4/0x450 [ 16.945942][ C0] f2fs_end_read_compressed_page+0xc0/0xfc [ 16.945959][ C0] f2fs_handle_step_decompress+0x118/0x1cc [ 16.945978][ C0] f2fs_read_end_io+0x168/0x2b0 [ 16.945993][ C0] bio_endio+0x25c/0x2c8 [ 16.946015][ C0] dm_io_dec_pending+0x3e8/0x57c [ 16.946052][ C0] clone_endio+0x134/0x254 [ 16.946069][ C0] bio_endio+0x25c/0x2c8 [ 16.946084][ C0] blk_update_request+0x1d4/0x478 [ 16.946103][ C0] scsi_end_request+0x38/0x4cc [ 16.946129][ C0] scsi_io_completion+0x94/0x184 [ 16.946147][ C0] scsi_finish_command+0xe8/0x154 [ 16.946164][ C0] scsi_complete+0x90/0x1d8 [ 16.946181][ C0] blk_done_softirq+0xa4/0x11c [ 16.946198][ C0] _stext+0x184/0x614 [ 16.946214][ C0] __irq_exit_rcu+0x78/0x144 [ 16.946234][ C0] handle_domain_irq+0xd4/0x154 [ 16.946260][ C0] gic_handle_irq.33881+0x5c/0x27c [ 16.946281][ C0] call_on_irq_stack+0x40/0x70 [ 16.946298][ C0] do_interrupt_handler+0x48/0xa4 [ 16.946313][ C0] el1_interrupt+0x38/0x68 [ 16.946346][ C0] el1h_64_irq_handler+0x20/0x30 [ 16.946362][ C0] el1h_64_irq+0x78/0x7c [ 16.946377][ C0] finish_task_switch+0xc8/0x3d8 [ 16.946394][ C0] __schedule+0x600/0xbdc [ 16.946408][ C0] preempt_schedule_common+0x34/0x5c [ 16.946423][ C0] preempt_schedule+0x44/0x48 [ 16.946438][ C0] process_one_work+0x30c/0x550 [ 16.946456][ C0] worker_thread+0x414/0x8bc [ 16.946472][ C0] kthread+0x16c/0x1e0 [ 16.946486][ C0] ret_from_fork+0x10/0x20
--- fs/f2fs/compress.c | 7 ++++++- fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)
fs/f2fs/compress.c +6 -1
@@ -759,7 +759,12 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task)if (dic->clen >PAGE_SIZE * dic->nr_cpages -COMPRESS_HEADER_SIZE ) { ret = -EFSCORRUPTED ; -f2fs_handle_error (sbi,ERROR_FAIL_DECOMPRESSION ); + +/* Avoid f2fs_commit_super in irq context */ +if (in_task) +f2fs_save_errors (sbi,ERROR_FAIL_DECOMPRESSION ); +else +f2fs_handle_error (sbi,ERROR_FAIL_DECOMPRESSION ); goto out_release; }
fs/f2fs/f2fs.h +1 -0
@@ -3576,6 +3576,7 @@ int f2fs_quota_sync(struct super_block *sb, int type);loff_t max_file_blocks (struct inode *inode);void f2fs_quota_off_umount (struct super_block *sb);void f2fs_handle_stop (struct f2fs_sb_info *sbi,unsigned char reason); +void f2fs_save_errors (struct f2fs_sb_info *sbi,unsigned char flag);void f2fs_handle_error (struct f2fs_sb_info *sbi,unsigned char error);int f2fs_commit_super (struct f2fs_sb_info *sbi,bool recover);int f2fs_sync_fs (struct super_block *sb,int sync);
fs/f2fs/super.c +1 -1
@@ -3895,7 +3895,7 @@ void f2fs_handle_stop(struct f2fs_sb_info *sbi, unsigned char reason)f2fs_up_write (&sbi->sb_lock); } -static void f2fs_save_errors (struct f2fs_sb_info *sbi,unsigned char flag) +void f2fs_save_errors (struct f2fs_sb_info *sbi,unsigned char flag) {spin_lock (&sbi->error_lock);if (!test_bit (flag, (unsigned long *)sbi->errors)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 323/663 crypto: caam - Clear some memory in instantiate_rng
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 9c19fb86a8cb2ee82a832c95e139f29ea05c4d08 ]
According to the comment at the end of the 'for' loop just a few lines below, it looks needed to clear 'desc'.
So it should also be cleared for the first iteration.
Move the memset() to the beginning of the loop to be safe.
--- drivers/crypto/caam/ctrl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/crypto/caam/ctrl.c +4 -2
@@ -284,6 +284,10 @@ static int instantiate_rng(struct device *ctrldev, int state_handle_mask,const u32 rdsta_if =RDSTA_IF0 << sh_idx;const u32 rdsta_pr =RDSTA_PR0 << sh_idx;const u32 rdsta_mask = rdsta_if | rdsta_pr; + +/* Clear the contents before using the descriptor */ +memset (desc,0x00 ,CAAM_CMD_SZ *7 ); +/* * If the corresponding bit is set, this state handle * was initialized by somebody else, so it's left alone.
@@ -327,8 +331,6 @@ static int instantiate_rng(struct device *ctrldev, int state_handle_mask, }dev_info (ctrldev,"Instantiated RNG4 SH%d\n" , sh_idx); -/* Clear the contents before recreating the descriptor */ -memset (desc,0x00 ,CAAM_CMD_SZ *7 ); }kfree (desc);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 324/663 crypto: sa2ul - Select CRYPTO_DES
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
[ Upstream commit 8832023efd20966e29944dac92118dfbf1fa1bc0 ]
The SA2UL Crypto driver provides support for couple of
DES3 algos "cbc(des3_ede)" and "ecb(des3_ede)", and enabling the crypto selftest throws the following errors (as seen on
K3 J721E SoCs):
saul-crypto 4e00000.crypto: Error allocating fallback algo cbc(des3_ede)
alg: skcipher: failed to allocate transform for cbc-des3-sa2ul: -2 saul-crypto 4e00000.crypto: Error allocating fallback algo ecb(des3_ede)
alg: skcipher: failed to allocate transform for ecb-des3-sa2ul: -2
Fix this by selecting CRYPTO_DES which was missed while adding base driver support.
--- drivers/crypto/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/Kconfig +1 -0
@@ -820,6 +820,7 @@ config CRYPTO_DEV_SA2UL select CRYPTO_AES select CRYPTO_ALGAPI select CRYPTO_AUTHENC + select CRYPTO_DES select CRYPTO_SHA1 select CRYPTO_SHA256 select CRYPTO_SHA512
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 325/663 wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
In reply to Greg Kroah-HartmanFrom: Wei Chen <[email protected]>
[ Upstream commit 905a9241e4e8c15d2c084fee916280514848fe35 ]
If there is a failure during copy_from_user or user-provided data buffer is invalid, rtl_debugfs_set_write_rfreg should return negative error code instead of a positive value count.
Fix this bug by returning correct error code. Moreover, the check of buffer against null is removed since it will be handled by copy_from_user.
--- drivers/net/wireless/realtek/rtlwifi/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/debug.c +3 -3
@@ -375,8 +375,8 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp, tmp_len = (count >sizeof (tmp) -1 ?sizeof (tmp) -1 : count); -if (!buffer ||copy_from_user (tmp, buffer, tmp_len)) -return count; +if (copy_from_user (tmp, buffer, tmp_len)) +return -EFAULT ; tmp[tmp_len] ='\0' ;
@@ -386,7 +386,7 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp,if (num !=4 ) {rtl_dbg (rtlpriv,COMP_ERR ,DBG_DMESG ,"Format is <path> <addr> <mask> <data>\n" ); -return count; +return -EINVAL ; }rtl_set_rfreg (hw, path, addr, bitmask, data);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 326/663 wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
In reply to Greg Kroah-HartmanFrom: Wei Chen <[email protected]>
[ Upstream commit 5dbe1f8eb8c5ac69394400a5b86fd81775e96c43 ]
If there is a failure during copy_from_user or user-provided data buffer is invalid, rtl_debugfs_set_write_reg should return negative error code instead of a positive value count.
Fix this bug by returning correct error code. Moreover, the check of buffer against null is removed since it will be handled by copy_from_user.
--- drivers/net/wireless/realtek/rtlwifi/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/debug.c +3 -3
@@ -278,8 +278,8 @@ static ssize_t rtl_debugfs_set_write_reg(struct file *filp, tmp_len = (count >sizeof (tmp) -1 ?sizeof (tmp) -1 : count); -if (!buffer ||copy_from_user (tmp, buffer, tmp_len)) -return count; +if (copy_from_user (tmp, buffer, tmp_len)) +return -EFAULT ; tmp[tmp_len] ='\0' ;
@@ -287,7 +287,7 @@ static ssize_t rtl_debugfs_set_write_reg(struct file *filp, num =sscanf (tmp,"%x %x %x" , &addr, &val, &len);if (num !=3 ) -return count; +return -EINVAL ;switch (len) {case 1 :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 327/663 scsi: hisi_sas: Handle NCQ error when IPTT is valid
In reply to Greg Kroah-HartmanFrom: Xingui Yang <[email protected]>
[ Upstream commit bb544224da77b96b2c11a13872bf91ede1e015be ]
If an NCQ error occurs when the IPTT is valid and slot->abort flag is set in completion path, sas_task_abort() will be called to abort only one NCQ command now, and the host would be set to SHOST_RECOVERY state. But this may not kick-off EH Immediately until other outstanding QCs timeouts. As a result, the host may remain in the SHOST_RECOVERY state for up to 30 seconds, such as follows:
[7972317.645234] hisi_sas_v3_hw 0000:74:04.0: erroneous completion iptt=3264 task=00000000466116b8 dev id=2 sas_addr=0x5000000000000502 CQ hdr: 0x1883 0x20cc0 0x40000 0x20420000 Error info: 0x0 0x0 0x200000 0x0 [7972341.508264] sas: Enter sas_scsi_recover_host busy: 32 failed: 32 [7972341.984731] sas: --- Exit sas_scsi_recover_host: busy: 0 failed: 32 tries: 1
All NCQ commands that are in the queue should be aborted when an NCQ error occurs in this scenario.
--- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 6 +++++- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 6 +++++- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +5 -1
@@ -1258,7 +1258,11 @@ static void slot_complete_v1_hw(struct hisi_hba *hisi_hba,slot_err_v1_hw (hisi_hba, task, slot);if (unlikely (slot->abort)) { -sas_task_abort (task); +if (dev_is_sata (device) && task->ata_task.use_ncq) +sas_ata_device_link_abort (device, true); +else +sas_task_abort (task); +return ; } goto out;
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +5 -1
@@ -2404,7 +2404,11 @@ static void slot_complete_v2_hw(struct hisi_hba *hisi_hba, error_info[2], error_info[3]);if (unlikely (slot->abort)) { -sas_task_abort (task); +if (dev_is_sata (device) && task->ata_task.use_ncq) +sas_ata_device_link_abort (device, true); +else +sas_task_abort (task); +return ; } goto out;
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +5 -1
@@ -2320,7 +2320,11 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba, error_info[0 ], error_info[1 ], error_info[2], error_info[3]);if (unlikely (slot->abort)) { -sas_task_abort (task); +if (dev_is_sata (device) && task->ata_task.use_ncq) +sas_ata_device_link_abort (device, true); +else +sas_task_abort (task); +return ; } goto out;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 328/663 wifi: rt2x00: Fix memory leak when handling surveys
In reply to Greg Kroah-HartmanFrom: Armin Wolf <[email protected]>
[ Upstream commit cbef9a83c51dfcb07f77cfa6ac26f53a1ea86f49 ]
When removing a rt2x00 device, its associated channel surveys are not freed, causing a memory leak observable with kmemleak:
unreferenced object 0xffff9620f0881a00 (size 512):
comm "systemd-udevd", pid 2290, jiffies 4294906974 (age 33.768s) hex dump (first 32 bytes):
70 44 12 00 00 00 00 00 92 8a 00 00 00 00 00 00 pD..............
00 00 00 00 00 00 00 00 ab 87 01 00 00 00 00 00 ................
backtrace:
[<ffffffffb0ed858b>] __kmalloc+0x4b/0x130
[<ffffffffc1b0f29b>] rt2800_probe_hw+0xc2b/0x1380 [rt2800lib]
[<ffffffffc1a9496e>] rt2800usb_probe_hw+0xe/0x60 [rt2800usb]
[<ffffffffc1ae491a>] rt2x00lib_probe_dev+0x21a/0x7d0 [rt2x00lib]
[<ffffffffc1b3b83e>] rt2x00usb_probe+0x1be/0x980 [rt2x00usb]
[<ffffffffc05981e2>] usb_probe_interface+0xe2/0x310 [usbcore]
[<ffffffffb13be2d5>] really_probe+0x1a5/0x410
[<ffffffffb13be5c8>] __driver_probe_device+0x78/0x180
[<ffffffffb13be6fe>] driver_probe_device+0x1e/0x90
[<ffffffffb13be972>] __driver_attach+0xd2/0x1c0
[<ffffffffb13bbc57>] bus_for_each_dev+0x77/0xd0
[<ffffffffb13bd2a2>] bus_add_driver+0x112/0x210
[<ffffffffb13bfc6c>] driver_register+0x5c/0x120
[<ffffffffc0596ae8>] usb_register_driver+0x88/0x150 [usbcore]
[<ffffffffb0c011c4>] do_one_initcall+0x44/0x220
[<ffffffffb0d6134c>] do_init_module+0x4c/0x220Fix this by freeing the channel surveys on device removal.
Tested with a RT3070 based USB wireless adapter.
--- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +1 -0
@@ -1091,6 +1091,7 @@ static void rt2x00lib_remove_hw(struct rt2x00_dev *rt2x00dev) }kfree (rt2x00dev->spec.channels_info); +kfree (rt2x00dev->chan_survey); }static const struct ieee80211_tpt_blink rt2x00_tpt_blink[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 329/663 bpf: rename list_head -> graph_root in field info types
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit 30465003ad776a922c32b2dac58db14f120f037e ]
Many of the structs recently added to track field info for linked-list head are useful as-is for rbtree root. So let's do a mechanical renaming of list_head-related types and fields:
include/linux/bpf.h:
struct btf_field_list_head -> struct btf_field_graph_root list_head -> graph_root in struct btf_field unionkernel/bpf/btf.c:
list_head -> graph_root in struct btf_field_info
This is a nonfunctional change, functionality to actually use these fields for rbtree will be added in further patches.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- include/linux/bpf.h | 4 ++-- kernel/bpf/btf.c | 21 +++++++++++---------- kernel/bpf/helpers.c | 4 ++-- kernel/bpf/verifier.c | 21 +++++++++++---------- 4 files changed, 26 insertions(+), 24 deletions(-)
include/linux/bpf.h +2 -2
@@ -189,7 +189,7 @@ struct btf_field_kptr {u32 btf_id; }; -struct btf_field_list_head { +struct btf_field_graph_root {struct btf *btf;u32 value_btf_id;u32 node_offset;
@@ -201,7 +201,7 @@ struct btf_field {enum btf_field_type type;union {struct btf_field_kptr kptr; -struct btf_field_list_head list_head; +struct btf_field_graph_root graph_root; }; };
kernel/bpf/btf.c +11 -10
@@ -3228,7 +3228,7 @@ struct btf_field_info {struct {const char *node_name;u32 value_btf_id; - } list_head; + } graph_root; }; };
@@ -3335,8 +3335,8 @@ static int btf_find_list_head(const struct btf *btf, const struct btf_type *pt,return -EINVAL ; info->type =BPF_LIST_HEAD ; info->off = off; - info->list_head.value_btf_id = id; - info->list_head.node_name = list_node; + info->graph_root.value_btf_id = id; + info->graph_root.node_name = list_node;return BTF_FIELD_FOUND ; }
@@ -3604,13 +3604,14 @@ static int btf_parse_list_head(const struct btf *btf, struct btf_field *field,u32 offset;int i; - t =btf_type_by_id (btf, info->list_head.value_btf_id); + t =btf_type_by_id (btf, info->graph_root.value_btf_id);/* We've already checked that value_btf_id is a struct type. We * just need to figure out the offset of the list_node, and * verify its type. */ for_each_member (i, t, member) { -if (strcmp (info->list_head.node_name,__btf_name_by_offset (btf, member->name_off))) +if (strcmp (info->graph_root.node_name, +__btf_name_by_offset (btf, member->name_off)))continue ;/* Invalid BTF, two members with same name */ if (n)
@@ -3627,9 +3628,9 @@ static int btf_parse_list_head(const struct btf *btf, struct btf_field *field,if (offset % __alignof__(struct bpf_list_node ))return -EINVAL ; - field->list_head.btf = (struct btf *)btf; - field->list_head.value_btf_id = info->list_head.value_btf_id; - field->list_head.node_offset = offset; + field->graph_root.btf = (struct btf *)btf; + field->graph_root.value_btf_id = info->graph_root.value_btf_id; + field->graph_root.node_offset = offset; }if (!n)return -ENOENT ;
@@ -3736,11 +3737,11 @@ int btf_check_and_fixup_fields(const struct btf *btf, struct btf_record *rec)if (!(rec->fields[i].type &BPF_LIST_HEAD ))continue ; - btf_id = rec->fields[i].list_head.value_btf_id; + btf_id = rec->fields[i].graph_root.value_btf_id; meta =btf_find_struct_meta (btf, btf_id);if (!meta)return -EFAULT ; - rec->fields[i].list_head.value_rec = meta->record; + rec->fields[i].graph_root.value_rec = meta->record;if (!(rec->field_mask &BPF_LIST_NODE ))continue ;
kernel/bpf/helpers.c +2 -2
@@ -1745,12 +1745,12 @@ void bpf_list_head_free(const struct btf_field *field, void *list_head,while (head != orig_head) {void *obj = head; - obj -= field->list_head.node_offset; + obj -= field->graph_root.node_offset; head = head->next;/* The contained type can also have resources, including a * bpf_list_head which needs to be freed. */ -bpf_obj_free_fields (field->list_head.value_rec, obj); +bpf_obj_free_fields (field->graph_root.value_rec, obj);/* bpf_mem_free requires migrate_disable(), since we can be * called from map free path as well apart from BPF program (as * part of map ops doing bpf_obj_free_fields).
kernel/bpf/verifier.c +11 -10
@@ -8997,21 +8997,22 @@ static int process_kf_arg_ptr_to_list_node(struct bpf_verifier_env *env, field = meta->arg_list_head.field; - et =btf_type_by_id (field->list_head.btf, field->list_head.value_btf_id); + et =btf_type_by_id (field->graph_root.btf, field->graph_root.value_btf_id); t =btf_type_by_id (reg->btf, reg->btf_id); -if (!btf_struct_ids_match (&env->log, reg->btf, reg->btf_id,0 , field->list_head.btf, - field->list_head.value_btf_id, true)) { +if (!btf_struct_ids_match (&env->log, reg->btf, reg->btf_id,0 , field->graph_root.btf, + field->graph_root.value_btf_id, true)) {verbose (env,"operation on bpf_list_head expects arg#1 bpf_list_node at offset=%d " "in struct %s, but arg is at offset=%d in struct %s\n" , - field->list_head.node_offset,btf_name_by_offset (field->list_head.btf, et->name_off), + field->graph_root.node_offset, +btf_name_by_offset (field->graph_root.btf, et->name_off), list_node_off,btf_name_by_offset (reg->btf, t->name_off));return -EINVAL ; } -if (list_node_off != field->list_head.node_offset) { +if (list_node_off != field->graph_root.node_offset) {verbose (env,"arg#1 offset=%d, but expected bpf_list_node at offset=%d in struct %s\n" , - list_node_off, field->list_head.node_offset, -btf_name_by_offset (field->list_head.btf, et->name_off)); + list_node_off, field->graph_root.node_offset, +btf_name_by_offset (field->graph_root.btf, et->name_off));return -EINVAL ; }/* Set arg#1 for expiration after unlock */
@@ -9453,9 +9454,9 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,mark_reg_known_zero (env, regs,BPF_REG_0 ); regs[BPF_REG_0 ].type =PTR_TO_BTF_ID |MEM_ALLOC ; - regs[BPF_REG_0 ].btf = field->list_head.btf; - regs[BPF_REG_0 ].btf_id = field->list_head.value_btf_id; - regs[BPF_REG_0 ].off = field->list_head.node_offset; + regs[BPF_REG_0 ].btf = field->graph_root.btf; + regs[BPF_REG_0 ].btf_id = field->graph_root.value_btf_id; + regs[BPF_REG_0 ].off = field->graph_root.node_offset; }else if (meta.func_id == special_kfunc_list[KF_bpf_cast_to_kern_ctx]) {mark_reg_known_zero (env, regs,BPF_REG_0 ); regs[BPF_REG_0 ].type =PTR_TO_BTF_ID |PTR_TRUSTED ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 330/663 bpf: Add __bpf_kfunc tag for marking kernel functions as kfuncs
In reply to Greg Kroah-HartmanFrom: David Vernet <[email protected]>
[ Upstream commit 57e7c169cd6afa093d858b8edfb9bceaf2e1c93b ]
kfuncs are functions defined in the kernel, which may be invoked by BPF programs. They may or may not also be used as regular kernel functions, implying that they may be static (in which case the compiler could e.g. inline it away, or elide one or more arguments), or it could have external linkage, but potentially be elided in an LTO build if a function is observed to never be used, and is stripped from the final kernel binary.
This has already resulted in some issues, such as those discussed in [0] wherein changes in DWARF that identify when a parameter has been optimized out can break BTF encodings (and in general break the kfunc).
[0]: https://lore.kernel.org/all/[email protected]/
We therefore require some convenience macro that kfunc developers can use just add to their kfuncs, and which will prevent all of the above issues from happening. This is in contrast with what we have today, where some kfunc definitions have "noinline", some have "__used", and others are static and have neither.
Note that longer term, this mechanism may be replaced by a macro that more closely resembles EXPORT_SYMBOL_GPL(), as described in [1]. For now, we're going with this shorter-term approach to fix existing issues in kfuncs.
[1]: https://lore.kernel.org/lkml/[email protected]/
Note as well that checkpatch complains about this patch with the following:
ERROR: Macros with complex values should be enclosed in parentheses +#define __bpf_kfunc __used noinline
There seems to be a precedent for using this pattern in other places such as compiler_types.h (see e.g. __randomize_layout and noinstr), so it seems appropriate.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- include/linux/btf.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/btf.h +8 -0
@@ -72,6 +72,14 @@#define KF_DESTRUCTIVE (1 << 6)/* kfunc performs destructive actions */ #define KF_RCU (1 << 7)/* kfunc only takes rcu pointer arguments */ +/* +* Tag marking a kernel function as a kfunc. This is meant to minimize the +* amount of copy-paste that kfunc authors have to include for correctness so +* as to avoid issues such as the compiler inlining or eliding either a static +* kfunc, or a global kfunc in an LTO build. +*/ +#define __bpf_kfunc __used noinline +/* * Return the name of the passed struct, if exists, or halt the build if for * example the structure gets renamed. In this way, developers have to revisit
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 331/663 bpf: Migrate release_on_unlock logic to non-owning ref semantics
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit 6a3cd3318ff65622415e34e8ee39d76331e7c869 ]
This patch introduces non-owning reference semantics to the verifier, specifically linked_list API kfunc handling. release_on_unlock logic for refs is refactored - with small functional changes - to implement these semantics, and bpf_list_push_{front,back} are migrated to use them.
When a list node is pushed to a list, the program still has a pointer to the node:
n = bpf_obj_new(typeof(*n)); bpf_spin_lock(&l); bpf_list_push_back(&l, n); /* n still points to the just-added node */ bpf_spin_unlock(&l);
What the verifier considers n to be after the push, and thus what can be done with n, are changed by this patch.
Common properties both before/after this patch:
* After push, n is only a valid reference to the node until end of critical section
* After push, n cannot be pushed to any list
* After push, the program can read the node's fields using n
Before:
* After push, n retains the ref_obj_id which it received on bpf_obj_new, but the associated bpf_reference_state's release_on_unlock field is set to true
* release_on_unlock field and associated logic is used to implement "n is only a valid ref until end of critical section"
* After push, n cannot be written to, the node must be removed from the list before writing to its fields
* After push, n is marked PTR_UNTRUSTED
After:
* After push, n's ref is released and ref_obj_id set to 0. NON_OWN_REF type flag is added to reg's type, indicating that it's a non-owning reference.
* NON_OWN_REF flag and logic is used to implement "n is only a valid ref until end of critical section"
* n can be written to (except for special fields e.g. bpf_list_node,
timer, ...)
Summary of specific implementation changes to achieve the above:
* release_on_unlock field, ref_set_release_on_unlock helper, and logic to "release on unlock" based on that field are removed
* The anonymous active_lock struct used by bpf_verifier_state is pulled out into a named struct bpf_active_lock.
* NON_OWN_REF type flag is introduced along with verifier logic changes to handle non-owning refs
* Helpers are added to use NON_OWN_REF flag to implement non-owning ref semantics as described above
* invalidate_non_owning_refs - helper to clobber all non-owning refs matching a particular bpf_active_lock identity. Replaces release_on_unlock logic in process_spin_lock.
* ref_set_non_owning - set NON_OWN_REF type flag after doing some sanity checking
* ref_convert_owning_non_owning - convert owning reference w/ specified ref_obj_id to non-owning references. Set NON_OWN_REF flag for each reg with that ref_obj_id and 0-out its ref_obj_id
* Update linked_list selftests to account for minor semantic differences introduced by this patch
* Writes to a release_on_unlock node ref are not allowed, while writes to non-owning reference pointees are. As a result the linked_list "write after push" failure tests are no longer scenarios that should fail.
* The test##missing_lock##op and test##incorrect_lock##op macro-generated failure tests need to have a valid node argument in order to have the same error output as before. Otherwise verification will fail early and the expected error output won't be seen.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- include/linux/bpf.h | 6 + include/linux/bpf_verifier.h | 38 ++-- kernel/bpf/verifier.c | 168 +++++++++++++----- .../selftests/bpf/prog_tests/linked_list.c | 2 - .../testing/selftests/bpf/progs/linked_list.c | 2 +- .../selftests/bpf/progs/linked_list_fail.c | 100 +++++++---- 6 files changed, 206 insertions(+), 110 deletions(-)
include/linux/bpf.h +6 -0
@@ -180,6 +180,7 @@ enum btf_field_type {BPF_KPTR =BPF_KPTR_UNREF |BPF_KPTR_REF ,BPF_LIST_HEAD = (1 <<4 ),BPF_LIST_NODE = (1 <<5 ), + BPF_GRAPH_NODE_OR_ROOT = BPF_LIST_NODE | BPF_LIST_HEAD, }; struct btf_field_kptr {
@@ -582,6 +583,11 @@ enum bpf_type_flag {/* MEM is tagged with rcu and memory access needs rcu_read_lock protection. */ MEM_RCU =BIT (13 +BPF_BASE_TYPE_BITS ), +/* Used to tag PTR_TO_BTF_ID | MEM_ALLOC references which are non-owning. +* Currently only valid for linked-list and rbtree nodes. +*/ +NON_OWN_REF =BIT (14 +BPF_BASE_TYPE_BITS ), + __BPF_TYPE_FLAG_MAX, __BPF_TYPE_LAST_FLAG = __BPF_TYPE_FLAG_MAX - 1, };
include/linux/bpf_verifier.h +18 -20
@@ -43,6 +43,22 @@ enum bpf_reg_liveness { REG_LIVE_DONE = 0x8, /* liveness won't be updating this register anymore */ }; +/* For every reg representing a map value or allocated object pointer, +* we consider the tuple of (ptr, id) for them to be unique in verifier +* context and conside them to not alias each other for the purposes of +* tracking lock state. +*/ +struct bpf_active_lock { +/* This can either be reg->map_ptr or reg->btf. If ptr is NULL, +* there's no active lock held, and other fields have no +* meaning. If non-NULL, it indicates that a lock is held and +* id member has the reg->id of the register which can be >= 0. +*/ +void *ptr; +/* This will be reg->id */ +u32 id; +}; +struct bpf_reg_state {/* Ordering of fields matters. See states_equal() */ enum bpf_reg_type type;
@@ -223,11 +239,6 @@ struct bpf_reference_state {* exiting a callback function. */ int callback_ref; -/* Mark the reference state to release the registers sharing the same id -* on bpf_spin_unlock (for nodes that we will lose ownership to but are -* safe to access inside the critical section). -*/ -bool release_on_unlock; };/* state of the program:
@@ -328,21 +339,8 @@ struct bpf_verifier_state {u32 branches;u32 insn_idx;u32 curframe; -/* For every reg representing a map value or allocated object pointer, -* we consider the tuple of (ptr, id) for them to be unique in verifier -* context and conside them to not alias each other for the purposes of -* tracking lock state. -*/ -struct { -/* This can either be reg->map_ptr or reg->btf. If ptr is NULL, -* there's no active lock held, and other fields have no -* meaning. If non-NULL, it indicates that a lock is held and -* id member has the reg->id of the register which can be >= 0. -*/ -void *ptr; -/* This will be reg->id */ -u32 id; - } active_lock; + +struct bpf_active_lock active_lock;bool speculative;bool active_rcu_lock;
kernel/bpf/verifier.c +119 -49
289 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/linked_list.c +0 -2
@@ -78,8 +78,6 @@ static struct { { "direct_write_head", "direct access to bpf_list_head is disallowed" }, { "direct_read_node", "direct access to bpf_list_node is disallowed" }, { "direct_write_node", "direct access to bpf_list_node is disallowed" }, - { "write_after_push_front", "only read is supported" }, - { "write_after_push_back", "only read is supported" }, { "use_after_unlock_push_front", "invalid mem access 'scalar'" }, { "use_after_unlock_push_back", "invalid mem access 'scalar'" }, { "double_push_front", "arg#1 expected pointer to allocated object" },
tools/testing/selftests/bpf/progs/linked_list.c +1 -1
@@ -260,7 +260,7 @@ int test_list_push_pop_multiple(struct bpf_spin_lock *lock, struct bpf_list_head {int ret; - ret =list_push_pop_multiple (lock ,head, false); + ret =list_push_pop_multiple (lock, head, false);if (ret)return ret;return list_push_pop_multiple (lock, head, true);
tools/testing/selftests/bpf/progs/linked_list_fail.c +62 -38
135 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 332/663 bpf: Add basic bpf_rb_{root,node} support
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit 9c395c1b99bd23f74bc628fa000480c49593d17f ]
This patch adds special BPF_RB_{ROOT,NODE} btf_field_types similar to BPF_LIST_{HEAD,NODE}, adds the necessary plumbing to detect the new types, and adds bpf_rb_root_free function for freeing bpf_rb_root in map_values.
structs bpf_rb_root and bpf_rb_node are opaque types meant to obscure structs rb_root_cached rb_node, respectively.
btf_struct_access will prevent BPF programs from touching these special fields automatically now that they're recognized.
btf_check_and_fixup_fields now groups list_head and rb_root together as "graph root" fields and {list,rb}_node as "graph node", and does same ownership cycle checking as before. Note that this function does _not_ prevent ownership type mixups (e.g. rb_root owning list_node) - that's handled by btf_parse_graph_root.
After this patch, a bpf program can have a struct bpf_rb_root in a map_value, but not add anything to nor do anything useful with it.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- include/linux/bpf.h | 20 ++- include/uapi/linux/bpf.h | 11 ++ kernel/bpf/btf.c | 162 ++++++++++++------ kernel/bpf/helpers.c | 40 +++++ kernel/bpf/syscall.c | 28 ++- kernel/bpf/verifier.c | 5 +- tools/include/uapi/linux/bpf.h | 11 ++ .../selftests/bpf/prog_tests/linked_list.c | 12 +- 8 files changed, 216 insertions(+), 73 deletions(-)
include/linux/bpf.h +19 -1
@@ -180,7 +180,10 @@ enum btf_field_type {BPF_KPTR =BPF_KPTR_UNREF |BPF_KPTR_REF ,BPF_LIST_HEAD = (1 <<4 ),BPF_LIST_NODE = (1 <<5 ), - BPF_GRAPH_NODE_OR_ROOT = BPF_LIST_NODE | BPF_LIST_HEAD, +BPF_RB_ROOT = (1 <<6 ), +BPF_RB_NODE = (1 <<7 ), +BPF_GRAPH_NODE_OR_ROOT =BPF_LIST_NODE |BPF_LIST_HEAD | + BPF_RB_NODE | BPF_RB_ROOT, }; struct btf_field_kptr {
@@ -284,6 +287,10 @@ static inline const char *btf_field_type_name(enum btf_field_type type)return "bpf_list_head" ;case BPF_LIST_NODE :return "bpf_list_node" ; +case BPF_RB_ROOT : +return "bpf_rb_root" ; +case BPF_RB_NODE : +return "bpf_rb_node" ;default :WARN_ON_ONCE (1 );return "unknown" ;
@@ -304,6 +311,10 @@ static inline u32 btf_field_type_size(enum btf_field_type type)return sizeof (struct bpf_list_head );case BPF_LIST_NODE :return sizeof (struct bpf_list_node ); +case BPF_RB_ROOT : +return sizeof (struct bpf_rb_root ); +case BPF_RB_NODE : +return sizeof (struct bpf_rb_node );default :WARN_ON_ONCE (1 );return 0 ;
@@ -324,6 +335,10 @@ static inline u32 btf_field_type_align(enum btf_field_type type)return __alignof__(struct bpf_list_head );case BPF_LIST_NODE :return __alignof__(struct bpf_list_node ); +case BPF_RB_ROOT : +return __alignof__(struct bpf_rb_root ); +case BPF_RB_NODE : +return __alignof__(struct bpf_rb_node );default :WARN_ON_ONCE (1 );return 0 ;
@@ -441,6 +456,9 @@ void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,void bpf_timer_cancel_and_free (void *timer);void bpf_list_head_free (const struct btf_field *field,void *list_head,struct bpf_spin_lock *spin_lock); +void bpf_rb_root_free (const struct btf_field *field,void *rb_root, +struct bpf_spin_lock *spin_lock); +int bpf_obj_name_cpy (char *dst,const char *src,unsigned int size);
include/uapi/linux/bpf.h +11 -0
@@ -6901,6 +6901,17 @@ struct bpf_list_node { __u64 :64 ; } __attribute__((aligned(8))); +struct bpf_rb_root { + __u64 :64; + __u64 :64; +} __attribute__((aligned (8 ))); + +struct bpf_rb_node { + __u64 :64; + __u64 :64; + __u64 :64; +} __attribute__((aligned (8 ))); +struct bpf_sysctl {__u32 write;/* Sysctl is being read (= 0) or written (= 1). * Allows 1,2,4-byte read, but no write.
kernel/bpf/btf.c +107 -55
313 lines not on this page · raw message
kernel/bpf/helpers.c +40 -0
@@ -1761,6 +1761,46 @@ void bpf_list_head_free(const struct btf_field *field, void *list_head, } } +/* Like rbtree_postorder_for_each_entry_safe, but 'pos' and 'n' are +* 'rb_node *', so field name of rb_node within containing struct is not +* needed. +* +* Since bpf_rb_tree's node type has a corresponding struct btf_field with +* graph_root.node_offset, it's not necessary to know field name +* or type of node struct +*/ +#define bpf_rbtree_postorder_for_each_entry_safe (pos, n, root) \ + for (pos = rb_first_postorder(root); \ + pos && ({ n = rb_next_postorder(pos); 1; }); \ + pos = n) + +void bpf_rb_root_free (const struct btf_field *field,void *rb_root, +struct bpf_spin_lock *spin_lock) +{ +struct rb_root_cached orig_root, *root = rb_root; +struct rb_node *pos, *n; +void *obj; + +BUILD_BUG_ON (sizeof (struct rb_root_cached ) >sizeof (struct bpf_rb_root )); +BUILD_BUG_ON (__alignof__(struct rb_root_cached ) > __alignof__(struct bpf_rb_root )); + +__bpf_spin_lock_irqsave (spin_lock); + orig_root = *root; + *root =RB_ROOT_CACHED ; +__bpf_spin_unlock_irqrestore (spin_lock); + +bpf_rbtree_postorder_for_each_entry_safe (pos, n, &orig_root.rb_root) { + obj = pos; + obj -= field->graph_root.node_offset; + +bpf_obj_free_fields (field->graph_root.value_rec, obj); + +migrate_disable (); +bpf_mem_free (&bpf_global_ma, obj); +migrate_enable (); + } +} +__diag_push ();__diag_ignore_all ("-Wmissing-prototypes" ,"Global functions as their definitions will be in vmlinux BTF" );
kernel/bpf/syscall.c +19 -9
@@ -527,9 +527,6 @@ void btf_record_free(struct btf_record *rec)return ;for (i =0 ; i < rec->cnt; i++) {switch (rec->fields[i].type) { -case BPF_SPIN_LOCK : -case BPF_TIMER : -break ;case BPF_KPTR_UNREF :case BPF_KPTR_REF :if (rec->fields[i].kptr.module)
@@ -538,7 +535,11 @@ void btf_record_free(struct btf_record *rec)break ;case BPF_LIST_HEAD :case BPF_LIST_NODE : -/* Nothing to release for bpf_list_head */ +case BPF_RB_ROOT : +case BPF_RB_NODE : +case BPF_SPIN_LOCK : +case BPF_TIMER : +/* Nothing to release */ break ;default :WARN_ON_ONCE (1 );
@@ -571,9 +572,6 @@ struct btf_record *btf_record_dup(const struct btf_record *rec) new_rec->cnt =0 ;for (i =0 ; i < rec->cnt; i++) {switch (fields[i].type) { -case BPF_SPIN_LOCK : -case BPF_TIMER : -break ;case BPF_KPTR_UNREF :case BPF_KPTR_REF :btf_get (fields[i].kptr.btf);
@@ -584,7 +582,11 @@ struct btf_record *btf_record_dup(const struct btf_record *rec)break ;case BPF_LIST_HEAD :case BPF_LIST_NODE : -/* Nothing to acquire for bpf_list_head */ +case BPF_RB_ROOT : +case BPF_RB_NODE : +case BPF_SPIN_LOCK : +case BPF_TIMER : +/* Nothing to acquire */ break ;default : ret = -EFAULT ;
@@ -664,7 +666,13 @@ void bpf_obj_free_fields(const struct btf_record *rec, void *obj)continue ;bpf_list_head_free (field, field_ptr, obj + rec->spin_lock_off);break ; +case BPF_RB_ROOT : +if (WARN_ON_ONCE (rec->spin_lock_off <0 )) +continue ; +bpf_rb_root_free (field, field_ptr, obj + rec->spin_lock_off); +break ;case BPF_LIST_NODE : +case BPF_RB_NODE :break ;default :WARN_ON_ONCE (1 );
@@ -1005,7 +1013,8 @@ static int map_check_btf(struct bpf_map *map, const struct btf *btf,return -EINVAL ; map->record =btf_parse_fields (btf, value_type, -BPF_SPIN_LOCK |BPF_TIMER |BPF_KPTR |BPF_LIST_HEAD , +BPF_SPIN_LOCK |BPF_TIMER |BPF_KPTR |BPF_LIST_HEAD | +BPF_RB_ROOT , map->value_size);if (!IS_ERR_OR_NULL (map->record)) {int i;
@@ -1053,6 +1062,7 @@ static int map_check_btf(struct bpf_map *map, const struct btf *btf, }break ;case BPF_LIST_HEAD : +case BPF_RB_ROOT :if (map->map_type !=BPF_MAP_TYPE_HASH && map->map_type !=BPF_MAP_TYPE_LRU_HASH && map->map_type !=BPF_MAP_TYPE_ARRAY ) {
kernel/bpf/verifier.c +3 -2
@@ -14583,9 +14583,10 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env, {enum bpf_prog_type prog_type =resolve_prog_type (prog); -if (btf_record_has_field (map->record,BPF_LIST_HEAD )) { +if (btf_record_has_field (map->record,BPF_LIST_HEAD ) || +btf_record_has_field (map->record,BPF_RB_ROOT )) {if (is_tracing_prog_type (prog_type)) { -verbose (env,"tracing progs cannot use bpf_list_head yet\n" ); +verbose (env,"tracing progs cannot use bpf_{list_head,rb_root} yet\n" );return -EINVAL ; } }
tools/include/uapi/linux/bpf.h +11 -0
@@ -6901,6 +6901,17 @@ struct bpf_list_node { __u64 :64 ; } __attribute__((aligned(8))); +struct bpf_rb_root { + __u64 :64; + __u64 :64; +} __attribute__((aligned (8 ))); + +struct bpf_rb_node { + __u64 :64; + __u64 :64; + __u64 :64; +} __attribute__((aligned (8 ))); +struct bpf_sysctl {__u32 write;/* Sysctl is being read (= 0) or written (= 1). * Allows 1,2,4-byte read, but no write.
tools/testing/selftests/bpf/prog_tests/linked_list.c +6 -6
@@ -58,12 +58,12 @@ static struct { TEST(inner_map, pop_front) TEST(inner_map, pop_back)#undef TEST - { "map_compat_kprobe", "tracing progs cannot use bpf_list_head yet" }, - { "map_compat_kretprobe", "tracing progs cannot use bpf_list_head yet" }, - { "map_compat_tp", "tracing progs cannot use bpf_list_head yet" }, - { "map_compat_perf", "tracing progs cannot use bpf_list_head yet" }, - { "map_compat_raw_tp", "tracing progs cannot use bpf_list_head yet" }, - { "map_compat_raw_tp_w", "tracing progs cannot use bpf_list_head yet" }, + { "map_compat_kprobe", "tracing progs cannot use bpf_{list_head,rb_root} yet" }, + { "map_compat_kretprobe", "tracing progs cannot use bpf_{list_head,rb_root} yet" }, + { "map_compat_tp", "tracing progs cannot use bpf_{list_head,rb_root} yet" }, + { "map_compat_perf", "tracing progs cannot use bpf_{list_head,rb_root} yet" }, + { "map_compat_raw_tp", "tracing progs cannot use bpf_{list_head,rb_root} yet" }, + { "map_compat_raw_tp_w", "tracing progs cannot use bpf_{list_head,rb_root} yet" }, { "obj_type_id_oor", "local type ID argument must be in range [0, U32_MAX]" }, { "obj_new_no_composite", "bpf_obj_new type ID argument must be of a struct" }, { "obj_new_no_struct", "bpf_obj_new type ID argument must be of a struct" },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 333/663 bpf: Add bpf_rbtree_{add,remove,first} kfuncs
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit bd1279ae8a691d7ec75852c6d0a22139afb034a4 ]
This patch adds implementations of bpf_rbtree_{add,remove,first} and teaches verifier about their BTF_IDs as well as those of bpf_rb_{root,node}.
All three kfuncs have some nonstandard component to their verification that needs to be addressed in future patches before programs can properly use them:
* bpf_rbtree_add: Takes 'less' callback, need to verify it
* bpf_rbtree_first: Returns ptr_to_node_type(off=rb_node_off) instead
of ptr_to_rb_node(off=0). Return value ref is non-owning.
* bpf_rbtree_remove: Returns ptr_to_node_type(off=rb_node_off) instead of ptr_to_rb_node(off=0). 2nd arg (node) is a non-owning reference.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- kernel/bpf/helpers.c | 54 +++++++++++++++++++++++++++++++++++++++++++ kernel/bpf/verifier.c | 14 ++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-)
kernel/bpf/helpers.c +54 -0
@@ -1873,6 +1873,56 @@ struct bpf_list_node *bpf_list_pop_back(struct bpf_list_head *head)return __bpf_list_del (head, true); } +__bpf_kfunc struct bpf_rb_node *bpf_rbtree_remove(struct bpf_rb_root *root, +struct bpf_rb_node *node) +{ +struct rb_root_cached *r = (struct rb_root_cached *)root; +struct rb_node *n = (struct rb_node *)node; + +rb_erase_cached (n, r); +RB_CLEAR_NODE (n); +return (struct bpf_rb_node *)n; +} + +/* Need to copy rbtree_add_cached's logic here because our 'less' is a BPF +* program +*/ +static void __bpf_rbtree_add (struct bpf_rb_root *root,struct bpf_rb_node *node, +void *less) +{ +struct rb_node **link = &((struct rb_root_cached *)root)->rb_root.rb_node; +bpf_callback_t cb = (bpf_callback_t )less; +struct rb_node *parent =NULL ; +bool leftmost = true; + +while (*link) { + parent = *link; +if (cb ((uintptr_t )node, (uintptr_t )parent,0 ,0 ,0 )) { + link = &parent->rb_left; + }else { + link = &parent->rb_right; + leftmost = false; + } + } + +rb_link_node ((struct rb_node *)node, parent, link); +rb_insert_color_cached ((struct rb_node *)node, + (struct rb_root_cached *)root, leftmost); +} + +__bpf_kfunc void bpf_rbtree_add(struct bpf_rb_root *root, struct bpf_rb_node *node, +bool (less )(struct bpf_rb_node *a,const struct bpf_rb_node *b)) +{ +__bpf_rbtree_add (root, node, (void *)less); +} + +__bpf_kfunc struct bpf_rb_node *bpf_rbtree_first(struct bpf_rb_root *root) +{ +struct rb_root_cached *r = (struct rb_root_cached *)root; + +return (struct bpf_rb_node *)rb_first_cached (r); +} +/** * bpf_task_acquire - Acquire a reference to a task. A task acquired by this * kfunc which is not stored in a map as a kptr, must be released by calling
@@ -2097,6 +2147,10 @@ BTF_ID_FLAGS(func, bpf_task_acquire, KF_ACQUIRE | KF_TRUSTED_ARGS) BTF_ID_FLAGS(func, bpf_task_acquire_not_zero, KF_ACQUIRE | KF_RCU | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_task_kptr_get, KF_ACQUIRE | KF_KPTR_GET | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_task_release, KF_RELEASE) +BTF_ID_FLAGS(func, bpf_rbtree_remove, KF_ACQUIRE) +BTF_ID_FLAGS(func, bpf_rbtree_add) +BTF_ID_FLAGS(func, bpf_rbtree_first, KF_RET_NULL) +#ifdef CONFIG_CGROUPS BTF_ID_FLAGS(func, bpf_cgroup_acquire, KF_ACQUIRE | KF_TRUSTED_ARGS)BTF_ID_FLAGS (func, bpf_cgroup_kptr_get,KF_ACQUIRE |KF_KPTR_GET |KF_RET_NULL )
kernel/bpf/verifier.c +13 -1
@@ -8555,6 +8555,8 @@ BTF_ID_LIST(kf_arg_btf_ids) BTF_ID(struct, bpf_dynptr_kern) BTF_ID(struct, bpf_list_head) BTF_ID(struct, bpf_list_node) +BTF_ID(struct, bpf_rb_root) +BTF_ID(struct, bpf_rb_node)static bool __is_kfunc_ptr_arg_type (const struct btf *btf,const struct btf_param *arg,int type)
@@ -8660,6 +8662,9 @@ enum special_kfunc_type { KF_bpf_rdonly_cast, KF_bpf_rcu_read_lock, KF_bpf_rcu_read_unlock, + KF_bpf_rbtree_remove, + KF_bpf_rbtree_add, + KF_bpf_rbtree_first, };BTF_SET_START (special_kfunc_set)
@@ -8671,6 +8676,9 @@ BTF_ID(func, bpf_list_pop_front) BTF_ID(func, bpf_list_pop_back) BTF_ID(func, bpf_cast_to_kern_ctx) BTF_ID(func, bpf_rdonly_cast) +BTF_ID(func, bpf_rbtree_remove) +BTF_ID(func, bpf_rbtree_add) +BTF_ID(func, bpf_rbtree_first)BTF_SET_END (special_kfunc_set)BTF_ID_LIST (special_kfunc_list)
@@ -8684,6 +8692,9 @@ BTF_ID(func, bpf_cast_to_kern_ctx) BTF_ID(func, bpf_rdonly_cast) BTF_ID(func, bpf_rcu_read_lock) BTF_ID(func, bpf_rcu_read_unlock) +BTF_ID(func, bpf_rbtree_remove) +BTF_ID(func, bpf_rbtree_add) +BTF_ID(func, bpf_rbtree_first)static bool is_kfunc_bpf_rcu_read_lock (struct bpf_kfunc_call_arg_meta *meta) {
@@ -9439,7 +9450,8 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, }if (meta.func_id == special_kfunc_list[KF_bpf_list_push_front] || - meta.func_id == special_kfunc_list[KF_bpf_list_push_back]) { + meta.func_id == special_kfunc_list[KF_bpf_list_push_back] || + meta.func_id == special_kfunc_list[KF_bpf_rbtree_add]) { release_ref_obj_id = regs[BPF_REG_2 ].ref_obj_id; err =ref_convert_owning_non_owning (env, release_ref_obj_id);if (err) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 334/663 bpf: Add support for bpf_rb_root and bpf_rb_node in kfunc args
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit cd6791b4b6f66f6b7925c840efe5c8fa0ce1ac87 ]
Now that we find bpf_rb_root and bpf_rb_node in structs, let's give args that contain those types special classification and properly handle these types when checking kfunc args.
"Properly handling" these types largely requires generalizing similar handling for bpf_list_{head,node}, with little new logic added in this patch.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- kernel/bpf/verifier.c | 238 +++++++++++++++++++++++++++++++++++------- 1 file changed, 203 insertions(+), 35 deletions(-)
kernel/bpf/verifier.c +203 -35
@@ -8438,6 +8438,9 @@ struct bpf_kfunc_call_arg_meta {struct {struct btf_field *field; } arg_list_head; +struct { +struct btf_field *field; + } arg_rbtree_root; };static bool is_kfunc_acquire (struct bpf_kfunc_call_arg_meta *meta)
@@ -8549,6 +8552,8 @@ enum {KF_ARG_DYNPTR_ID ,KF_ARG_LIST_HEAD_ID ,KF_ARG_LIST_NODE_ID , +KF_ARG_RB_ROOT_ID , +KF_ARG_RB_NODE_ID , };BTF_ID_LIST (kf_arg_btf_ids)
@@ -8590,6 +8595,16 @@ static bool is_kfunc_arg_list_node(const struct btf *btf, const struct btf_paramreturn __is_kfunc_ptr_arg_type (btf, arg,KF_ARG_LIST_NODE_ID ); } +static bool is_kfunc_arg_rbtree_root (const struct btf *btf,const struct btf_param *arg) +{ +return __is_kfunc_ptr_arg_type (btf, arg,KF_ARG_RB_ROOT_ID ); +} + +static bool is_kfunc_arg_rbtree_node (const struct btf *btf,const struct btf_param *arg) +{ +return __is_kfunc_ptr_arg_type (btf, arg,KF_ARG_RB_NODE_ID ); +} +/* Returns true if struct is composed of scalars, 4 levels of nesting allowed */ static bool __btf_type_is_scalar_struct(struct bpf_verifier_env *env, const struct btf *btf,
@@ -8649,6 +8664,8 @@ enum kfunc_ptr_arg_type {KF_ARG_PTR_TO_BTF_ID ,/* Also covers reg2btf_ids conversions */ KF_ARG_PTR_TO_MEM ,KF_ARG_PTR_TO_MEM_SIZE ,/* Size derived from next argument, skip it */ +KF_ARG_PTR_TO_RB_ROOT , + KF_ARG_PTR_TO_RB_NODE, }; enum special_kfunc_type {
@@ -8756,6 +8773,12 @@ get_kfunc_ptr_arg_type(struct bpf_verifier_env *env,if (is_kfunc_arg_list_node (meta->btf, &args[argno]))return KF_ARG_PTR_TO_LIST_NODE ; +if (is_kfunc_arg_rbtree_root (meta->btf, &args[argno])) +return KF_ARG_PTR_TO_RB_ROOT ; + +if (is_kfunc_arg_rbtree_node (meta->btf, &args[argno])) +return KF_ARG_PTR_TO_RB_NODE ; +if ((base_type (reg->type) ==PTR_TO_BTF_ID || reg2btf_ids[base_type (reg->type)])) {if (!btf_type_is_struct (ref_t)) { verbose(env, "kernel function %s args#%d pointer type %s %s is not supported\n",
@@ -8984,95 +9007,193 @@ static bool is_bpf_list_api_kfunc(u32 btf_id) btf_id == special_kfunc_list[KF_bpf_list_pop_back]; } -static int process_kf_arg_ptr_to_list_head (struct bpf_verifier_env *env, -struct bpf_reg_state *reg,u32 regno, -struct bpf_kfunc_call_arg_meta *meta) +static bool is_bpf_rbtree_api_kfunc (u32 btf_id) +{ +return btf_id == special_kfunc_list[KF_bpf_rbtree_add] || + btf_id == special_kfunc_list[KF_bpf_rbtree_remove] || + btf_id == special_kfunc_list[KF_bpf_rbtree_first]; +} + +static bool is_bpf_graph_api_kfunc (u32 btf_id) +{ +return is_bpf_list_api_kfunc (btf_id) ||is_bpf_rbtree_api_kfunc (btf_id); +} + +static bool check_kfunc_is_graph_root_api (struct bpf_verifier_env *env, +enum btf_field_type head_field_type, +u32 kfunc_btf_id) { +bool ret; + +switch (head_field_type) { +case BPF_LIST_HEAD : + ret =is_bpf_list_api_kfunc (kfunc_btf_id); +break ; +case BPF_RB_ROOT : + ret =is_bpf_rbtree_api_kfunc (kfunc_btf_id); +break ; +default : +verbose (env,"verifier internal error: unexpected graph root argument type %s\n" , +btf_field_type_name (head_field_type)); +return false; + } + +if (!ret) +verbose (env,"verifier internal error: %s head arg for unknown kfunc\n" , +btf_field_type_name (head_field_type)); +return ret; +} + +static bool check_kfunc_is_graph_node_api (struct bpf_verifier_env *env, +enum btf_field_type node_field_type, +u32 kfunc_btf_id) +{ +bool ret; + +switch (node_field_type) { +case BPF_LIST_NODE : + ret = (kfunc_btf_id == special_kfunc_list[KF_bpf_list_push_front] || + kfunc_btf_id == special_kfunc_list[KF_bpf_list_push_back]); +break ; +case BPF_RB_NODE : + ret = (kfunc_btf_id == special_kfunc_list[KF_bpf_rbtree_remove] || + kfunc_btf_id == special_kfunc_list[KF_bpf_rbtree_add]); +break ; +default : +verbose (env,"verifier internal error: unexpected graph node argument type %s\n" , +btf_field_type_name (node_field_type)); +return false; + } + +if (!ret) +verbose (env,"verifier internal error: %s node arg for unknown kfunc\n" , +btf_field_type_name (node_field_type)); +return ret; +} + +static int +__process_kf_arg_ptr_to_graph_root (struct bpf_verifier_env *env, +struct bpf_reg_state *reg,u32 regno, +struct bpf_kfunc_call_arg_meta *meta, +enum btf_field_type head_field_type, +struct btf_field **head_field) +{ +const char *head_type_name;struct btf_field *field;struct btf_record *rec; -u32 list_head_off; +u32 head_off; -if (meta->btf != btf_vmlinux || !is_bpf_list_api_kfunc (meta->func_id)) { -verbose (env,"verifier internal error: bpf_list_head argument for unknown kfunc\n" ); +if (meta->btf != btf_vmlinux) { +verbose (env,"verifier internal error: unexpected btf mismatch in kfunc call\n" );return -EFAULT ; } +if (!check_kfunc_is_graph_root_api (env, head_field_type, meta->func_id)) +return -EFAULT ; + + head_type_name =btf_field_type_name (head_field_type);if (!tnum_is_const (reg->var_off)) {verbose (env, -"R%d doesn't have constant offset. bpf_list_head has to be at the constant offset\n" , - regno); +"R%d doesn't have constant offset. %s has to be at the constant offset\n" , + regno, head_type_name);return -EINVAL ; } rec =reg_btf_record (reg); - list_head_off = reg->off + reg->var_off.value; - field =btf_record_find (rec, list_head_off,BPF_LIST_HEAD ); + head_off = reg->off + reg->var_off.value; + field =btf_record_find (rec, head_off, head_field_type);if (!field) { -verbose (env,"bpf_list_head not found at offset=%u\n" , list_head_off); +verbose (env,"%s not found at offset=%u\n" , head_type_name, head_off);return -EINVAL ; }/* All functions require bpf_list_head to be protected using a bpf_spin_lock */ if (check_reg_allocation_locked (env, reg)) { -verbose (env,"bpf_spin_lock at off=%d must be held for bpf_list_head\n" , - rec->spin_lock_off); +verbose (env,"bpf_spin_lock at off=%d must be held for %s\n" , + rec->spin_lock_off, head_type_name);return -EINVAL ; } -if (meta->arg_list_head.field) { -verbose (env,"verifier internal error: repeating bpf_list_head arg\n" ); +if (*head_field) { +verbose (env,"verifier internal error: repeating %s arg\n" , head_type_name);return -EFAULT ; } - meta->arg_list_head.field = field; + *head_field = field;return 0 ; } -static int process_kf_arg_ptr_to_list_node (struct bpf_verifier_env *env, +static int process_kf_arg_ptr_to_list_head (struct bpf_verifier_env *env,struct bpf_reg_state *reg,u32 regno,struct bpf_kfunc_call_arg_meta *meta) { +return __process_kf_arg_ptr_to_graph_root (env, reg, regno, meta,BPF_LIST_HEAD , + &meta->arg_list_head.field); +} + +static int process_kf_arg_ptr_to_rbtree_root (struct bpf_verifier_env *env, +struct bpf_reg_state *reg,u32 regno, +struct bpf_kfunc_call_arg_meta *meta) +{ +return __process_kf_arg_ptr_to_graph_root (env, reg, regno, meta,BPF_RB_ROOT , + &meta->arg_rbtree_root.field); +} + +static int +__process_kf_arg_ptr_to_graph_node (struct bpf_verifier_env *env, +struct bpf_reg_state *reg,u32 regno, +struct bpf_kfunc_call_arg_meta *meta, +enum btf_field_type head_field_type, +enum btf_field_type node_field_type, +struct btf_field **node_field) +{ +const char *node_type_name;const struct btf_type *et, *t;struct btf_field *field; -u32 list_node_off; +u32 node_off; -if (meta->btf != btf_vmlinux || - (meta->func_id != special_kfunc_list[KF_bpf_list_push_front] && - meta->func_id != special_kfunc_list[KF_bpf_list_push_back])) { -verbose (env,"verifier internal error: bpf_list_node argument for unknown kfunc\n" ); +if (meta->btf != btf_vmlinux) { +verbose (env,"verifier internal error: unexpected btf mismatch in kfunc call\n" );return -EFAULT ; } +if (!check_kfunc_is_graph_node_api (env, node_field_type, meta->func_id)) +return -EFAULT ; + + node_type_name =btf_field_type_name (node_field_type);if (!tnum_is_const (reg->var_off)) {verbose (env, -"R%d doesn't have constant offset. bpf_list_node has to be at the constant offset\n" , - regno); +"R%d doesn't have constant offset. %s has to be at the constant offset\n" , + regno, node_type_name);return -EINVAL ; } - list_node_off = reg->off + reg->var_off.value; - field =reg_find_field_offset (reg, list_node_off,BPF_LIST_NODE ); -if (!field || field->offset != list_node_off) { -verbose (env,"bpf_list_node not found at offset=%u\n" , list_node_off); + node_off = reg->off + reg->var_off.value; + field =reg_find_field_offset (reg, node_off, node_field_type); +if (!field || field->offset != node_off) { +verbose (env,"%s not found at offset=%u\n" , node_type_name, node_off);return -EINVAL ; } - field = meta->arg_list_head.field; + field = *node_field; et =btf_type_by_id (field->graph_root.btf, field->graph_root.value_btf_id); t =btf_type_by_id (reg->btf, reg->btf_id);if (!btf_struct_ids_match (&env->log, reg->btf, reg->btf_id,0 , field->graph_root.btf, field->graph_root.value_btf_id, true)) { -verbose (env,"operation on bpf_list_head expects arg#1 bpf_list_node at offset=%d " +verbose (env,"operation on %s expects arg#1 %s at offset=%d " "in struct %s, but arg is at offset=%d in struct %s\n" , +btf_field_type_name (head_field_type), +btf_field_type_name (node_field_type), field->graph_root.node_offset,btf_name_by_offset (field->graph_root.btf, et->name_off), - list_node_off,btf_name_by_offset (reg->btf, t->name_off)); + node_off,btf_name_by_offset (reg->btf, t->name_off));return -EINVAL ; } -if (list_node_off != field->graph_root.node_offset) { -verbose (env,"arg#1 offset=%d, but expected bpf_list_node at offset=%d in struct %s\n" , - list_node_off, field->graph_root.node_offset, +if (node_off != field->graph_root.node_offset) { +verbose (env,"arg#1 offset=%d, but expected %s at offset=%d in struct %s\n" , + node_off,btf_field_type_name (node_field_type), + field->graph_root.node_offset,btf_name_by_offset (field->graph_root.btf, et->name_off));return -EINVAL ; }
@@ -9080,6 +9201,24 @@ static int process_kf_arg_ptr_to_list_node(struct bpf_verifier_env *env,return 0 ; } +static int process_kf_arg_ptr_to_list_node (struct bpf_verifier_env *env, +struct bpf_reg_state *reg,u32 regno, +struct bpf_kfunc_call_arg_meta *meta) +{ +return __process_kf_arg_ptr_to_graph_node (env, reg, regno, meta, +BPF_LIST_HEAD ,BPF_LIST_NODE , + &meta->arg_list_head.field); +} + +static int process_kf_arg_ptr_to_rbtree_node (struct bpf_verifier_env *env, +struct bpf_reg_state *reg,u32 regno, +struct bpf_kfunc_call_arg_meta *meta) +{ +return __process_kf_arg_ptr_to_graph_node (env, reg, regno, meta, +BPF_RB_ROOT ,BPF_RB_NODE , + &meta->arg_rbtree_root.field); +} +static int check_kfunc_args (struct bpf_verifier_env *env,struct bpf_kfunc_call_arg_meta *meta) {const char *func_name = meta->func_name, *ref_tname;
@@ -9208,6 +9347,8 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_case KF_ARG_PTR_TO_DYNPTR :case KF_ARG_PTR_TO_LIST_HEAD :case KF_ARG_PTR_TO_LIST_NODE : +case KF_ARG_PTR_TO_RB_ROOT : +case KF_ARG_PTR_TO_RB_NODE :case KF_ARG_PTR_TO_MEM :case KF_ARG_PTR_TO_MEM_SIZE :/* Trusted by default */
@@ -9286,6 +9427,20 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_if (ret <0 )return ret;break ; +case KF_ARG_PTR_TO_RB_ROOT : +if (reg->type !=PTR_TO_MAP_VALUE && + reg->type != (PTR_TO_BTF_ID |MEM_ALLOC )) { +verbose (env,"arg#%d expected pointer to map value or allocated object\n" , i); +return -EINVAL ; + } +if (reg->type == (PTR_TO_BTF_ID |MEM_ALLOC ) && !reg->ref_obj_id) { +verbose (env,"allocated object must be referenced\n" ); +return -EINVAL ; + } + ret =process_kf_arg_ptr_to_rbtree_root (env, reg, regno, meta); +if (ret <0 ) +return ret; +break ;case KF_ARG_PTR_TO_LIST_NODE :if (reg->type != (PTR_TO_BTF_ID |MEM_ALLOC )) {verbose (env,"arg#%d expected pointer to allocated object\n" , i);
@@ -9299,6 +9454,19 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_if (ret <0 )return ret;break ; +case KF_ARG_PTR_TO_RB_NODE : +if (reg->type != (PTR_TO_BTF_ID |MEM_ALLOC )) { +verbose (env,"arg#%d expected pointer to allocated object\n" , i); +return -EINVAL ; + } +if (!reg->ref_obj_id) { +verbose (env,"allocated object must be referenced\n" ); +return -EINVAL ; + } + ret =process_kf_arg_ptr_to_rbtree_node (env, reg, regno, meta); +if (ret <0 ) +return ret; +break ;case KF_ARG_PTR_TO_BTF_ID :/* Only base_type is checked, further checks are done here */ if ((base_type(reg->type) != PTR_TO_BTF_ID ||
@@ -14297,7 +14465,7 @@ static int do_check(struct bpf_verifier_env *env)if ((insn->src_reg ==BPF_REG_0 && insn->imm != BPF_FUNC_spin_unlock) || (insn->src_reg ==BPF_PSEUDO_CALL ) || (insn->src_reg ==BPF_PSEUDO_KFUNC_CALL && - (insn->off !=0 || !is_bpf_list_api_kfunc (insn->imm)))) { + (insn->off !=0 || !is_bpf_graph_api_kfunc (insn->imm)))) {verbose (env,"function calls are not allowed while holding a lock\n" );return -EINVAL ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 335/663 bpf: Add callback validation to kfunc verifier logic
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit 5d92ddc3de1b44a82108af68ed71f638ca20509a ]
Some BPF helpers take a callback function which the helper calls. For each helper that takes such a callback, there's a special call to __check_func_call with a callback-state-setting callback that sets up verifier bpf_func_state for the callback's frame.
kfuncs don't have any of this infrastructure yet, so let's add it in this patch, following existing helper pattern as much as possible. To validate functionality of this added plumbing, this patch adds callback handling for the bpf_rbtree_add kfunc and hopes to lay groundwork for future graph datastructure callbacks.
In the "general plumbing" category we have:
* check_kfunc_call doing callback verification right before clearing CALLER_SAVED_REGS, exactly like check_helper_call
* recognition of func_ptr BTF types in kfunc args as KF_ARG_PTR_TO_CALLBACK + propagation of subprogno for this arg type
In the "rbtree_add / graph datastructure-specific plumbing" category:
* Since bpf_rbtree_add must be called while the spin_lock associated with the tree is held, don't complain when callback's func_state doesn't unlock it by frame exit
* Mark rbtree_add callback's args with ref_set_non_owning to prevent rbtree api functions from being called in the callback. Semantically this makes sense, as less() takes no ownership of its args when determining which comes first.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- kernel/bpf/verifier.c | 134 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 5 deletions(-)
kernel/bpf/verifier.c +129 -5
@@ -191,6 +191,7 @@ struct bpf_verifier_stack_elem {static int acquire_reference_state (struct bpf_verifier_env *env,int insn_idx);static int release_reference (struct bpf_verifier_env *env,int ref_obj_id);static void invalidate_non_owning_refs (struct bpf_verifier_env *env); +static bool in_rbtree_lock_required_cb (struct bpf_verifier_env *env);static int ref_set_non_owning (struct bpf_verifier_env *env,struct bpf_reg_state *reg);
@@ -1609,6 +1610,16 @@ static void mark_ptr_not_null_reg(struct bpf_reg_state *reg) reg->type &= ~PTR_MAYBE_NULL ; } +static void mark_reg_graph_node (struct bpf_reg_state *regs,u32 regno, +struct btf_field_graph_root *ds_head) +{ +__mark_reg_known_zero (®s[regno]); + regs[regno].type =PTR_TO_BTF_ID |MEM_ALLOC ; + regs[regno].btf = ds_head->btf; + regs[regno].btf_id = ds_head->value_btf_id; + regs[regno].off = ds_head->node_offset; +} +static bool reg_is_pkt_pointer (const struct bpf_reg_state *reg) {return type_is_pkt_pointer (reg->type);
@@ -6771,6 +6782,10 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg, meta->ret_btf_id = reg->btf_id;break ;case ARG_PTR_TO_SPIN_LOCK : +if (in_rbtree_lock_required_cb (env)) { +verbose (env,"can't spin_{lock,unlock} in rbtree cb\n" ); +return -EACCES ; + }if (meta->func_id == BPF_FUNC_spin_lock) { err =process_spin_lock (env, regno, true);if (err)
@@ -7354,6 +7369,8 @@ static int set_callee_state(struct bpf_verifier_env *env,struct bpf_func_state *caller, struct bpf_func_state *callee, int insn_idx); +static bool is_callback_calling_kfunc (u32 btf_id); +static int __check_func_call (struct bpf_verifier_env *env,struct bpf_insn *insn,int *insn_idx,int subprog,set_callee_state_fn set_callee_state_cb)
@@ -7408,10 +7425,18 @@ static int __check_func_call(struct bpf_verifier_env *env, struct bpf_insn *insn* interested in validating only BPF helpers that can call subprogs as * callbacks */ -if (set_callee_state_cb != set_callee_state && !is_callback_calling_function (insn->imm)) { -verbose (env,"verifier bug: helper %s#%d is not marked as callback-calling\n" , -func_id_name (insn->imm), insn->imm); -return -EFAULT ; +if (set_callee_state_cb != set_callee_state) { +if (bpf_pseudo_kfunc_call (insn) && + !is_callback_calling_kfunc (insn->imm)) { +verbose (env,"verifier bug: kfunc %s#%d not marked as callback-calling\n" , +func_id_name (insn->imm), insn->imm); +return -EFAULT ; + }else if (!bpf_pseudo_kfunc_call (insn) && + !is_callback_calling_function (insn->imm)) {/* helper */ +verbose (env,"verifier bug: helper %s#%d not marked as callback-calling\n" , +func_id_name (insn->imm), insn->imm); +return -EFAULT ; + } } if (insn->code == (BPF_JMP | BPF_CALL) &&
@@ -7676,6 +7701,63 @@ static int set_user_ringbuf_callback_state(struct bpf_verifier_env *env,return 0 ; } +static int set_rbtree_add_callback_state (struct bpf_verifier_env *env, +struct bpf_func_state *caller, +struct bpf_func_state *callee, +int insn_idx) +{ +/* void bpf_rbtree_add(struct bpf_rb_root *root, struct bpf_rb_node *node, +* bool (less)(struct bpf_rb_node *a, const struct bpf_rb_node *b)); +* +* 'struct bpf_rb_node *node' arg to bpf_rbtree_add is the same PTR_TO_BTF_ID w/ offset +* that 'less' callback args will be receiving. However, 'node' arg was release_reference'd +* by this point, so look at 'root' +*/ +struct btf_field *field; + + field =reg_find_field_offset (&caller->regs[BPF_REG_1 ], caller->regs[BPF_REG_1 ].off, +BPF_RB_ROOT ); +if (!field || !field->graph_root.value_btf_id) +return -EFAULT ; + +mark_reg_graph_node (callee->regs,BPF_REG_1 , &field->graph_root); +ref_set_non_owning (env, &callee->regs[BPF_REG_1 ]); +mark_reg_graph_node (callee->regs,BPF_REG_2 , &field->graph_root); +ref_set_non_owning (env, &callee->regs[BPF_REG_2 ]); + +__mark_reg_not_init (env, &callee->regs[BPF_REG_3 ]); +__mark_reg_not_init (env, &callee->regs[BPF_REG_4 ]); +__mark_reg_not_init (env, &callee->regs[BPF_REG_5 ]); + callee->in_callback_fn = true; + callee->callback_ret_range =tnum_range (0 ,1 ); +return 0 ; +} + +static bool is_rbtree_lock_required_kfunc (u32 btf_id); + +/* Are we currently verifying the callback for a rbtree helper that must +* be called with lock held? If so, no need to complain about unreleased +* lock +*/ +static bool in_rbtree_lock_required_cb (struct bpf_verifier_env *env) +{ +struct bpf_verifier_state *state = env->cur_state; +struct bpf_insn *insn = env->prog->insnsi; +struct bpf_func_state *callee; +int kfunc_btf_id; + +if (!state->curframe) +return false; + + callee = state->frame[state->curframe]; + +if (!callee->in_callback_fn) +return false; + + kfunc_btf_id = insn[callee->callsite].imm; +return is_rbtree_lock_required_kfunc (kfunc_btf_id); +} +static int prepare_func_exit (struct bpf_verifier_env *env,int *insn_idx) {struct bpf_verifier_state *state = env->cur_state;
@@ -8427,6 +8509,7 @@ struct bpf_kfunc_call_arg_meta {bool r0_rdonly;u32 ret_btf_id;u64 r0_size; +u32 subprogno;struct {u64 value;bool found;
@@ -8605,6 +8688,18 @@ static bool is_kfunc_arg_rbtree_node(const struct btf *btf, const struct btf_parreturn __is_kfunc_ptr_arg_type (btf, arg,KF_ARG_RB_NODE_ID ); } +static bool is_kfunc_arg_callback (struct bpf_verifier_env *env,const struct btf *btf, +const struct btf_param *arg) +{ +const struct btf_type *t; + + t =btf_type_resolve_func_ptr (btf, arg->type,NULL ); +if (!t) +return false; + +return true; +} +/* Returns true if struct is composed of scalars, 4 levels of nesting allowed */ static bool __btf_type_is_scalar_struct(struct bpf_verifier_env *env, const struct btf *btf,
@@ -8664,6 +8759,7 @@ enum kfunc_ptr_arg_type {KF_ARG_PTR_TO_BTF_ID ,/* Also covers reg2btf_ids conversions */ KF_ARG_PTR_TO_MEM ,KF_ARG_PTR_TO_MEM_SIZE ,/* Size derived from next argument, skip it */ +KF_ARG_PTR_TO_CALLBACK ,KF_ARG_PTR_TO_RB_ROOT , KF_ARG_PTR_TO_RB_NODE, };
@@ -8788,6 +8884,9 @@ get_kfunc_ptr_arg_type(struct bpf_verifier_env *env,return KF_ARG_PTR_TO_BTF_ID ; } +if (is_kfunc_arg_callback (env, meta->btf, &args[argno])) +return KF_ARG_PTR_TO_CALLBACK ; +if (argno +1 < nargs &&is_kfunc_arg_mem_size (meta->btf, &args[argno +1 ], ®s[regno +1 ])) arg_mem_size = true;
@@ -9019,6 +9118,16 @@ static bool is_bpf_graph_api_kfunc(u32 btf_id)return is_bpf_list_api_kfunc (btf_id) ||is_bpf_rbtree_api_kfunc (btf_id); } +static bool is_callback_calling_kfunc (u32 btf_id) +{ +return btf_id == special_kfunc_list[KF_bpf_rbtree_add]; +} + +static bool is_rbtree_lock_required_kfunc (u32 btf_id) +{ +return is_bpf_rbtree_api_kfunc (btf_id); +} +static bool check_kfunc_is_graph_root_api (struct bpf_verifier_env *env,enum btf_field_type head_field_type,u32 kfunc_btf_id)
@@ -9351,6 +9460,7 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_case KF_ARG_PTR_TO_RB_NODE :case KF_ARG_PTR_TO_MEM :case KF_ARG_PTR_TO_MEM_SIZE : +case KF_ARG_PTR_TO_CALLBACK :/* Trusted by default */ break ;default :
@@ -9502,6 +9612,9 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_/* Skip next '__sz' argument */ i++;break ; +case KF_ARG_PTR_TO_CALLBACK : + meta->subprogno = reg->subprogno; +break ; } }
@@ -9636,6 +9749,16 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, } } +if (meta.func_id == special_kfunc_list[KF_bpf_rbtree_add]) { + err =__check_func_call (env, insn, insn_idx_p, meta.subprogno, + set_rbtree_add_callback_state); +if (err) { +verbose (env,"kfunc %s#%d failed callback verification\n" , + func_name, func_id); +return err; + } + } +for (i =0 ; i <CALLER_SAVED_REGS ; i++)mark_reg_not_init (env, regs, caller_saved[i]);
@@ -14501,7 +14624,8 @@ static int do_check(struct bpf_verifier_env *env)return -EINVAL ; } -if (env->cur_state->active_lock.ptr) { +if (env->cur_state->active_lock.ptr && + !in_rbtree_lock_required_cb (env)) {verbose (env,"bpf_spin_unlock is missing\n" );return -EINVAL ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 336/663 bpf: factor out fetching basic kfunc metadata
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 07236eab7a3139da97aef9f5f21f403be82a82ea ]
Factor out logic to fetch basic kfunc metadata based on struct bpf_insn. This is not exactly short or trivial code to just copy/paste and this information is sometimes necessary in other parts of the verifier logic. Subsequent patches will rely on this to determine if an instruction is a kfunc call to iterator next method.
No functional changes intended, including that verbose() warning behavior when kfunc is not allowed for a particular program type.
Stable-dep-of: f6a6a5a97628 ("bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call")
--- kernel/bpf/verifier.c | 92 +++++++++++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 33 deletions(-)
kernel/bpf/verifier.c +59 -33
@@ -9627,24 +9627,21 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_return 0 ; } -static int check_kfunc_call (struct bpf_verifier_env *env,struct bpf_insn *insn, -int *insn_idx_p) +static int fetch_kfunc_meta (struct bpf_verifier_env *env, +struct bpf_insn *insn, +struct bpf_kfunc_call_arg_meta *meta, +const char **kfunc_name) { -const struct btf_type *t, *func, *func_proto, *ptr_type; -u32 i, nargs, func_id, ptr_type_id, release_ref_obj_id; -struct bpf_reg_state *regs =cur_regs (env); -const char *func_name, *ptr_type_name; -bool sleepable, rcu_lock, rcu_unlock; -struct bpf_kfunc_call_arg_meta meta; -int err, insn_idx = *insn_idx_p; -const struct btf_param *args; -const struct btf_type *ret_t; +const struct btf_type *func, *func_proto; +u32 func_id, *kfunc_flags; +const char *func_name;struct btf *desc_btf; -u32 *kfunc_flags; -/* skip for now, but return error when we find this in fixup_kfunc_call */ +if (kfunc_name) + *kfunc_name =NULL ; +if (!insn->imm) -return 0 ; +return -EINVAL ; desc_btf =find_kfunc_desc_btf (env, insn->off);if (IS_ERR (desc_btf))
@@ -9653,22 +9650,51 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, func_id = insn->imm; func =btf_type_by_id (desc_btf, func_id); func_name =btf_name_by_offset (desc_btf, func->name_off); +if (kfunc_name) + *kfunc_name = func_name; func_proto =btf_type_by_id (desc_btf, func->type); kfunc_flags =btf_kfunc_id_set_contains (desc_btf,resolve_prog_type (env->prog), func_id);if (!kfunc_flags) { -verbose (env,"calling kernel function %s is not allowed\n" , - func_name);return -EACCES ; } -/* Prepare kfunc call metadata */ -memset (&meta,0 ,sizeof (meta)); - meta.btf = desc_btf; - meta.func_id = func_id; - meta.kfunc_flags = *kfunc_flags; - meta.func_proto = func_proto; - meta.func_name = func_name; +memset (meta,0 ,sizeof (*meta)); + meta->btf = desc_btf; + meta->func_id = func_id; + meta->kfunc_flags = *kfunc_flags; + meta->func_proto = func_proto; + meta->func_name = func_name; + +return 0 ; +} + +static int check_kfunc_call (struct bpf_verifier_env *env,struct bpf_insn *insn, +int *insn_idx_p) +{ +const struct btf_type *t, *ptr_type; +u32 i, nargs, ptr_type_id, release_ref_obj_id; +struct bpf_reg_state *regs =cur_regs (env); +const char *func_name, *ptr_type_name; +bool sleepable, rcu_lock, rcu_unlock; +struct bpf_kfunc_call_arg_meta meta; +struct bpf_insn_aux_data *insn_aux; +int err, insn_idx = *insn_idx_p; +const struct btf_param *args; +const struct btf_type *ret_t; +struct btf *desc_btf; + +/* skip for now, but return error when we find this in fixup_kfunc_call */ +if (!insn->imm) +return 0 ; + + err =fetch_kfunc_meta (env, insn, &meta, &func_name); +if (err == -EACCES && func_name) +verbose (env,"calling kernel function %s is not allowed\n" , func_name); +if (err) +return err; + desc_btf = meta.btf; + insn_aux = &env->insn_aux_data[insn_idx];if (is_kfunc_destructive (&meta) && !capable (CAP_SYS_BOOT )) {verbose (env,"destructive kfunc calls require CAP_SYS_BOOT capability\n" );
@@ -9725,7 +9751,7 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, err =release_reference (env, regs[meta.release_regno].ref_obj_id);if (err) {verbose (env,"kfunc %s#%d reference has not been acquired before\n" , - func_name, func_id); + func_name, meta.func_id);return err; } }
@@ -9737,14 +9763,14 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, err =ref_convert_owning_non_owning (env, release_ref_obj_id);if (err) {verbose (env,"kfunc %s#%d conversion of owning ref to non-owning failed\n" , - func_name, func_id); + func_name, meta.func_id);return err; } err =release_reference (env, release_ref_obj_id);if (err) {verbose (env,"kfunc %s#%d reference has not been acquired before\n" , - func_name, func_id); + func_name, meta.func_id);return err; } }
@@ -9754,7 +9780,7 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, set_rbtree_add_callback_state);if (err) {verbose (env,"kfunc %s#%d failed callback verification\n" , - func_name, func_id); + func_name, meta.func_id);return err; } }
@@ -9763,7 +9789,7 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,mark_reg_not_init (env, regs, caller_saved[i]);/* Check return type */ - t =btf_type_skip_modifiers (desc_btf, func_proto->type,NULL ); + t =btf_type_skip_modifiers (desc_btf, meta.func_proto->type,NULL );if (is_kfunc_acquire (&meta) && !btf_type_is_struct_ptr (meta.btf, t)) {/* Only exception is bpf_obj_new_impl */
@@ -9812,11 +9838,11 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, regs[BPF_REG_0 ].btf = ret_btf; regs[BPF_REG_0 ].btf_id = ret_btf_id; - env->insn_aux_data[insn_idx].obj_new_size = ret_t->size; - env->insn_aux_data[insn_idx].kptr_struct_meta = + insn_aux->obj_new_size = ret_t->size; + insn_aux->kptr_struct_meta =btf_find_struct_meta (ret_btf, ret_btf_id); }else if (meta.func_id == special_kfunc_list[KF_bpf_obj_drop_impl]) { - env->insn_aux_data[insn_idx].kptr_struct_meta = + insn_aux->kptr_struct_meta =btf_find_struct_meta (meta.arg_obj_drop.btf, meta.arg_obj_drop.btf_id); } else if (meta.func_id == special_kfunc_list[KF_bpf_list_pop_front] ||
@@ -9898,8 +9924,8 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, regs[BPF_REG_0 ].id = ++env->id_gen; }/* else { add_kfunc_call() ensures it is btf_type_is_void(t) } */ - nargs =btf_type_vlen (func_proto); - args = (const struct btf_param *)(func_proto +1 ); + nargs =btf_type_vlen (meta.func_proto); + args = (const struct btf_param *)(meta.func_proto +1 );for (i =0 ; i < nargs; i++) {u32 regno = i +1 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 337/663 bpf: Fix struct_meta lookup for bpf_obj_free_fields kfunc call
In reply to Greg Kroah-HartmanFrom: Dave Marchevsky <[email protected]>
[ Upstream commit f6a6a5a976288e4d0d94eb1c6c9e983e8e5cdb31 ]
bpf_obj_drop_impl has a void return type. In check_kfunc_call, the "else if" which sets insn_aux->kptr_struct_meta for bpf_obj_drop_impl is surrounded by a larger if statement which checks btf_type_is_ptr. As a result:
* The bpf_obj_drop_impl-specific code will never execute
* The btf_struct_meta input to bpf_obj_drop is always NULL
* __bpf_obj_drop_impl will always see a NULL btf_record when called from BPF program, and won't call bpf_obj_free_fields
* program-allocated kptrs which have fields that should be cleaned up by bpf_obj_free_fields may instead leak resources
This patch adds a btf_type_is_void branch to the larger if and moves special handling for bpf_obj_drop_impl there, fixing the issue.
--- kernel/bpf/verifier.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
kernel/bpf/verifier.c +9 -5
@@ -9841,10 +9841,6 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, insn_aux->obj_new_size = ret_t->size; insn_aux->kptr_struct_meta =btf_find_struct_meta (ret_btf, ret_btf_id); - }else if (meta.func_id == special_kfunc_list[KF_bpf_obj_drop_impl]) { - insn_aux->kptr_struct_meta = -btf_find_struct_meta (meta.arg_obj_drop.btf, - meta.arg_obj_drop.btf_id); }else if (meta.func_id == special_kfunc_list[KF_bpf_list_pop_front] || meta.func_id == special_kfunc_list[KF_bpf_list_pop_back]) {struct btf_field *field = meta.arg_list_head.field;
@@ -9922,7 +9918,15 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, }if (reg_may_point_to_spin_lock (®s[BPF_REG_0 ]) && !regs[BPF_REG_0 ].id) regs[BPF_REG_0 ].id = ++env->id_gen; - }/* else { add_kfunc_call() ensures it is btf_type_is_void(t) } */ + }else if (btf_type_is_void (t)) { +if (meta.btf == btf_vmlinux &&btf_id_set_contains (&special_kfunc_set, meta.func_id)) { +if (meta.func_id == special_kfunc_list[KF_bpf_obj_drop_impl]) { + insn_aux->kptr_struct_meta = +btf_find_struct_meta (meta.arg_obj_drop.btf, + meta.arg_obj_drop.btf_id); + } + } + } nargs =btf_type_vlen (meta.func_proto); args = (const struct btf_param *)(meta.func_proto +1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 338/663 f2fs: fix iostat lock protection
In reply to Greg Kroah-HartmanFrom: Qilin Tan <[email protected]>
[ Upstream commit 144f1cd40bf91fb3ac1d41806470756ce774f389 ]
Made iostat lock irq safe to avoid potentinal deadlock.
Deadlock scenario:f2fs_attr_store
-> f2fs_sbi_store
-> _sbi_store
-> spin_lock(sbi->iostat_lock)
<interrupt request>
-> scsi_end_request
-> bio_endio
-> f2fs_dio_read_end_io
-> f2fs_update_iostat
-> spin_lock_irqsave(sbi->iostat_lock) ===> Dead lock here--- fs/f2fs/sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/f2fs/sysfs.c +2 -2
@@ -564,9 +564,9 @@ static ssize_t __sbi_store(struct f2fs_attr *a,if (!strcmp (a->attr.name,"iostat_period_ms" )) {if (t <MIN_IOSTAT_PERIOD_MS || t >MAX_IOSTAT_PERIOD_MS )return -EINVAL ; -spin_lock (&sbi->iostat_lock); +spin_lock_irq (&sbi->iostat_lock); sbi->iostat_period_ms = (unsigned int )t; -spin_unlock (&sbi->iostat_lock); +spin_unlock_irq (&sbi->iostat_lock);return count; }#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 339/663 net: qrtr: correct types of trace event parameters
In reply to Greg Kroah-HartmanFrom: Simon Horman <[email protected]>
[ Upstream commit 054fbf7ff8143d35ca7d3bb5414bb44ee1574194 ]
The arguments passed to the trace events are of type unsigned int, however the signature of the events used __le32 parameters.
I may be missing the point here, but sparse flagged this and it does seem incorrect to me.
net/qrtr/ns.c: note: in included file (through include/trace/trace_events.h, include/trace/define_trace.h, include/trace/events/qrtr.h):
./include/trace/events/qrtr.h:11:1: warning: cast to restricted __le32
./include/trace/events/qrtr.h:11:1: warning: restricted __le32 degrades to integer ./include/trace/events/qrtr.h:11:1: warning: restricted __le32 degrades to integer
... (a lot more similar warnings)
net/qrtr/ns.c:115:47: expected restricted __le32 [usertype] service
net/qrtr/ns.c:115:47: got unsigned int service
net/qrtr/ns.c:115:61: warning: incorrect type in argument 2 (different base types)
... (a lot more similar warnings)
--- include/trace/events/qrtr.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
include/trace/events/qrtr.h +18 -15
@@ -10,15 +10,16 @@ TRACE_EVENT(qrtr_ns_service_announce_new, - TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port), + TP_PROTO(unsigned int service, unsigned int instance, + unsigned int node, unsigned int port), TP_ARGS(service, instance, node, port), TP_STRUCT__entry( - __field(__le32, service) - __field(__le32, instance) - __field(__le32, node) - __field(__le32, port) + __field(unsigned int, service) + __field(unsigned int, instance) + __field(unsigned int, node) + __field(unsigned int, port) ), TP_fast_assign(
@@ -36,15 +37,16 @@ TRACE_EVENT(qrtr_ns_service_announce_new, TRACE_EVENT(qrtr_ns_service_announce_del, - TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port), + TP_PROTO(unsigned int service, unsigned int instance, + unsigned int node, unsigned int port), TP_ARGS(service, instance, node, port), TP_STRUCT__entry( - __field(__le32, service) - __field(__le32, instance) - __field(__le32, node) - __field(__le32, port) + __field(unsigned int, service) + __field(unsigned int, instance) + __field(unsigned int, node) + __field(unsigned int, port) ), TP_fast_assign(
@@ -62,15 +64,16 @@ TRACE_EVENT(qrtr_ns_service_announce_del, TRACE_EVENT(qrtr_ns_server_add, - TP_PROTO(__le32 service, __le32 instance, __le32 node, __le32 port), + TP_PROTO(unsigned int service, unsigned int instance, + unsigned int node, unsigned int port), TP_ARGS(service, instance, node, port), TP_STRUCT__entry( - __field(__le32, service) - __field(__le32, instance) - __field(__le32, node) - __field(__le32, port) + __field(unsigned int, service) + __field(unsigned int, instance) + __field(unsigned int, node) + __field(unsigned int, port) ), TP_fast_assign(
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 340/663 selftests: xsk: Use correct UMEM size in testapp_invalid_desc
In reply to Greg Kroah-HartmanFrom: Kal Conley <[email protected]>
[ Upstream commit 7a2050df244e2c9a4e90882052b7907450ad10ed ]
Avoid UMEM_SIZE macro in testapp_invalid_desc which is incorrect when the frame size is not XSK_UMEM__DEFAULT_FRAME_SIZE. Also remove the macro since it's no longer being used.
--- tools/testing/selftests/bpf/xskxceiver.c | 9 +++++---- tools/testing/selftests/bpf/xskxceiver.h | 1 - 2 files changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/bpf/xskxceiver.c +5 -4
@@ -1662,6 +1662,7 @@ static void testapp_single_pkt(struct test_spec *test)static void testapp_invalid_desc (struct test_spec *test) { +u64 umem_size = test->ifobj_tx->umem->num_frames * test->ifobj_tx->umem->frame_size;struct pkt pkts[] = {/* Zero packet address allowed */ {0 ,PKT_SIZE ,0 , true},
@@ -1672,9 +1673,9 @@ static void testapp_invalid_desc(struct test_spec *test)/* Packet too large */ {0x2000, XSK_UMEM__INVALID_FRAME_SIZE, 0, false},/* After umem ends */ - {UMEM_SIZE, PKT_SIZE, 0, false}, + {umem_size, PKT_SIZE, 0, false},/* Straddle the end of umem */ - {UMEM_SIZE - PKT_SIZE / 2, PKT_SIZE, 0, false}, + {umem_size - PKT_SIZE / 2, PKT_SIZE, 0, false},/* Straddle a page boundrary */ {0x3000 - PKT_SIZE / 2, PKT_SIZE, 0, false}, /* Straddle a 2K boundrary */
@@ -1692,8 +1693,8 @@ static void testapp_invalid_desc(struct test_spec *test) }if (test->ifobj_tx->shared_umem) { - pkts[4 ].addr +=UMEM_SIZE ; - pkts[5 ].addr +=UMEM_SIZE ; + pkts[4 ].addr += umem_size; + pkts[5 ].addr += umem_size; }pkt_stream_generate_custom (test, pkts,ARRAY_SIZE (pkts));
tools/testing/selftests/bpf/xskxceiver.h +0 -1
@@ -52,7 +52,6 @@#define THREAD_TMOUT 3#define DEFAULT_PKT_CNT (4 * 1024)#define DEFAULT_UMEM_BUFFERS (DEFAULT_PKT_CNT / 4) -#define UMEM_SIZE (DEFAULT_UMEM_BUFFERS * XSK_UMEM__DEFAULT_FRAME_SIZE)#define RX_FULL_RXQSIZE 32#define UMEM_HEADROOM_TEST_SIZE 128#define XSK_UMEM__INVALID_FRAME_SIZE (XSK_UMEM__DEFAULT_FRAME_SIZE + 1)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 341/663 selftests: xsk: Disable IPv6 on VETH1
In reply to Greg Kroah-HartmanFrom: Kal Conley <[email protected]>
[ Upstream commit f2b50f17268390567bc0e95642170d88f336c8f4 ]
This change fixes flakiness in the BIDIRECTIONAL test:
# [is_pkt_valid] expected length [60], got length [90] not ok 1 FAIL: SKB BUSY-POLL BIDIRECTIONAL
When IPv6 is enabled, the interface will periodically send MLDv1 and MLDv2 packets. These packets can cause the BIDIRECTIONAL test to fail since it uses VETH0 for RX.
For other tests, this was not a problem since they only receive on VETH1 and IPv6 was already disabled on VETH0.
--- tools/testing/selftests/bpf/test_xsk.sh | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/test_xsk.sh +1 -0
@@ -118,6 +118,7 @@ setup_vethPairs() { ip link add ${VETH0} numtxqueues 4 numrxqueues 4 type veth peer name ${VETH1} numtxqueues 4 numrxqueues 4 if [ -f /proc/net/if_inet6 ]; then echo 1 > /proc/sys/net/ipv6/conf/${VETH0}/disable_ipv6 + echo 1 > /proc/sys/net/ipv6/conf/${VETH1}/disable_ipv6 fi if [[ $verbose -eq 1 ]]; then echo "setting up ${VETH1}: namespace: ${NS1}"
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 342/663 selftests: xsk: Deflakify STATS_RX_DROPPED test
In reply to Greg Kroah-HartmanFrom: Kal Conley <[email protected]>
[ Upstream commit 68e7322142f5e731af222892d384d311835db0f1 ]
Fix flaky STATS_RX_DROPPED test. The receiver calls getsockopt after receiving the last (valid) packet which is not the final packet sent in the test (valid and invalid packets are sent in alternating fashion with the final packet being invalid). Since the last packet may or may not have been dropped already, both outcomes must be allowed.
This issue could also be fixed by making sure the last packet sent is valid. This alternative is left as an exercise to the reader (or the benevolent maintainers of this file).
This problem was quite visible on certain setups. On one machine this failure was observed 50% of the time.
Also, remove a redundant assignment of pkt_stream->nb_pkts. This field is already initialized by __pkt_stream_alloc.
--- tools/testing/selftests/bpf/xskxceiver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/xskxceiver.c +8 -2
@@ -649,7 +649,6 @@ static struct pkt_stream *pkt_stream_generate(struct xsk_umem_info *umem, u32 nbif (!pkt_stream)exit_with_error (ENOMEM ); - pkt_stream->nb_pkts = nb_pkts;for (i =0 ; i < nb_pkts; i++) {pkt_set (umem, &pkt_stream->pkts[i], (i % umem->num_frames) * umem->frame_size, pkt_len);
@@ -1142,7 +1141,14 @@ static int validate_rx_dropped(struct ifobject *ifobject)if (err)return TEST_FAILURE ; -if (stats.rx_dropped == ifobject->pkt_stream->nb_pkts /2 ) +/* The receiver calls getsockopt after receiving the last (valid) +* packet which is not the final packet sent in this test (valid and +* invalid packets are sent in alternating fashion with the final +* packet being invalid). Since the last packet may or may not have +* been dropped already, both outcomes must be allowed. +*/ +if (stats.rx_dropped == ifobject->pkt_stream->nb_pkts /2 || + stats.rx_dropped == ifobject->pkt_stream->nb_pkts /2 -1 )return TEST_PASS ;return TEST_FAILURE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 343/663 selftests/bpf: Wait for receive in cg_storage_multi test
In reply to Greg Kroah-HartmanFrom: YiFei Zhu <[email protected]>
[ Upstream commit 5af607a861d43ffff830fc1890033e579ec44799 ]
In some cases the loopback latency might be large enough, causing the assertion on invocations to be run before ingress prog getting executed. The assertion would fail and the test would flake.
This can be reliably reproduced by arbitrarily increasing the loopback latency (thanks to [1]):
tc qdisc add dev lo root handle 1: htb default 12
tc class add dev lo parent 1:1 classid 1:12 htb rate 20kbps ceil 20kbps tc qdisc add dev lo parent 1:12 netem delay 100ms
Fix this by waiting on the receive end, instead of instantly returning to the assert. The call to read() will wait for the default SO_RCVTIMEO timeout of 3 seconds provided by start_server().
[1] https://gist.github.com/kstevens715/4598301
--- tools/testing/selftests/bpf/prog_tests/cg_storage_multi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/cg_storage_multi.c +6 -2
@@ -56,8 +56,9 @@ static bool assert_storage_noexist(struct bpf_map *map, const void *key)static bool connect_send (const char *cgroup_path) { -bool res = true;int server_fd =-1 , client_fd =-1 ; +char message[] ="message" ; +bool res = true;if (join_cgroup (cgroup_path)) goto out_clean;
@@ -70,7 +71,10 @@ static bool connect_send(const char *cgroup_path)if (client_fd <0 ) goto out_clean; -if (send (client_fd,"message" ,strlen ("message" ),0 ) <0 ) +if (send (client_fd, &message,sizeof (message),0 ) <0 ) + goto out_clean; + +if (read (server_fd, &message,sizeof (message)) <0 ) goto out_clean; res = false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 344/663 bpftool: Fix bug for long instructions in program CFG dumps
In reply to Greg Kroah-HartmanFrom: Quentin Monnet <[email protected]>
[ Upstream commit 67cf52cdb6c8fa6365d29106555dacf95c9fd374 ]
When dumping the control flow graphs for programs using the 16-byte long load instruction, we need to skip the second part of this instruction when looking for the next instruction to process. Otherwise, we end up printing "BUG_ld_00" from the kernel disassembler in the CFG.
--- tools/bpf/bpftool/xlated_dumper.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/bpf/bpftool/xlated_dumper.c +7 -0
@@ -372,8 +372,15 @@ void dump_xlated_for_graph(struct dump_data *dd, void *buf_start, void *buf_end,struct bpf_insn *insn_start = buf_start;struct bpf_insn *insn_end = buf_end;struct bpf_insn *cur = insn_start; +bool double_insn = false;for (; cur <= insn_end; cur++) { +if (double_insn) { + double_insn = false; +continue ; + } + double_insn = cur->code == (BPF_LD |BPF_IMM |BPF_DW ); +printf ("% 4d: " , (int )(cur - insn_start + start_idx));print_bpf_insn (&cbs, cur, true);if (cur != insn_end)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 345/663 crypto: drbg - Only fail when jent is unavailable in FIPS mode
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 686cd976b6ddedeeb1a1fb09ba53a891d3cc9a03 ]
When jent initialisation fails for any reason other than ENOENT, the entire drbg fails to initialise, even when we're not in FIPS mode. This is wrong because we can still use the kernel RNG when we're not in FIPS mode.
Change it so that it only fails when we are in FIPS mode.
--- crypto/drbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/drbg.c +1 -1
@@ -1546,7 +1546,7 @@ static int drbg_prepare_hrng(struct drbg_state *drbg)const int err =PTR_ERR (drbg->jent); drbg->jent =NULL ; -if (fips_enabled || err != -ENOENT ) +if (fips_enabled)return err;pr_info ("DRBG: Continuing without Jitter RNG\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 346/663 xsk: Fix unaligned descriptor validation
In reply to Greg Kroah-HartmanFrom: Kal Conley <[email protected]>
[ Upstream commit d769ccaf957fe7391f357c0a923de71f594b8a2b ]
Make sure unaligned descriptors that straddle the end of the UMEM are considered invalid. Currently, descriptor validation is broken for zero-copy mode which only checks descriptors at page granularity. For example, descriptors in zero-copy mode that overrun the end of the UMEM but not a page boundary are (incorrectly) considered valid. The UMEM boundary check needs to happen before the page boundary and contiguity checks in xp_desc_crosses_non_contig_pg(). Do this check in xp_unaligned_validate_desc() instead like xp_check_unaligned() already does.
--- include/net/xsk_buff_pool.h | 9 ++------- net/xdp/xsk_queue.h | 1 + 2 files changed, 3 insertions(+), 7 deletions(-)
include/net/xsk_buff_pool.h +2 -7
@@ -175,13 +175,8 @@ static inline bool xp_desc_crosses_non_contig_pg(struct xsk_buff_pool *pool,if (likely (!cross_pg))return false; -if (pool->dma_pages_cnt) { -return !(pool->dma_pages[addr >>PAGE_SHIFT ] & -XSK_NEXT_PG_CONTIG_MASK ); - } - -/* skb path */ -return addr + len > pool->addrs_cnt; +return pool->dma_pages_cnt && + !(pool->dma_pages[addr >>PAGE_SHIFT ] &XSK_NEXT_PG_CONTIG_MASK ); }static inline u64 xp_aligned_extract_addr (struct xsk_buff_pool *pool,u64 addr)
net/xdp/xsk_queue.h +1 -0
@@ -161,6 +161,7 @@ static inline bool xp_unaligned_validate_desc(struct xsk_buff_pool *pool,return false;if (base_addr >= pool->addrs_cnt || addr >= pool->addrs_cnt || + addr + desc->len > pool->addrs_cnt ||xp_desc_crosses_non_contig_pg (pool, addr, desc->len))return false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 347/663 f2fs: fix to avoid use-after-free for cached IPU bio
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 5cdb422c839134273866208dad5360835ddb9794 ]
xfstest generic/019 reports a bug:
kernel BUG at mm/filemap.c:1619!
RIP: 0010:folio_end_writeback+0x8a/0x90 Call Trace: end_page_writeback+0x1c/0x60 f2fs_write_end_io+0x199/0x420 bio_endio+0x104/0x180 submit_bio_noacct+0xa5/0x510 submit_bio+0x48/0x80 f2fs_submit_write_bio+0x35/0x300 f2fs_submit_merged_ipu_write+0x2a0/0x2b0 f2fs_write_single_data_page+0x838/0x8b0 f2fs_write_cache_pages+0x379/0xa30 f2fs_write_data_pages+0x30c/0x340 do_writepages+0xd8/0x1b0 __writeback_single_inode+0x44/0x370 writeback_sb_inodes+0x233/0x4d0 __writeback_inodes_wb+0x56/0xf0 wb_writeback+0x1dd/0x2d0 wb_workfn+0x367/0x4a0 process_one_work+0x21d/0x430 worker_thread+0x4e/0x3c0 kthread+0x103/0x130 ret_from_fork+0x2c/0x50
The root cause is: after cp_error is set, f2fs_submit_merged_ipu_write() in f2fs_write_single_data_page() tries to flush IPU bio in cache, however f2fs_submit_merged_ipu_write() missed to check validity of @bio parameter, result in submitting random cached bio which belong to other IO context, then it will cause use-after-free issue, fix it by adding additional validity check.
--- fs/f2fs/data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/f2fs/data.c +4 -1
@@ -873,6 +873,8 @@ void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,bool found = false;struct bio *target = bio ? *bio :NULL ; +f2fs_bug_on (sbi, !target && !page); +for (temp =HOT ; temp <NR_TEMP_TYPE && !found; temp++) {struct f2fs_bio_info *io = sbi->write_io[DATA ] + temp;struct list_head *head = &io->bio_list;
@@ -2899,7 +2901,8 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,if (unlikely (f2fs_cp_error (sbi))) {f2fs_submit_merged_write (sbi,DATA ); -f2fs_submit_merged_ipu_write (sbi, bio,NULL ); +if (bio && *bio) +f2fs_submit_merged_ipu_write (sbi, bio,NULL ); submitted =NULL ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 348/663 wifi: iwlwifi: fix duplicate entry in iwl_dev_info_table
In reply to Greg Kroah-HartmanFrom: Gregory Greenman <[email protected]>
[ Upstream commit fc3c2f0ed86b65dff4b6844c59c597b977cae533 ]
There're two identical entries for ax1650 device in iwl_dev_info_table. Remove one of the duplicate entries.
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +0 -1
@@ -565,7 +565,6 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {IWL_DEV_INFO (0x43F0 ,0x1652 , killer1650i_2ax_cfg_qu_b0_hr_b0, iwl_ax201_killer_1650i_name),IWL_DEV_INFO (0x43F0 ,0x2074 , iwl_ax201_cfg_qu_hr,NULL ),IWL_DEV_INFO (0x43F0 ,0x4070 , iwl_ax201_cfg_qu_hr,NULL ), -IWL_DEV_INFO (0x43F0 ,0x1651 , killer1650s_2ax_cfg_qu_b0_hr_b0, iwl_ax201_killer_1650s_name),IWL_DEV_INFO (0xA0F0 ,0x0070 , iwl_ax201_cfg_qu_hr,NULL ),IWL_DEV_INFO (0xA0F0 ,0x0074 , iwl_ax201_cfg_qu_hr,NULL ), IWL_DEV_INFO(0xA0F0, 0x0078, iwl_ax201_cfg_qu_hr, NULL),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 349/663 bpf/btf: Fix is_int_ptr()
In reply to Greg Kroah-HartmanFrom: Feng Zhou <[email protected]>
[ Upstream commit 91f2dc6838c19342f7f2993627c622835cc24890 ]
When tracing a kernel function with arg type is u32*, btf_ctx_access() would report error: arg2 type INT is not a struct.
The commit bb6728d75611 ("bpf: Allow access to int pointer arguments in tracing programs") added support for int pointer, but did not skip modifiers before checking it's type. This patch fixes it.
--- kernel/bpf/btf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
kernel/bpf/btf.c +2 -6
@@ -5848,12 +5848,8 @@ struct btf *bpf_prog_get_target_btf(const struct bpf_prog *prog)static bool is_int_ptr (struct btf *btf,const struct btf_type *t) { -/* t comes in already as a pointer */ - t =btf_type_by_id (btf, t->type); - -/* allow const */ -if (BTF_INFO_KIND (t->info) ==BTF_KIND_CONST ) - t =btf_type_by_id (btf, t->type); +/* skip modifiers */ + t =btf_type_skip_modifiers (btf, t->type,NULL );return btf_type_is_int (t); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 350/663 scsi: lpfc: Fix ioremap issues in lpfc_sli4_pci_mem_setup()
In reply to Greg Kroah-HartmanFrom: Shuchang Li <[email protected]>
[ Upstream commit 91a0c0c1413239d0548b5aac4c82f38f6d53a91e ]
When if_type equals zero and pci_resource_start(pdev, PCI_64BIT_BAR4) returns false, drbl_regs_memmap_p is not remapped. This passes a NULL pointer to iounmap(), which can trigger a WARN() on certain arches.
When if_type equals six and pci_resource_start(pdev, PCI_64BIT_BAR4) returns true, drbl_regs_memmap_p may has been remapped and ctrl_regs_memmap_p is not remapped. This is a resource leak and passes a NULL pointer to iounmap().
To fix these issues, we need to add null checks before iounmap(), and change some goto labels.
--- drivers/scsi/lpfc/lpfc_init.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +6 -4
@@ -11970,7 +11970,7 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) goto out_iounmap_all; }else { error = -ENOMEM ; - goto out_iounmap_all; + goto out_iounmap_ctrl; } }
@@ -11988,7 +11988,7 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)dev_err (&pdev->dev,"ioremap failed for SLI4 HBA dpp registers.\n" ); error = -ENOMEM ; - goto out_iounmap_ctrl; + goto out_iounmap_all; } phba->pci_bar4_memmap_p = phba->sli4_hba.dpp_regs_memmap_p; }
@@ -12013,9 +12013,11 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)return 0 ; out_iounmap_all: -iounmap (phba->sli4_hba.drbl_regs_memmap_p); +if (phba->sli4_hba.drbl_regs_memmap_p) +iounmap (phba->sli4_hba.drbl_regs_memmap_p); out_iounmap_ctrl: -iounmap (phba->sli4_hba.ctrl_regs_memmap_p); +if (phba->sli4_hba.ctrl_regs_memmap_p) +iounmap (phba->sli4_hba.ctrl_regs_memmap_p); out_iounmap_conf:iounmap (phba->sli4_hba.conf_regs_memmap_p);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 351/663 net: ethernet: stmmac: dwmac-rk: rework optional clock handling
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit ea449f7fa0bf3fcd02e04a770b9ff707bf5e8f96 ]
The clock requesting code is quite repetitive. Fix this by requesting the clocks via devm_clk_bulk_get_optional. The optional variant has been used, since this is effectively what the old code did. The exact clocks required depend on the platform and configuration. As a side effect this change adds correct -EPROBE_DEFER handling.
--- .../net/ethernet/stmicro/stmmac/dwmac-rk.c | 183 +++++++----------- 1 file changed, 70 insertions(+), 113 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +70 -113
@@ -39,6 +39,24 @@ struct rk_gmac_ops {u32 regs[]; }; +static const char *const rk_clocks[] = { +"aclk_mac" ,"pclk_mac" ,"mac_clk_tx" ,"clk_mac_speed" , +}; + +static const char *const rk_rmii_clocks[] = { +"mac_clk_rx" ,"clk_mac_ref" ,"clk_mac_refout" , +}; + +enum rk_clocks_index { +RK_ACLK_MAC =0 , +RK_PCLK_MAC , +RK_MAC_CLK_TX , +RK_CLK_MAC_SPEED , +RK_MAC_CLK_RX , +RK_CLK_MAC_REF , +RK_CLK_MAC_REFOUT , +}; +struct rk_priv_data {struct platform_device *pdev;phy_interface_t phy_iface;
@@ -51,15 +69,9 @@ struct rk_priv_data {bool clock_input;bool integrated_phy; +struct clk_bulk_data *clks; +int num_clks;struct clk *clk_mac; -struct clk *gmac_clkin; -struct clk *mac_clk_rx; -struct clk *mac_clk_tx; -struct clk *clk_mac_ref; -struct clk *clk_mac_refout; -struct clk *clk_mac_speed; -struct clk *aclk_mac; -struct clk *pclk_mac;struct clk *clk_phy;struct reset_control *phy_reset;
@@ -104,10 +116,11 @@ static void px30_set_to_rmii(struct rk_priv_data *bsp_priv)static void px30_set_rmii_speed (struct rk_priv_data *bsp_priv,int speed) { +struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED ].clk;struct device *dev = &bsp_priv->pdev->dev;int ret; -if (IS_ERR (bsp_priv->clk_mac_speed)) { +if (!clk_mac_speed) {dev_err (dev,"%s: Missing clk_mac_speed clock\n" , __func__);return ; }
@@ -116,7 +129,7 @@ static void px30_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)regmap_write (bsp_priv->grf,PX30_GRF_GMAC_CON1 ,PX30_GMAC_SPEED_10M ); - ret =clk_set_rate (bsp_priv->clk_mac_speed,2500000 ); + ret =clk_set_rate (clk_mac_speed,2500000 );if (ret)dev_err (dev,"%s: set clk_mac_speed rate 2500000 failed: %d\n" , __func__, ret);
@@ -124,7 +137,7 @@ static void px30_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)regmap_write (bsp_priv->grf,PX30_GRF_GMAC_CON1 ,PX30_GMAC_SPEED_100M ); - ret =clk_set_rate (bsp_priv->clk_mac_speed,25000000 ); + ret =clk_set_rate (clk_mac_speed,25000000 );if (ret)dev_err (dev,"%s: set clk_mac_speed rate 25000000 failed: %d\n" , __func__, ret);
@@ -1066,6 +1079,7 @@ static void rk3568_set_to_rmii(struct rk_priv_data *bsp_priv)static void rk3568_set_gmac_speed (struct rk_priv_data *bsp_priv,int speed) { +struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED ].clk;struct device *dev = &bsp_priv->pdev->dev;unsigned long rate;int ret;
@@ -1085,7 +1099,7 @@ static void rk3568_set_gmac_speed(struct rk_priv_data *bsp_priv, int speed)return ; } - ret =clk_set_rate (bsp_priv->clk_mac_speed, rate); + ret =clk_set_rate (clk_mac_speed, rate);if (ret)dev_err (dev,"%s: set clk_mac_speed rate %ld failed %d\n" , __func__, rate, ret);
@@ -1371,6 +1385,7 @@ static void rv1126_set_to_rmii(struct rk_priv_data *bsp_priv)static void rv1126_set_rgmii_speed (struct rk_priv_data *bsp_priv,int speed) { +struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED ].clk;struct device *dev = &bsp_priv->pdev->dev;unsigned long rate;int ret;
@@ -1390,7 +1405,7 @@ static void rv1126_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)return ; } - ret =clk_set_rate (bsp_priv->clk_mac_speed, rate); + ret =clk_set_rate (clk_mac_speed, rate);if (ret)dev_err (dev,"%s: set clk_mac_speed rate %ld failed %d\n" , __func__, rate, ret);
@@ -1398,6 +1413,7 @@ static void rv1126_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)static void rv1126_set_rmii_speed (struct rk_priv_data *bsp_priv,int speed) { +struct clk *clk_mac_speed = bsp_priv->clks[RK_CLK_MAC_SPEED ].clk;struct device *dev = &bsp_priv->pdev->dev;unsigned long rate;int ret;
@@ -1414,7 +1430,7 @@ static void rv1126_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)return ; } - ret =clk_set_rate (bsp_priv->clk_mac_speed, rate); + ret =clk_set_rate (clk_mac_speed, rate);if (ret)dev_err (dev,"%s: set clk_mac_speed rate %ld failed %d\n" , __func__, rate, ret);
@@ -1475,68 +1491,50 @@ static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat) {struct rk_priv_data *bsp_priv = plat->bsp_priv;struct device *dev = &bsp_priv->pdev->dev; -int ret; +int phy_iface = bsp_priv->phy_iface; +int i, j, ret; bsp_priv->clk_enabled = false; - bsp_priv->mac_clk_rx =devm_clk_get (dev,"mac_clk_rx" ); -if (IS_ERR (bsp_priv->mac_clk_rx)) -dev_err (dev,"cannot get clock %s\n" , -"mac_clk_rx" ); - - bsp_priv->mac_clk_tx =devm_clk_get (dev,"mac_clk_tx" ); -if (IS_ERR (bsp_priv->mac_clk_tx)) -dev_err (dev,"cannot get clock %s\n" , -"mac_clk_tx" ); + bsp_priv->num_clks =ARRAY_SIZE (rk_clocks); +if (phy_iface ==PHY_INTERFACE_MODE_RMII ) + bsp_priv->num_clks +=ARRAY_SIZE (rk_rmii_clocks); - bsp_priv->aclk_mac =devm_clk_get (dev,"aclk_mac" ); -if (IS_ERR (bsp_priv->aclk_mac)) -dev_err (dev,"cannot get clock %s\n" , -"aclk_mac" ); + bsp_priv->clks =devm_kcalloc (dev, bsp_priv->num_clks, +sizeof (*bsp_priv->clks),GFP_KERNEL ); +if (!bsp_priv->clks) +return -ENOMEM ; - bsp_priv->pclk_mac =devm_clk_get (dev,"pclk_mac" ); -if (IS_ERR (bsp_priv->pclk_mac)) -dev_err (dev,"cannot get clock %s\n" , -"pclk_mac" ); +for (i =0 ; i <ARRAY_SIZE (rk_clocks); i++) + bsp_priv->clks[i].id = rk_clocks[i]; - bsp_priv->clk_mac =devm_clk_get (dev,"stmmaceth" ); -if (IS_ERR (bsp_priv->clk_mac)) -dev_err (dev,"cannot get clock %s\n" , -"stmmaceth" ); - -if (bsp_priv->phy_iface ==PHY_INTERFACE_MODE_RMII ) { - bsp_priv->clk_mac_ref =devm_clk_get (dev,"clk_mac_ref" ); -if (IS_ERR (bsp_priv->clk_mac_ref)) -dev_err (dev,"cannot get clock %s\n" , -"clk_mac_ref" ); - -if (!bsp_priv->clock_input) { - bsp_priv->clk_mac_refout = -devm_clk_get (dev,"clk_mac_refout" ); -if (IS_ERR (bsp_priv->clk_mac_refout)) -dev_err (dev,"cannot get clock %s\n" , -"clk_mac_refout" ); - } +if (phy_iface ==PHY_INTERFACE_MODE_RMII ) { +for (j =0 ; j <ARRAY_SIZE (rk_rmii_clocks); j++) + bsp_priv->clks[i++].id = rk_rmii_clocks[j]; } - bsp_priv->clk_mac_speed =devm_clk_get (dev,"clk_mac_speed" ); -if (IS_ERR (bsp_priv->clk_mac_speed)) -dev_err (dev,"cannot get clock %s\n" ,"clk_mac_speed" ); + ret =devm_clk_bulk_get_optional (dev, bsp_priv->num_clks, + bsp_priv->clks); +if (ret) +return dev_err_probe (dev, ret,"Failed to get clocks\n" ); + +/* "stmmaceth" will be enabled by the core */ + bsp_priv->clk_mac =devm_clk_get (dev,"stmmaceth" ); + ret =PTR_ERR_OR_ZERO (bsp_priv->clk_mac); +if (ret) +return dev_err_probe (dev, ret,"Cannot get stmmaceth clock\n" );if (bsp_priv->clock_input) {dev_info (dev,"clock input from PHY\n" ); - }else { -if (bsp_priv->phy_iface ==PHY_INTERFACE_MODE_RMII ) -clk_set_rate (bsp_priv->clk_mac,50000000 ); + }else if (phy_iface ==PHY_INTERFACE_MODE_RMII ) { +clk_set_rate (bsp_priv->clk_mac,50000000 ); }if (plat->phy_node && bsp_priv->integrated_phy) { bsp_priv->clk_phy =of_clk_get (plat->phy_node,0 ); -if (IS_ERR (bsp_priv->clk_phy)) { - ret =PTR_ERR (bsp_priv->clk_phy); -dev_err (dev,"Cannot get PHY clock: %d\n" , ret); -return -EINVAL ; - } + ret =PTR_ERR_OR_ZERO (bsp_priv->clk_phy); +if (ret) +return dev_err_probe (dev, ret,"Cannot get PHY clock\n" );clk_set_rate (bsp_priv->clk_phy,50000000 ); }
@@ -1545,77 +1543,36 @@ static int rk_gmac_clk_init(struct plat_stmmacenet_data *plat)static int gmac_clk_enable (struct rk_priv_data *bsp_priv,bool enable) { -int phy_iface = bsp_priv->phy_iface; +int ret;if (enable) {if (!bsp_priv->clk_enabled) { -if (phy_iface ==PHY_INTERFACE_MODE_RMII ) { -if (!IS_ERR (bsp_priv->mac_clk_rx)) -clk_prepare_enable ( - bsp_priv->mac_clk_rx); - -if (!IS_ERR (bsp_priv->clk_mac_ref)) -clk_prepare_enable ( - bsp_priv->clk_mac_ref); - -if (!IS_ERR (bsp_priv->clk_mac_refout)) -clk_prepare_enable ( - bsp_priv->clk_mac_refout); - } - -if (!IS_ERR (bsp_priv->clk_phy)) -clk_prepare_enable (bsp_priv->clk_phy); - -if (!IS_ERR (bsp_priv->aclk_mac)) -clk_prepare_enable (bsp_priv->aclk_mac); - -if (!IS_ERR (bsp_priv->pclk_mac)) -clk_prepare_enable (bsp_priv->pclk_mac); - -if (!IS_ERR (bsp_priv->mac_clk_tx)) -clk_prepare_enable (bsp_priv->mac_clk_tx); + ret =clk_bulk_prepare_enable (bsp_priv->num_clks, + bsp_priv->clks); +if (ret) +return ret; -if (!IS_ERR (bsp_priv->clk_mac_speed)) -clk_prepare_enable (bsp_priv->clk_mac_speed); + ret =clk_prepare_enable (bsp_priv->clk_phy); +if (ret) +return ret;if (bsp_priv->ops && bsp_priv->ops->set_clock_selection) bsp_priv->ops->set_clock_selection (bsp_priv, bsp_priv->clock_input, true); -/** -* if (!IS_ERR(bsp_priv->clk_mac)) -* clk_prepare_enable(bsp_priv->clk_mac); -*/ mdelay (5 ); bsp_priv->clk_enabled = true; } }else {if (bsp_priv->clk_enabled) { -if (phy_iface ==PHY_INTERFACE_MODE_RMII ) { -clk_disable_unprepare (bsp_priv->mac_clk_rx); - -clk_disable_unprepare (bsp_priv->clk_mac_ref); - -clk_disable_unprepare (bsp_priv->clk_mac_refout); - } - +clk_bulk_disable_unprepare (bsp_priv->num_clks, + bsp_priv->clks);clk_disable_unprepare (bsp_priv->clk_phy); -clk_disable_unprepare (bsp_priv->aclk_mac); - -clk_disable_unprepare (bsp_priv->pclk_mac); - -clk_disable_unprepare (bsp_priv->mac_clk_tx); - -clk_disable_unprepare (bsp_priv->clk_mac_speed); -if (bsp_priv->ops && bsp_priv->ops->set_clock_selection) bsp_priv->ops->set_clock_selection (bsp_priv, bsp_priv->clock_input, false); -/** -* if (!IS_ERR(bsp_priv->clk_mac)) -* clk_disable_unprepare(bsp_priv->clk_mac); -*/ + bsp_priv->clk_enabled = false; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 352/663 net: ethernet: stmmac: dwmac-rk: fix optional phy regulator handling
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit db21973263f8c56750cb610f1d5e8bee00a513b9 ]
The usual devm_regulator_get() call already handles "optional" regulators by returning a valid dummy and printing a warning that the dummy regulator should be described properly. This code open coded the same behaviour, but masked any errors that are not -EPROBE_DEFER and is quite noisy.
This change effectively unmasks and propagates regulators errors not involving -ENODEV, downgrades the error print to warning level if no regulator is specified and captures the probe defer message for /sys/kernel/debug/devices_deferred.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +4 -10
@@ -1586,9 +1586,6 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)int ret;struct device *dev = &bsp_priv->pdev->dev; -if (!ldo) -return 0 ; -if (enable) { ret =regulator_enable (ldo);if (ret)
@@ -1636,14 +1633,11 @@ static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev, } } - bsp_priv->regulator =devm_regulator_get_optional (dev,"phy" ); + bsp_priv->regulator =devm_regulator_get (dev,"phy" );if (IS_ERR (bsp_priv->regulator)) { -if (PTR_ERR (bsp_priv->regulator) == -EPROBE_DEFER ) { -dev_err (dev,"phy regulator is not available yet, deferred probing\n" ); -return ERR_PTR (-EPROBE_DEFER ); - } -dev_err (dev,"no regulator found\n" ); - bsp_priv->regulator =NULL ; + ret =PTR_ERR (bsp_priv->regulator); +dev_err_probe (dev, ret,"failed to get phy regulator\n" ); +return ERR_PTR (ret); } ret =of_property_read_string (dev->of_node,"clock_in_out" , &strings);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 353/663 wifi: ath11k: fix writing to unintended memory region
In reply to Greg Kroah-HartmanFrom: P Praneesh <[email protected]>
[ Upstream commit 756a7f90878f0866fd2fe167ef37e90b47326b96 ]
While initializing spectral, the magic value is getting written to the invalid memory address leading to random boot-up crash. This occurs due to the incorrect index increment in ath11k_dbring_fill_magic_value function. Fix it by replacing the existing logic with memset32 to ensure there is no invalid memory access.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01838-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/dbring.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/dbring.c +6 -6
@@ -26,13 +26,13 @@ int ath11k_dbring_validate_buffer(struct ath11k *ar, void *buffer, u32 size)static void ath11k_dbring_fill_magic_value (struct ath11k *ar,void *buffer,u32 size) { -u32 *temp; -int idx; - - size = size >>2 ; +/* memset32 function fills buffer payload with the ATH11K_DB_MAGIC_VALUE +* and the variable size is expected to be the number of u32 values +* to be stored, not the number of bytes. +*/ + size = size /sizeof (u32); -for (idx =0 , temp = buffer; idx < size; idx++, temp++) - *temp++ =ATH11K_DB_MAGIC_VALUE ; +memset32 (buffer,ATH11K_DB_MAGIC_VALUE , size); } static int ath11k_dbring_bufs_replenish(struct ath11k *ar,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 354/663 bpf, sockmap: fix deadlocks in the sockhash and sockmap
In reply to Greg Kroah-HartmanFrom: Xin Liu <[email protected]>
[ Upstream commit ed17aa92dc56b6d8883e4b7a8f1c6fbf5ed6cd29 ]
When huang uses sched_switch tracepoint, the tracepoint does only one thing in the mounted ebpf program, which deletes the fixed elements in sockhash ([0])
It seems that elements in sockhash are rarely actively deleted by users or ebpf program. Therefore, we do not pay much attention to their deletion. Compared with hash maps, sockhash only provides spin_lock_bh protection. This causes it to appear to have self-locking behavior in the interrupt context.
[0]:https://lore.kernel.org/all/CABcoxUayum5oOqFMMqAeWuS8+EzojquSOSyDA3J_2omY=2EeAg@mail.gmail.com/
--- net/core/sock_map.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/core/sock_map.c +6 -4
@@ -414,8 +414,9 @@ static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test, {struct sock *sk;int err =0 ; +unsigned long flags; -raw_spin_lock_bh (&stab->lock); +raw_spin_lock_irqsave (&stab->lock, flags); sk = *psk;if (!sk_test || sk_test == sk) sk =xchg (psk,NULL );
@@ -425,7 +426,7 @@ static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test,else err = -EINVAL ; -raw_spin_unlock_bh (&stab->lock); +raw_spin_unlock_irqrestore (&stab->lock, flags);return err; }
@@ -923,11 +924,12 @@ static long sock_hash_delete_elem(struct bpf_map *map, void *key)struct bpf_shtab_bucket *bucket;struct bpf_shtab_elem *elem;int ret = -ENOENT ; +unsigned long flags; hash =sock_hash_bucket_hash (key, key_size); bucket =sock_hash_select_bucket (htab, hash); -raw_spin_lock_bh (&bucket->lock); +raw_spin_lock_irqsave (&bucket->lock, flags); elem =sock_hash_lookup_elem_raw (&bucket->head, hash, key, key_size);if (elem) {hlist_del_rcu (&elem->node);
@@ -935,7 +937,7 @@ static long sock_hash_delete_elem(struct bpf_map *map, void *key)sock_hash_free_elem (htab, elem); ret =0 ; } -raw_spin_unlock_bh (&bucket->lock); +raw_spin_unlock_irqrestore (&bucket->lock, flags);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 355/663 nvmet: fix error handling in nvmet_execute_identify_cns_cs_ns()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit ab76e7206b672b2e8818cb121a04506956d6b223 ]
Nvme specifications state that:
If the I/O Command Set associated with the namespace identified by the NSID field does not support the Identify Namespace data structure specified by the CSI field, the controller shall abort the command with a status code of Invalid Field in Command.
In other words, if nvmet_execute_identify_cns_cs_ns() is called for a target with a block device that is not zoned, we should not return any data and set the status to NVME_SC_INVALID_FIELD.
While at it, it is also better to revalidate the ns block devie *before* checking if the block device is zoned, to ensure that nvmet_execute_identify_cns_cs_ns() operates against updated device characteristics.
--- drivers/nvme/target/zns.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/nvme/target/zns.c +9 -7
@@ -97,7 +97,7 @@ void nvmet_execute_identify_cns_cs_ctrl(struct nvmet_req *req)void nvmet_execute_identify_cns_cs_ns (struct nvmet_req *req) { -struct nvme_id_ns_zns *id_zns; +struct nvme_id_ns_zns *id_zns =NULL ;u64 zsze;u16 status;u32 mar, mor;
@@ -118,16 +118,18 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req)if (status) goto done; -if (!bdev_is_zoned (req->ns->bdev)) { - req->error_loc = offsetof(struct nvme_identify , nsid); - goto done; - } -if (nvmet_ns_revalidate (req->ns)) {mutex_lock (&req->ns->subsys->lock);nvmet_ns_changed (req->ns->subsys, req->ns->nsid);mutex_unlock (&req->ns->subsys->lock); } + +if (!bdev_is_zoned (req->ns->bdev)) { + status =NVME_SC_INVALID_FIELD |NVME_SC_DNR ; + req->error_loc = offsetof(struct nvme_identify , nsid); + goto out; + } + zsze = (bdev_zone_sectors (req->ns->bdev) <<9 ) >> req->ns->blksize_shift; id_zns->lbafe[0 ].zsze =cpu_to_le64 (zsze);
@@ -148,8 +150,8 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req) done: status =nvmet_copy_to_sgl (req,0 , id_zns,sizeof (*id_zns)); -kfree (id_zns); out: +kfree (id_zns);nvmet_req_complete (req, status); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 356/663 nvmet: fix Identify Namespace handling
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 8c098aa00118c35108f0c19bd3cdc45e11574948 ]
The identify command with cns set to NVME_ID_CNS_NS does not directly depend on the command set. The NVMe specifications is rather confusing here as it appears that this command only applies to the NVM command set. However, footnote 8 of Figure 273 in the NVMe 2.0 base specifications clearly state that this command applies to NVM command sets that support logical blocks, that is, NVM and ZNS. Both the NVM and ZNS command set specifications also list this identify as mandatory.
The command handling should thus not look at the csi field since it is defined as unused for this command. Given that we do not support the KV command set, simply remove the csi switch-case for that command handling and call directly nvmet_execute_identify_ns() in nvmet_execute_identify().
--- drivers/nvme/target/admin-cmd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/nvme/target/admin-cmd.c +2 -7
@@ -692,13 +692,8 @@ static void nvmet_execute_identify(struct nvmet_req *req)switch (req->cmd->identify.cns) {case NVME_ID_CNS_NS : -switch (req->cmd->identify.csi) { -case NVME_CSI_NVM : -return nvmet_execute_identify_ns (req); -default : -break ; - } -break ; +nvmet_execute_identify_ns (req); +return ;case NVME_ID_CNS_CS_NS :if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) {switch (req->cmd->identify.csi) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 357/663 nvmet: fix Identify Controller handling
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 62904b3b333e7f3c0f879dc3513295eee5765c9f ]
The identify command with cns set to NVME_ID_CNS_CTRL does not depend on the command set. The execution of this command should thus not look at the csi specified in the command. Simplify nvmet_execute_identify() to directly call nvmet_execute_identify_ctrl() without the csi switch-case.
--- drivers/nvme/target/admin-cmd.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/nvme/target/admin-cmd.c +2 -5
@@ -705,11 +705,8 @@ static void nvmet_execute_identify(struct nvmet_req *req) }break ;case NVME_ID_CNS_CTRL : -switch (req->cmd->identify.csi) { -case NVME_CSI_NVM : -return nvmet_execute_identify_ctrl (req); - } -break ; +nvmet_execute_identify_ctrl (req); +return ;case NVME_ID_CNS_CS_CTRL :if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) {switch (req->cmd->identify.csi) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 358/663 nvmet: fix Identify Active Namespace ID list handling
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 97416f67d55fb8b866ff1815ca7ef26b6dfa6a5e ]
The identify command with cns set to NVME_ID_CNS_NS_ACTIVE_LIST does not depend on the command set. The execution of this command should thus not look at the csi field specified in the command. Simplify nvmet_execute_identify() to directly call nvmet_execute_identify_nslist() without the csi switch-case.
--- drivers/nvme/target/admin-cmd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/nvme/target/admin-cmd.c +2 -7
@@ -718,13 +718,8 @@ static void nvmet_execute_identify(struct nvmet_req *req) }break ;case NVME_ID_CNS_NS_ACTIVE_LIST : -switch (req->cmd->identify.csi) { -case NVME_CSI_NVM : -return nvmet_execute_identify_nslist (req); -default : -break ; - } -break ; +nvmet_execute_identify_nslist (req); +return ;case NVME_ID_CNS_NS_DESC_LIST :if (nvmet_handle_identify_desclist (req) == true)return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 359/663 nvmet: fix I/O Command Set specific Identify Controller
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit a5a6ab0950b46ab1ef4a5c83c80234018b81b38a ]
For an identify command with cns set to NVME_ID_CNS_CS_CTRL, the NVMe 2.0 specification states that:
If the I/O Command Set specified by the CSI field does not have an Identify Controller data structure, then the controller shall return a zero filled data structure. If the host requests a data structure for an I/O Command Set that the controller does not support, the controller shall abort the command with a status code of Invalid Field in Command.
However, the current implementation of this identify command in nvmet_execute_identify() only handles the ZNS command set, returning an error for the NVM command set, which is not compliant with the specifications as we do support this command set.
Fix this by:
1) Renaming nvmet_execute_identify_cns_cs_ctrl() to nvmet_execute_identify_ctrl_zns() to continue handling the ZNS command set as is.
2) Introduce a nvmet_execute_identify_ctrl_ns() helper to handle the NVM command set, returning a zero filled nvme_id_ctrl_nvm data structure.
3) Modify nvmet_execute_identify() to call these helpers based on the csi specified, returning an error for unsupported command sets.
--- drivers/nvme/target/admin-cmd.c | 22 ++++++++++++++++------ drivers/nvme/target/nvmet.h | 2 +- drivers/nvme/target/zns.c | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-)
drivers/nvme/target/admin-cmd.c +16 -6
@@ -685,6 +685,13 @@ static bool nvmet_handle_identify_desclist(struct nvmet_req *req) } } +static void nvmet_execute_identify_ctrl_nvm (struct nvmet_req *req) +{ +/* Not supported: return zeroes */ +nvmet_req_complete (req, +nvmet_zero_sgl (req,0 ,sizeof (struct nvme_id_ctrl_nvm ))); +} +static void nvmet_execute_identify (struct nvmet_req *req) {if (!nvmet_check_transfer_len (req,NVME_IDENTIFY_DATA_SIZE ))
@@ -708,13 +715,16 @@ static void nvmet_execute_identify(struct nvmet_req *req)nvmet_execute_identify_ctrl (req);return ;case NVME_ID_CNS_CS_CTRL : -if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) { -switch (req->cmd->identify.csi) { -case NVME_CSI_ZNS : -return nvmet_execute_identify_cns_cs_ctrl (req); -default : -break ; +switch (req->cmd->identify.csi) { +case NVME_CSI_NVM : +nvmet_execute_identify_ctrl_nvm (req); +return ; +case NVME_CSI_ZNS : +if (IS_ENABLED (CONFIG_BLK_DEV_ZONED )) { +nvmet_execute_identify_ctrl_zns (req); +return ; } +break ; }break ;case NVME_ID_CNS_NS_ACTIVE_LIST :
drivers/nvme/target/nvmet.h +1 -1
@@ -581,7 +581,7 @@ bool nvmet_ns_revalidate(struct nvmet_ns *ns);u16 blk_to_nvme_status (struct nvmet_req *req,blk_status_t blk_sts);bool nvmet_bdev_zns_enable (struct nvmet_ns *ns); -void nvmet_execute_identify_cns_cs_ctrl (struct nvmet_req *req); +void nvmet_execute_identify_ctrl_zns (struct nvmet_req *req);void nvmet_execute_identify_cns_cs_ns (struct nvmet_req *req);void nvmet_bdev_execute_zone_mgmt_recv (struct nvmet_req *req);void nvmet_bdev_execute_zone_mgmt_send (struct nvmet_req *req);
drivers/nvme/target/zns.c +1 -1
@@ -70,7 +70,7 @@ bool nvmet_bdev_zns_enable(struct nvmet_ns *ns)return true; } -void nvmet_execute_identify_cns_cs_ctrl (struct nvmet_req *req) +void nvmet_execute_identify_ctrl_zns (struct nvmet_req *req) {u8 zasl = req->sq->ctrl->subsys->zasl;struct nvmet_ctrl *ctrl = req->sq->ctrl;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 360/663 nvme: fix async event trace event
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
[ Upstream commit 6622b76fe922b94189499a90ccdb714a4a8d0773 ]
Mixing AER Event Type and Event Info has masking clashes. Just print the event type, but also include the event info of the AER result in the trace.
--- drivers/nvme/host/core.c | 5 +---- drivers/nvme/host/trace.h | 15 ++++++--------- 2 files changed, 7 insertions(+), 13 deletions(-)
drivers/nvme/host/core.c +1 -4
@@ -4808,8 +4808,6 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)u32 aer_notice_type =nvme_aer_subtype (result);bool requeue = true; -trace_nvme_async_event (ctrl, aer_notice_type); -switch (aer_notice_type) {case NVME_AER_NOTICE_NS_CHANGED :set_bit (NVME_AER_NOTICE_NS_CHANGED , &ctrl->events);
@@ -4845,7 +4843,6 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)static void nvme_handle_aer_persistent_error (struct nvme_ctrl *ctrl) { -trace_nvme_async_event (ctrl,NVME_AER_ERROR );dev_warn (ctrl->device,"resetting controller due to AER\n" );nvme_reset_ctrl (ctrl); }
@@ -4861,6 +4858,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,if (le16_to_cpu (status) >>1 !=NVME_SC_SUCCESS )return ; +trace_nvme_async_event (ctrl, result);switch (aer_type) {case NVME_AER_NOTICE : requeue =nvme_handle_aen_notice (ctrl, result);
@@ -4878,7 +4876,6 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status,case NVME_AER_SMART :case NVME_AER_CSS :case NVME_AER_VS : -trace_nvme_async_event (ctrl, aer_type); ctrl->aen_result = result;break ;default :
drivers/nvme/host/trace.h +6 -9
@@ -127,15 +127,12 @@ TRACE_EVENT(nvme_async_event, ),TP_printk ("nvme%d: NVME_AEN=%#08x [%s]" , __entry->ctrl_id, __entry->result, -__print_symbolic (__entry->result, -aer_name (NVME_AER_NOTICE_NS_CHANGED ), -aer_name (NVME_AER_NOTICE_ANA ), -aer_name (NVME_AER_NOTICE_FW_ACT_STARTING ), -aer_name (NVME_AER_NOTICE_DISC_CHANGED ), -aer_name (NVME_AER_ERROR ), -aer_name (NVME_AER_SMART ), -aer_name (NVME_AER_CSS ), -aer_name (NVME_AER_VS )) +__print_symbolic (__entry->result &0x7 , +aer_name (NVME_AER_ERROR ), +aer_name (NVME_AER_SMART ), +aer_name (NVME_AER_NOTICE ), +aer_name (NVME_AER_CSS ), +aer_name (NVME_AER_VS )) ) );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 361/663 nvme-fcloop: fix "inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage"
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 4f86a6ff6fbd891232dda3ca97fd1b9630b59809 ]
fcloop_fcp_op() could be called from flush request's ->end_io(flush_end_io) in which the spinlock of fq->mq_flush_lock is grabbed with irq saved/disabled.
So fcloop_fcp_op() can't call spin_unlock_irq(&tfcp_req->reqlock) simply which enables irq unconditionally.
Fixes the warning by switching to spin_lock_irqsave()/spin_unlock_irqrestore()
--- drivers/nvme/target/fcloop.c | 48 ++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-)
drivers/nvme/target/fcloop.c +27 -21
@@ -614,10 +614,11 @@ fcloop_fcp_recv_work(struct work_struct *work)struct fcloop_fcpreq *tfcp_req = container_of(work, struct fcloop_fcpreq, fcp_rcv_work);struct nvmefc_fcp_req *fcpreq = tfcp_req->fcpreq; +unsigned long flags;int ret =0 ;bool aborted = false; -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags);switch (tfcp_req->inistate) {case INI_IO_START : tfcp_req->inistate =INI_IO_ACTIVE ;
@@ -626,11 +627,11 @@ fcloop_fcp_recv_work(struct work_struct *work) aborted = true;break ;default : -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);WARN_ON (1 );return ; } -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);if (unlikely (aborted)) ret = -ECANCELED ;
@@ -655,8 +656,9 @@ fcloop_fcp_abort_recv_work(struct work_struct *work) container_of(work, struct fcloop_fcpreq, abort_rcv_work);struct nvmefc_fcp_req *fcpreq;bool completed = false; +unsigned long flags; -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); fcpreq = tfcp_req->fcpreq;switch (tfcp_req->inistate) {case INI_IO_ABORTED :
@@ -665,11 +667,11 @@ fcloop_fcp_abort_recv_work(struct work_struct *work) completed = true;break ;default : -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);WARN_ON (1 );return ; } -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);if (unlikely (completed)) {/* remove reference taken in original abort downcall */
@@ -681,9 +683,9 @@ fcloop_fcp_abort_recv_work(struct work_struct *work)nvmet_fc_rcv_fcp_abort (tfcp_req->tport->targetport, &tfcp_req->tgt_fcp_req); -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); tfcp_req->fcpreq =NULL ; -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);fcloop_call_host_done (fcpreq, tfcp_req, -ECANCELED );/* call_host_done releases reference for abort downcall */
@@ -699,11 +701,12 @@ fcloop_tgt_fcprqst_done_work(struct work_struct *work)struct fcloop_fcpreq *tfcp_req = container_of(work, struct fcloop_fcpreq, tio_done_work);struct nvmefc_fcp_req *fcpreq; +unsigned long flags; -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); fcpreq = tfcp_req->fcpreq; tfcp_req->inistate =INI_IO_COMPLETED ; -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);fcloop_call_host_done (fcpreq, tfcp_req, tfcp_req->status); }
@@ -807,13 +810,14 @@ fcloop_fcp_op(struct nvmet_fc_target_port *tgtport,u32 rsplen =0 , xfrlen =0 ;int fcp_err =0 , active, aborted;u8 op = tgt_fcpreq->op; +unsigned long flags; -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); fcpreq = tfcp_req->fcpreq; active = tfcp_req->active; aborted = tfcp_req->aborted; tfcp_req->active = true; -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);if (unlikely (active))/* illegal - call while i/o active */
@@ -821,9 +825,9 @@ fcloop_fcp_op(struct nvmet_fc_target_port *tgtport,if (unlikely (aborted)) {/* target transport has aborted i/o prior */ -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); tfcp_req->active = false; -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags); tgt_fcpreq->transferred_length =0 ; tgt_fcpreq->fcp_error = -ECANCELED ; tgt_fcpreq->done (tgt_fcpreq);
@@ -880,9 +884,9 @@ fcloop_fcp_op(struct nvmet_fc_target_port *tgtport,break ; } -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); tfcp_req->active = false; -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags); tgt_fcpreq->transferred_length = xfrlen; tgt_fcpreq->fcp_error = fcp_err;
@@ -896,15 +900,16 @@ fcloop_tgt_fcp_abort(struct nvmet_fc_target_port *tgtport, struct nvmefc_tgt_fcp_req *tgt_fcpreq) {struct fcloop_fcpreq *tfcp_req =tgt_fcp_req_to_fcpreq (tgt_fcpreq); +unsigned long flags;/* * mark aborted only in case there were 2 threads in transport * (one doing io, other doing abort) and only kills ops posted * after the abort request */ -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags); tfcp_req->aborted = true; -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags); tfcp_req->status =NVME_SC_INTERNAL ;
@@ -946,6 +951,7 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport,struct fcloop_ini_fcpreq *inireq = fcpreq->private;struct fcloop_fcpreq *tfcp_req;bool abortio = true; +unsigned long flags;spin_lock (&inireq->inilock); tfcp_req = inireq->tfcp_req;
@@ -958,7 +964,7 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport,return ;/* break initiator/target relationship for io */ -spin_lock_irq (&tfcp_req->reqlock); +spin_lock_irqsave (&tfcp_req->reqlock, flags);switch (tfcp_req->inistate) {case INI_IO_START :case INI_IO_ACTIVE :
@@ -968,11 +974,11 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport, abortio = false;break ;default : -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);WARN_ON (1 );return ; } -spin_unlock_irq (&tfcp_req->reqlock); +spin_unlock_irqrestore (&tfcp_req->reqlock, flags);if (abortio)/* leave the reference while the work item is scheduled */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 362/663 selftests/bpf: Use read_perf_max_sample_freq() in perf_event_stackmap
In reply to Greg Kroah-HartmanFrom: Song Liu <[email protected]>
[ Upstream commit de6d014a09bf12a9a8959d60c0a1d4a41d394a89 ]
Currently, perf_event sample period in perf_event_stackmap is set too low that the test fails randomly. Fix this by using the max sample frequency, from read_perf_max_sample_freq().
Move read_perf_max_sample_freq() to testing_helpers.c. Replace the CHECK() with if-printf, as CHECK is not available in testing_helpers.c.
--- .../bpf/prog_tests/perf_event_stackmap.c | 3 ++- .../bpf/prog_tests/stacktrace_build_id_nmi.c | 15 -------------- tools/testing/selftests/bpf/testing_helpers.c | 20 +++++++++++++++++++ tools/testing/selftests/bpf/testing_helpers.h | 2 ++ 4 files changed, 24 insertions(+), 16 deletions(-)
tools/testing/selftests/bpf/prog_tests/perf_event_stackmap.c +2 -1
@@ -63,7 +63,8 @@ void test_perf_event_stackmap(void)PERF_SAMPLE_BRANCH_NO_FLAGS |PERF_SAMPLE_BRANCH_NO_CYCLES | PERF_SAMPLE_BRANCH_CALL_STACK, - .sample_period = 5000, + .freq = 1, + .sample_freq = read_perf_max_sample_freq(), .size = sizeof(struct perf_event_attr), };struct perf_event_stackmap *skel;
tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c +0 -15
@@ -2,21 +2,6 @@#include <test_progs.h> #include "test_stacktrace_build_id.skel.h" -static __u64 read_perf_max_sample_freq (void ) -{ -__u64 sample_freq =5000 ;/* fallback to 5000 on error */ -FILE *f; -__u32 duration =0 ; - - f =fopen ("/proc/sys/kernel/perf_event_max_sample_rate" ,"r" ); -if (f ==NULL ) -return sample_freq; -CHECK (fscanf (f,"%llu" , &sample_freq) !=1 ,"Get max sample rate" , -"return default value: 5000,err %d\n" , -errno); -fclose (f); -return sample_freq; -} -void test_stacktrace_build_id_nmi (void ) {int control_map_fd, stackid_hmap_fd, stackmap_fd;
tools/testing/selftests/bpf/testing_helpers.c +20 -0
@@ -229,3 +229,23 @@ int bpf_test_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,return bpf_prog_load (type,NULL , license, insns, insns_cnt, &opts); } + +__u64 read_perf_max_sample_freq (void ) +{ +__u64 sample_freq =5000 ;/* fallback to 5000 on error */ +FILE *f; + + f =fopen ("/proc/sys/kernel/perf_event_max_sample_rate" ,"r" ); +if (f ==NULL ) { +printf ("Failed to open /proc/sys/kernel/perf_event_max_sample_rate: err %d\n" +"return default value: 5000\n" , -errno); +return sample_freq; + } +if (fscanf (f,"%llu" , &sample_freq) !=1 ) { +printf ("Failed to parse /proc/sys/kernel/perf_event_max_sample_rate: err %d\n" +"return default value: 5000\n" , -errno); + } + +fclose (f); +return sample_freq; +}
tools/testing/selftests/bpf/testing_helpers.h +2 -0
@@ -20,3 +20,5 @@ struct test_filter_set;int parse_test_list (const char *s,struct test_filter_set *test_set,bool is_glob_pattern); + +__u64 read_perf_max_sample_freq (void );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 363/663 selftests/bpf: Fix leaked bpf_link in get_stackid_cannot_attach
In reply to Greg Kroah-HartmanFrom: Song Liu <[email protected]>
[ Upstream commit c1e07a80cf23d3a6e96172bc9a73bfa912a9fcbc ]
skel->links.oncpu is leaked in one case. This causes test perf_branches fails when it runs after get_stackid_cannot_attach:
./test_progs -t get_stackid_cannot_attach,perf_branches
84 get_stackid_cannot_attach:OK
test_perf_branches_common:PASS:test_perf_branches_load 0 nsec test_perf_branches_common:PASS:attach_perf_event 0 nsec test_perf_branches_common:PASS:set_affinity 0 nsec check_good_sample:FAIL:output not valid no valid sample from prog
146/1 perf_branches/perf_branches_hw:FAIL 146/2 perf_branches/perf_branches_no_hw:OK 146 perf_branches:FAIL
All error logs:
test_perf_branches_common:PASS:test_perf_branches_load 0 nsec test_perf_branches_common:PASS:attach_perf_event 0 nsec test_perf_branches_common:PASS:set_affinity 0 nsec check_good_sample:FAIL:output not valid no valid sample from prog
146/1 perf_branches/perf_branches_hw:FAIL
146 perf_branches:FAIL
Summary: 1/1 PASSED, 0 SKIPPED, 1 FAILED
Fix this by adding the missing bpf_link__destroy().
--- .../testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c +1 -0
@@ -65,6 +65,7 @@ void test_get_stackid_cannot_attach(void) skel->links.oncpu =bpf_program__attach_perf_event (skel->progs.oncpu, pmu_fd);ASSERT_OK_PTR (skel->links.oncpu,"attach_perf_event_callchain" ); +bpf_link__destroy (skel->links.oncpu);close (pmu_fd);/* add exclude_callchain_kernel, attach should fail */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 364/663 blk-mq: dont plug for head insertions in blk_execute_rq_nowait
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 50947d7fe9fa6abe3ddc40769dfb02a51c58edb6 ]
Plugs never insert at head, so don't plug for head insertions.
--- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-mq.c +1 -1
@@ -1345,7 +1345,7 @@ void blk_execute_rq_nowait(struct request *rq, bool at_head)* device, directly accessing the plug instead of using blk_mq_plug() * should not have any consequences. */ -if (current->plug) +if (current->plug && !at_head)blk_add_rq_to_plug (current->plug, rq);else blk_mq_sched_insert_request (rq, at_head, true, false);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 365/663 wifi: iwlwifi: debug: fix crash in __iwl_err()
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 634c7b1bd08ca322537ab389f8cbd7bb543b5e45 ]
In __iwl_err(), if we rate-limit the message away, then vaf.va is still NULL-initialized by the time we get to the tracing code, which then crashes. When it doesn't get rate-limited out, it's still wrong to reuse the old args2 that was already printed, which is why we bother making a copy in the first place.
Assign vaf.va properly to fix this.
--- drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-debug.c +2 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2005-2011, 2021 Intel Corporation +* Copyright (C) 2005-2011, 2021-2022 Intel Corporation */ #include <linux/device.h> #include <linux/interrupt.h>
@@ -57,6 +57,7 @@ void __iwl_err(struct device *dev, enum iwl_err_mode mode, const char *fmt, ...)default :break ; } + vaf.va = &args;trace_iwlwifi_err (&vaf);va_end (args); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 366/663 wifi: iwlwifi: mvm: fix A-MSDU checks
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit d34d11aea2d5d71a66f2f90507c3f7202b964175 ]
Since Gl A-step devices use the old checksum hardware, we shouldn't use the Bz code to check for A-MSDU combining ability; fix that.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +4 -1
@@ -5518,7 +5518,10 @@ static bool iwl_mvm_mac_can_aggregate(struct ieee80211_hw *hw, {struct iwl_mvm *mvm =IWL_MAC80211_GET_MVM (hw); -if (mvm->trans->trans_cfg->device_family >=IWL_DEVICE_FAMILY_BZ ) +if (mvm->trans->trans_cfg->device_family >IWL_DEVICE_FAMILY_BZ || + (mvm->trans->trans_cfg->device_family ==IWL_DEVICE_FAMILY_BZ && + !(CSR_HW_REV_TYPE (mvm->trans->hw_rev) ==IWL_CFG_MAC_TYPE_GL && + mvm->trans->hw_rev_step ==SILICON_A_STEP )))return iwl_mvm_tx_csum_bz (mvm, head, true) ==iwl_mvm_tx_csum_bz (mvm, skb, true);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 367/663 wifi: iwlwifi: trans: dont trigger d3 interrupt twice
In reply to Greg Kroah-HartmanFrom: Avraham Stern <[email protected]>
[ Upstream commit 277f56a141fc54ef7f9e09dba65fb2e12021411d ]
When the IPC registers are used for sleep control, setting the IPC sleep bit already triggers an interrupt to the fw, so there is no need to also set the doorbell. Setting also the doorbell triggers the sleep interrupt twice which lead to an assert.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +3 -6
@@ -1522,19 +1522,16 @@ static int iwl_pcie_d3_handshake(struct iwl_trans *trans, bool suspend)struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans);int ret; -if (trans->trans_cfg->device_family ==IWL_DEVICE_FAMILY_AX210 ) { +if (trans->trans_cfg->device_family ==IWL_DEVICE_FAMILY_AX210 )iwl_write_umac_prph (trans,UREG_DOORBELL_TO_ISR6 , suspend ?UREG_DOORBELL_TO_ISR6_SUSPEND :UREG_DOORBELL_TO_ISR6_RESUME ); - }else if (trans->trans_cfg->device_family >=IWL_DEVICE_FAMILY_BZ ) { +else if (trans->trans_cfg->device_family >=IWL_DEVICE_FAMILY_BZ )iwl_write32 (trans,CSR_IPC_SLEEP_CONTROL , suspend ?CSR_IPC_SLEEP_CONTROL_SUSPEND :CSR_IPC_SLEEP_CONTROL_RESUME ); -iwl_write_umac_prph (trans,UREG_DOORBELL_TO_ISR6 , -UREG_DOORBELL_TO_ISR6_SLEEP_CTRL ); - }else { +else return 0 ; - } ret =wait_event_timeout (trans_pcie->sx_waitq, trans_pcie->sx_complete,2 *HZ );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 368/663 wifi: iwlwifi: mvm: dont set CHECKSUM_COMPLETE for unsupported protocols
In reply to Greg Kroah-HartmanFrom: Avraham Stern <[email protected]>
[ Upstream commit 217f3c52f00d3419ecdd38a99a7eceecb11679b2 ]
On Bz devices, CHECKSUM_COMPLETE was set for unsupported protocols which results in a warning. Fix it.
--- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +2 -3
@@ -193,8 +193,7 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb,* Starting from Bz hardware, it calculates starting directly after * the MAC header, so that matches mac80211's expectation. */ -if (skb->ip_summed ==CHECKSUM_COMPLETE && - mvm->trans->trans_cfg->device_family <IWL_DEVICE_FAMILY_BZ ) { +if (skb->ip_summed ==CHECKSUM_COMPLETE ) {struct {u8 hdr[6 ];__be16 type;
@@ -209,7 +208,7 @@ static int iwl_mvm_create_skb(struct iwl_mvm *mvm, struct sk_buff *skb, shdr->type !=htons (ETH_P_PAE ) && shdr->type != htons(ETH_P_TDLS)))) skb->ip_summed = CHECKSUM_NONE; - else + else if (mvm->trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_BZ) /* mac80211 assumes full CSUM including SNAP header */ skb_postpush_rcsum(skb, shdr, sizeof(*shdr)); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 369/663 bpf, sockmap: Revert buggy deadlock fix in the sockhash and sockmap
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
[ Upstream commit 8c5c2a4898e3d6bad86e29d471e023c8a19ba799 ]
syzbot reported a splat and bisected it to recent commit ed17aa92dc56 ("bpf,
sockmap: fix deadlocks in the sockhash and sockmap"):
[...]
WARNING: CPU: 1 PID: 9280 at kernel/softirq.c:376 __local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Modules linked in: CPU: 1 PID: 9280 Comm: syz-executor.1 Not tainted 6.2.0-syzkaller-13249-gd319f344561d #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/30/2023 RIP: 0010:__local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 [...] Call Trace: <TASK> spin_unlock_bh include/linux/spinlock.h:395 [inline] sock_map_del_link+0x2ea/0x510 net/core/sock_map.c:165 sock_map_unref+0xb0/0x1d0 net/core/sock_map.c:184 sock_hash_delete_elem+0x1ec/0x2a0 net/core/sock_map.c:945 map_delete_elem kernel/bpf/syscall.c:1536 [inline] __sys_bpf+0x2edc/0x53e0 kernel/bpf/syscall.c:5053 __do_sys_bpf kernel/bpf/syscall.c:5166 [inline] __se_sys_bpf kernel/bpf/syscall.c:5164 [inline] __x64_sys_bpf+0x79/0xc0 kernel/bpf/syscall.c:5164 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7fe8f7c8c169 </TASK> [...]
Revert for now until we have a proper solution.
--- net/core/sock_map.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
net/core/sock_map.c +4 -6
@@ -414,9 +414,8 @@ static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test, {struct sock *sk;int err =0 ; -unsigned long flags; -raw_spin_lock_irqsave (&stab->lock, flags); +raw_spin_lock_bh (&stab->lock); sk = *psk;if (!sk_test || sk_test == sk) sk =xchg (psk,NULL );
@@ -426,7 +425,7 @@ static int __sock_map_delete(struct bpf_stab *stab, struct sock *sk_test,else err = -EINVAL ; -raw_spin_unlock_irqrestore (&stab->lock, flags); +raw_spin_unlock_bh (&stab->lock);return err; }
@@ -924,12 +923,11 @@ static long sock_hash_delete_elem(struct bpf_map *map, void *key)struct bpf_shtab_bucket *bucket;struct bpf_shtab_elem *elem;int ret = -ENOENT ; -unsigned long flags; hash =sock_hash_bucket_hash (key, key_size); bucket =sock_hash_select_bucket (htab, hash); -raw_spin_lock_irqsave (&bucket->lock, flags); +raw_spin_lock_bh (&bucket->lock); elem =sock_hash_lookup_elem_raw (&bucket->head, hash, key, key_size);if (elem) {hlist_del_rcu (&elem->node);
@@ -937,7 +935,7 @@ static long sock_hash_delete_elem(struct bpf_map *map, void *key)sock_hash_free_elem (htab, elem); ret =0 ; } -raw_spin_unlock_irqrestore (&bucket->lock, flags); +raw_spin_unlock_bh (&bucket->lock);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 370/663 f2fs: fix to check return value of f2fs_do_truncate_blocks()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit b851ee6ba3cc212641e622ebcf92b950c7bafa07 ]
Otherwise, if truncation on cow_inode failed, remained data may pollute current transaction of atomic write.
--- fs/f2fs/file.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/f2fs/file.c +5 -1
@@ -2117,7 +2117,11 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)clear_inode_flag (fi->cow_inode,FI_INLINE_DATA ); }else {/* Reuse the already created COW inode */ -f2fs_do_truncate_blocks (fi->cow_inode,0 , true); + ret =f2fs_do_truncate_blocks (fi->cow_inode,0 , true); +if (ret) { +f2fs_up_write (&fi->i_gc_rwsem[WRITE ]); + goto out; + } }f2fs_write_inode (inode,NULL );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 371/663 f2fs: fix to check return value of inc_valid_block_count()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 935fc6fa6466cf18dd72dd1518ebc7bfc4cd58a4 ]
In __replace_atomic_write_block(), we missed to check return value of inc_valid_block_count(), for extreme testcase that f2fs image is run out of space, it may cause inconsistent status in between SIT table and total valid block count.
--- fs/f2fs/segment.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +7 -1
@@ -246,10 +246,16 @@ static int __replace_atomic_write_block(struct inode *inode, pgoff_t index, }else {blkcnt_t count =1 ; + err =inc_valid_block_count (sbi, inode, &count); +if (err) { +f2fs_put_dnode (&dn); +return err; + } + *old_addr = dn.data_blkaddr;f2fs_truncate_data_blocks_range (&dn,1 );dec_valid_block_count (sbi,F2FS_I (inode)->cow_inode, count); -inc_valid_block_count (sbi, inode, &count); +f2fs_replace_block (sbi, &dn, dn.data_blkaddr, new_addr, ni.version, true, false); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 372/663 md/raid10: fix task hung in raid10d
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 72c215ed8731c88b2d7e09afc51fffc207ae47b8 ]
commit fe630de009d0 ("md/raid10: avoid deadlock on recovery.") allowed normal io and sync io to exist at the same time. Task hung will occur as below:
T1 T2 T3 T4
raid10d
handle_read_error
allow_barrier
conf->nr_pending--
-> 0
//submit sync io
raid10_sync_request
raise_barrier
->will not be blocked
...
//submit to drivers
raid10_read_request
wait_barrier
conf->nr_pending++
-> 1
//retry read fail
raid10_end_read_request
reschedule_retry
add to retry_list
conf->nr_queued++
-> 1
//sync io fail
end_sync_read
__end_sync_read
reschedule_retry
add to retry_list
conf->nr_queued++
-> 2
...
handle_read_error
get form retry_list
conf->nr_queued--
freeze_array
wait nr_pending == nr_queued+1
->1 ->2//task hung
retry read and sync io will be added to retry_list(nr_queued->2) if they fails. raid10d() called handle_read_error() and hung in freeze_array(). nr_queued will not decrease because raid10d is blocked, nr_pending will not increase because conf->barrier is not released.
Fix it by moving allow_barrier() after raid10_read_request(). raise_barrier() will wait for nr_waiting to become 0. Therefore, sync io and regular io will not be issued at the same time.
Also remove the check of nr_queued in stop_waiting_barrier. It can be 0 but don't need to be blocking. Remove the check for MD_RECOVERY_RUNNING as the check is redundent.
--- drivers/md/raid10.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/md/raid10.c +13 -5
@@ -995,11 +995,15 @@ static bool stop_waiting_barrier(struct r10conf *conf) (!bio_list_empty(&bio_list[0]) || !bio_list_empty(&bio_list[1])))return true; -/* move on if recovery thread is blocked by us */ -if (conf->mddev->thread->tsk == current && -test_bit (MD_RECOVERY_RUNNING , &conf->mddev->recovery) && - conf->nr_queued >0 ) +/* +* move on if io is issued from raid10d(), nr_pending is not released +* from original io(see handle_read_error()). All raise barrier is +* blocked until this io is done. +*/ +if (conf->mddev->thread->tsk == current) { +WARN_ON_ONCE (atomic_read (&conf->nr_pending) ==0 );return true; + }return false; }
@@ -2978,9 +2982,13 @@ static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio)md_error (mddev, rdev);rdev_dec_pending (rdev, mddev); -allow_barrier (conf); r10_bio->state =0 ;raid10_read_request (mddev, r10_bio->master_bio, r10_bio); +/* +* allow_barrier after re-submit to ensure no sync io +* can be issued while regular io pending. +*/ +allow_barrier (conf); }static void handle_write_completed (struct r10conf *conf,struct r10bio *r10_bio)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 373/663 md/raid10: fix leak of r10bio->remaining for recovery
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 26208a7cffd0c7cbf14237ccd20c7270b3ffeb7e ]
raid10_sync_request() will add 'r10bio->remaining' for both rdev and replacement rdev. However, if the read io fails, recovery_request_write() returns without issuing the write io, in this case, end_sync_request() is only called once and 'remaining' is leaked, cause an io hang.
Fix the problem by decreasing 'remaining' according to if 'bio' and 'repl_bio' is valid.
--- drivers/md/raid10.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/md/raid10.c +13 -10
@@ -2613,11 +2613,22 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio) {struct r10conf *conf = mddev->private;int d; -struct bio *wbio, *wbio2; +struct bio *wbio = r10_bio->devs[1 ].bio; +struct bio *wbio2 = r10_bio->devs[1 ].repl_bio; + +/* Need to test wbio2->bi_end_io before we call +* submit_bio_noacct as if the former is NULL, +* the latter is free to free wbio2. +*/ +if (wbio2 && !wbio2->bi_end_io) + wbio2 =NULL ;if (!test_bit (R10BIO_Uptodate, &r10_bio->state)) {fix_recovery_read_error (r10_bio); -end_sync_request (r10_bio); +if (wbio->bi_end_io) +end_sync_request (r10_bio); +if (wbio2) +end_sync_request (r10_bio);return ; }
@@ -2626,14 +2637,6 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio)* and submit the write request */ d = r10_bio->devs[1 ].devnum; - wbio = r10_bio->devs[1 ].bio; - wbio2 = r10_bio->devs[1 ].repl_bio; -/* Need to test wbio2->bi_end_io before we call -* submit_bio_noacct as if the former is NULL, -* the latter is free to free wbio2. -*/ -if (wbio2 && !wbio2->bi_end_io) - wbio2 =NULL ;if (wbio->bi_end_io) {atomic_inc (&conf->mirrors[d].rdev->nr_pending);md_sync_acct (conf->mirrors[d].rdev->bdev,bio_sectors (wbio));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 374/663 md/raid10: fix memleak for conf->bio_split
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit c9ac2acde53f5385de185bccf6aaa91cf9ac1541 ]
In the error path of raid10_run(), 'conf' need be freed, however, 'conf->bio_split' is missed and memory will be leaked.
Since there are 3 places to free 'conf', factor out a helper to fix the problem.
--- drivers/md/raid10.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/md/raid10.c +17 -20
@@ -4015,6 +4015,20 @@ static int setup_geo(struct geom *geo, struct mddev *mddev, enum geo_type new)return nc*fc; } +static void raid10_free_conf (struct r10conf *conf) +{ +if (!conf) +return ; + +mempool_exit (&conf->r10bio_pool); +kfree (conf->mirrors); +kfree (conf->mirrors_old); +kfree (conf->mirrors_new); +safe_put_page (conf->tmppage); +bioset_exit (&conf->bio_split); +kfree (conf); +} +static struct r10conf *setup_conf (struct mddev *mddev) {struct r10conf *conf =NULL ;
@@ -4097,13 +4111,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)return conf; out: -if (conf) { -mempool_exit (&conf->r10bio_pool); -kfree (conf->mirrors); -safe_put_page (conf->tmppage); -bioset_exit (&conf->bio_split); -kfree (conf); - } +raid10_free_conf (conf);return ERR_PTR (err); }
@@ -4294,10 +4302,7 @@ static int raid10_run(struct mddev *mddev) out_free_conf:md_unregister_thread (&mddev->thread); -mempool_exit (&conf->r10bio_pool); -safe_put_page (conf->tmppage); -kfree (conf->mirrors); -kfree (conf); +raid10_free_conf (conf); mddev->private =NULL ; out:return -EIO ;
@@ -4305,15 +4310,7 @@ static int raid10_run(struct mddev *mddev)static void raid10_free (struct mddev *mddev,void *priv) { -struct r10conf *conf = priv; - -mempool_exit (&conf->r10bio_pool); -safe_put_page (conf->tmppage); -kfree (conf->mirrors); -kfree (conf->mirrors_old); -kfree (conf->mirrors_new); -bioset_exit (&conf->bio_split); -kfree (conf); +raid10_free_conf (priv); }static void raid10_quiesce (struct mddev *mddev,int quiesce)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 375/663 md/raid10: fix memleak of md thread
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit f0ddb83da3cbbf8a1f9087a642c448ff52ee9abd ]
In raid10_run(), if setup_conf() succeed and raid10_run() failed before setting 'mddev->thread', then in the error path 'conf->thread' is not freed.
Fix the problem by setting 'mddev->thread' right after setup_conf().
--- drivers/md/raid10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/md/raid10.c +3 -3
@@ -4148,6 +4148,9 @@ static int raid10_run(struct mddev *mddev)if (!conf) goto out; + mddev->thread = conf->thread; + conf->thread =NULL ; +if (mddev_is_clustered (conf->mddev)) {int fc, fo;
@@ -4160,9 +4163,6 @@ static int raid10_run(struct mddev *mddev) } } - mddev->thread = conf->thread; - conf->thread =NULL ; -if (mddev->queue) {blk_queue_max_write_zeroes_sectors (mddev->queue,0 );blk_queue_io_min (mddev->queue, mddev->chunk_sectors <<9 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 376/663 md/raid10: dont call bio_start_io_acct twice for bio which experienced read error
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 7cddb055bfda5f7b0be931e8ea750fc28bc18a27 ]
handle_read_error() will resumit r10_bio by raid10_read_request(), which will call bio_start_io_acct() again, while bio_end_io_acct() will only be called once.
Fix the problem by don't account io again from handle_read_error().
--- drivers/md/raid10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/raid10.c +3 -1
@@ -1248,7 +1248,8 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, } slot = r10_bio->read_slot; -if (blk_queue_io_stat (bio->bi_bdev->bd_disk->queue)) +if (!r10_bio->start_time && +blk_queue_io_stat (bio->bi_bdev->bd_disk->queue)) r10_bio->start_time =bio_start_io_acct (bio); read_bio =bio_alloc_clone (rdev->bdev, bio, gfp, &mddev->bio_set);
@@ -1578,6 +1579,7 @@ static void __make_request(struct mddev *mddev, struct bio *bio, int sectors) r10_bio->sector = bio->bi_iter.bi_sector; r10_bio->state =0 ; r10_bio->read_slot =-1 ; + r10_bio->start_time =0 ;memset (r10_bio->devs,0 ,sizeof (r10_bio->devs[0 ]) * conf->geo.raid_disks);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 377/663 wifi: iwlwifi: mvm: dont drop unencrypted MCAST frames
In reply to Greg Kroah-HartmanFrom: Ayala Beker <[email protected]>
[ Upstream commit 8e5a26360cbe29b896b6758518280d41c3704d43 ]
MCAST frames are filtered out by the driver if we are not authorized yet.
Fix it to filter out only protected frames.
--- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rx.c +3 -2
@@ -384,9 +384,10 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,* Don't even try to decrypt a MCAST frame that was received * before the managed vif is authorized, we'd fail anyway. */ -if (vif->type ==NL80211_IFTYPE_STATION && +if (is_multicast_ether_addr (hdr->addr1) && + vif->type ==NL80211_IFTYPE_STATION && !mvmvif->authorized && -is_multicast_ether_addr (hdr->addr1)) { +ieee80211_has_protected (hdr->frame_control)) {IWL_DEBUG_DROP (mvm,"MCAST before the vif is authorized\n" );kfree_skb (skb);rcu_read_unlock ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 378/663 wifi: iwlwifi: yoyo: skip dump correctly on hw error
In reply to Greg Kroah-HartmanFrom: Daniel Gabay <[email protected]>
[ Upstream commit 11195ab0d6f3202cf7af1a4c69570f59c377d8ad ]
When NIC is in a bad state, reading data will return 28 bits as 0xa5a5a5a and the lowest 4 bits are not fixed value.
Mask these bits in a few places to skip the dump correctly.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +2 -2
@@ -1038,7 +1038,7 @@ iwl_dump_ini_prph_mac_iter(struct iwl_fw_runtime *fwrt, range->range_data_size = reg->dev_addr.size;for (i =0 ; i <le32_to_cpu (reg->dev_addr.size); i +=4 ) { prph_val =iwl_read_prph (fwrt->trans, addr + i); -if (prph_val ==0x5a5a5a5a ) +if ((prph_val & ~0xf ) ==0xa5a5a5a0 )return -EBUSY ; *val++ =cpu_to_le32 (prph_val); }
@@ -1562,7 +1562,7 @@ iwl_dump_ini_dbgi_sram_iter(struct iwl_fw_runtime *fwrt, prph_data =iwl_read_prph_no_grab (fwrt->trans, (i %2 ) ?DBGI_SRAM_TARGET_ACCESS_RDATA_MSB :DBGI_SRAM_TARGET_ACCESS_RDATA_LSB ); -if (prph_data ==0x5a5a5a5a ) { +if ((prph_data & ~0xf ) ==0xa5a5a5a0 ) {iwl_trans_release_nic_access (fwrt->trans);return -EBUSY ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 379/663 wifi: iwlwifi: yoyo: Fix possible division by zero
In reply to Greg Kroah-HartmanFrom: Daniel Gabay <[email protected]>
[ Upstream commit ba30415118eee374a08b39a0460a1d1e52c24a25 ]
Don't allow buffer allocation TLV with zero req_size since it leads later to division by zero in iwl_dbg_tlv_alloc_fragments(). Also, NPK/SRAM locations are allowed to have zero buffer req_size, don't discard them.
--- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +6 -0
@@ -138,6 +138,12 @@ static int iwl_dbg_tlv_alloc_buf_alloc(struct iwl_trans *trans, alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1) goto err; +if (buf_location ==IWL_FW_INI_LOCATION_DRAM_PATH && + alloc->req_size ==0 ) { +IWL_ERR (trans,"WRT: Invalid DRAM buffer allocation requested size (0)\n" ); +return -EINVAL ; + } + trans->dbg.fw_mon_cfg[alloc_id] = *alloc;return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 380/663 wifi: iwlwifi: mvm: initialize seq variable
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 11e94d2bcd88dea5d9ce99555b6b172f5232d3e2 ]
Clang static analysis reports this issue
d3.c:567:22: warning: The left operand of '>' is
a garbage value
if (seq.tkip.iv32 > cur_rx_iv32)
~~~~~~~~~~~~~ ^
seq is never initialized. Call ieee80211_get_key_rx_seq() to initialize seq.
--- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +1 -0
@@ -563,6 +563,7 @@ static void iwl_mvm_wowlan_get_tkip_data(struct ieee80211_hw *hw, }for (i =0 ; i <IWL_NUM_RSC ; i++) { +ieee80211_get_key_rx_seq (key, i, &seq);/* wrapping isn't allowed, AP must rekey */ if (seq.tkip.iv32 > cur_rx_iv32) cur_rx_iv32 = seq.tkip.iv32;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 381/663 wifi: iwlwifi: fw: move memset before early return
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 8ce437dd5b2e4adef13aa4ecce07392f9966b1ab ]
Clang static analysis reports this representative issue dbg.c:1455:6: warning: Branch condition evaluates to a garbage value
if (!rxf_data.size)
^~~~~~~~~~~~~~
This check depends on iwl_ini_get_rxf_data() to clear rxf_data but the function can return early without doing the clear. So move the memset before the early return.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +2 -2
@@ -1388,13 +1388,13 @@ static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt,if (!data)return ; +memset (data,0 ,sizeof (*data)); +/* make sure only one bit is set in only one fid */ if (WARN_ONCE (hweight_long (fid1) +hweight_long (fid2) !=1 ,"fid1=%x, fid2=%x\n" , fid1, fid2))return ; -memset (data,0 ,sizeof (*data)); -if (fid1) { fifo_idx =ffs (fid1) -1 ; if (WARN_ONCE(fifo_idx >= MAX_NUM_LMAC, "fifo_idx=%d\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 382/663 jdb2: Dont refuse invalidation of already invalidated buffers
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit bd159398a2d2234de07d310132865706964aaaa7 ]
When invalidating buffers under the partial tail page, jbd2_journal_invalidate_folio() returns -EBUSY if the buffer is part of the committing transaction as we cannot safely modify buffer state. However if the buffer is already invalidated (due to previous invalidation attempts from ext4_wait_for_tail_page_commit()), there's nothing to do and there's no point in returning -EBUSY. This fixes occasional warnings from ext4_journalled_invalidate_folio() triggered by generic/051 fstest when blocksize < pagesize.
--- fs/jbd2/transaction.c | 3 +++ 1 file changed, 3 insertions(+)
fs/jbd2/transaction.c +3 -0
@@ -2387,6 +2387,9 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh,spin_unlock (&jh->b_state_lock);write_unlock (&journal->j_state_lock);jbd2_journal_put_journal_head (jh); +/* Already zapped buffer? Nothing to do... */ +if (!bh->b_bdev) +return 0 ;return -EBUSY ; }/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 383/663 io_uring/rsrc: use nospeced indexes
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
[ Upstream commit 953c37e066f05a3dca2d74643574b8dfe8a83983 ]
We use array_index_nospec() for registered buffer indexes, but don't use it while poking into rsrc tags, fix that.
--- io_uring/rsrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/rsrc.c +1 -1
@@ -577,7 +577,7 @@ static int __io_sqe_buffers_update(struct io_ring_ctx *ctx, } ctx->user_bufs[i] = imu; - *io_get_tag_slot (ctx->buf_data, offset) = tag; + *io_get_tag_slot (ctx->buf_data, i) = tag; }if (needs_switch)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 384/663 wifi: iwlwifi: make the loop for card preparation effective
In reply to Greg Kroah-HartmanFrom: Emmanuel Grumbach <[email protected]>
[ Upstream commit 28965ec0b5d9112585f725660e2ff13218505ace ]
Since we didn't reset t to 0, only the first iteration of the loop did checked the ready bit several times.
Quoted 1 line
From the second iteration and on, we just tested the bit once and
continued to the next iteration.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +2 -1
@@ -599,7 +599,6 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans)int iwl_pcie_prepare_card_hw (struct iwl_trans *trans) {int ret; -int t =0 ;int iter;IWL_DEBUG_INFO (trans,"iwl_trans_prepare_card_hw enter\n" );
@@ -616,6 +615,8 @@ int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)usleep_range (1000 ,2000 );for (iter =0 ; iter <10 ; iter++) { +int t =0 ; +/* If HW is not ready, prepare the conditions to check again */ iwl_set_bit (trans,CSR_HW_IF_CONFIG_REG ,CSR_HW_IF_CONFIG_REG_PREPARE );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 385/663 wifi: mt76: remove redundent MCU_UNI_CMD_* definitions
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit 532f0482fc577a78c0086893ab39acb406ac3e65 ]
clear redundent definitions only
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 3 --- 1 file changed, 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +0 -3
@@ -962,9 +962,6 @@ enum {DEV_INFO_MAX_NUM }; -#define MCU_UNI_CMD_EVENT BIT(1) -#define MCU_UNI_CMD_UNSOLICITED_EVENT BIT(2) -/* event table */ enum {MCU_EVENT_TARGET_ADDRESS_LEN =0x01 ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 386/663 wifi: mt76: mt7921: fix wrong command to set STA channel
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit fcc51acfebb85dbc3ab1bea3ce4997d7c0a3a38d ]
Should not use AND operator to check vif type NL80211_IFTYPE_MONITOR, and that will cause we go into sniffer command for both STA and MONITOR mode. However, the sniffer command would set channel properly (with some extra options), the STA mode still works even if using the wrong command.
Fix vif type check to make sure we using the right command to update channel.
--- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -1
@@ -1705,7 +1705,7 @@ static void mt7921_ctx_iter(void *priv, u8 *mac,if (ctx != mvif->ctx)return ; -if (vif->type &NL80211_IFTYPE_MONITOR ) +if (vif->type ==NL80211_IFTYPE_MONITOR )mt7921_mcu_config_sniffer (mvif, ctx);else mt76_connac_mcu_uni_set_chctx (mvif->phy->mt76, &mvif->mt76, ctx);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 387/663 wifi: mt76: mt7921: fix PCI DMA hang after reboot
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit 9270270d62191b7549296721e8d5f3dc0df01563 ]
mt7921 just stop some workers and clean up chip status before reboot. In stress test, there are working activities still running at the period of .shutdown callback and that would cause some hosts cannot recover DMA after reboot. To avoid the floating state in reboot, we use mt7921_pci_remove() to fully deinit all resources.
--- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/pci.c +1 -11
@@ -515,17 +515,7 @@ static int mt7921_pci_resume(struct device *device)static void mt7921_pci_shutdown (struct pci_dev *pdev) { -struct mt76_dev *mdev =pci_get_drvdata (pdev); - struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); -struct mt76_connac_pm *pm = &dev->pm; - -cancel_delayed_work_sync (&pm->ps_work); -cancel_work_sync (&pm->wake_work); - -/* chip cleanup before reboot */ -mt7921_mcu_drv_pmctrl (dev); -mt7921_dma_cleanup (dev); -mt7921_wfsys_reset (dev); +mt7921_pci_remove (pdev); } static DEFINE_SIMPLE_DEV_PM_OPS(mt7921_pm_ops, mt7921_pci_suspend, mt7921_pci_resume);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 388/663 wifi: mt76: mt7915: unlock on error in mt7915_thermal_temp_store()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit cdc215c2c8d74b3c8886650e979b47f16c1f7f92 ]
Drop the lock before returning -EINVAL.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +1 -0
@@ -90,6 +90,7 @@ static ssize_t mt7915_thermal_temp_store(struct device *dev, val < phy->throttle_temp[MT7915_CRIT_TEMP_IDX])) {dev_err (phy->dev->mt76.dev,"temp1_max shall be greater than temp1_crit." ); +mutex_unlock (&phy->dev->mt76.mutex);return -EINVAL ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 389/663 wifi: mt76: mt7996: fix radiotap bitfield
In reply to Greg Kroah-HartmanFrom: Ryder Lee <[email protected]>
[ Upstream commit 63a3724632464559d1e98d90d2c63d43ec6ef6f5 ]
The 11be generation's radiotap bitfields were wrongly copy-and-pasted from 11ax driver, so fix them accordingly.
--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 54 ++++++++++--------- .../net/wireless/mediatek/mt76/mt7996/mac.h | 41 +++++++------- 2 files changed, 47 insertions(+), 48 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +28 -26
@@ -253,12 +253,9 @@ mt7996_mac_decode_he_radiotap_ru(struct mt76_rx_status *status,struct ieee80211_radiotap_he *he, __le32 *rxv) { - u32 ru_h, ru_l; -u8 ru, offs =0 ; + u32 ru, offs = 0; - ru_l =le32_get_bits (rxv[0 ],MT_PRXV_HE_RU_ALLOC_L ); - ru_h =le32_get_bits (rxv[1 ],MT_PRXV_HE_RU_ALLOC_H ); - ru = (u8)(ru_l | ru_h <<4 ); + ru =le32_get_bits (rxv[0 ],MT_PRXV_HE_RU_ALLOC ); status->bw =RATE_INFO_BW_HE_RU ;
@@ -323,18 +320,23 @@ mt7996_mac_decode_he_mu_radiotap(struct sk_buff *skb, __le32 *rxv) he_mu->flags2 |=MU_PREP (FLAGS2_BW_FROM_SIG_A_BW , status->bw) |MU_PREP (FLAGS2_SIG_B_SYMS_USERS , -le32_get_bits (rxv[2 ],MT_CRXV_HE_NUM_USER )); +le32_get_bits (rxv[4 ],MT_CRXV_HE_NUM_USER )); - he_mu->ru_ch1[0 ] =le32_get_bits (rxv[3 ],MT_CRXV_HE_RU0 ); + he_mu->ru_ch1[0 ] =le32_get_bits (rxv[16 ],MT_CRXV_HE_RU0 ) &0xff ;if (status->bw >=RATE_INFO_BW_40 ) { he_mu->flags1 |=HE_BITS (MU_FLAGS1_CH2_RU_KNOWN ); - he_mu->ru_ch2[0 ] =le32_get_bits (rxv[3 ],MT_CRXV_HE_RU1 ); + he_mu->ru_ch2[0 ] =le32_get_bits (rxv[16 ],MT_CRXV_HE_RU1 ) &0xff ; }if (status->bw >=RATE_INFO_BW_80 ) { - he_mu->ru_ch1[1 ] =le32_get_bits (rxv[3 ],MT_CRXV_HE_RU2 ); - he_mu->ru_ch2[1 ] =le32_get_bits (rxv[3 ],MT_CRXV_HE_RU3 ); +u32 ru_h, ru_l; + + he_mu->ru_ch1[1 ] =le32_get_bits (rxv[16 ],MT_CRXV_HE_RU2 ) &0xff ; + + ru_l =le32_get_bits (rxv[16 ],MT_CRXV_HE_RU3_L ); + ru_h =le32_get_bits (rxv[17 ],MT_CRXV_HE_RU3_H ) &0x7 ; + he_mu->ru_ch2[1 ] = (u8)(ru_l | ru_h <<4 ); } }
@@ -357,23 +359,23 @@ mt7996_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv, u8 mode) HE_BITS(DATA2_TXOP_KNOWN), };struct ieee80211_radiotap_he *he =NULL ; -u32 ltf_size =le32_get_bits (rxv[2 ],MT_CRXV_HE_LTF_SIZE ) +1 ; +u32 ltf_size =le32_get_bits (rxv[4 ],MT_CRXV_HE_LTF_SIZE ) +1 ; status->flag |=RX_FLAG_RADIOTAP_HE ; he =skb_push (skb,sizeof (known));memcpy (he, &known,sizeof (known)); - he->data3 =HE_PREP (DATA3_BSS_COLOR ,BSS_COLOR , rxv[14 ]) | -HE_PREP (DATA3_LDPC_XSYMSEG ,LDPC_EXT_SYM , rxv[2 ]); - he->data4 =HE_PREP (DATA4_SU_MU_SPTL_REUSE ,SR_MASK , rxv[11 ]); - he->data5 =HE_PREP (DATA5_PE_DISAMBIG ,PE_DISAMBIG , rxv[2 ]) | + he->data3 =HE_PREP (DATA3_BSS_COLOR ,BSS_COLOR , rxv[9 ]) | +HE_PREP (DATA3_LDPC_XSYMSEG ,LDPC_EXT_SYM , rxv[4 ]); + he->data4 =HE_PREP (DATA4_SU_MU_SPTL_REUSE ,SR_MASK , rxv[13 ]); + he->data5 =HE_PREP (DATA5_PE_DISAMBIG ,PE_DISAMBIG , rxv[5 ]) |le16_encode_bits (ltf_size,IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE );if (le32_to_cpu (rxv[0 ]) &MT_PRXV_TXBF ) he->data5 |=HE_BITS (DATA5_TXBF ); - he->data6 =HE_PREP (DATA6_TXOP ,TXOP_DUR , rxv[14 ]) | -HE_PREP (DATA6_DOPPLER ,DOPPLER , rxv[14 ]); + he->data6 =HE_PREP (DATA6_TXOP ,TXOP_DUR , rxv[9 ]) | +HE_PREP (DATA6_DOPPLER ,DOPPLER , rxv[9 ]);switch (mode) {case MT_PHY_TYPE_HE_SU :
@@ -382,22 +384,22 @@ mt7996_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv, u8 mode)HE_BITS (DATA1_BEAM_CHANGE_KNOWN ) |HE_BITS (DATA1_BW_RU_ALLOC_KNOWN ); - he->data3 |=HE_PREP (DATA3_BEAM_CHANGE ,BEAM_CHNG , rxv[14 ]) | -HE_PREP (DATA3_UL_DL ,UPLINK , rxv[2 ]); + he->data3 |=HE_PREP (DATA3_BEAM_CHANGE ,BEAM_CHNG , rxv[8 ]) | +HE_PREP (DATA3_UL_DL ,UPLINK , rxv[5 ]);break ;case MT_PHY_TYPE_HE_EXT_SU : he->data1 |=HE_BITS (DATA1_FORMAT_EXT_SU ) |HE_BITS (DATA1_UL_DL_KNOWN ) |HE_BITS (DATA1_BW_RU_ALLOC_KNOWN ); - he->data3 |=HE_PREP (DATA3_UL_DL ,UPLINK , rxv[2 ]); + he->data3 |=HE_PREP (DATA3_UL_DL ,UPLINK , rxv[5 ]);break ;case MT_PHY_TYPE_HE_MU : he->data1 |=HE_BITS (DATA1_FORMAT_MU ) |HE_BITS (DATA1_UL_DL_KNOWN ); - he->data3 |=HE_PREP (DATA3_UL_DL ,UPLINK , rxv[2 ]); - he->data4 |=HE_PREP (DATA4_MU_STA_ID ,MU_AID , rxv[7 ]); + he->data3 |=HE_PREP (DATA3_UL_DL ,UPLINK , rxv[5 ]); + he->data4 |=HE_PREP (DATA4_MU_STA_ID ,MU_AID , rxv[8 ]);mt7996_mac_decode_he_radiotap_ru (status, he, rxv);mt7996_mac_decode_he_mu_radiotap (skb, rxv);
@@ -408,10 +410,10 @@ mt7996_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv, u8 mode)HE_BITS (DATA1_SPTL_REUSE3_KNOWN ) |HE_BITS (DATA1_SPTL_REUSE4_KNOWN ); - he->data4 |=HE_PREP (DATA4_TB_SPTL_REUSE1 ,SR_MASK , rxv[11 ]) | -HE_PREP (DATA4_TB_SPTL_REUSE2 ,SR1_MASK , rxv[11 ]) | -HE_PREP (DATA4_TB_SPTL_REUSE3 ,SR2_MASK , rxv[11 ]) | -HE_PREP (DATA4_TB_SPTL_REUSE4 ,SR3_MASK , rxv[11 ]); + he->data4 |=HE_PREP (DATA4_TB_SPTL_REUSE1 ,SR_MASK , rxv[13 ]) | +HE_PREP (DATA4_TB_SPTL_REUSE2 ,SR1_MASK , rxv[13 ]) | +HE_PREP (DATA4_TB_SPTL_REUSE3 ,SR2_MASK , rxv[13 ]) | +HE_PREP (DATA4_TB_SPTL_REUSE4 ,SR3_MASK , rxv[13 ]);mt7996_mac_decode_he_radiotap_ru (status, he, rxv);break ;
drivers/net/wireless/mediatek/mt76/mt7996/mac.h +19 -22
61 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 390/663 wifi: mt76: mt7915: expose device tree match table
In reply to Greg Kroah-HartmanFrom: Lorenz Brun <[email protected]>
[ Upstream commit 90fb69212c60e26ef70ed0e8532b116c7649ac88 ]
On MT7986 the WiFi driver currently does not get automatically loaded, requiring manual modprobing because the device tree compatibles are not exported into metadata.
Add the missing MODULE_DEVICE_TABLE macro to fix this.
--- drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/soc.c +2 -0
@@ -1237,6 +1237,8 @@ static const struct of_device_id mt7986_wmac_of_match[] = { {}, }; +MODULE_DEVICE_TABLE (of, mt7986_wmac_of_match); +struct platform_driver mt7986_wmac_driver = { .driver = { .name ="mt7986-wmac" ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 391/663 wifi: mt76: mt7915: add error message in mt7915_thermal_set_cur_throttle_state()
In reply to Greg Kroah-HartmanFrom: Howard Hsu <[email protected]>
[ Upstream commit 2f2d86309e228adfe658c9c0a23c726d8b3ce475 ]
Add dev_err so that it is easier to see invalid setting while looking at dmesg.
Stable-dep-of: 9c97df11dfe6 ("wifi: mt76: mt7915: rework init flow in mt7915_thermal_init()")
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 12 +++++++----- drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +7 -5
@@ -146,8 +146,11 @@ mt7915_thermal_set_cur_throttle_state(struct thermal_cooling_device *cdev,u8 throttling =MT7915_THERMAL_THROTTLE_MAX - state;int ret; -if (state >MT7915_CDEV_THROTTLE_MAX ) +if (state >MT7915_CDEV_THROTTLE_MAX ) { +dev_err (phy->dev->mt76.dev, +"please specify a valid throttling state\n" );return -EINVAL ; + }if (state == phy->cdev_state)return 0 ;
@@ -176,7 +179,7 @@ static void mt7915_unregister_thermal(struct mt7915_phy *phy)struct wiphy *wiphy = phy->mt76->hw->wiphy;if (!phy->cdev) -return ; +return ;sysfs_remove_link (&wiphy->dev.kobj,"cooling_device" );thermal_cooling_device_unregister (phy->cdev);
@@ -210,8 +213,8 @@ static int mt7915_thermal_init(struct mt7915_phy *phy)return PTR_ERR (hwmon);/* initialize critical/maximum high temperature */ - phy->throttle_temp[MT7915_CRIT_TEMP_IDX ] =110 ; - phy->throttle_temp[MT7915_MAX_TEMP_IDX ] =120 ; + phy->throttle_temp[MT7915_CRIT_TEMP_IDX ] =MT7915_CRIT_TEMP ; + phy->throttle_temp[MT7915_MAX_TEMP_IDX ] =MT7915_MAX_TEMP ;return 0 ; }
@@ -1112,7 +1115,6 @@ static void mt7915_stop_hardware(struct mt7915_dev *dev)mt7986_wmac_disable (dev); } -int mt7915_register_device (struct mt7915_dev *dev) {struct ieee80211_hw *hw =mt76_hw (dev);
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +2 -0
@@ -72,6 +72,8 @@#define MT7915_CRIT_TEMP_IDX 0#define MT7915_MAX_TEMP_IDX 1 +#define MT7915_CRIT_TEMP 110 +#define MT7915_MAX_TEMP 120struct mt7915_vif ;struct mt7915_sta ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 392/663 wifi: mt76: mt7915: rework init flow in mt7915_thermal_init()
In reply to Greg Kroah-HartmanFrom: Howard Hsu <[email protected]>
[ Upstream commit 9c97df11dfe68b548a47744ba9fa6beddcfba2bc ]
If kernel do not enable CONFIG_HWMON, it may cause thermal initialization to be done with temperature value 0 and then can not transmit. This commit fixes it by setting trigger/restore temperature before checking CONFIG_HWMON.
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +4 -4
@@ -204,6 +204,10 @@ static int mt7915_thermal_init(struct mt7915_phy *phy) phy->cdev = cdev; } +/* initialize critical/maximum high temperature */ + phy->throttle_temp[MT7915_CRIT_TEMP_IDX ] =MT7915_CRIT_TEMP ; + phy->throttle_temp[MT7915_MAX_TEMP_IDX ] =MT7915_MAX_TEMP ; +if (!IS_REACHABLE (CONFIG_HWMON ))return 0 ;
@@ -212,10 +216,6 @@ static int mt7915_thermal_init(struct mt7915_phy *phy)if (IS_ERR (hwmon))return PTR_ERR (hwmon); -/* initialize critical/maximum high temperature */ - phy->throttle_temp[MT7915_CRIT_TEMP_IDX ] =MT7915_CRIT_TEMP ; - phy->throttle_temp[MT7915_MAX_TEMP_IDX ] =MT7915_MAX_TEMP ; -return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 393/663 wifi: mt76: handle failure of vzalloc in mt7615_coredump_work
In reply to Greg Kroah-HartmanFrom: Kang Chen <[email protected]>
[ Upstream commit 9e47dd9f64a47ae00ca0123017584c37209ee900 ]
vzalloc may fails, dump might be null and will cause illegal address access later.
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +5 -3
@@ -2355,7 +2355,7 @@ void mt7615_coredump_work(struct work_struct *work)break ;skb_pull (skb,sizeof (struct mt7615_mcu_rxd )); -if (data + skb->len - dump >MT76_CONNAC_COREDUMP_SZ ) { +if (!dump || data + skb->len - dump >MT76_CONNAC_COREDUMP_SZ ) {dev_kfree_skb (skb);continue ; }
@@ -2365,6 +2365,8 @@ void mt7615_coredump_work(struct work_struct *work)dev_kfree_skb (skb); } -dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ , -GFP_KERNEL ); + +if (dump) +dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ , +GFP_KERNEL ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 394/663 wifi: mt76: mt7996: let non-bufferable MMPDUs use correct hw queue
In reply to Greg Kroah-HartmanFrom: Shayne Chen <[email protected]>
[ Upstream commit d0b6f86fdbefa62fd4ad2acd1aea6c45f9b518ba ]
Pass qid into mt7996_mac_write_txwi() to let the tx descriptor of non-bufferable MMPDUs be filled with correct hw queue index.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 11 ++++++----- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +6 -5
@@ -962,8 +962,9 @@ mt7996_mac_write_txwi_80211(struct mt7996_dev *dev, __le32 *txwi, }void mt7996_mac_write_txwi (struct mt7996_dev *dev,__le32 *txwi, -struct sk_buff *skb,struct mt76_wcid *wcid,int pid, -struct ieee80211_key_conf *key,u32 changed) +struct sk_buff *skb,struct mt76_wcid *wcid, +struct ieee80211_key_conf *key,int pid, +enum mt76_txq_id qid,u32 changed) {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_vif *vif = info->control.vif;
@@ -994,7 +995,7 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, }else if (beacon) { p_fmt =MT_TX_TYPE_FW ; q_idx =MT_LMAC_BCN0 ; - }else if (skb_get_queue_mapping (skb) >=MT_TXQ_PSD ) { + }else if (qid >=MT_TXQ_PSD ) { p_fmt =MT_TX_TYPE_CT ; q_idx =MT_LMAC_ALTX0 ; }else {
@@ -1103,8 +1104,8 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,memset (txwi_ptr,0 ,MT_TXD_SIZE );/* Transmit non qos data by 802.11 header and need to fill txd by host*/ if (!is_8023 || pid >=MT_PACKET_ID_FIRST ) -mt7996_mac_write_txwi (dev, txwi_ptr, tx_info->skb, wcid, pid, - key,0 ); +mt7996_mac_write_txwi (dev, txwi_ptr, tx_info->skb, wcid, key, + pid, qid,0 ); txp = (struct mt7996_txp *)(txwi +MT_TXD_SIZE );for (i =0 ; i < nbuf; i++) {
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +3 -3
@@ -1804,8 +1804,9 @@ mt7996_mcu_beacon_cont(struct mt7996_dev *dev, struct ieee80211_vif *vif, } buf = (u8 *)bcn +sizeof (*bcn) -MAX_BEACON_SIZE ; -mt7996_mac_write_txwi (dev, (__le32 *)buf, skb, wcid,0 ,NULL , +mt7996_mac_write_txwi (dev, (__le32 *)buf, skb, wcid,NULL ,0 ,0 ,BSS_CHANGED_BEACON ); +memcpy (buf +MT_TXD_SIZE , skb->data, skb->len); }
@@ -1995,8 +1996,7 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev, buf = (u8 *)tlv +sizeof (*discov) -MAX_INBAND_FRAME_SIZE ; -mt7996_mac_write_txwi (dev, (__le32 *)buf, skb, wcid,0 ,NULL , - changed); +mt7996_mac_write_txwi (dev, (__le32 *)buf, skb, wcid,NULL ,0 ,0 , changed);memcpy (buf +MT_TXD_SIZE , skb->data, skb->len);
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +3 -2
@@ -472,8 +472,9 @@ void mt7996_mac_enable_nf(struct mt7996_dev *dev, u8 band);void mt7996_mac_enable_rtscts (struct mt7996_dev *dev,struct ieee80211_vif *vif,bool enable);void mt7996_mac_write_txwi (struct mt7996_dev *dev,__le32 *txwi, -struct sk_buff *skb,struct mt76_wcid *wcid,int pid, -struct ieee80211_key_conf *key,u32 changed); +struct sk_buff *skb,struct mt76_wcid *wcid, +struct ieee80211_key_conf *key,int pid, +enum mt76_txq_id qid,u32 changed);void mt7996_mac_set_timing (struct mt7996_phy *phy);int mt7996_mac_sta_add (struct mt76_dev *mdev,struct ieee80211_vif *vif,struct ieee80211_sta *sta);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 395/663 wifi: mt76: mt7996: fix pointer calculation in ie countdown event
In reply to Greg Kroah-HartmanFrom: Peter Chiu <[email protected]>
[ Upstream commit 8b14ce24a0297175bc4ebdf26d45a22b5a33847f ]
Fix the tail and data pointers. The rxd->len in mt7996_mcu_rxd does not include the length of general rxd. It only includes the length of firmware event rxd. Use skb->length to get the correct length.
--- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +2 -1
@@ -421,7 +421,8 @@ mt7996_mcu_ie_countdown(struct mt7996_dev *dev, struct sk_buff *skb)if (hdr->band && dev->mt76.phys[hdr->band]) mphy = dev->mt76.phys[hdr->band]; - tail = skb->data +le16_to_cpu (rxd->len); + tail = skb->data + skb->len; + data +=sizeof (struct header );while (data +sizeof (struct tlv ) < tail &&le16_to_cpu (tlv->len)) {switch (le16_to_cpu (tlv->tag)) {case UNI_EVENT_IE_COUNTDOWN_CSA :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 396/663 wifi: mt76: mt7996: fix eeprom tx path bitfields
In reply to Greg Kroah-HartmanFrom: StanleyYP Wang <[email protected]>
[ Upstream commit 72fc0df3006ce5c109f9c68f0724e44c47b4ec7b ]
Swap the tx path bitfields of band1 and band2 to read correct setting.
--- drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h +4 -4
@@ -31,11 +31,11 @@ enum mt7996_eeprom_field {#define MT_EE_WIFI_CONF2_BAND_SEL GENMASK(2, 0)#define MT_EE_WIFI_CONF1_TX_PATH_BAND0 GENMASK(5, 3) -#define MT_EE_WIFI_CONF2_TX_PATH_BAND1 GENMASK(5, 3) -#define MT_EE_WIFI_CONF2_TX_PATH_BAND2 GENMASK(2, 0) +#define MT_EE_WIFI_CONF2_TX_PATH_BAND1 GENMASK(2, 0) +#define MT_EE_WIFI_CONF2_TX_PATH_BAND2 GENMASK(5, 3)#define MT_EE_WIFI_CONF4_STREAM_NUM_BAND0 GENMASK(5, 3) -#define MT_EE_WIFI_CONF5_STREAM_NUM_BAND1 GENMASK(5, 3) -#define MT_EE_WIFI_CONF5_STREAM_NUM_BAND2 GENMASK(2, 0) +#define MT_EE_WIFI_CONF5_STREAM_NUM_BAND1 GENMASK(2, 0) +#define MT_EE_WIFI_CONF5_STREAM_NUM_BAND2 GENMASK(5, 3)#define MT_EE_RATE_DELTA_MASK GENMASK(5, 0)#define MT_EE_RATE_DELTA_SIGN BIT(6)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 397/663 wifi: mt76: add flexible polling wait-interval support
In reply to Greg Kroah-HartmanFrom: Deren Wu <[email protected]>
[ Upstream commit 35effe6c0c24adcf0f732bb1c3d75573d4c88e63 ]
The default waiting unit is 10ms and the value is too much for data path related control. Provide a new API mt76_poll_msec_tick() to support different cases, such as 1ms polling waiting kick.
Stable-dep-of: c397fc1e6365 ("wifi: mt76: mt7921e: fix probe timeout after reboot")
--- drivers/net/wireless/mediatek/mt76/mt76.h | 9 +++++---- drivers/net/wireless/mediatek/mt76/util.c | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +5 -4
@@ -908,10 +908,11 @@ bool __mt76_poll(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,#define mt76_poll (dev, ...) __mt76_poll(&((dev)->mt76), __VA_ARGS__) -bool __mt76_poll_msec (struct mt76_dev *dev,u32 offset,u32 mask,u32 val, -int timeout); - -#define mt76_poll_msec (dev, ...) __mt76_poll_msec(&((dev)->mt76), __VA_ARGS__) +bool ____mt76_poll_msec (struct mt76_dev *dev,u32 offset,u32 mask,u32 val, +int timeout,int kick); +#define __mt76_poll_msec (...) ____mt76_poll_msec(__VA_ARGS__, 10) +#define mt76_poll_msec (dev, ...) ____mt76_poll_msec(&((dev)->mt76), __VA_ARGS__, 10) +#define mt76_poll_msec_tick (dev, ...) ____mt76_poll_msec(&((dev)->mt76), __VA_ARGS__)void mt76_mmio_init (struct mt76_dev *dev,void __iomem *regs);void mt76_pci_disable_aspm (struct pci_dev *pdev);
drivers/net/wireless/mediatek/mt76/util.c +5 -5
@@ -24,23 +24,23 @@ bool __mt76_poll(struct mt76_dev *dev, u32 offset, u32 mask, u32 val, }EXPORT_SYMBOL_GPL (__mt76_poll); -bool __mt76_poll_msec (struct mt76_dev *dev,u32 offset,u32 mask,u32 val, -int timeout) +bool ____mt76_poll_msec (struct mt76_dev *dev,u32 offset,u32 mask,u32 val, +int timeout,int tick) {u32 cur; - timeout /=10 ; + timeout /= tick;do { cur =__mt76_rr (dev, offset) & mask;if (cur == val)return true; -usleep_range (10000 ,20000 ); +usleep_range (1000 * tick,2000 * tick); }while (timeout-- >0 );return false; } -EXPORT_SYMBOL_GPL (__mt76_poll_msec); +EXPORT_SYMBOL_GPL (____mt76_poll_msec);int mt76_wcid_alloc (u32 *mask,int size) {
Signature · 1 line
2.39.2