5.5.9-stable review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 10/189 netfilter: hashlimit: do not use indirect calls during gc
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 28b3a4270c0fc064557e409111f2a678e64b6fa7 ]
no need, just use a simple boolean to indicate we want to reap all entries.
--- net/netfilter/xt_hashlimit.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)
net/netfilter/xt_hashlimit.c +4 -18
@@ -358,21 +358,7 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,return 0 ; } -static bool select_all (const struct xt_hashlimit_htable *ht, -const struct dsthash_ent *he) -{ -return true; -} - -static bool select_gc (const struct xt_hashlimit_htable *ht, -const struct dsthash_ent *he) -{ -return time_after_eq (jiffies, he->expires); -} - -static void htable_selective_cleanup (struct xt_hashlimit_htable *ht, -bool (*select)(const struct xt_hashlimit_htable *ht, -const struct dsthash_ent *he)) +static void htable_selective_cleanup (struct xt_hashlimit_htable *ht,bool select_all) {unsigned int i;
@@ -382,7 +368,7 @@ static void htable_selective_cleanup(struct xt_hashlimit_htable *ht,spin_lock_bh (&ht->lock);hlist_for_each_entry_safe (dh, n, &ht->hash[i], node) { -if ((*select)(ht, dh)) +if (time_after_eq (jiffies, dh->expires) || select_all)dsthash_free (ht, dh); }spin_unlock_bh (&ht->lock);
@@ -396,7 +382,7 @@ static void htable_gc(struct work_struct *work) ht = container_of(work, struct xt_hashlimit_htable, gc_work.work); -htable_selective_cleanup (ht, select_gc); +htable_selective_cleanup (ht, false);queue_delayed_work (system_power_efficient_wq, &ht->gc_work,msecs_to_jiffies (ht->cfg.gc_interval));
@@ -420,7 +406,7 @@ static void htable_destroy(struct xt_hashlimit_htable *hinfo) {cancel_delayed_work_sync (&hinfo->gc_work);htable_remove_proc_entry (hinfo); -htable_selective_cleanup (hinfo, select_all); +htable_selective_cleanup (hinfo, true);kfree (hinfo->name);vfree (hinfo); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/189 netfilter: xt_hashlimit: unregister proc file before releasing mutex
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 99b79c3900d4627672c85d9f344b5b0f06bc2a4d ]
Before releasing the global mutex, we only unlink the hashtable from the hash list, its proc file is still not unregistered at this point. So syzbot could trigger a race condition where a parallel htable_create() could register the same file immediately after the mutex is released.
Move htable_remove_proc_entry() back to mutex protection to fix this. And, fold htable_destroy() into htable_put() to make the code slightly easier to understand.
--- net/netfilter/xt_hashlimit.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
net/netfilter/xt_hashlimit.c +6 -10
@@ -402,15 +402,6 @@ static void htable_remove_proc_entry(struct xt_hashlimit_htable *hinfo)remove_proc_entry (hinfo->name, parent); } -static void htable_destroy (struct xt_hashlimit_htable *hinfo) -{ -cancel_delayed_work_sync (&hinfo->gc_work); -htable_remove_proc_entry (hinfo); -htable_selective_cleanup (hinfo, true); -kfree (hinfo->name); -vfree (hinfo); -} -static struct xt_hashlimit_htable *htable_find_get (struct net *net,const char *name,u_int8_t family)
@@ -432,8 +423,13 @@ static void htable_put(struct xt_hashlimit_htable *hinfo) {if (refcount_dec_and_mutex_lock (&hinfo->use, &hashlimit_mutex)) {hlist_del (&hinfo->node); +htable_remove_proc_entry (hinfo);mutex_unlock (&hashlimit_mutex); -htable_destroy (hinfo); + +cancel_delayed_work_sync (&hinfo->gc_work); +htable_selective_cleanup (hinfo, true); +kfree (hinfo->name); +vfree (hinfo); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/189 ALSA: hda: do not override bus codec_mask in link_get()
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 43bcb1c0507858cdc95e425017dcc33f8105df39 ]
snd_hdac_ext_bus_link_get() does not work correctly in case there are multiple codecs on the bus. It unconditionally resets the bus->codec_mask value. As per documentation in hdaudio.h and existing use in client code, this field should be used to store bit flag of detected codecs on the bus.
By overwriting value of the codec_mask, information on all detected codecs is lost. No current user of hdac is impacted, but use of bus->codec_mask is planned in future patches for SOF.
--- sound/hda/ext/hdac_ext_controller.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/hda/ext/hdac_ext_controller.c +6 -3
@@ -254,6 +254,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all);int snd_hdac_ext_bus_link_get (struct hdac_bus *bus,struct hdac_ext_link *link) { +unsigned long codec_mask;int ret =0 ;mutex_lock (&bus->lock);
@@ -280,9 +281,11 @@ int snd_hdac_ext_bus_link_get(struct hdac_bus *bus,* HDA spec section 4.3 - Codec Discovery */ udelay (521 ); - bus->codec_mask =snd_hdac_chip_readw (bus,STATESTS ); -dev_dbg (bus->dev,"codec_mask = 0x%lx\n" , bus->codec_mask); -snd_hdac_chip_writew (bus,STATESTS , bus->codec_mask); + codec_mask =snd_hdac_chip_readw (bus,STATESTS ); +dev_dbg (bus->dev,"codec_mask = 0x%lx\n" , codec_mask); +snd_hdac_chip_writew (bus,STATESTS , codec_mask); +if (!bus->codec_mask) + bus->codec_mask = codec_mask; }mutex_unlock (&bus->lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/189 usb: gadget: composite: Support more than 500mA MaxPower
In reply to Greg Kroah-HartmanFrom: Jack Pham <[email protected]>
[ Upstream commit a2035411fa1d1206cea7d5dfe833e78481844a76 ]
USB 3.x SuperSpeed peripherals can draw up to 900mA of VBUS power when in configured state. However, if a configuration wanting to take advantage of this is added with MaxPower greater than 500 (currently possible if using a ConfigFS gadget) the composite driver fails to accommodate this for a couple reasons:
- usb_gadget_vbus_draw() when called from set_config() and composite_resume() will be passed the MaxPower value without regard for the current connection speed, resulting in a violation for USB 2.0 since the max is 500mA.
- the bMaxPower of the configuration descriptor would be incorrectly encoded, again if the connection speed is only at USB 2.0 or below, likely wrapping around U8_MAX since the 2mA multiplier corresponds to a maximum of 510mA.
Fix these by adding checks against the current gadget->speed when the c->MaxPower value is used (set_config() and composite_resume()) and appropriately limit based on whether it is currently at a low-/full-/high- or super-speed connection.
Because 900 is not divisible by 8, with the round-up division currently used in encode_bMaxPower() a MaxPower of 900mA will result in an encoded value of 0x71. When a host stack (including Linux and Windows) enumerates this on a single port root hub, it reads this value back and decodes (multiplies by 8) to get 904mA which is strictly greater than 900mA that is typically budgeted for that port, causing it to reject the configuration. Instead, we should be using the round-down behavior of normal integral division so that 900 / 8 -> 0x70 or 896mA to stay within range. And we might as well change it for the high/full/low case as well for consistency.
N.B. USB 3.2 Gen N x 2 allows for up to 1500mA but there doesn't seem to be any any peripheral controller supported by Linux that does two lane operation, so for now keeping the clamp at 900 should be fine.
--- drivers/usb/gadget/composite.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/usb/gadget/composite.c +18 -6
@@ -438,9 +438,13 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,if (!val)return 0 ;if (speed <USB_SPEED_SUPER ) -return DIV_ROUND_UP (val,2 ); +return min (val,500U ) /2 ;else -return DIV_ROUND_UP (val,8 ); +/* +* USB 3.x supports up to 900mA, but since 900 isn't divisible +* by 8 the integral division will effectively cap to 896mA. +*/ +return min (val,900U ) /8 ; } static int config_buf(struct usb_configuration *config,
@@ -852,6 +856,10 @@ static int set_config(struct usb_composite_dev *cdev,/* when we return, be sure our power usage is valid */ power = c->MaxPower ? c->MaxPower :CONFIG_USB_GADGET_VBUS_DRAW ; +if (gadget->speed <USB_SPEED_SUPER ) + power =min (power,500U ); +else + power =min (power,900U ); done:usb_gadget_vbus_draw (gadget, power);if (result >=0 && cdev->delayed_status)
@@ -2278,7 +2286,7 @@ void composite_resume(struct usb_gadget *gadget) {struct usb_composite_dev *cdev =get_gadget_data (gadget);struct usb_function *f; -u16 maxpower; +unsigned maxpower;/* REVISIT: should we have config level * suspend/resume callbacks?
@@ -2292,10 +2300,14 @@ void composite_resume(struct usb_gadget *gadget) f->resume (f); } - maxpower = cdev->config->MaxPower; + maxpower = cdev->config->MaxPower ? + cdev->config->MaxPower :CONFIG_USB_GADGET_VBUS_DRAW ; +if (gadget->speed <USB_SPEED_SUPER ) + maxpower =min (maxpower,500U ); +else + maxpower =min (maxpower,900U ); -usb_gadget_vbus_draw (gadget, maxpower ? - maxpower :CONFIG_USB_GADGET_VBUS_DRAW ); +usb_gadget_vbus_draw (gadget, maxpower); } cdev->suspended =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/189 selftests: fix too long argument
In reply to Greg Kroah-HartmanFrom: Jiri Benc <[email protected]>
[ Upstream commit c363eb48ada5cf732b3f489fab799fc881097842 ]
With some shells, the command construed for install of bpf selftests becomes too large due to long list of files:
make[1]: execvp: /bin/sh: Argument list too long
make[1]: *** [../lib.mk:73: install] Error 127
Currently, each of the file lists is replicated three times in the command:
in the shell 'if' condition, in the 'echo' and in the 'rsync'. Reduce that by one instance by using make conditionals and separate the echo and rsync into two shell commands. (One would be inclined to just remove the '@' at the beginning of the rsync command and let 'make' echo it by itself; unfortunately, it appears that the '@' in the front of mkdir silences output also for the following commands.)
Also, separate handling of each of the lists to its own shell command.
The semantics of the makefile is unchanged before and after the patch. The ability of individual test directories to override INSTALL_RULE is retained.
--- tools/testing/selftests/lib.mk | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
tools/testing/selftests/lib.mk +13 -10
@@ -83,17 +83,20 @@ else $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS)) endif +define INSTALL_SINGLE_RULE + $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) + $(if $(INSTALL_LIST),@echo rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) + $(if $(INSTALL_LIST),@rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) +endef + define INSTALL_RULE - @if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \ - mkdir -p ${INSTALL_PATH}; \ - echo "rsync -a $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/"; \ - rsync -a $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/; \ - fi - @if [ "X$(TEST_GEN_PROGS)$(TEST_CUSTOM_PROGS)$(TEST_GEN_PROGS_EXTENDED)$(TEST_GEN_FILES)" != "X" ]; then \ - mkdir -p ${INSTALL_PATH}; \ - echo "rsync -a $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/"; \ - rsync -a $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) $(INSTALL_PATH)/; \ - fi + $(eval INSTALL_LIST = $(TEST_PROGS)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(TEST_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(TEST_FILES)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(TEST_GEN_PROGS)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(TEST_CUSTOM_PROGS)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(TEST_GEN_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE) + $(eval INSTALL_LIST = $(TEST_GEN_FILES)) $(INSTALL_SINGLE_RULE) endef install: all
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/189 usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
In reply to Greg Kroah-HartmanFrom: Lars-Peter Clausen <[email protected]>
[ Upstream commit 43d565727a3a6fd24e37c7c2116475106af71806 ]
ffs_aio_cancel() can be called from both interrupt and thread context. Make sure that the current IRQ state is saved and restored by using spin_{un,}lock_irq{save,restore}().
Otherwise undefined behavior might occur.
--- drivers/usb/gadget/function/f_fs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_fs.c +3 -2
@@ -1162,18 +1162,19 @@ static int ffs_aio_cancel(struct kiocb *kiocb) {struct ffs_io_data *io_data = kiocb->private;struct ffs_epfile *epfile = kiocb->ki_filp->private_data; +unsigned long flags;int value;ENTER (); -spin_lock_irq (&epfile->ffs->eps_lock); +spin_lock_irqsave (&epfile->ffs->eps_lock, flags);if (likely (io_data && io_data->ep && io_data->req)) value =usb_ep_dequeue (io_data->ep, io_data->req);else value = -EINVAL ; -spin_unlock_irq (&epfile->ffs->eps_lock); +spin_unlock_irqrestore (&epfile->ffs->eps_lock, flags);return value; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/189 habanalabs: halt the engines before hard-reset
In reply to Greg Kroah-HartmanFrom: Oded Gabbay <[email protected]>
[ Upstream commit 908087ffbe896c100ed73d5f0ce11a5b7264af4a ]
The driver must halt the engines before doing hard-reset, otherwise the device can go into undefined state. There is a place where the driver didn't do that and this patch fixes it.
--- drivers/misc/habanalabs/device.c | 1 + drivers/misc/habanalabs/goya/goya.c | 42 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
drivers/misc/habanalabs/device.c +1 -0
@@ -1189,6 +1189,7 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)if (hdev->asic_funcs->get_hw_state (hdev) ==HL_DEVICE_HW_STATE_DIRTY ) {dev_info (hdev->dev,"H/W state is dirty, must reset before initializing\n" ); + hdev->asic_funcs->halt_engines (hdev, true); hdev->asic_funcs->hw_fini (hdev, true); }
drivers/misc/habanalabs/goya/goya.c +42 -0
95 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/189 usb: gadget: serial: fix Tx stall after buffer overflow
In reply to Greg Kroah-HartmanFrom: Sergey Organov <[email protected]>
[ Upstream commit e4bfded56cf39b8d02733c1e6ef546b97961e18a ]
Symptom: application opens /dev/ttyGS0 and starts sending (writing) to it while either USB cable is not connected, or nobody listens on the other side of the cable. If driver circular buffer overflows before connection is established, no data will be written to the USB layer until/unless /dev/ttyGS0 is closed and re-opened again by the application (the latter besides having no means of being notified about the event of establishing of the connection.)
Fix: on open and/or connect, kick Tx to flush circular buffer data to USB layer.
--- drivers/usb/gadget/function/u_serial.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/gadget/function/u_serial.c +3 -1
@@ -561,8 +561,10 @@ static int gs_start_io(struct gs_port *port) port->n_read =0 ; started =gs_start_rx (port); -/* unblock any pending writes into our circular buffer */ if (started) { +gs_start_tx (port); +/* Unblock any pending writes into our circular buffer, in case +* we didn't in gs_start_tx() */ tty_wakeup (port->port.tty); }else {gs_free_requests (ep, head, &port->read_allocated);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/189 block, bfq: get a ref to a group when adding it to a service tree
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit db37a34c563bf4692b36990ae89005c031385e52 ]
BFQ schedules generic entities, which may represent either bfq_queues or groups of bfq_queues. When an entity is inserted into a service tree, a reference must be taken, to make sure that the entity does not disappear while still referred in the tree. Unfortunately, such a reference is mistakenly taken only if the entity represents a bfq_queue. This commit takes a reference also in case the entity represents a group.
--- block/bfq-cgroup.c | 2 +- block/bfq-iosched.h | 1 + block/bfq-wf2q.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-)
block/bfq-cgroup.c +1 -1
@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)kfree (bfqg); } -static void bfqg_and_blkg_get (struct bfq_group *bfqg) +void bfqg_and_blkg_get (struct bfq_group *bfqg) {/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */ bfqg_get (bfqg);
block/bfq-iosched.h +1 -0
@@ -984,6 +984,7 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,struct blkcg_gq *bfqg_to_blkg (struct bfq_group *bfqg);struct bfq_group *bfqq_group (struct bfq_queue *bfqq);struct bfq_group *bfq_create_group_hierarchy (struct bfq_data *bfqd,int node); +void bfqg_and_blkg_get (struct bfq_group *bfqg);void bfqg_and_blkg_put (struct bfq_group *bfqg);#ifdef CONFIG_BFQ_GROUP_IOSCHED
block/bfq-wf2q.c +10 -2
@@ -536,7 +536,9 @@ static void bfq_get_entity(struct bfq_entity *entity) bfqq->ref++;bfq_log_bfqq (bfqq->bfqd, bfqq,"get_entity: %p %d" , bfqq, bfqq->ref); - } + } else +bfqg_and_blkg_get (container_of (entity ,struct bfq_group , +entity )); }/**
@@ -650,8 +652,14 @@ static void bfq_forget_entity(struct bfq_service_tree *st, entity->on_st = false; st->wsum -= entity->weight; -if (bfqq && !is_in_service) +if (is_in_service) +return ; + +if (bfqq)bfq_put_queue (bfqq); +else + bfqg_and_blkg_put(container_of(entity, struct bfq_group, + entity)); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/189 habanalabs: do not halt CoreSight during hard reset
In reply to Greg Kroah-HartmanFrom: Omer Shpigelman <[email protected]>
[ Upstream commit a37e47192dfa98f79a0cd5ab991c224b5980c982 ]
During hard reset we must not write to the device.
Hence avoid halting CoreSight during user context close if it is done during hard reset.
In addition, we must not re-enable clock gating afterwards as it was deliberately disabled in the beginning of the hard reset flow.
--- drivers/misc/habanalabs/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/misc/habanalabs/device.c +3 -1
@@ -598,7 +598,9 @@ int hl_device_set_debug_mode(struct hl_device *hdev, bool enable) goto out; } - hdev->asic_funcs->halt_coresight (hdev); +if (!hdev->hard_reset_pending) + hdev->asic_funcs->halt_coresight (hdev); + hdev->in_debug =0 ; goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/189 drm/msm/mdp5: rate limit pp done timeout warnings
In reply to Greg Kroah-HartmanFrom: Brian Masney <[email protected]>
[ Upstream commit ef8c9809acb0805c991bba8bdd4749fc46d44a98 ]
Add rate limiting of the 'pp done time out' warnings since these warnings can quickly fill the dmesg buffer.
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +2 -2
@@ -1109,8 +1109,8 @@ static void mdp5_crtc_wait_for_pp_done(struct drm_crtc *crtc) ret =wait_for_completion_timeout (&mdp5_crtc->pp_completion,msecs_to_jiffies (50 ));if (ret ==0 ) -dev_warn (dev->dev,"pp done time out, lm=%d\n" , - mdp5_cstate->pipeline.mixer->lm); +dev_warn_ratelimited (dev->dev,"pp done time out, lm=%d\n" , + mdp5_cstate->pipeline.mixer->lm); }static void mdp5_crtc_wait_for_flush_done (struct drm_crtc *crtc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/189 drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
[ Upstream commit 7fd2dfc3694922eb7ace4801b7208cf9f62ebc7d ]
I was hitting kCFI crashes when building with clang, and after some digging finally narrowed it down to the dsi_mgr_connector_mode_valid() function being implemented as returning an int, instead of an enum drm_mode_status.
This patch fixes it, and appeases the opaque word of the kCFI gods (seriously, clang inlining everything makes the kCFI backtraces only really rough estimates of where things went wrong).
Thanks as always to Sami for his help narrowing this down.
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dsi/dsi_manager.c +1 -1
@@ -336,7 +336,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)return num; } -static int dsi_mgr_connector_mode_valid (struct drm_connector *connector, +static enum drm_mode_status dsi_mgr_connector_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {int id =dsi_mgr_connector_get_id (connector);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/189 drm/modes: Make sure to parse valid rotation value from cmdline
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit e6980a727154b793adb218fbc7b4d6af52a7e364 ]
A rotation value should have exactly one rotation angle. At the moment there is no validation for this when parsing video= parameters from the command line. This causes problems later on when we try to combine the command line rotation with the panel orientation.
To make sure that we generate a valid rotation value:
- Set DRM_MODE_ROTATE_0 by default (if no rotate= option is set)
- Validate that there is exactly one rotation angle set (i.e. specifying the rotate= option multiple times is invalid)
--- drivers/gpu/drm/drm_modes.c | 7 +++++++ drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 1 + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_modes.c +7 -0
@@ -1672,6 +1672,13 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len, } } +if (!(rotation &DRM_MODE_ROTATE_MASK )) + rotation |=DRM_MODE_ROTATE_0 ; + +/* Make sure there is exactly one rotation defined */ +if (!is_power_of_2 (rotation &DRM_MODE_ROTATE_MASK )) +return -EINVAL ; + mode->rotation_reflection = rotation;return 0 ;
drivers/gpu/drm/selftests/drm_cmdline_selftests.h +1 -0
@@ -53,6 +53,7 @@ cmdline_test(drm_cmdline_test_rotate_0) cmdline_test(drm_cmdline_test_rotate_90) cmdline_test(drm_cmdline_test_rotate_180) cmdline_test(drm_cmdline_test_rotate_270) +cmdline_test(drm_cmdline_test_rotate_multiple) cmdline_test(drm_cmdline_test_rotate_invalid_val) cmdline_test(drm_cmdline_test_rotate_truncated) cmdline_test(drm_cmdline_test_hmirror)
drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +13 -2
@@ -856,6 +856,17 @@ static int drm_cmdline_test_rotate_270(void *ignored)return 0 ; } +static int drm_cmdline_test_rotate_multiple (void *ignored) +{ +struct drm_cmdline_mode mode = { }; + +FAIL_ON (drm_mode_parse_command_line_for_connector ("720x480,rotate=0,rotate=90" , + &no_connector, + &mode)); + +return 0 ; +} +static int drm_cmdline_test_rotate_invalid_val (void *ignored) {struct drm_cmdline_mode mode = { };
@@ -888,7 +899,7 @@ static int drm_cmdline_test_hmirror(void *ignored)FAIL_ON (!mode.specified);FAIL_ON (mode.xres !=720 );FAIL_ON (mode.yres !=480 ); -FAIL_ON (mode.rotation_reflection !=DRM_MODE_REFLECT_X ); +FAIL_ON (mode.rotation_reflection != (DRM_MODE_ROTATE_0 |DRM_MODE_REFLECT_X ));FAIL_ON (mode.refresh_specified);
@@ -913,7 +924,7 @@ static int drm_cmdline_test_vmirror(void *ignored)FAIL_ON (!mode.specified);FAIL_ON (mode.xres !=720 );FAIL_ON (mode.yres !=480 ); -FAIL_ON (mode.rotation_reflection !=DRM_MODE_REFLECT_Y ); +FAIL_ON (mode.rotation_reflection != (DRM_MODE_ROTATE_0 |DRM_MODE_REFLECT_Y ));FAIL_ON (mode.refresh_specified);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/189 scsi: megaraid_sas: silence a warning
In reply to Greg Kroah-HartmanFrom: Tomas Henzl <[email protected]>
[ Upstream commit 0e99b2c625da181aebf1a3d13493e3f7a5057a9c ]
Add a flag to DMA memory allocation to silence a warning.
This driver allocates DMA memory for IO frames. This allocation may exceed MAX_ORDER pages for few megaraid_sas controllers (controllers with very high queue depth). Consequently, the driver has logic to keep reducing the controller queue depth until the DMA memory allocation succeeds.
On impacted megaraid_sas controllers there would be multiple DMA allocation failures until driver settled on an allocation that fit. These failed DMA allocation requests caused stack traces in system logs. These were not harmful and this patch silences those warnings/stack traces.
[mkp: clarified commit desc]
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +3 -2
@@ -594,7 +594,8 @@ megasas_alloc_request_fusion(struct megasas_instance *instance) fusion->io_request_frames =dma_pool_alloc (fusion->io_request_frames_pool, -GFP_KERNEL , &fusion->io_request_frames_phys); +GFP_KERNEL | __GFP_NOWARN, + &fusion->io_request_frames_phys);if (!fusion->io_request_frames) {if (instance->max_fw_cmds >= (MEGASAS_REDUCE_QD_COUNT *2 )) { instance->max_fw_cmds -=MEGASAS_REDUCE_QD_COUNT ;
@@ -632,7 +633,7 @@ megasas_alloc_request_fusion(struct megasas_instance *instance) fusion->io_request_frames =dma_pool_alloc (fusion->io_request_frames_pool, -GFP_KERNEL , +GFP_KERNEL | __GFP_NOWARN, &fusion->io_request_frames_phys);if (!fusion->io_request_frames) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/189 drm/msm/dsi: save pll state before dsi host is powered off
In reply to Greg Kroah-HartmanFrom: Harigovindan P <[email protected]>
[ Upstream commit a1028dcfd0dd97884072288d0c8ed7f30399b528 ]
Save pll state before dsi host is powered off. Without this change some register values gets resetted.
--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 5 +++++ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_manager.c +5 -0
@@ -479,6 +479,7 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge)struct msm_dsi *msm_dsi1 =dsi_mgr_get_dsi (DSI_1 );struct mipi_dsi_host *host = msm_dsi->host;struct drm_panel *panel = msm_dsi->panel; +struct msm_dsi_pll *src_pll;bool is_dual_dsi =IS_DUAL_DSI ();int ret;
@@ -519,6 +520,10 @@ static void dsi_mgr_bridge_post_disable(struct drm_bridge *bridge) id, ret); } +/* Save PLL status if it is a clock source */ + src_pll =msm_dsi_phy_get_pll (msm_dsi->phy); +msm_dsi_pll_save_state (src_pll); + ret =msm_dsi_host_power_off (host);if (ret)pr_err ("%s: host %d power off failed,%d\n" , __func__, id, ret);
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +0 -4
@@ -724,10 +724,6 @@ void msm_dsi_phy_disable(struct msm_dsi_phy *phy)if (!phy || !phy->cfg->ops.disable)return ; -/* Save PLL status if it is a clock source */ -if (phy->usecase !=MSM_DSI_PHY_SLAVE ) -msm_dsi_pll_save_state (phy->pll); - phy->cfg->ops.disable (phy);dsi_phy_regulator_disable (phy);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/189 drm/msm/dsi/pll: call vco set rate explicitly
In reply to Greg Kroah-HartmanFrom: Harigovindan P <[email protected]>
[ Upstream commit c6659785dfb3f8d75f1fe637e4222ff8178f5280 ]
For a given byte clock, if VCO recalc value is exactly same as vco set rate value, vco_set_rate does not get called assuming VCO is already set to required value. But Due to GDSC toggle, VCO values are erased in the HW. To make sure VCO is programmed correctly, we forcefully call set_rate from vco_prepare.
--- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +6 -0
@@ -411,6 +411,12 @@ static int dsi_pll_10nm_vco_prepare(struct clk_hw *hw)if (pll_10nm->slave)dsi_pll_enable_pll_bias (pll_10nm->slave); + rc =dsi_pll_10nm_vco_set_rate (hw,pll_10nm->vco_current_rate,0 ); +if (rc) { +pr_err ("vco_set_rate failed, rc=%d\n" , rc); +return rc; + } +/* Start PLL */ pll_write (pll_10nm->phy_cmn_mmio + REG_DSI_10nm_PHY_CMN_PLL_CNTRL,0x01 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/189 selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit e8023b030ce1748930e2dc76353a262fe47d4745 ]
For tc ip_proto filter, when we extract the flow via __skb_flow_dissect() without flag FLOW_DISSECTOR_F_STOP_AT_ENCAP, we will continue extract to the inner proto.
So for GRE + ICMP messages, we should not track GRE proto, but inner ICMP proto.
For test mirror_gre.sh, it may make user confused if we capture ICMP message on $h3(since the flow is GRE message). So I move the capture dev to h3-gt{4,6}, and only capture ICMP message.
Before the fix:
]# ./mirror_gre.sh
TEST: ingress mirror to gretap (skip_hw) [ OK ]
TEST: egress mirror to gretap (skip_hw) [ OK ]
TEST: ingress mirror to ip6gretap (skip_hw) [ OK ]
TEST: egress mirror to ip6gretap (skip_hw) [ OK ]
TEST: ingress mirror to gretap: envelope MAC (skip_hw) [FAIL]
Expected to capture 10 packets, got 0.
TEST: egress mirror to gretap: envelope MAC (skip_hw) [FAIL]
Expected to capture 10 packets, got 0.
TEST: ingress mirror to ip6gretap: envelope MAC (skip_hw) [FAIL]
Expected to capture 10 packets, got 0.
TEST: egress mirror to ip6gretap: envelope MAC (skip_hw) [FAIL]
Expected to capture 10 packets, got 0.
TEST: two simultaneously configured mirrors (skip_hw) [ OK ]
WARN: Could not test offloaded functionality
After fix:
]# ./mirror_gre.sh
TEST: ingress mirror to gretap (skip_hw) [ OK ]
TEST: egress mirror to gretap (skip_hw) [ OK ]
TEST: ingress mirror to ip6gretap (skip_hw) [ OK ]
TEST: egress mirror to ip6gretap (skip_hw) [ OK ]
TEST: ingress mirror to gretap: envelope MAC (skip_hw) [ OK ]
TEST: egress mirror to gretap: envelope MAC (skip_hw) [ OK ]
TEST: ingress mirror to ip6gretap: envelope MAC (skip_hw) [ OK ]
TEST: egress mirror to ip6gretap: envelope MAC (skip_hw) [ OK ]
TEST: two simultaneously configured mirrors (skip_hw) [ OK ]
WARN: Could not test offloaded functionality
--- .../selftests/net/forwarding/mirror_gre.sh | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-)
tools/testing/selftests/net/forwarding/mirror_gre.sh +13 -12
@@ -63,22 +63,23 @@ test_span_gre_mac() { local tundev=$1; shift local direction=$1; shift - local prot=$1; shift local what=$1; shift - local swp3mac=$(mac_get $swp3) - local h3mac=$(mac_get $h3) + case "$direction" in + ingress) local src_mac=$(mac_get $h1); local dst_mac=$(mac_get $h2) + ;; + egress) local src_mac=$(mac_get $h2); local dst_mac=$(mac_get $h1) + ;; + esac RET=0 mirror_install $swp1 $direction $tundev "matchall $tcflags" - tc filter add dev $h3 ingress pref 77 prot $prot \ - flower ip_proto 0x2f src_mac $swp3mac dst_mac $h3mac \ - action pass + icmp_capture_install h3-${tundev} "src_mac $src_mac dst_mac $dst_mac" - mirror_test v$h1 192.0.2.1 192.0.2.2 $h3 77 10 + mirror_test v$h1 192.0.2.1 192.0.2.2 h3-${tundev} 100 10 - tc filter del dev $h3 ingress pref 77 + icmp_capture_uninstall h3-${tundev} mirror_uninstall $swp1 $direction log_test "$direction $what: envelope MAC ($tcflags)"
@@ -120,14 +121,14 @@ test_ip6gretap() test_gretap_mac() { - test_span_gre_mac gt4 ingress ip "mirror to gretap" - test_span_gre_mac gt4 egress ip "mirror to gretap" + test_span_gre_mac gt4 ingress "mirror to gretap" + test_span_gre_mac gt4 egress "mirror to gretap" } test_ip6gretap_mac() { - test_span_gre_mac gt6 ingress ipv6 "mirror to ip6gretap" - test_span_gre_mac gt6 egress ipv6 "mirror to ip6gretap" + test_span_gre_mac gt6 ingress "mirror to ip6gretap" + test_span_gre_mac gt6 egress "mirror to ip6gretap" } test_all()
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/189 block, bfq: get extra ref to prevent a queue from being freed during a group move
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit ecedd3d7e19911ab8fe42f17b77c0a30fe7f4db3 ]
In bfq_bfqq_move(), the bfq_queue, say Q, to be moved to a new group may happen to be deactivated in the scheduling data structures of the source group (and then activated in the destination group). If Q is referred only by the data structures in the source group when the deactivation happens, then Q is freed upon the deactivation.
This commit addresses this issue by getting an extra reference before the possible deactivation, and releasing this extra reference after Q has been moved.
--- block/bfq-cgroup.c | 8 ++++++++ 1 file changed, 8 insertions(+)
block/bfq-cgroup.c +8 -0
@@ -651,6 +651,12 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,bfq_bfqq_expire (bfqd, bfqd->in_service_queue, false,BFQQE_PREEMPTED ); +/* +* get extra reference to prevent bfqq from being freed in +* next possible deactivate +*/ + bfqq->ref++; +if (bfq_bfqq_busy (bfqq))bfq_deactivate_bfqq (bfqd, bfqq, false, false);else if (entity->on_st)
@@ -670,6 +676,8 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,if (!bfqd->in_service_queue && !bfqd->rq_in_driver)bfq_schedule_dispatch (bfqd); +/* release extra ref taken above */ +bfq_put_queue (bfqq); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/189 selftests: forwarding: vxlan_bridge_1d: fix tos value
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 4e867c9a50ff1a07ed0b86c3b1c8bc773933d728 ]
After commit 71130f29979c ("vxlan: fix tos value before xmit") we start strict vxlan xmit tos value by RT_TOS(), which limits the tos value less than 0x1E. With current value 0x40 the test will failed with "v1: Expected to capture 10 packets, got 0". So let's choose a smaller tos value for testing.
--- tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh +3 -3
@@ -516,9 +516,9 @@ test_tos() RET=0 tc filter add dev v1 egress pref 77 prot ip \ - flower ip_tos 0x40 action pass - vxlan_ping_test $h1 192.0.2.3 "-Q 0x40" v1 egress 77 10 - vxlan_ping_test $h1 192.0.2.3 "-Q 0x30" v1 egress 77 0 + flower ip_tos 0x11 action pass + vxlan_ping_test $h1 192.0.2.3 "-Q 0x11" v1 egress 77 10 + vxlan_ping_test $h1 192.0.2.3 "-Q 0x12" v1 egress 77 0 tc filter del dev v1 egress pref 77 prot ip log_test "VXLAN: envelope TOS inheritance"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/189 block, bfq: do not insert oom queue into position tree
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit 32c59e3a9a5a0b180dd015755d6d18ca31e55935 ]
BFQ maintains an ordered list, implemented with an RB tree, of head-request positions of non-empty bfq_queues. This position tree, inherited from CFQ, is used to find bfq_queues that contain I/O close to each other. BFQ merges these bfq_queues into a single shared queue, if this boosts throughput on the device at hand.
There is however a special-purpose bfq_queue that does not participate in queue merging, the oom bfq_queue. Yet, also this bfq_queue could be wrongly added to the position tree. So bfqq_find_close() could return the oom bfq_queue, which is a source of further troubles in an out-of-memory situation. This commit prevents the oom bfq_queue from being inserted into the position tree.
--- block/bfq-iosched.c | 4 ++++ 1 file changed, 4 insertions(+)
block/bfq-iosched.c +4 -0
@@ -614,6 +614,10 @@ bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq) bfqq->pos_root =NULL ; } +/* oom_bfqq does not participate in queue merging */ +if (bfqq == &bfqd->oom_bfqq) +return ; +/* * bfqq cannot be merged any longer (see comments in * bfq_setup_cooperator): no point in adding bfqq into the
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/189 net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 98c5f7d44fef309e692c24c6d71131ee0f0871fb ]
We are still experiencing some packet loss with the existing advanced congestion buffering (ACB) settings with the IMP port configured for 2Gb/sec, so revert to conservative link speeds that do not produce packet loss until this is resolved.
--- drivers/net/dsa/bcm_sf2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/dsa/bcm_sf2.c +1 -2
@@ -69,8 +69,7 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)/* Force link status for IMP port */ reg =core_readl (priv, offset); reg |= (MII_SW_OR |LINK_STS ); -if (priv->type ==BCM7278_DEVICE_ID ) - reg |=GMII_SPEED_UP_2G ; + reg &= ~GMII_SPEED_UP_2G ;core_writel (priv, reg, offset);/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/189 RDMA/core: Fix use of logical OR in get_new_pps
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 4ca501d6aaf21de31541deac35128bbea8427aa6 ]
Clang warns:
../drivers/infiniband/core/security.c:351:41: warning: converting the enum constant to a boolean [-Wint-in-bool-context]
if (!(qp_attr_mask & (IB_QP_PKEY_INDEX || IB_QP_PORT)) && qp_pps) {
^1 warning generated.
A bitwise OR should have been used instead.
--- drivers/infiniband/core/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/security.c +1 -1
@@ -352,7 +352,7 @@ static struct ib_ports_pkeys *get_new_pps(const struct ib_qp *qp,if ((qp_attr_mask &IB_QP_PKEY_INDEX ) && (qp_attr_mask &IB_QP_PORT )) new_pps->main.state =IB_PORT_PKEY_VALID ; -if (!(qp_attr_mask & (IB_QP_PKEY_INDEX ||IB_QP_PORT )) && qp_pps) { +if (!(qp_attr_mask & (IB_QP_PKEY_INDEX |IB_QP_PORT )) && qp_pps) { new_pps->main.port_num = qp_pps->main.port_num; new_pps->main.pkey_index = qp_pps->main.pkey_index;if (qp_pps->main.state !=IB_PORT_PKEY_NOT_VALID )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/189 dm thin metadata: fix lockdep complaint
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
[ Upstream commit 3918e0667bbac99400b44fa5aef3f8be2eeada4a ]
[ 3934.173244] ======================================================
[ 3934.179572] WARNING: possible circular locking dependency detected
[ 3934.185884] 5.4.21-xfstests #1 Not tainted
[ 3934.190151] ------------------------------------------------------
[ 3934.196673] dmsetup/8897 is trying to acquire lock:
[ 3934.201688] ffffffffbce82b18 (shrinker_rwsem){++++}, at: unregister_shrinker+0x22/0x80
[ 3934.210268]
but task is already holding lock:
[ 3934.216489] ffff92a10cc5e1d0 (&pmd->root_lock){++++}, at: dm_pool_metadata_close+0xba/0x120
[ 3934.225083]
which lock already depends on the new lock.[ 3934.564165] Chain exists of:
shrinker_rwsem --> &journal->j_checkpoint_mutex --> &pmd->root_lockFor a more detailed lockdep report, please see:
https://lore.kernel.org/r/[email protected]
We shouldn't need to hold the lock while are just tearing down and freeing the whole metadata pool structure.
--- drivers/md/dm-thin-metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-thin-metadata.c +1 -1
@@ -960,9 +960,9 @@ int dm_pool_metadata_close(struct dm_pool_metadata *pmd)DMWARN ("%s: __commit_transaction() failed, error = %d" , __func__, r); } +pmd_write_unlock (pmd);if (!pmd->fail_io)__destroy_persistent_data_objects (pmd); -pmd_write_unlock (pmd);kfree (pmd);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/189 blktrace: fix dereference after null check
In reply to Greg Kroah-HartmanFrom: Cengiz Can <[email protected]>
[ Upstream commit 153031a301bb07194e9c37466cfce8eacb977621 ]
There was a recent change in blktrace.c that added a RCU protection to q->blk_trace in order to fix a use-after-free issue during access.
However the change missed an edge case that can lead to dereferencing of bt pointer even when it's NULL:
Coverity static analyzer marked this as a FORWARD_NULL issue with CID 1460458.
```
/kernel/trace/blktrace.c: 1904 in sysfs_blk_trace_attr_store()
1898 ret = 0;
1899 if (bt == NULL)
1900 ret = blk_trace_setup_queue(q, bdev);
1901
1902 if (ret == 0) {
1903 if (attr == &dev_attr_act_mask)
>>> CID 1460458: Null pointer dereferences (FORWARD_NULL)
>>> Dereferencing null pointer "bt".
1904 bt->act_mask = value;
1905 else if (attr == &dev_attr_pid)
1906 bt->pid = value;
1907 else if (attr == &dev_attr_start_lba)
1908 bt->start_lba = value;
1909 else if (attr == &dev_attr_end_lba)
```Added a reassignment with RCU annotation to fix the issue.
--- kernel/trace/blktrace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/blktrace.c +4 -1
@@ -1896,8 +1896,11 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev, } ret =0 ; -if (bt ==NULL ) +if (bt ==NULL ) { ret =blk_trace_setup_queue (q, bdev); + bt =rcu_dereference_protected (q->blk_trace, +lockdep_is_held (&q->blk_trace_mutex)); + }if (ret ==0 ) {if (attr == &dev_attr_act_mask)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 5.5.9-stable review
This is the start of the stable review cycle for the 5.5.9 release. There are 189 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 12 Mar 2020 12:34:10 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.5.9-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.5.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.5.9-rc1
Aaro Koskinen <[email protected]>
net: stmmac: fix notifier registration
Jason A. Donenfeld <[email protected]>
efi: READ_ONCE rng seed size before munmap
Ard Biesheuvel <[email protected]>
efi/x86: Handle by-ref arguments covering multiple pages in mixed mode
Ard Biesheuvel <[email protected]>
efi/x86: Align GUIDs to their size in the mixed mode runtime wrapper
Desnes A. Nunes do Rosario <[email protected]>
powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems
Sherry Sun <[email protected]>
EDAC/synopsys: Do not print an error with back-to-back snprintf() calls
Sébastien Szymanski <[email protected]>
dt-bindings: arm: fsl: fix APF6Dev compatible
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix 1-wire reset quirk
Christian Hewitt <[email protected]>
arm64: dts: meson: fix gxm-khadas-vim2 wifi
Vincent Guittot <[email protected]>
sched/fair: Fix statistics for find_idlest_group()
Dan Carpenter <[email protected]>
dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()
Cong Wang <[email protected]>
dma-buf: free dmabuf->name in dma_buf_release()
Dan Carpenter <[email protected]>
hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
Oleksandr Suvorov <[email protected]>
ARM: dts: imx7-colibri: Fix frequency for sd/mmc
Johan Hovold <[email protected]>
ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties
Suman Anna <[email protected]>
ARM: dts: dra7xx-clocks: Fixup IPU1 mux clock parent source
Suman Anna <[email protected]>
ARM: dts: am437x-idk-evm: Fix incorrect OPP node names
Peng Fan <[email protected]>
ARM: dts: imx7d: fix opp-supported-hw
Ahmad Fatoum <[email protected]>
ARM: imx: build v7_cpu_resume() unconditionally
Dennis Dalessandro <[email protected]>
IB/hfi1, qib: Ensure RCU is locked when accessing list
Artemy Kovalyov <[email protected]>
IB/mlx5: Fix implicit ODP race
Jason Gunthorpe <[email protected]>
RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()
Petr Vorel <[email protected]>
regulator: qcom_spmi: Fix docs for PM8004
Fabrice Gasnier <[email protected]>
regulator: stm32-vrefbuf: fix a possible overshoot when re-enabling
Maor Gottlieb <[email protected]>
RDMA/core: Fix protection fault in ib_mr_pool_destroy
Bernard Metzler <[email protected]>
RDMA/iwcm: Fix iwcm work deallocation
Bernard Metzler <[email protected]>
RDMA/siw: Fix failure handling during device creation
Mark Zhang <[email protected]>
RDMA/nldev: Fix crash when set a QP to a new counter but QPN is missing
Jason Gunthorpe <[email protected]>
RDMA/odp: Ensure the mm is still alive before creating an implicit child
Max Gurtovoy <[email protected]>
RDMA/rw: Fix error flow during RDMA context initialization
Parav Pandit <[email protected]>
Revert "RDMA/cma: Simplify rdma_resolve_addr() error flow"
Leonard Crestez <[email protected]>
soc: imx-scu: Align imx sc msg structs to 4
Leonard Crestez <[email protected]>
firmware: imx: Align imx_sc_msg_req_cpu_start to 4
Leonard Crestez <[email protected]>
firmware: imx: scu-pd: Align imx sc msg structs to 4
Leonard Crestez <[email protected]>
firmware: imx: misc: Align imx sc msg structs to 4
Fabio Estevam <[email protected]>
arm64: dts: imx8qxp-mek: Remove unexisting Ethernet PHY
Marco Felsch <[email protected]>
ARM: dts: imx6: phycore-som: fix emmc supply
Tony Lindgren <[email protected]>
phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval
Tony Lindgren <[email protected]>
phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling
Chris Wilson <[email protected]>
drm/i915/perf: Reintroduce wait on OA configuration completion
Dan Carpenter <[email protected]>
drm/i915/selftests: Fix return in assert_mmap_offset()
Matt Roper <[email protected]>
drm/i915: Program MBUS with rmw during initialization
Jernej Skrabec <[email protected]>
drm/sun4i: de2/de3: Remove unsupported VI layer formats
Jernej Skrabec <[email protected]>
drm/sun4i: Fix DE2 VI layer format support
Jernej Skrabec <[email protected]>
drm/sun4i: Add separate DE3 VI layer formats
John Stultz <[email protected]>
drm: kirin: Revert "Fix for hikey620 display offset problem"
Ahzo <[email protected]>
drm/ttm: fix leaking fences via ttm_buffer_object_transfer
Phong LE <[email protected]>
drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly
Tomeu Vizoso <[email protected]>
drm/panfrost: Don't try to map on error faults
Tudor Ambarus <[email protected]>
spi: atmel-quadspi: fix possible MMIO window size overrun
Kuninori Morimoto <[email protected]>
ASoC: soc-component: tidyup snd_soc_pcm_component_sync_stop()
Charles Keepax <[email protected]>
ASoC: dapm: Correct DAPM handling of active widgets during shutdown
Amadeusz Sławiński <[email protected]>
ASoC: Intel: Skylake: Fix available clock counter incrementation
Matthias Reichl <[email protected]>
ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path
Takashi Iwai <[email protected]>
ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output
Takashi Iwai <[email protected]>
ASoC: intel: skl: Fix possible buffer overflow in debug outputs
Takashi Iwai <[email protected]>
ASoC: intel: skl: Fix pin debug prints
Dan Carpenter <[email protected]>
ASoC: SOF: Fix snd_sof_ipc_stream_posn()
Dragos Tarcatu <[email protected]>
ASoC: topology: Fix memleak in soc_tplg_manifest_load()
Dragos Tarcatu <[email protected]>
ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
John Bates <[email protected]>
drm/virtio: fix resource id creation race
Christophe JAILLET <[email protected]>
spi: bcm63xx-hsspi: Really keep pll clk enabled
Vladimir Oltean <[email protected]>
ARM: dts: ls1021a: Restore MDIO compatible to gianfar
Guillaume La Roque <[email protected]>
arm64: dts: meson-sm1-sei610: add missing interrupt-names
Hou Tao <[email protected]>
dm: fix congested_fn for request-based device
Shin'ichiro Kawasaki <[email protected]>
dm zoned: Fix reference counter initial value of chunk works
Mikulas Patocka <[email protected]>
dm writecache: verify watermark during resume
Mikulas Patocka <[email protected]>
dm: report suspended device during destroy
Mikulas Patocka <[email protected]>
dm cache: fix a crash due to incorrect work item cancelling
Mikulas Patocka <[email protected]>
dm integrity: fix invalid table returned due to argument count mismatch
Mikulas Patocka <[email protected]>
dm integrity: fix a deadlock due to offloading to an incorrect workqueue
Mikulas Patocka <[email protected]>
dm integrity: fix recalculation when moving from journal mode to bitmap mode
Dmitry Osipenko <[email protected]>
dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list
Dmitry Osipenko <[email protected]>
dmaengine: tegra-apb: Fix use-after-free
Frieder Schrempf <[email protected]>
dmaengine: imx-sdma: Fix the event id check to include RX event for UART6
Martin Fuzzey <[email protected]>
dmaengine: imx-sdma: fix context cache
Prike Liang <[email protected]>
drm/amd/powerplay: fix pre-check condition for setting clock range
Tianci.Yin <[email protected]>
drm/amdgpu: disable 3D pipe 1 on Navi1x
Gerd Hoffmann <[email protected]>
drm/shmem: add support for per object caching flags.
Gerd Hoffmann <[email protected]>
drm/virtio: fix mmap page attributes
Michael Ellerman <[email protected]>
powerpc/mm: Fix missing KUAP disable in flush_coherent_icache()
Christophe Leroy <[email protected]>
selftests: pidfd: Add pidfd_fdinfo_test in .gitignore
Gerald Schaefer <[email protected]>
s390/mm: fix panic in gup_fast on large pud
Niklas Schnelle <[email protected]>
s390/pci: Fix unexpected write combine on resource
Sean Christopherson <[email protected]>
x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes
Juergen Gross <[email protected]>
x86/ioperm: Add new paravirt function update_io_bitmap()
Lukas Wunner <[email protected]>
spi: spidev: Fix CS polarity if GPIO descriptors are used
Adrian Hunter <[email protected]>
perf arm-spe: Fix endless record after being terminated
Wei Li <[email protected]>
perf cs-etm: Fix endless record after being terminated
Wei Li <[email protected]>
perf intel-bts: Fix endless record after being terminated
Wei Li <[email protected]>
perf intel-pt: Fix endless record after being terminated
Hans Verkuil <[email protected]>
media: v4l2-mem2mem.c: fix broken links
Hans Verkuil <[email protected]>
media: vicodec: process all 4 components for RGB32 formats
Hans Verkuil <[email protected]>
media: mc-entity.c: use & to check pad flags, not ==
Ezequiel Garcia <[email protected]>
media: hantro: Fix broken media controller links
Jiri Slaby <[email protected]>
vt: selection, push sel_lock up
Jiri Slaby <[email protected]>
vt: selection, push console lock down
Jiri Slaby <[email protected]>
vt: selection, close sel_buffer race
Ronald Tschalär <[email protected]>
serdev: Fix detection of UART devices on Apple machines.
Jay Dolan <[email protected]>
serial: 8250_exar: add support for ACCES cards
Michael Walle <[email protected]>
tty: serial: fsl_lpuart: free IDs allocated by IDA
tangbin <[email protected]>
tty:serial:mvebu-uart:fix a wrong return
Rikard Falkeborn <[email protected]>
phy: allwinner: Fix GENMASK misuse
Faiz Abbas <[email protected]>
arm: dts: dra76x: Fix mmc3 max-frequency
Ley Foon Tan <[email protected]>
arm64: dts: socfpga: agilex: Fix gmac compatible
Omar Sandoval <[email protected]>
btrfs: fix RAID direct I/O reads with alternate csums
OGAWA Hirofumi <[email protected]>
fat: fix uninit-memory access for partial initialized inode
Vlastimil Babka <[email protected]>
mm, hotplug: fix page online with DEBUG_PAGEALLOC compiled but not enabled
Kirill A. Shutemov <[email protected]>
mm: avoid data corruption on CoW fault into PFN-mapped VMA
Huang Ying <[email protected]>
mm: fix possible PMD dirty bit lost in set_pmd_migration_entry()
Mel Gorman <[email protected]>
mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa
Zhang Xiaoxu <[email protected]>
vgacon: Fix a UAF in vgacon_invert_region
Eugeniu Rosca <[email protected]>
usb: core: port: do error out if usb_autopm_get_interface() fails
Eugeniu Rosca <[email protected]>
usb: core: hub: do error out if usb_autopm_get_interface() fails
Eugeniu Rosca <[email protected]>
usb: core: hub: fix unhandled return by employing a void function
Peter Chen <[email protected]>
usb: cdns3: gadget: toggle cycle bit before reset endpoint
Peter Chen <[email protected]>
usb: cdns3: gadget: link trb should point to next request
Pratham Pratap <[email protected]>
usb: dwc3: gadget: Update chain bit correctly when using sg list
Dan Lazewatsky <[email protected]>
usb: quirks: add NO_LPM quirk for Logitech Screen Share
Marco Felsch <[email protected]>
usb: usb251xb: fix regulator probe and error handling
Jim Lin <[email protected]>
usb: storage: Add quirk for Samsung Fit flash
Aurelien Aptel <[email protected]>
cifs: fix rename() by ensuring source handle opened with DELETE bit
Ronnie Sahlberg <[email protected]>
cifs: don't leak -EAGAIN for stat() during reconnect
Saravana Kannan <[email protected]>
driver core: Call sync_state() even if supplier has no consumers
Jian-Hong Pan <[email protected]>
ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294
Christian Lachner <[email protected]>
ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master
Hui Wang <[email protected]>
ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add Headset Mic supported
Christian Brauner <[email protected]>
binder: prevent UAF for binderfs devices II
Christian Brauner <[email protected]>
binder: prevent UAF for binderfs devices
Leonard Crestez <[email protected]>
firmware: imx: scu: Ensure sequential TX
Hangbin Liu <[email protected]>
selftests: forwarding: vxlan_bridge_1d: use more proper tos value
Randy Dunlap <[email protected]>
arch/csky: fix some Kconfig typos
Guo Ren <[email protected]>
csky: Fixup compile warning for three unimplemented syscalls
Guo Ren <[email protected]>
csky: Fixup ftrace modify panic
Guo Ren <[email protected]>
csky/smp: Fixup boot failed when CONFIG_SMP
Guo Ren <[email protected]>
csky: Set regs->usp to kernel sp, when the exception is from kernel
Guo Ren <[email protected]>
csky/mm: Fixup export invalid_pte_table symbol
Tim Harvey <[email protected]>
net: thunderx: workaround BGX TX Underflow issue
Kees Cook <[email protected]>
x86/xen: Distribute switch variables for initialization
Michal Swiatkowski <[email protected]>
ice: Don't tell the OS that link is going down
Keith Busch <[email protected]>
nvme: Fix uninitialized-variable warning
Julian Wiedmann <[email protected]>
s390/qdio: fill SL with absolute addresses
H.J. Lu <[email protected]>
x86/boot/compressed: Don't declare __force_order in kaslr_64.c
Andy Shevchenko <[email protected]>
nvme-pci: Use single IRQ vector for old Apple models
Shyjumon N <[email protected]>
nvme/pci: Add sleep quirk for Samsung and Toshiba drives
Kai-Heng Feng <[email protected]>
iommu/amd: Disable IOMMU on Stoney Ridge systems
Hamdan Igbaria <[email protected]>
net/mlx5: DR, Fix matching on vport gvmi
Javier Martinez Canillas <[email protected]>
efi: Only print errors about failing to get certs if EFI vars are found
Masahiro Yamada <[email protected]>
s390: make 'install' not depend on vmlinux
Vasily Averin <[email protected]>
s390/cio: cio_ignore_proc_seq_next should increase position index
Marco Felsch <[email protected]>
watchdog: da9062: do not ping the hw during stop()
Paul Cercueil <[email protected]>
net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()
Marek Vasut <[email protected]>
net: ks8851-ml: Fix 16-bit IO operation
Marek Vasut <[email protected]>
net: ks8851-ml: Fix 16-bit data access
Marek Vasut <[email protected]>
net: ks8851-ml: Remove 8-bit bus accessors
Egor Pomozov <[email protected]>
net: atlantic: ptp gpio adjustments
Igor Russkikh <[email protected]>
net: atlantic: check rpc result and wait for rpc address
Hangbin Liu <[email protected]>
selftests: forwarding: vxlan_bridge_1d: fix tos value
Hangbin Liu <[email protected]>
selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing
Harigovindan P <[email protected]>
drm/msm/dsi/pll: call vco set rate explicitly
Harigovindan P <[email protected]>
drm/msm/dsi: save pll state before dsi host is powered off
Tomas Henzl <[email protected]>
scsi: megaraid_sas: silence a warning
Stephan Gerhold <[email protected]>
drm/modes: Allow DRM_MODE_ROTATE_0 when applying video mode parameters
Stephan Gerhold <[email protected]>
drm/modes: Make sure to parse valid rotation value from cmdline
John Stultz <[email protected]>
drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
Brian Masney <[email protected]>
drm/msm/mdp5: rate limit pp done timeout warnings
Oded Gabbay <[email protected]>
habanalabs: patched cb equals user cb in device memset
Omer Shpigelman <[email protected]>
habanalabs: do not halt CoreSight during hard reset
Oded Gabbay <[email protected]>
habanalabs: halt the engines before hard-reset
Sergey Organov <[email protected]>
usb: gadget: serial: fix Tx stall after buffer overflow
Lars-Peter Clausen <[email protected]>
usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
Jack Pham <[email protected]>
usb: gadget: composite: Support more than 500mA MaxPower
Jiri Benc <[email protected]>
selftests: fix too long argument
Nikita Sobolev <[email protected]>
Kernel selftests: tpm2: check for tpm support
Daniel Golle <[email protected]>
serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE
Kai Vehmanen <[email protected]>
ALSA: hda: do not override bus codec_mask in link_get()
Cong Wang <[email protected]>
netfilter: xt_hashlimit: unregister proc file before releasing mutex
Florian Westphal <[email protected]>
netfilter: hashlimit: do not use indirect calls during gc
Cengiz Can <[email protected]>
blktrace: fix dereference after null check
Nathan Chancellor <[email protected]>
RDMA/core: Fix use of logical OR in get_new_pps
Maor Gottlieb <[email protected]>
RDMA/core: Fix pkey and port assignment in get_new_pps
Florian Fainelli <[email protected]>
net: dsa: bcm_sf2: Forcibly configure IMP port for 1Gb/sec
Theodore Ts'o <[email protected]>
dm thin metadata: fix lockdep complaint
Paolo Valente <[email protected]>
block, bfq: do not insert oom queue into position tree
Paolo Valente <[email protected]>
block, bfq: get extra ref to prevent a queue from being freed during a group move
Paolo Valente <[email protected]>
block, bfq: get a ref to a group when adding it to a service tree
Jaroslav Kysela <[email protected]>
ASoC: intel/skl/hda - export number of digital microphones via control components
-------------
Diffstat:
Documentation/devicetree/bindings/arm/fsl.yaml | 2 +- .../bindings/regulator/qcom,spmi-regulator.txt | 2 +- Makefile | 4 +- arch/arm/boot/dts/am437x-idk-evm.dts | 4 +- arch/arm/boot/dts/dra76x.dtsi | 5 + arch/arm/boot/dts/dra7xx-clocks.dtsi | 12 +-- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 4 +- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 - arch/arm/boot/dts/imx7-colibri.dtsi | 1 - arch/arm/boot/dts/imx7d.dtsi | 6 +- arch/arm/boot/dts/ls1021a.dtsi | 4 +- arch/arm/mach-imx/Makefile | 2 + arch/arm/mach-imx/common.h | 4 +- arch/arm/mach-imx/resume-imx6.S | 24 +++++ arch/arm/mach-imx/suspend-imx6.S | 14 --- .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 5 - arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 6 +- arch/csky/Kconfig | 2 +- arch/csky/abiv1/inc/abi/entry.h | 19 +++- arch/csky/abiv2/inc/abi/entry.h | 11 +++ arch/csky/include/uapi/asm/unistd.h | 3 + arch/csky/kernel/atomic.S | 8 +- arch/csky/kernel/smp.c | 2 +- arch/csky/mm/Makefile | 2 + arch/csky/mm/init.c | 1 + arch/powerpc/kernel/cputable.c | 4 +- arch/powerpc/mm/mem.c | 2 + arch/s390/Makefile | 2 +- arch/s390/boot/Makefile | 2 +- arch/s390/include/asm/pgtable.h | 6 ++ arch/s390/include/asm/qdio.h | 2 +- arch/s390/pci/pci.c | 4 +- arch/x86/boot/compressed/kaslr_64.c | 3 - arch/x86/include/asm/io_bitmap.h | 9 +- arch/x86/include/asm/paravirt.h | 7 ++ arch/x86/include/asm/paravirt_types.h | 4 + arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/paravirt.c | 5 + arch/x86/kernel/process.c | 2 +- arch/x86/platform/efi/efi_64.c | 70 +++++++++----- arch/x86/xen/enlighten_pv.c | 32 ++++++- block/bfq-cgroup.c | 10 +- block/bfq-iosched.c | 4 + block/bfq-iosched.h | 1 + block/bfq-wf2q.c | 12 ++- drivers/android/binder.c | 9 ++ drivers/android/binder_internal.h | 2 + drivers/android/binderfs.c | 7 +- drivers/base/core.c | 23 +++-- drivers/bus/ti-sysc.c | 4 +- drivers/dma-buf/dma-buf.c | 1 + drivers/dma/coh901318.c | 4 - drivers/dma/imx-sdma.c | 5 +- drivers/dma/tegra20-apb-dma.c | 6 +- drivers/edac/synopsys_edac.c | 22 ++--- drivers/firmware/efi/efi.c | 4 +- drivers/firmware/imx/imx-scu.c | 27 ++++++ drivers/firmware/imx/misc.c | 8 +- drivers/firmware/imx/scu-pd.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 97 ++++++++++--------- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 3 - drivers/gpu/drm/drm_client_modeset.c | 3 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 15 ++- drivers/gpu/drm/drm_modes.c | 7 ++ drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 - drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 ---- drivers/gpu/drm/i915/display/intel_display_power.c | 16 +++- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/i915_perf.c | 58 ++++++++---- drivers/gpu/drm/i915/i915_perf_types.h | 3 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 7 +- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 - drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 6 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 44 ++++----- drivers/gpu/drm/selftests/drm_cmdline_selftests.h | 1 + .../gpu/drm/selftests/test-drm_cmdline_parser.c | 15 ++- drivers/gpu/drm/sun4i/sun8i_mixer.c | 104 ++++++++++++++++++--- drivers/gpu/drm/sun4i/sun8i_mixer.h | 11 +++ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 66 +++++++++++-- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/virtio/virtgpu_object.c | 5 +- drivers/hwmon/adt7462.c | 2 +- drivers/infiniband/core/cm.c | 1 + drivers/infiniband/core/cma.c | 15 ++- drivers/infiniband/core/core_priv.h | 15 +++ drivers/infiniband/core/iwcm.c | 4 +- drivers/infiniband/core/nldev.c | 2 + drivers/infiniband/core/rw.c | 31 +++--- drivers/infiniband/core/security.c | 14 ++- drivers/infiniband/core/umem_odp.c | 24 ++++- drivers/infiniband/core/uverbs_cmd.c | 10 -- drivers/infiniband/core/verbs.c | 10 -- drivers/infiniband/hw/hfi1/verbs.c | 4 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + drivers/infiniband/hw/mlx5/odp.c | 17 ++-- drivers/infiniband/hw/qib/qib_verbs.c | 2 + drivers/infiniband/sw/siw/siw_main.c | 6 +- drivers/iommu/amd_iommu_init.c | 13 ++- drivers/md/dm-cache-target.c | 4 +- drivers/md/dm-integrity.c | 50 ++++++---- drivers/md/dm-thin-metadata.c | 2 +- drivers/md/dm-writecache.c | 14 ++- drivers/md/dm-zoned-target.c | 8 +- drivers/md/dm.c | 22 ++--- drivers/media/mc/mc-entity.c | 4 +- drivers/media/platform/vicodec/codec-v4l2-fwht.c | 34 ++----- drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +- drivers/misc/habanalabs/device.c | 5 +- drivers/misc/habanalabs/goya/goya.c | 44 ++++++++- drivers/net/dsa/bcm_sf2.c | 3 +- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 19 +++- .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 12 +++ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 62 +++++++++++- drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 9 ++ drivers/net/ethernet/davicom/dm9000.c | 2 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 -- .../ethernet/mellanox/mlx5/core/steering/dr_ste.c | 5 +- drivers/net/ethernet/micrel/ks8851_mll.c | 53 ++--------- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 ++- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/pci.c | 15 ++- drivers/phy/allwinner/phy-sun50i-usb3.c | 2 +- drivers/phy/motorola/phy-mapphone-mdm6600.c | 27 +++++- drivers/regulator/stm32-vrefbuf.c | 3 +- drivers/s390/cio/blacklist.c | 5 +- drivers/s390/cio/qdio_setup.c | 3 +- drivers/s390/net/qeth_core_main.c | 23 +++-- drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +- drivers/soc/imx/soc-imx-scu.c | 2 +- drivers/spi/atmel-quadspi.c | 11 +++ drivers/spi/spi-bcm63xx-hsspi.c | 1 - drivers/spi/spidev.c | 5 + drivers/staging/media/hantro/hantro_drv.c | 4 +- drivers/staging/speakup/selection.c | 2 - drivers/tty/serdev/core.c | 10 ++ drivers/tty/serial/8250/8250_exar.c | 33 +++++++ drivers/tty/serial/ar933x_uart.c | 8 ++ drivers/tty/serial/fsl_lpuart.c | 39 +++++--- drivers/tty/serial/mvebu-uart.c | 2 +- drivers/tty/vt/selection.c | 26 +++++- drivers/tty/vt/vt.c | 2 - drivers/usb/cdns3/gadget.c | 19 +++- drivers/usb/core/hub.c | 8 +- drivers/usb/core/port.c | 10 +- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/gadget.c | 9 +- drivers/usb/gadget/composite.c | 24 +++-- drivers/usb/gadget/function/f_fs.c | 5 +- drivers/usb/gadget/function/u_serial.c | 4 +- drivers/usb/misc/usb251xb.c | 20 +++- drivers/usb/storage/unusual_devs.h | 6 ++ drivers/video/console/vgacon.c | 3 + drivers/watchdog/da9062_wdt.c | 7 -- fs/btrfs/inode.c | 4 +- fs/cifs/cifsglob.h | 7 ++ fs/cifs/cifsproto.h | 5 +- fs/cifs/cifssmb.c | 3 +- fs/cifs/file.c | 19 ++-- fs/cifs/inode.c | 12 ++- fs/cifs/smb1ops.c | 2 +- fs/cifs/smb2inode.c | 4 +- fs/cifs/smb2ops.c | 3 +- fs/cifs/smb2pdu.c | 1 + fs/fat/inode.c | 19 ++-- include/drm/drm_gem_shmem_helper.h | 5 + include/linux/mm.h | 4 + kernel/sched/fair.c | 2 + kernel/trace/blktrace.c | 5 +- mm/huge_memory.c | 3 +- mm/memory.c | 35 +++++-- mm/memory_hotplug.c | 8 +- mm/mprotect.c | 38 +++++++- net/netfilter/xt_hashlimit.c | 36 ++----- security/integrity/platform_certs/load_uefi.c | 40 +++++--- sound/hda/ext/hdac_ext_controller.c | 9 +- sound/pci/hda/patch_realtek.c | 31 +++++- sound/soc/codecs/pcm512x.c | 8 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 ++ sound/soc/intel/skylake/skl-debug.c | 32 ++++--- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +- sound/soc/soc-component.c | 2 +- sound/soc/soc-dapm.c | 2 +- sound/soc/soc-pcm.c | 16 ++-- sound/soc/soc-topology.c | 17 ++-- sound/soc/sof/intel/hda.c | 3 +- sound/soc/sof/ipc.c | 2 +- tools/perf/arch/arm/util/cs-etm.c | 5 +- tools/perf/arch/arm64/util/arm-spe.c | 5 +- tools/perf/arch/x86/util/intel-bts.c | 5 +- tools/perf/arch/x86/util/intel-pt.c | 5 +- tools/testing/selftests/lib.mk | 23 +++-- .../testing/selftests/net/forwarding/mirror_gre.sh | 25 ++--- .../selftests/net/forwarding/vxlan_bridge_1d.sh | 6 +- tools/testing/selftests/pidfd/.gitignore | 1 + tools/testing/selftests/tpm2/test_smoke.sh | 13 ++- tools/testing/selftests/tpm2/test_space.sh | 9 +- 203 files changed, 1602 insertions(+), 739 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 33/189 net: ks8851-ml: Remove 8-bit bus accessors
From: Marek Vasut <[email protected]>
[ Upstream commit 69233bba6543a37755158ca3382765387b8078df ]
This driver is mixing 8-bit and 16-bit bus accessors for reasons unknown, however the speculation is that this was some sort of attempt to support the 8-bit bus mode.
As per the KS8851-16MLL documentation, all two registers accessed via the 8-bit accessors are internally 16-bit registers, so reading them using 16-bit accessors is fine. The KS_CCR read can be converted to 16-bit read outright, as it is already a concatenation of two 8-bit reads of that register. The KS_RXQCR accesses are 8-bit only, however writing the top 8 bits of the register is OK as well, since the driver caches the entire 16-bit register value anyway.
Finally, the driver is not used by any hardware in the kernel right now. The only hardware available to me is one with 16-bit bus, so I have no way to test the 8-bit bus mode, however it is unlikely this ever really worked anyway. If the 8-bit bus mode is ever required, it can be easily added by adjusting the 16-bit accessors to do 2 consecutive accesses, which is how this should have been done from the beginning.
--- drivers/net/ethernet/micrel/ks8851_mll.c | 45 +++--------------------- 1 file changed, 5 insertions(+), 40 deletions(-)
drivers/net/ethernet/micrel/ks8851_mll.c +5 -40
@@ -156,24 +156,6 @@ static int msg_enable;* chip is busy transferring packet data (RX/TX FIFO accesses). */ -/** -* ks_rdreg8 - read 8 bit register from device -* @ks : The chip information -* @offset: The register address -* -* Read a 8bit register from the chip, returning the result -*/ -static u8 ks_rdreg8 (struct ks_net *ks,int offset) -{ -u16 data; -u8 shift_bit = offset &0x03 ; -u8 shift_data = (offset &1 ) <<3 ; - ks->cmd_reg_cache = (u16 ) offset | (u16)(BE0 << shift_bit); -iowrite16 (ks->cmd_reg_cache, ks->hw_addr_cmd); - data =ioread16 (ks->hw_addr); -return (u8)(data >> shift_data); -} -/** * ks_rdreg16 - read 16 bit register from device * @ks : The chip information
@@ -189,22 +171,6 @@ static u16 ks_rdreg16(struct ks_net *ks, int offset)return ioread16 (ks->hw_addr); } -/** -* ks_wrreg8 - write 8bit register value to chip -* @ks: The chip information -* @offset: The register address -* @value: The value to write -* -*/ -static void ks_wrreg8 (struct ks_net *ks,int offset,u8 value) -{ -u8 shift_bit = (offset &0x03 ); -u16 value_write = (u16)(value << ((offset &1 ) <<3 )); - ks->cmd_reg_cache = (u16 )offset | (BE0 << shift_bit); -iowrite16 (ks->cmd_reg_cache, ks->hw_addr_cmd); -iowrite16 (value_write, ks->hw_addr); -} -/** * ks_wrreg16 - write 16bit register value to chip * @ks: The chip information
@@ -324,8 +290,7 @@ static void ks_read_config(struct ks_net *ks)u16 reg_data =0 ;/* Regardless of bus width, 8 bit read should always work.*/ - reg_data =ks_rdreg8 (ks,KS_CCR ) &0x00FF ; - reg_data |=ks_rdreg8 (ks,KS_CCR +1 ) <<8 ; + reg_data =ks_rdreg16 (ks,KS_CCR );/* addr/data bus are multiplexed */ ks->sharedbus = (reg_data &CCR_SHARED ) ==CCR_SHARED ;
@@ -429,7 +394,7 @@ static inline void ks_read_qmu(struct ks_net *ks, u16 *buf, u32 len)/* 1. set sudo DMA mode */ ks_wrreg16 (ks,KS_RXFDPR ,RXFDPR_RXFPAI ); -ks_wrreg8 (ks,KS_RXQCR , (ks->rc_rxqcr |RXQCR_SDA ) &0xff ); +ks_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr |RXQCR_SDA );/* 2. read prepend data */ /**
@@ -446,7 +411,7 @@ static inline void ks_read_qmu(struct ks_net *ks, u16 *buf, u32 len)ks_inblk (ks, buf,ALIGN (len,4 ));/* 4. reset sudo DMA Mode */ -ks_wrreg8 (ks,KS_RXQCR , ks->rc_rxqcr); +ks_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr); }/**
@@ -679,13 +644,13 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) ks->txh.txw[1 ] =cpu_to_le16 (len);/* 1. set sudo-DMA mode */ -ks_wrreg8 (ks,KS_RXQCR , (ks->rc_rxqcr |RXQCR_SDA ) &0xff ); +ks_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr |RXQCR_SDA );/* 2. write status/lenth info */ ks_outblk (ks, ks->txh.txw,4 );/* 3. write pkt data */ ks_outblk (ks, (u16 *)pdata,ALIGN (len,4 ));/* 4. reset sudo-DMA mode */ -ks_wrreg8 (ks,KS_RXQCR , ks->rc_rxqcr); +ks_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr);/* 5. Enqueue Tx(move the pkt from TX buffer into TXQ) */ ks_wrreg16 (ks,KS_TXQCR ,TXQCR_METFE );/* 6. wait until TXQCR_METFE is auto-cleared */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/189 nvme/pci: Add sleep quirk for Samsung and Toshiba drives
In reply to Greg Kroah-HartmanFrom: Shyjumon N <[email protected]>
[ Upstream commit 1fae37accfc5872af3905d4ba71dc6ab15829be7 ]
The Samsung SSD SM981/PM981 and Toshiba SSD KBG40ZNT256G on the Lenovo C640 platform experience runtime resume issues when the SSDs are kept in sleep/suspend mode for long time.
This patch applies the 'Simple Suspend' quirk to these configurations. With this patch, the issue had not been observed in a 1+ day test.
--- drivers/nvme/host/pci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/nvme/host/pci.c +12 -0
@@ -2747,6 +2747,18 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) (dmi_match(DMI_BOARD_NAME, "PRIME B350M-A") || dmi_match(DMI_BOARD_NAME, "PRIME Z370-A")))return NVME_QUIRK_NO_APST ; + }else if ((pdev->vendor ==0x144d && (pdev->device ==0xa801 || + pdev->device ==0xa808 || pdev->device ==0xa809 )) || + (pdev->vendor ==0x1e0f && pdev->device ==0x0001 )) { +/* +* Forcing to use host managed nvme power settings for +* lowest idle power with quick resume latency on +* Samsung and Toshiba SSDs based on suspend behavior +* on Coffee Lake board for LENOVO C640 +*/ +if ((dmi_match (DMI_BOARD_VENDOR ,"LENOVO" )) && +dmi_match (DMI_BOARD_NAME ,"LNVNB161216" )) +return NVME_QUIRK_SIMPLE_SUSPEND ; }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/189 iommu/amd: Disable IOMMU on Stoney Ridge systems
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 3dfee47b215e49788cfc80e474820ea2e948c031 ]
Serious screen flickering when Stoney Ridge outputs to a 4K monitor.
Use identity-mapping and PCI ATS doesn't help this issue.
According to Alex Deucher, IOMMU isn't enabled on Windows, so let's do the same here to avoid screen flickering on 4K monitor.
--- drivers/iommu/amd_iommu_init.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu_init.c +12 -1
@@ -2533,6 +2533,7 @@ static int __init early_amd_iommu_init(void)struct acpi_table_header *ivrs_base;acpi_status status;int i, remap_cache_sz, ret =0 ; +u32 pci_id;if (!amd_iommu_detected)return -ENODEV ;
@@ -2620,6 +2621,16 @@ static int __init early_amd_iommu_init(void)if (ret) goto out; +/* Disable IOMMU if there's Stoney Ridge graphics */ +for (i =0 ; i <32 ; i++) { + pci_id =read_pci_config (0 , i,0 ,0 ); +if ((pci_id &0xffff ) ==0x1002 && (pci_id >>16 ) ==0x98e4 ) { +pr_info ("Disable IOMMU on Stoney Ridge\n" ); + amd_iommu_disabled = true; +break ; + } + } +/* Disable any previously enabled IOMMUs */ if (!is_kdump_kernel () || amd_iommu_disabled)disable_iommus ();
@@ -2728,7 +2739,7 @@ static int __init state_next(void) ret =early_amd_iommu_init (); init_state = ret ?IOMMU_INIT_ERROR :IOMMU_ACPI_FINISHED ;if (init_state ==IOMMU_ACPI_FINISHED && amd_iommu_disabled) { -pr_info ("AMD IOMMU disabled on kernel command-line\n" ); +pr_info ("AMD IOMMU disabled\n" ); init_state =IOMMU_CMDLINE_DISABLED ; ret = -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/189 x86/boot/compressed: Dont declare __force_order in kaslr_64.c
In reply to Greg Kroah-HartmanFrom: H.J. Lu <[email protected]>
[ Upstream commit df6d4f9db79c1a5d6f48b59db35ccd1e9ff9adfc ]
GCC 10 changed the default to -fno-common, which leads to
LD arch/x86/boot/compressed/vmlinux
ld: arch/x86/boot/compressed/pgtable_64.o:(.bss+0x0): multiple definition of `__force_order'; \
arch/x86/boot/compressed/kaslr_64.o:(.bss+0x0): first defined here make[2]: *** [arch/x86/boot/compressed/Makefile:119: arch/x86/boot/compressed/vmlinux] Error 1
Since __force_order is already provided in pgtable_64.c, there is no need to declare __force_order in kaslr_64.c.
--- arch/x86/boot/compressed/kaslr_64.c | 3 --- 1 file changed, 3 deletions(-)
arch/x86/boot/compressed/kaslr_64.c +0 -3
@@ -29,9 +29,6 @@#define __PAGE_OFFSET __PAGE_OFFSET_BASE#include "../../mm/ident_map.c" -/* Used by pgtable.h asm code to force instruction serialization. */ -unsigned long __force_order; -/* Used to track our page table allocation area. */ struct alloc_pgt_data {unsigned char *pgt_buf;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/189 nvme: Fix uninitialized-variable warning
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
[ Upstream commit 15755854d53b4bbb0bb37a0fce66f0156cfc8a17 ]
gcc may detect a false positive on nvme using an unintialized variable if setting features fails. Since this is not a fast path, explicitly initialize this variable to suppress the warning.
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -1165,8 +1165,8 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl,static int nvme_features (struct nvme_ctrl *dev,u8 op,unsigned int fid,unsigned int dword11,void *buffer,size_t buflen,u32 *result) { +union nvme_result res = {0 };struct nvme_command c; -union nvme_result res;int ret;memset (&c,0 ,sizeof (c));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/189 ice: Dont tell the OS that link is going down
In reply to Greg Kroah-HartmanFrom: Michal Swiatkowski <[email protected]>
[ Upstream commit 8a55c08d3bbc9ffc9639f69f742e59ebd99f913b ]
Remove code that tell the OS that link is going down when user change flow control via ethtool. When link is up it isn't certain that link goes down after 0x0605 aq command. If link doesn't go down, OS thinks that link is down, but physical link is up. To reset this state user have to take interface down and up.
If link goes down after 0x0605 command, FW send information about that and after that driver tells the OS that the link goes down. So this code in ethtool is unnecessary.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +0 -7
@@ -2977,13 +2977,6 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)else return -EINVAL ; -/* Tell the OS link is going down, the link will go back up when fw -* says it is ready asynchronously -*/ -ice_print_link_msg (vsi, false); -netif_carrier_off (netdev); -netif_tx_stop_all_queues (netdev); -/* Set the FC mode and only restart AN if link is up */ status =ice_set_fc (pi, &aq_failures, link_up);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/189 x86/xen: Distribute switch variables for initialization
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 9038ec99ceb94fb8d93ade5e236b2928f0792c7c ]
Variables declared in a switch statement before any case statements cannot be automatically initialized with compiler instrumentation (as they are not part of any execution flow). With GCC's proposed automatic stack variable initialization feature, this triggers a warning (and they don't get initialized). Clang's automatic stack variable initialization (via CONFIG_INIT_STACK_ALL=y) doesn't throw a warning, but it also doesn't initialize such variables[1]. Note that these warnings (or silent skipping) happen before the dead-store elimination optimization phase, so even when the automatic initializations are later elided in favor of direct initializations, the warnings remain.
To avoid these problems, move such variables into the "case" where they're used or lift them up into the main function body.
arch/x86/xen/enlighten_pv.c: In function ‘xen_write_msr_safe’:arch/x86/xen/enlighten_pv.c:904:12: warning: statement will never be executed [-Wswitch-unreachable]
904 | unsigned which;
| ^~~~~[1] https://bugs.llvm.org/show_bug.cgi?id=44916
--- arch/x86/xen/enlighten_pv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/xen/enlighten_pv.c +4 -3
@@ -896,14 +896,15 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err)static int xen_write_msr_safe (unsigned int msr,unsigned low,unsigned high) {int ret; +#ifdef CONFIG_X86_64 +unsigned int which; +u64 base; +#endif ret =0 ;switch (msr) {#ifdef CONFIG_X86_64 -unsigned which; -u64 base; -case MSR_FS_BASE : which =SEGBASE_FS ; goto set;case MSR_KERNEL_GS_BASE : which =SEGBASE_GS_USER ; goto set;case MSR_GS_BASE : which =SEGBASE_GS_KERNEL ; goto set;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/189 net: thunderx: workaround BGX TX Underflow issue
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
[ Upstream commit 971617c3b761c876d686a2188220a33898c90e99 ]
While it is not yet understood why a TX underflow can easily occur for SGMII interfaces resulting in a TX wedge. It has been found that disabling/re-enabling the LMAC resolves the issue.
--- .../net/ethernet/cavium/thunder/thunder_bgx.c | 62 ++++++++++++++++++- .../net/ethernet/cavium/thunder/thunder_bgx.h | 9 +++ 2 files changed, 68 insertions(+), 3 deletions(-)
drivers/net/ethernet/cavium/thunder/thunder_bgx.c +59 -3
@@ -410,10 +410,19 @@ void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable) lmac = &bgx->lmac[lmacid]; cfg =bgx_reg_read (bgx, lmacid,BGX_CMRX_CFG ); -if (enable) +if (enable) { cfg |=CMR_PKT_RX_EN |CMR_PKT_TX_EN ; -else + +/* enable TX FIFO Underflow interrupt */ +bgx_reg_modify (bgx, lmacid,BGX_GMP_GMI_TXX_INT_ENA_W1S , +GMI_TXX_INT_UNDFLW ); + }else { cfg &= ~(CMR_PKT_RX_EN |CMR_PKT_TX_EN ); + +/* Disable TX FIFO Underflow interrupt */ +bgx_reg_modify (bgx, lmacid,BGX_GMP_GMI_TXX_INT_ENA_W1C , +GMI_TXX_INT_UNDFLW ); + }bgx_reg_write (bgx, lmacid,BGX_CMRX_CFG , cfg);if (bgx->is_rgx)
@@ -1535,6 +1544,48 @@ static int bgx_init_phy(struct bgx *bgx)return bgx_init_of_phy (bgx); } +static irqreturn_t bgx_intr_handler (int irq,void *data) +{ +struct bgx *bgx = (struct bgx *)data; +u64 status, val; +int lmac; + +for (lmac =0 ; lmac < bgx->lmac_count; lmac++) { + status =bgx_reg_read (bgx, lmac,BGX_GMP_GMI_TXX_INT ); +if (status &GMI_TXX_INT_UNDFLW ) { +pci_err (bgx->pdev,"BGX%d lmac%d UNDFLW\n" , + bgx->bgx_id, lmac); + val =bgx_reg_read (bgx, lmac,BGX_CMRX_CFG ); + val &= ~CMR_EN ; +bgx_reg_write (bgx, lmac,BGX_CMRX_CFG , val); + val |=CMR_EN ; +bgx_reg_write (bgx, lmac,BGX_CMRX_CFG , val); + } +/* clear interrupts */ +bgx_reg_write (bgx, lmac,BGX_GMP_GMI_TXX_INT , status); + } + +return IRQ_HANDLED ; +} + +static void bgx_register_intr (struct pci_dev *pdev) +{ +struct bgx *bgx =pci_get_drvdata (pdev); +int ret; + + ret =pci_alloc_irq_vectors (pdev,BGX_LMAC_VEC_OFFSET , +BGX_LMAC_VEC_OFFSET ,PCI_IRQ_ALL_TYPES ); +if (ret <0 ) { +pci_err (pdev,"Req for #%d msix vectors failed\n" , +BGX_LMAC_VEC_OFFSET ); +return ; + } + ret =pci_request_irq (pdev,GMPX_GMI_TX_INT , bgx_intr_handler,NULL , + bgx,"BGX%d" , bgx->bgx_id); +if (ret) +pci_free_irq (pdev,GMPX_GMI_TX_INT , bgx); +} +static int bgx_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {int err;
@@ -1550,7 +1601,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)pci_set_drvdata (pdev, bgx); - err =pci_enable_device (pdev); + err =pcim_enable_device (pdev);if (err) {dev_err (dev,"Failed to enable PCI device\n" );pci_set_drvdata (pdev,NULL );
@@ -1604,6 +1655,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)bgx_init_hw (bgx); +bgx_register_intr (pdev); +/* Enable all LMACs */ for (lmac =0 ; lmac < bgx->lmac_count; lmac++) { err =bgx_lmac_enable (bgx, lmac);
@@ -1620,6 +1673,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_enable: bgx_vnic[bgx->bgx_id] =NULL ; +pci_free_irq (pdev,GMPX_GMI_TX_INT , bgx); err_release_regions:pci_release_regions (pdev); err_disable_device:
@@ -1637,6 +1691,8 @@ static void bgx_remove(struct pci_dev *pdev)for (lmac =0 ; lmac < bgx->lmac_count; lmac++)bgx_lmac_disable (bgx, lmac); +pci_free_irq (pdev,GMPX_GMI_TX_INT , bgx); + bgx_vnic[bgx->bgx_id] =NULL ;pci_release_regions (pdev);pci_disable_device (pdev);
drivers/net/ethernet/cavium/thunder/thunder_bgx.h +9 -0
@@ -180,6 +180,15 @@#define BGX_GMP_GMI_TXX_BURST 0x38228#define BGX_GMP_GMI_TXX_MIN_PKT 0x38240#define BGX_GMP_GMI_TXX_SGMII_CTL 0x38300 +#define BGX_GMP_GMI_TXX_INT 0x38500 +#define BGX_GMP_GMI_TXX_INT_W1S 0x38508 +#define BGX_GMP_GMI_TXX_INT_ENA_W1C 0x38510 +#define BGX_GMP_GMI_TXX_INT_ENA_W1S 0x38518 +#define GMI_TXX_INT_PTP_LOST BIT_ULL(4) +#define GMI_TXX_INT_LATE_COL BIT_ULL(3) +#define GMI_TXX_INT_XSDEF BIT_ULL(2) +#define GMI_TXX_INT_XSCOL BIT_ULL(1) +#define GMI_TXX_INT_UNDFLW BIT_ULL(0)#define BGX_MSIX_VEC_0_29_ADDR 0x400000/* +(0..29) << 4 */ #define BGX_MSIX_VEC_0_29_CTL 0x400008
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/189 csky/mm: Fixup export invalid_pte_table symbol
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
[ Upstream commit 7f4a567332f035ab16b29010fbd04a0f10183c77 ]
There is no present bit in csky pmd hardware, so we need to prepare invalid_pte_table for empty pmd entry and the functions (pmd_none & pmd_present) in pgtable.h need invalid_pte_talbe to get result. If a module use these functions, we need export the symbol for it.
--- arch/csky/mm/init.c | 1 + 1 file changed, 1 insertion(+)
arch/csky/mm/init.c +1 -0
@@ -31,6 +31,7 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss; +EXPORT_SYMBOL (invalid_pte_table); unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;EXPORT_SYMBOL (empty_zero_page);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/189 csky: Set regs->usp to kernel sp, when the exception is from kernel
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
[ Upstream commit f8e17c17b81070f38062dce79ca7f4541851dadd ]
In the past, we didn't care about kernel sp when saving pt_reg. But in some cases, we still need pt_reg->usp to represent the kernel stack before enter exception.
For cmpxhg in atomic.S, we need save and restore usp for above.
--- arch/csky/abiv1/inc/abi/entry.h | 19 ++++++++++++++----- arch/csky/abiv2/inc/abi/entry.h | 11 +++++++++++ arch/csky/kernel/atomic.S | 8 ++++++-- 3 files changed, 31 insertions(+), 7 deletions(-)
arch/csky/abiv1/inc/abi/entry.h +14 -5
@@ -16,14 +16,16 @@#define LSAVE_A4 40#define LSAVE_A5 44 +#define usp ss1 + .macro USPTOKSP -mtcr sp, ss1 +mtcr sp, usp mfcr sp, ss0 .endm .macro KSPTOUSP mtcr sp, ss0 - mfcr sp, ss1 + mfcr sp, usp .endm .macro SAVE_ALL epc_inc
@@ -45,7 +47,13 @@add lr, r13 stw lr, (sp, 8) + mov lr, sp + addi lr, 32 + addi lr, 32 + addi lr, 16 + bt 2f mfcr lr, ss1 +2: stw lr, (sp, 16) stw a0, (sp, 20)
@@ -79,9 +87,10 @@ ldw a0, (sp, 12) mtcr a0, epsr btsti a0, 31 + bt 1f ldw a0, (sp, 16) mtcr a0, ss1 - +1: ldw a0, (sp, 24) ldw a1, (sp, 28) ldw a2, (sp, 32)
@@ -102,9 +111,9 @@ addi sp, 32 addi sp, 8 - bt 1f + bt 2f KSPTOUSP -1: +2: rte .endm
arch/csky/abiv2/inc/abi/entry.h +11 -0
@@ -31,7 +31,13 @@mfcr lr, epsr stw lr, (sp, 12) + btsti lr, 31 + bf 1f + addi lr, sp, 152 + br 2f +1: mfcr lr, usp +2: stw lr, (sp, 16) stw a0, (sp, 20)
@@ -64,8 +70,10 @@mtcr a0, epc ldw a0, (sp, 12) mtcr a0, epsr + btsti a0, 31 ldw a0, (sp, 16) mtcr a0, usp + mtcr a0, ss0 #ifdef CONFIG_CPU_HAS_HILO ldw a0, (sp, 140)
@@ -86,6 +94,9 @@ addi sp, 40 ldm r16-r30, (sp) addi sp, 72 + bf 1f + mfcr sp, ss0 +1: rte .endm
arch/csky/kernel/atomic.S +6 -2
@@ -17,10 +17,12 @@ ENTRY(csky_cmpxchg) mfcr a3, epc addi a3, TRAP0_SIZE - subi sp, 8 + subi sp, 16 stw a3, (sp, 0) mfcr a3, epsr stw a3, (sp, 4) + mfcr a3, usp + stw a3, (sp, 8) psrset ee #ifdef CONFIG_CPU_HAS_LDSTEX
@@ -47,7 +49,9 @@ ENTRY(csky_cmpxchg) mtcr a3, epc ldw a3, (sp, 4) mtcr a3, epsr - addi sp, 8 + ldw a3, (sp, 8) + mtcr a3, usp + addi sp, 16 KSPTOUSP rte END(csky_cmpxchg)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/189 csky/smp: Fixup boot failed when CONFIG_SMP
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
[ Upstream commit c9492737b25ca32679ba3163609d938c9abfd508 ]
If we use a non-ipi-support interrupt controller, it will cause panic here. We should let cpu up and work with CONFIG_SMP, when we use a non-ipi intc.
--- arch/csky/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/csky/kernel/smp.c +1 -1
@@ -120,7 +120,7 @@ void __init setup_smp_ipi(void)int rc;if (ipi_irq ==0 ) -panic ("%s IRQ mapping failed\n" , __func__); +return ; rc =request_percpu_irq (ipi_irq, handle_ipi,"IPI Interrupt" , &ipi_dummy_dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/189 csky: Fixup ftrace modify panic
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
[ Upstream commit 359ae00d12589c31cf103894d0f32588d523ca83 ]
During ftrace init, linux will replace all function prologues (call_mcout) with nops, but it need flush_dcache and invalidate_icache to make it work. So flush_cache functions couldn't be nested called by ftrace framework.
--- arch/csky/mm/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/csky/mm/Makefile +2 -0
@@ -1,8 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only ifeq ($(CONFIG_CPU_HAS_CACHEV2),y) obj-y += cachev2.o +CFLAGS_REMOVE_cachev2.o = $(CC_FLAGS_FTRACE) else obj-y += cachev1.o +CFLAGS_REMOVE_cachev1.o = $(CC_FLAGS_FTRACE) endif obj-y += dma-mapping.o
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/189 arch/csky: fix some Kconfig typos
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit bebd26ab623616728d6e72b5c74a47bfff5287d8 ]
Fix wording in help text for the CPU_HAS_LDSTEX symbol.
--- arch/csky/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/csky/Kconfig +1 -1
@@ -75,7 +75,7 @@ config CPU_HAS_TLBI config CPU_HAS_LDSTEX bool help - For SMP, CPU needs "ldex&stex" instrcutions to atomic operations. + For SMP, CPU needs "ldex&stex" instructions for atomic operations. config CPU_NEED_TLBSYNC bool
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/189 csky: Fixup compile warning for three unimplemented syscalls
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
[ Upstream commit 2305f60b76110cb3e8658a4ae85d1f7eb0c66a5b ]
Implement fstat64, fstatat64, clone3 syscalls to fixup checksyscalls.sh compile warnings.
--- arch/csky/include/uapi/asm/unistd.h | 3 +++ 1 file changed, 3 insertions(+)
arch/csky/include/uapi/asm/unistd.h +3 -0
@@ -1,7 +1,10 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. +#define __ARCH_WANT_STAT64 +#define __ARCH_WANT_NEW_STAT#define __ARCH_WANT_SYS_CLONE +#define __ARCH_WANT_SYS_CLONE3#define __ARCH_WANT_SET_GET_RLIMIT#define __ARCH_WANT_TIME32_SYSCALLS#include <asm-generic/unistd.h>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/189 selftests: forwarding: vxlan_bridge_1d: use more proper tos value
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 9b64208f74fbd0e920475ecfe9326f8443fdc3a5 ]
0x11 and 0x12 set the ECN bits based on RFC2474, it would be better to avoid that. 0x14 and 0x18 would be better and works as well.
--- tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh +3 -3
@@ -516,9 +516,9 @@ test_tos() RET=0 tc filter add dev v1 egress pref 77 prot ip \ - flower ip_tos 0x11 action pass - vxlan_ping_test $h1 192.0.2.3 "-Q 0x11" v1 egress 77 10 - vxlan_ping_test $h1 192.0.2.3 "-Q 0x12" v1 egress 77 0 + flower ip_tos 0x14 action pass + vxlan_ping_test $h1 192.0.2.3 "-Q 0x14" v1 egress 77 10 + vxlan_ping_test $h1 192.0.2.3 "-Q 0x18" v1 egress 77 0 tc filter del dev v1 egress pref 77 prot ip log_test "VXLAN: envelope TOS inheritance"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/189 binder: prevent UAF for binderfs devices
In reply to Greg Kroah-HartmanFrom: Christian Brauner <[email protected]>
commit 2669b8b0c798fbe1a31d49e07aa33233d469ad9b upstream.
On binder_release(), binder_defer_work(proc, BINDER_DEFERRED_RELEASE) is called which punts the actual cleanup operation to a workqueue. At some point, binder_deferred_func() will be called which will end up calling binder_deferred_release() which will retrieve and cleanup the binder_context attach to this struct binder_proc.
If we trace back where this binder_context is attached to binder_proc we see that it is set in binder_open() and is taken from the struct binder_device it is associated with. This obviously assumes that the struct binder_device that context is attached to is _never_ freed. While that might be true for devtmpfs binder devices it is most certainly wrong for binderfs binder devices.
So, assume binder_open() is called on a binderfs binder devices. We now stash away the struct binder_context associated with that struct binder_devices:
proc->context = &binder_dev->context;
/* binderfs stashes devices in i_private */
if (is_binderfs_device(nodp)) {
binder_dev = nodp->i_private;
info = nodp->i_sb->s_fs_info;
binder_binderfs_dir_entry_proc = info->proc_log_dir;
} else {
.
.
.
proc->context = &binder_dev->context;Now let's assume that the binderfs instance for that binder devices is shutdown via umount() and/or the mount namespace associated with it goes away. As long as there is still an fd open for that binderfs binder device things are fine. But let's assume we now close the last fd for that binderfs binder device. Now binder_release() is called and punts to the workqueue. Assume that the workqueue has quite a bit of stuff to do and doesn't get to cleaning up the struct binder_proc and the associated struct binder_context with it for that binderfs binder device right away. In the meantime, the VFS is killing the super block and is ultimately calling sb->evict_inode() which means it will call binderfs_evict_inode() which does:
static void binderfs_evict_inode(struct inode *inode)
{
struct binder_device *device = inode->i_private;
struct binderfs_info *info = BINDERFS_I(inode);
clear_inode(inode);
if (!S_ISCHR(inode->i_mode) || !device)
return;
mutex_lock(&binderfs_minors_mutex);
--info->device_count;
ida_free(&binderfs_minors, device->miscdev.minor);
mutex_unlock(&binderfs_minors_mutex);
kfree(device->context.name);
kfree(device);
}thereby freeing the struct binder_device including struct binder_context.
Now the workqueue finally has time to get around to cleaning up struct binder_proc and is now trying to access the associate struct binder_context. Since it's already freed it will OOPs.
Fix this by holding an additional reference to the inode that is only released once the workqueue is done cleaning up struct binder_proc. This is an easy alternative to introducing separate refcounting on struct binder_device which we can always do later if it becomes necessary.
This is an alternative fix to 51d8a7eca677 ("binder: prevent UAF read in print_binder_transaction_log_entry()").
Related : 51d8a7eca677 ("binder: prevent UAF read in print_binder_transaction_log_entry()")
--- drivers/android/binder.c | 5 ++++- drivers/android/binder_internal.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/android/binder.c +4 -1
@@ -5219,7 +5219,7 @@ static int binder_open(struct inode *nod proc->default_priority =task_nice (current);/* binderfs stashes devices in i_private */ if (is_binderfs_device (nodp)) { - binder_dev = nodp->i_private; + binder_dev =binderfs_device_get (nodp->i_private); info = nodp->i_sb->s_fs_info; binder_binderfs_dir_entry_proc = info->proc_log_dir; }else {
@@ -5403,6 +5403,7 @@ static int binder_node_release(struct bistatic void binder_deferred_release (struct binder_proc *proc) {struct binder_context *context = proc->context; +struct binder_device *device;struct rb_node *n;int threads, nodes, incoming_refs, outgoing_refs, active_transactions;
@@ -5482,6 +5483,8 @@ static void binder_deferred_release(stru outgoing_refs, active_transactions);binder_proc_dec_tmpref (proc); + device = container_of(proc->context, struct binder_device, context); +binderfs_device_put (device); }static void binder_deferred_func (struct work_struct *work)
drivers/android/binder_internal.h +13 -0
@@ -35,6 +35,19 @@ struct binder_device {struct inode *binderfs_inode; }; +static inline struct binder_device *binderfs_device_get (struct binder_device *dev) +{ +if (dev->binderfs_inode) +ihold (dev->binderfs_inode); +return dev; +} + +static inline void binderfs_device_put (struct binder_device *dev) +{ +if (dev->binderfs_inode) +iput (dev->binderfs_inode); +} +/** * binderfs_mount_opts - mount options for binderfs * @max: maximum number of allocatable binderfs binder devices
Greg Kroah-Hartman
maintainerPATCH 60/189 binder: prevent UAF for binderfs devices II
In reply to Greg Kroah-HartmanFrom: Christian Brauner <[email protected]>
commit f0fe2c0f050d31babcad7d65f1d550d462a40064 upstream.
This is a necessary follow up to the first fix I proposed and we merged in 2669b8b0c79 ("binder: prevent UAF for binderfs devices"). I have been overly optimistic that the simple fix I proposed would work. But alas, ihold() + iput() won't work since the inodes won't survive the destruction of the superblock.
So all we get with my prior fix is a different race with a tinier race-window but it doesn't solve the issue. Fwiw, the problem lies with generic_shutdown_super(). It even has this cozy Al-style comment:
if (!list_empty(&sb->s_inodes)) {
printk("VFS: Busy inodes after unmount of %s. "
"Self-destruct in 5 seconds. Have a nice day...\n",
sb->s_id);
}On binder_release(), binder_defer_work(proc, BINDER_DEFERRED_RELEASE) is called which punts the actual cleanup operation to a workqueue. At some point, binder_deferred_func() will be called which will end up calling binder_deferred_release() which will retrieve and cleanup the binder_context attach to this struct binder_proc.
If we trace back where this binder_context is attached to binder_proc we see that it is set in binder_open() and is taken from the struct binder_device it is associated with. This obviously assumes that the struct binder_device that context is attached to is _never_ freed. While that might be true for devtmpfs binder devices it is most certainly wrong for binderfs binder devices.
So, assume binder_open() is called on a binderfs binder devices. We now stash away the struct binder_context associated with that struct binder_devices:
proc->context = &binder_dev->context;
/* binderfs stashes devices in i_private */
if (is_binderfs_device(nodp)) {
binder_dev = nodp->i_private;
info = nodp->i_sb->s_fs_info;
binder_binderfs_dir_entry_proc = info->proc_log_dir;
} else {
.
.
.
proc->context = &binder_dev->context;Now let's assume that the binderfs instance for that binder devices is shutdown via umount() and/or the mount namespace associated with it goes away. As long as there is still an fd open for that binderfs binder device things are fine. But let's assume we now close the last fd for that binderfs binder device. Now binder_release() is called and punts to the workqueue. Assume that the workqueue has quite a bit of stuff to do and doesn't get to cleaning up the struct binder_proc and the associated struct binder_context with it for that binderfs binder device right away. In the meantime, the VFS is killing the super block and is ultimately calling sb->evict_inode() which means it will call binderfs_evict_inode() which does:
static void binderfs_evict_inode(struct inode *inode)
{
struct binder_device *device = inode->i_private;
struct binderfs_info *info = BINDERFS_I(inode);
clear_inode(inode);
if (!S_ISCHR(inode->i_mode) || !device)
return;
mutex_lock(&binderfs_minors_mutex);
--info->device_count;
ida_free(&binderfs_minors, device->miscdev.minor);
mutex_unlock(&binderfs_minors_mutex);
kfree(device->context.name);
kfree(device);
}thereby freeing the struct binder_device including struct binder_context.
Now the workqueue finally has time to get around to cleaning up struct binder_proc and is now trying to access the associate struct binder_context. Since it's already freed it will OOPs.
Fix this by introducing a refounct on binder devices.
This is an alternative fix to 51d8a7eca677 ("binder: prevent UAF read in print_binder_transaction_log_entry()").
Related : 51d8a7eca677 ("binder: prevent UAF read in print_binder_transaction_log_entry()")
--- drivers/android/binder.c | 12 +++++++++--- drivers/android/binder_internal.h | 15 ++------------- drivers/android/binderfs.c | 7 +++++-- 3 files changed, 16 insertions(+), 18 deletions(-)
drivers/android/binder.c +9 -3
@@ -5219,13 +5219,14 @@ static int binder_open(struct inode *nod proc->default_priority =task_nice (current);/* binderfs stashes devices in i_private */ if (is_binderfs_device (nodp)) { - binder_dev =binderfs_device_get (nodp->i_private); + binder_dev = nodp->i_private; info = nodp->i_sb->s_fs_info; binder_binderfs_dir_entry_proc = info->proc_log_dir; }else { binder_dev =container_of (filp->private_data, struct binder_device, miscdev); } +refcount_inc (&binder_dev->ref); proc->context = &binder_dev->context;binder_alloc_init (&proc->alloc);
@@ -5420,6 +5421,12 @@ static void binder_deferred_release(stru context->binder_context_mgr_node =NULL ; }mutex_unlock (&context->context_mgr_node_lock); + device = container_of(proc->context, struct binder_device, context); +if (refcount_dec_and_test (&device->ref)) { +kfree (context->name); +kfree (device); + } + proc->context =NULL ;binder_inner_proc_lock (proc);/* * Make sure proc stays alive after we
@@ -5483,8 +5490,6 @@ static void binder_deferred_release(stru outgoing_refs, active_transactions);binder_proc_dec_tmpref (proc); - device = container_of(proc->context, struct binder_device, context); -binderfs_device_put (device); }static void binder_deferred_func (struct work_struct *work)
@@ -6078,6 +6083,7 @@ static int __init init_binder_device(con binder_device->miscdev.minor =MISC_DYNAMIC_MINOR ; binder_device->miscdev.name = name; +refcount_set (&binder_device->ref,1 ); binder_device->context.binder_context_mgr_uid =INVALID_UID ; binder_device->context.name = name;mutex_init (&binder_device->context.context_mgr_node_lock);
drivers/android/binder_internal.h +2 -13
@@ -8,6 +8,7 @@#include <linux/list.h> #include <linux/miscdevice.h> #include <linux/mutex.h> +#include <linux/refcount.h> #include <linux/stddef.h> #include <linux/types.h> #include <linux/uidgid.h>
@@ -33,21 +34,9 @@ struct binder_device {struct miscdevice miscdev;struct binder_context context;struct inode *binderfs_inode; +refcount_t ref; }; -static inline struct binder_device *binderfs_device_get (struct binder_device *dev) -{ -if (dev->binderfs_inode) -ihold (dev->binderfs_inode); -return dev; -} - -static inline void binderfs_device_put (struct binder_device *dev) -{ -if (dev->binderfs_inode) -iput (dev->binderfs_inode); -} -/** * binderfs_mount_opts - mount options for binderfs * @max: maximum number of allocatable binderfs binder devices
drivers/android/binderfs.c +5 -2
@@ -154,6 +154,7 @@ static int binderfs_binder_device_createif (!name) goto err; +refcount_set (&device->ref,1 ); device->binderfs_inode = inode; device->context.binder_context_mgr_uid =INVALID_UID ; device->context.name = name;
@@ -257,8 +258,10 @@ static void binderfs_evict_inode(structida_free (&binderfs_minors, device->miscdev.minor);mutex_unlock (&binderfs_minors_mutex); -kfree (device->context.name); -kfree (device); +if (refcount_dec_and_test (&device->ref)) { +kfree (device->context.name); +kfree (device); + } }/**
Greg Kroah-Hartman
maintainerPATCH 35/189 net: ks8851-ml: Fix 16-bit IO operation
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 58292104832fef6cb4a89f736012c0e0724c3442 ]
The Micrel KSZ8851-16MLLI datasheet DS00002357B page 12 states that BE[3:0] signals are active high. This contradicts the measurements of the behavior of the actual chip, where these signals behave as active low. For example, to read the CIDER register, the bus must expose 0xc0c0 during the address phase, which means BE[3:0]=4'b1100.
--- drivers/net/ethernet/micrel/ks8851_mll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/micrel/ks8851_mll.c +2 -2
@@ -166,7 +166,7 @@ static int msg_enable;static u16 ks_rdreg16 (struct ks_net *ks,int offset) { - ks->cmd_reg_cache = (u16 )offset | ((BE1 |BE0 ) << (offset &0x02 )); + ks->cmd_reg_cache = (u16 )offset | ((BE3 |BE2 ) >> (offset &0x02 ));iowrite16 (ks->cmd_reg_cache, ks->hw_addr_cmd);return ioread16 (ks->hw_addr); }
@@ -181,7 +181,7 @@ static u16 ks_rdreg16(struct ks_net *ks, int offset)static void ks_wrreg16 (struct ks_net *ks,int offset,u16 value) { - ks->cmd_reg_cache = (u16 )offset | ((BE1 |BE0 ) << (offset &0x02 )); + ks->cmd_reg_cache = (u16 )offset | ((BE3 |BE2 ) >> (offset &0x02 ));iowrite16 (ks->cmd_reg_cache, ks->hw_addr_cmd);iowrite16 (value, ks->hw_addr); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/189 ALSA: hda/realtek - Add Headset Mic supported
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit 78def224f59c05d00e815be946ec229719ccf377 upstream.
Dell desktop platform supported headset Mic.
Add pin verb to enable headset Mic.
This platform only support fixed type headset for Iphone type.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -7115,6 +7115,8 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1028 ,0x0935 ,"Dell" ,ALC274_FIXUP_DELL_AIO_LINEOUT_VERB ),SND_PCI_QUIRK (0x1028 ,0x097e ,"Dell Precision" ,ALC289_FIXUP_DUAL_SPK ),SND_PCI_QUIRK (0x1028 ,0x097d ,"Dell Precision" ,ALC289_FIXUP_DUAL_SPK ), +SND_PCI_QUIRK (0x1028 ,0x098d ,"Dell Precision" ,ALC233_FIXUP_ASUS_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1028 ,0x09bf ,"Dell Precision" ,ALC233_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x164a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x164b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
Greg Kroah-Hartman
maintainerPATCH 62/189 ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit 76f7dec08fd64e9e3ad0810a1a8a60b0a846d348 upstream.
ThinkPad want to support Headset Button control.
This patch will enable it.
--- sound/pci/hda/patch_realtek.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
sound/pci/hda/patch_realtek.c +9 -4
@@ -5920,7 +5920,7 @@ enum {ALC289_FIXUP_DUAL_SPK ,ALC294_FIXUP_SPK2_TO_DAC1 ,ALC294_FIXUP_ASUS_DUAL_SPK , - + ALC285_FIXUP_THINKPAD_HEADSET_JACK, }; static const struct hda_fixup alc269_fixups[] = {
@@ -7040,7 +7040,12 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id =ALC294_FIXUP_SPK2_TO_DAC1 }, - + [ALC285_FIXUP_THINKPAD_HEADSET_JACK] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_headset_jack, + .chained = true, + .chain_id =ALC285_FIXUP_SPEAKER2_TO_DAC1 + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7276,8 +7281,8 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x224c ,"Thinkpad" ,ALC298_FIXUP_TPT470_DOCK ),SND_PCI_QUIRK (0x17aa ,0x224d ,"Thinkpad" ,ALC298_FIXUP_TPT470_DOCK ),SND_PCI_QUIRK (0x17aa ,0x225d ,"Thinkpad T480" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ), -SND_PCI_QUIRK (0x17aa ,0x2292 ,"Thinkpad X1 Yoga 7th" ,ALC285_FIXUP_SPEAKER2_TO_DAC1 ), -SND_PCI_QUIRK (0x17aa ,0x2293 ,"Thinkpad X1 Carbon 7th" ,ALC285_FIXUP_SPEAKER2_TO_DAC1 ), +SND_PCI_QUIRK (0x17aa ,0x2292 ,"Thinkpad X1 Yoga 7th" ,ALC285_FIXUP_THINKPAD_HEADSET_JACK ), +SND_PCI_QUIRK (0x17aa ,0x2293 ,"Thinkpad X1 Carbon 7th" ,ALC285_FIXUP_THINKPAD_HEADSET_JACK ),SND_PCI_QUIRK (0x17aa ,0x30bb ,"ThinkCentre AIO" ,ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY ),SND_PCI_QUIRK (0x17aa ,0x30e2 ,"ThinkCentre AIO" ,ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY ), SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
Greg Kroah-Hartman
maintainerPATCH 63/189 ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1
In reply to Greg Kroah-HartmanFrom: Hui Wang <[email protected]>
commit c37c0ab029569a75fd180edb03d411e7a28a936f upstream.
Need to chain the THINKPAD_ACPI, otherwise the mute led will not work.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -6684,6 +6684,8 @@ static const struct hda_fixup alc269_fix [ALC285_FIXUP_SPEAKER2_TO_DAC1] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_speaker2_to_dac1, + .chained = true, + .chain_id =ALC269_FIXUP_THINKPAD_ACPI }, [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = { .type = HDA_FIXUP_PINS,
Greg Kroah-Hartman
maintainerPATCH 64/189 ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master
In reply to Greg Kroah-HartmanFrom: Christian Lachner <[email protected]>
commit 0d45e86d2267d5bdf7bbb631499788da1c27ceb2 upstream.
The Gigabyte X570 Aorus Master motherboard with ALC1220 codec requires a similar workaround for Clevo laptops to enforce the DAC/mixer connection path. Set up a quirk entry for that.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2447,6 +2447,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1071 ,0x8258 ,"Evesham Voyaeger" ,ALC882_FIXUP_EAPD ),SND_PCI_QUIRK (0x1458 ,0xa002 ,"Gigabyte EP45-DS3/Z87X-UD3H" ,ALC889_FIXUP_FRONT_HP_NO_PRESENCE ),SND_PCI_QUIRK (0x1458 ,0xa0b8 ,"Gigabyte AZ370-Gaming" ,ALC1220_FIXUP_GB_DUAL_CODECS ), +SND_PCI_QUIRK (0x1458 ,0xa0cd ,"Gigabyte X570 Aorus Master" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1462 ,0x1228 ,"MSI-GP63" ,ALC1220_FIXUP_CLEVO_P950 ),SND_PCI_QUIRK (0x1462 ,0x1276 ,"MSI-GL73" ,ALC1220_FIXUP_CLEVO_P950 ), SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950),
Greg Kroah-Hartman
maintainerPATCH 65/189 ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
commit 8b33a134a9cc2a501f8fc731d91caef39237d495 upstream.
A headset on the laptop like ASUS B9450FA does not work, until quirk ALC294_FIXUP_ASUS_HPE is applied.
--- sound/pci/hda/patch_realtek.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/pci/hda/patch_realtek.c +13 -0
@@ -5922,6 +5922,7 @@ enum {ALC294_FIXUP_SPK2_TO_DAC1 ,ALC294_FIXUP_ASUS_DUAL_SPK ,ALC285_FIXUP_THINKPAD_HEADSET_JACK , + ALC294_FIXUP_ASUS_HPE, }; static const struct hda_fixup alc269_fixups[] = {
@@ -7049,6 +7050,17 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id =ALC285_FIXUP_SPEAKER2_TO_DAC1 }, + [ALC294_FIXUP_ASUS_HPE] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb []) { +/* Set EAPD high */ + {0x20 ,AC_VERB_SET_COEF_INDEX ,0x0f }, + {0x20 ,AC_VERB_SET_PROC_COEF ,0x7774 }, + { } + }, + .chained = true, + .chain_id =ALC294_FIXUP_ASUS_HEADSET_MIC + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7214,6 +7226,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x16e3 ,"ASUS UX50" ,ALC269_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1043 ,0x17d1 ,"ASUS UX431FL" ,ALC294_FIXUP_ASUS_DUAL_SPK ),SND_PCI_QUIRK (0x1043 ,0x18b1 ,"Asus MJ401TA" ,ALC256_FIXUP_ASUS_HEADSET_MIC ), +SND_PCI_QUIRK (0x1043 ,0x19ce ,"ASUS B9450FA" ,ALC294_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x1a13 ,"Asus G73Jw" ,ALC269_FIXUP_ASUS_G73JW ),SND_PCI_QUIRK (0x1043 ,0x1a30 ,"ASUS X705UD" ,ALC256_FIXUP_ASUS_MIC ), SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
Greg Kroah-Hartman
maintainerPATCH 67/189 cifs: dont leak -EAGAIN for stat() during reconnect
In reply to Greg Kroah-HartmanFrom: Ronnie Sahlberg <[email protected]>
commit fc513fac56e1b626ae48a74d7551d9c35c50129e upstream.
If from cifs_revalidate_dentry_attr() the SMB2/QUERY_INFO call fails with an error, such as STATUS_SESSION_EXPIRED, causing the session to be reconnected it is possible we will leak -EAGAIN back to the application even for system calls such as stat() where this is not a valid error.
Fix this by re-trying the operation from within cifs_revalidate_dentry_attr() if cifs_get_inode_info*() returns -EAGAIN.
This fixes stat() and possibly also other system calls that uses cifs_revalidate_dentry*().
--- fs/cifs/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/cifs/inode.c +5 -1
@@ -2074,6 +2074,7 @@ int cifs_revalidate_dentry_attr(struct dstruct inode *inode =d_inode (dentry);struct super_block *sb = dentry->d_sb;char *full_path =NULL ; +int count =0 ;if (inode ==NULL )return -ENOENT ;
@@ -2095,15 +2096,18 @@ int cifs_revalidate_dentry_attr(struct d full_path, inode, inode->i_count.counter, dentry, cifs_get_time(dentry), jiffies); +again:if (cifs_sb_master_tcon (CIFS_SB (sb))->unix_ext) rc =cifs_get_inode_info_unix (&inode, full_path, sb, xid);else rc =cifs_get_inode_info (&inode, full_path,NULL , sb, xid,NULL ); - +if (rc == -EAGAIN && count++ <10 ) + goto again; out:kfree (full_path);free_xid (xid); +return rc; }
Greg Kroah-Hartman
maintainerPATCH 66/189 driver core: Call sync_state() even if supplier has no consumers
In reply to Greg Kroah-HartmanFrom: Saravana Kannan <[email protected]>
commit 21eb93f432b1a785df193df1a56a59e9eb3a985f upstream.
The initial patch that added sync_state() support didn't handle the case where a supplier has no consumers. This was because when a device is successfully bound with a driver, only its suppliers were checked to see if they are eligible to get a sync_state(). This is not sufficient for devices that have no consumers but still need to do device state clean up. So fix this.
--- drivers/base/core.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/base/core.c +17 -6
@@ -745,25 +745,31 @@ static void __device_links_queue_sync_st/** * device_links_flush_sync_list - Call sync_state() on a list of devices * @list: List of devices to call sync_state() on +* @dont_lock_dev: Device for which lock is already held by the caller * * Calls sync_state() on all the devices that have been queued for it. This -* function is used in conjunction with __device_links_queue_sync_state(). +* function is used in conjunction with __device_links_queue_sync_state(). The +* @dont_lock_dev parameter is useful when this function is called from a +* context where a device lock is already held. */ -static void device_links_flush_sync_list (struct list_head *list) +static void device_links_flush_sync_list (struct list_head *list, +struct device *dont_lock_dev) {struct device *dev, *tmp;list_for_each_entry_safe (dev, tmp, list, links.defer_sync) {list_del_init (&dev->links.defer_sync); -device_lock (dev); +if (dev != dont_lock_dev) +device_lock (dev);if (dev->bus->sync_state) dev->bus->sync_state (dev);else if (dev->driver && dev->driver->sync_state) dev->driver->sync_state (dev); -device_unlock (dev); +if (dev != dont_lock_dev) +device_unlock (dev);put_device (dev); }
@@ -801,7 +807,7 @@ void device_links_supplier_sync_state_re out:device_links_write_unlock (); -device_links_flush_sync_list (&sync_list); +device_links_flush_sync_list (&sync_list,NULL ); }static int sync_state_resume_initcall (void )
@@ -865,6 +871,11 @@ void device_links_driver_bound(struct dedriver_deferred_probe_add (link->consumer); } +if (defer_sync_state_count) +__device_links_supplier_defer_sync (dev); +else +__device_links_queue_sync_state (dev, &sync_list); +list_for_each_entry (link, &dev->links.suppliers, c_node) {if (!(link->flags &DL_FLAG_MANAGED ))continue ;
@@ -883,7 +894,7 @@ void device_links_driver_bound(struct dedevice_links_write_unlock (); -device_links_flush_sync_list (&sync_list); +device_links_flush_sync_list (&sync_list, dev); }static void device_link_drop_managed (struct device_link *link)
Greg Kroah-Hartman
maintainerPATCH 68/189 cifs: fix rename() by ensuring source handle opened with DELETE bit
In reply to Greg Kroah-HartmanFrom: Aurelien Aptel <[email protected]>
commit 86f740f2aed5ea7fe1aa86dc2df0fb4ab0f71088 upstream.
To rename a file in SMB2 we open it with the DELETE access and do a special SetInfo on it. If the handle is missing the DELETE bit the server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with cifs_get_writable_path(). That function looks for handles with WRITE access but doesn't check for DELETE, making rename() fail if it finds a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument to cifs_get_writable_path() and find_writable_file() and the existing 'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the original SMB access flags. Since the DELETE bit is not mapped in that mode, this patch stores the access mask in cifs_fid on file open, which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}$ gcc -o bugrename bugrename.c $ ./bugrename /mnt/a /mnt/b rename(): Permission denied
--- fs/cifs/cifsglob.h | 7 +++++++ fs/cifs/cifsproto.h | 5 +++-- fs/cifs/cifssmb.c | 3 ++- fs/cifs/file.c | 19 ++++++++++++------- fs/cifs/inode.c | 6 +++--- fs/cifs/smb1ops.c | 2 +- fs/cifs/smb2inode.c | 4 ++-- fs/cifs/smb2ops.c | 3 ++- fs/cifs/smb2pdu.c | 1 + 9 files changed, 33 insertions(+), 17 deletions(-)
fs/cifs/cifsglob.h +7 -0
@@ -1277,6 +1277,7 @@ struct cifs_fid {__u64 volatile_fid;/* volatile file id for smb2 */ __u8 lease_key[SMB2_LEASE_KEY_SIZE ];/* lease key for smb2 */ __u8 create_guid[16 ]; +__u32 access;struct cifs_pending_open *pending_open;unsigned int epoch;#ifdef CONFIG_CIFS_DEBUG2
@@ -1737,6 +1738,12 @@ static inline bool is_retryable_error(inreturn false; } + +/* cifs_get_writable_file() flags */ +#define FIND_WR_ANY 0 +#define FIND_WR_FSUID_ONLY 1 +#define FIND_WR_WITH_DELETE 2 +#define MID_FREE 0#define MID_REQUEST_ALLOCATED 1#define MID_REQUEST_SUBMITTED 2
fs/cifs/cifsproto.h +3 -2
@@ -134,11 +134,12 @@ extern bool backup_cred(struct cifs_sb_iextern bool is_size_safe_to_change (struct cifsInodeInfo *,__u64 eof);extern void cifs_update_eof (struct cifsInodeInfo *cifsi,loff_t offset,unsigned int bytes_written); -extern struct cifsFileInfo *find_writable_file (struct cifsInodeInfo *,bool ); +extern struct cifsFileInfo *find_writable_file (struct cifsInodeInfo *,int );extern int cifs_get_writable_file (struct cifsInodeInfo *cifs_inode, -bool fsuid_only, +int flags,struct cifsFileInfo **ret_file);extern int cifs_get_writable_path (struct cifs_tcon *tcon,const char *name, +int flags,struct cifsFileInfo **ret_file);extern struct cifsFileInfo *find_readable_file (struct cifsInodeInfo *,bool ); extern int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,
fs/cifs/cifssmb.c +2 -1
@@ -1492,6 +1492,7 @@ openRetry: *oplock = rsp->OplockLevel;/* cifs fid stays in le */ oparms->fid->netfid = rsp->Fid; + oparms->fid->access = desired_access;/* Let caller know file was created so we can set the mode. */ /* Do we care about the CreateAction in any other cases? */
@@ -2115,7 +2116,7 @@ cifs_writev_requeue(struct cifs_writedat wdata2->tailsz = tailsz; wdata2->bytes = cur_len; - rc =cifs_get_writable_file (CIFS_I (inode), false, + rc =cifs_get_writable_file (CIFS_I (inode),FIND_WR_ANY , &wdata2->cfile);if (!wdata2->cfile) { cifs_dbg(VFS, "No writable handle to retry writepages rc=%d\n",
fs/cifs/file.c +12 -7
@@ -1964,7 +1964,7 @@ struct cifsFileInfo *find_readable_file(/* Return -EBADF if no handle is found and general rc otherwise */ int -cifs_get_writable_file (struct cifsInodeInfo *cifs_inode,bool fsuid_only, +cifs_get_writable_file (struct cifsInodeInfo *cifs_inode,int flags,struct cifsFileInfo **ret_file) {struct cifsFileInfo *open_file, *inv_file =NULL ;
@@ -1972,7 +1972,8 @@ cifs_get_writable_file(struct cifsInodeIbool any_available = false;int rc = -EBADF ;unsigned int refind =0 ; - +bool fsuid_only = flags &FIND_WR_FSUID_ONLY ; +bool with_delete = flags &FIND_WR_WITH_DELETE ; *ret_file =NULL ;/*
@@ -2004,6 +2005,8 @@ refind_writable:continue ;if (fsuid_only && !uid_eq (open_file->uid,current_fsuid ()))continue ; +if (with_delete && !(open_file->fid.access &DELETE )) +continue ;if (OPEN_FMODE (open_file->f_flags) &FMODE_WRITE ) {if (!open_file->invalidHandle) {/* found a good writable file */
@@ -2051,12 +2054,12 @@ refind_writable: }struct cifsFileInfo * -find_writable_file (struct cifsInodeInfo *cifs_inode,bool fsuid_only) +find_writable_file (struct cifsInodeInfo *cifs_inode,int flags) {struct cifsFileInfo *cfile;int rc; - rc =cifs_get_writable_file (cifs_inode, fsuid_only, &cfile); + rc =cifs_get_writable_file (cifs_inode, flags, &cfile);if (rc)cifs_dbg (FYI ,"couldn't find writable handle rc=%d" , rc);
@@ -2065,6 +2068,7 @@ find_writable_file(struct cifsInodeInfoint cifs_get_writable_path (struct cifs_tcon *tcon,const char *name, +int flags,struct cifsFileInfo **ret_file) {struct list_head *tmp;
@@ -2091,7 +2095,7 @@ cifs_get_writable_path(struct cifs_tconkfree (full_path); cinode =CIFS_I (d_inode (cfile->dentry));spin_unlock (&tcon->open_file_lock); -return cifs_get_writable_file (cinode,0 , ret_file); +return cifs_get_writable_file (cinode, flags, ret_file); }spin_unlock (&tcon->open_file_lock);
@@ -2168,7 +2172,8 @@ static int cifs_partialpagewrite(structif (mapping->host->i_size - offset < (loff_t )to) to = (unsigned )(mapping->host->i_size - offset); - rc =cifs_get_writable_file (CIFS_I (mapping->host), false, &open_file); + rc =cifs_get_writable_file (CIFS_I (mapping->host),FIND_WR_ANY , + &open_file);if (!rc) { bytes_written =cifs_write (open_file, open_file->pid, write_data, to - from, &offset);
@@ -2361,7 +2366,7 @@ retry:if (cfile)cifsFileInfo_put (cfile); - rc =cifs_get_writable_file (CIFS_I (inode), false, &cfile); + rc =cifs_get_writable_file (CIFS_I (inode),FIND_WR_ANY , &cfile);/* in case of an error store it to return later */ if (rc)
fs/cifs/inode.c +3 -3
@@ -2283,7 +2283,7 @@ cifs_set_file_size(struct inode *inode,* writebehind data than the SMB timeout for the SetPathInfo * request would allow */ - open_file =find_writable_file (cifsInode, true); + open_file =find_writable_file (cifsInode,FIND_WR_FSUID_ONLY );if (open_file) { tcon =tlink_tcon (open_file->tlink); server = tcon->ses->server;
@@ -2433,7 +2433,7 @@ cifs_setattr_unix(struct dentry *direntr args->ctime =NO_CHANGE_64 ; args->device =0 ; - open_file =find_writable_file (cifsInode, true); + open_file =find_writable_file (cifsInode,FIND_WR_FSUID_ONLY );if (open_file) {u16 nfid = open_file->fid.netfid;u32 npid = open_file->pid;
@@ -2536,7 +2536,7 @@ cifs_setattr_nounix(struct dentry *diren rc =0 ;if (attrs->ia_valid &ATTR_MTIME ) { - rc =cifs_get_writable_file (cifsInode, false, &wfile); + rc =cifs_get_writable_file (cifsInode,FIND_WR_ANY , &wfile);if (!rc) { tcon =tlink_tcon (wfile->tlink); rc = tcon->ses->server->ops->flush (xid, tcon, &wfile->fid);
fs/cifs/smb1ops.c +1 -1
@@ -765,7 +765,7 @@ smb_set_file_info(struct inode *inode, cstruct cifs_tcon *tcon;/* if the file is already open for write, just use that fileid */ - open_file =find_writable_file (cinode, true); + open_file =find_writable_file (cinode,FIND_WR_FSUID_ONLY );if (open_file) { fid.netfid = open_file->fid.netfid; netpid = open_file->pid;
fs/cifs/smb2inode.c +2 -2
@@ -526,7 +526,7 @@ smb2_mkdir_setinfo(struct inode *inode, cifs_i =CIFS_I (inode); dosattrs = cifs_i->cifsAttrs |ATTR_READONLY ; data.Attributes =cpu_to_le32 (dosattrs); -cifs_get_writable_path (tcon, name, &cfile); +cifs_get_writable_path (tcon, name,FIND_WR_ANY , &cfile); tmprc = smb2_compound_op(xid, tcon, cifs_sb, name, FILE_WRITE_ATTRIBUTES, FILE_CREATE, CREATE_NOT_FILE, ACL_NO_MODE,
@@ -582,7 +582,7 @@ smb2_rename_path(const unsigned int xid, {struct cifsFileInfo *cfile; -cifs_get_writable_path (tcon, from_name, &cfile); +cifs_get_writable_path (tcon, from_name,FIND_WR_WITH_DELETE , &cfile);return smb2_set_path_attr (xid, tcon, from_name, to_name, cifs_sb,DELETE ,SMB2_OP_RENAME , cfile);
fs/cifs/smb2ops.c +2 -1
@@ -1366,6 +1366,7 @@ smb2_set_fid(struct cifsFileInfo *cfile, cfile->fid.persistent_fid = fid->persistent_fid; cfile->fid.volatile_fid = fid->volatile_fid; + cfile->fid.access = fid->access;#ifdef CONFIG_CIFS_DEBUG2 cfile->fid.mid = fid->mid;#endif /* CIFS_DEBUG2 */
@@ -3225,7 +3226,7 @@ static loff_t smb3_llseek(struct file *f* some servers (Windows2016) will not reflect recent writes in * QUERY_ALLOCATED_RANGES until SMB2_flush is called. */ - wrcfile =find_writable_file (cifsi, false); + wrcfile =find_writable_file (cifsi,FIND_WR_ANY );if (wrcfile) {filemap_write_and_wait (inode->i_mapping);smb2_flush_file (xid, tcon, &wrcfile->fid);
fs/cifs/smb2pdu.c +1 -0
@@ -2749,6 +2749,7 @@ SMB2_open(const unsigned int xid, structatomic_inc (&tcon->num_remote_opens); oparms->fid->persistent_fid = rsp->PersistentFileId; oparms->fid->volatile_fid = rsp->VolatileFileId; + oparms->fid->access = oparms->desired_access;#ifdef CONFIG_CIFS_DEBUG2 oparms->fid->mid =le64_to_cpu (rsp->sync_hdr.MessageId);#endif /* CIFS_DEBUG2 */
Greg Kroah-Hartman
maintainerPATCH 70/189 usb: usb251xb: fix regulator probe and error handling
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
commit f06947f275f1838586792c17b6ab70da82ed7b43 upstream.
Commit 4d7201cda226 ("usb: usb251xb: add vdd supply support") didn't covered the non-DT use-case and so the regualtor_enable() call during probe will fail on those platforms. Also the commit didn't handled the error case correctly.
Move devm_regulator_get() out of usb251xb_get_ofdata() to address the 1st issue. This can be done without worries because devm_regulator_get() handles the non-DT use-case too. Add devm_add_action_or_reset() to address the 2nd bug.
--- drivers/usb/misc/usb251xb.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/usb/misc/usb251xb.c +16 -4
@@ -424,10 +424,6 @@ static int usb251xb_get_ofdata(struct usreturn err; } - hub->vdd =devm_regulator_get (dev,"vdd" ); -if (IS_ERR (hub->vdd)) -return PTR_ERR (hub->vdd); -if (of_property_read_u16_array (np,"vendor-id" , &hub->vendor_id,1 )) hub->vendor_id =USB251XB_DEF_VENDOR_ID ;
@@ -640,6 +636,13 @@ static int usb251xb_get_ofdata(struct us }#endif /* CONFIG_OF */ +static void usb251xb_regulator_disable_action (void *data) +{ +struct usb251xb *hub = data; + +regulator_disable (hub->vdd); +} +static int usb251xb_probe (struct usb251xb *hub) {struct device *dev = hub->dev;
@@ -676,10 +679,19 @@ static int usb251xb_probe(struct usb251xif (err)return err; + hub->vdd =devm_regulator_get (dev,"vdd" ); +if (IS_ERR (hub->vdd)) +return PTR_ERR (hub->vdd); + err =regulator_enable (hub->vdd);if (err)return err; + err =devm_add_action_or_reset (dev, + usb251xb_regulator_disable_action, hub); +if (err) +return err; + err =usb251xb_connect (hub);if (err) {dev_err (dev,"Failed to connect hub (%d)\n" , err);
Greg Kroah-Hartman
maintainerPATCH 71/189 usb: quirks: add NO_LPM quirk for Logitech Screen Share
In reply to Greg Kroah-HartmanFrom: Dan Lazewatsky <[email protected]>
commit b96ed52d781a2026d0c0daa5787c6f3d45415862 upstream.
LPM on the device appears to cause xHCI host controllers to claim that there isn't enough bandwidth to support additional devices.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -231,6 +231,9 @@ static const struct usb_device_id usb_qu/* Logitech PTZ Pro Camera */ { USB_DEVICE(0x046d, 0x0853), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Logitech Screen Share */ + { USB_DEVICE(0x046d, 0x086c), .driver_info = USB_QUIRK_NO_LPM }, + /* Logitech Quickcam Fusion */ { USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 36/189 net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit 9a6a0dea16177ccaecc116f560232e63bec115f1 ]
The call to of_get_mac_address() can return -EPROBE_DEFER, for instance when the MAC address is read from a NVMEM driver that did not probe yet.
--- drivers/net/ethernet/davicom/dm9000.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/davicom/dm9000.c +2 -0
@@ -1405,6 +1405,8 @@ static struct dm9000_plat_data *dm9000_parse_dt(struct device *dev) mac_addr =of_get_mac_address (np);if (!IS_ERR (mac_addr))ether_addr_copy (pdata->dev_addr, mac_addr); +else if (PTR_ERR (mac_addr) == -EPROBE_DEFER ) +return ERR_CAST (mac_addr);return pdata; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/189 watchdog: da9062: do not ping the hw during stop()
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
[ Upstream commit e9a0e65eda3f78d0b04ec6136c591c000cbc3b76 ]
The da9062 hw has a minimum ping cool down phase of at least 200ms. The driver takes that into account by setting the min_hw_heartbeat_ms to 300ms and the core guarantees that the hw limit is observed for the ping() calls. But the core can't guarantee the required minimum ping cool down phase if a stop() command is send immediately after the ping() command. So it is not allowed to ping the watchdog within the stop() command as the driver does. Remove the ping can be done without doubts because the watchdog gets disabled anyway and a (re)start resets the watchdog counter too.
--- drivers/watchdog/da9062_wdt.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/watchdog/da9062_wdt.c +0 -7
@@ -94,13 +94,6 @@ static int da9062_wdt_stop(struct watchdog_device *wdd)struct da9062_watchdog *wdt =watchdog_get_drvdata (wdd);int ret; - ret =da9062_reset_watchdog_timer (wdt); -if (ret) { -dev_err (wdt->hw->dev,"Failed to ping the watchdog (err = %d)\n" , - ret); -return ret; - } - ret = regmap_update_bits(wdt->hw->regmap, DA9062AA_CONTROL_D, DA9062AA_TWDSCALE_MASK,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/189 s390/cio: cio_ignore_proc_seq_next should increase position index
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
[ Upstream commit 8b101a5e14f2161869636ff9cb4907b7749dc0c2 ]
if seq_file .next fuction does not change position index, read after some lseek can generate unexpected output.
--- drivers/s390/cio/blacklist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/s390/cio/blacklist.c +3 -2
@@ -303,8 +303,10 @@ static void * cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) { struct ccwdev_iter *iter; +loff_t p = *offset; -if (*offset >= (__MAX_SUBCHANNEL +1 ) * (__MAX_SSID +1 )) + (*offset)++; +if (p >= (__MAX_SUBCHANNEL +1 ) * (__MAX_SSID +1 ))return NULL ; iter = it;if (iter->devno == __MAX_SUBCHANNEL) {
@@ -314,7 +316,6 @@ cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset)return NULL ; }else iter->devno++; - (*offset)++;return iter; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/189 s390: make install not depend on vmlinux
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 94e90f727f7424d827256023cace829cad6896f4 ]
For the same reason as commit 19514fc665ff ("arm, kbuild: make "make install" not depend on vmlinux"), the install targets should never trigger the rebuild of the kernel.
The variable, CONFIGURE, is not set by anyone. Remove it as well.
--- arch/s390/Makefile | 2 +- arch/s390/boot/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/Makefile +1 -1
@@ -146,7 +146,7 @@ all: bzImage #KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg... KBUILD_IMAGE := $(boot)/bzImage -install: vmlinux +install: $(Q)$(MAKE) $(build)=$(boot) $@ bzImage: vmlinux
arch/s390/boot/Makefile +1 -1
@@ -70,7 +70,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE $(obj)/startup.a: $(OBJECTS) FORCE $(call if_changed,ar) -install: $(CONFIGURE) $(obj)/bzImage +install: sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \ System.map "$(INSTALL_PATH)"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/189 efi: Only print errors about failing to get certs if EFI vars are found
In reply to Greg Kroah-HartmanFrom: Javier Martinez Canillas <[email protected]>
[ Upstream commit 3be54d558c75562e42bc83d665df024bd79d399b ]
If CONFIG_LOAD_UEFI_KEYS is enabled, the kernel attempts to load the certs from the db, dbx and MokListRT EFI variables into the appropriate keyrings.
But it just assumes that the variables will be present and prints an error if the certs can't be loaded, even when is possible that the variables may not exist. For example the MokListRT variable will only be present if shim is used.
So only print an error message about failing to get the certs list from an EFI variable if this is found. Otherwise these printed errors just pollute the kernel log ring buffer with confusing messages like the following:
[ 5.427251] Couldn't get size: 0x800000000000000e [ 5.427261] MODSIGN: Couldn't get UEFI db list [ 5.428012] Couldn't get size: 0x800000000000000e [ 5.428023] Couldn't get UEFI MokListRT
--- security/integrity/platform_certs/load_uefi.c | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-)
security/integrity/platform_certs/load_uefi.c +26 -14
@@ -35,16 +35,18 @@ static __init bool uefi_check_ignore_db(void)* Get a certificate list blob from the named EFI variable. */ static __init void *get_cert_list (efi_char16_t *name,efi_guid_t *guid, -unsigned long *size) +unsigned long *size,efi_status_t *status) { -efi_status_t status;unsigned long lsize =4 ;unsigned long tmpdb[4 ];void *db; - status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb); -if (status !=EFI_BUFFER_TOO_SMALL ) { -pr_err ("Couldn't get size: 0x%lx\n" , status); + *status = efi.get_variable (name, guid,NULL , &lsize, &tmpdb); +if (*status ==EFI_NOT_FOUND ) +return NULL ; + +if (*status !=EFI_BUFFER_TOO_SMALL ) { +pr_err ("Couldn't get size: 0x%lx\n" , *status);return NULL ; }
@@ -52,10 +54,10 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,if (!db)return NULL ; - status = efi.get_variable (name, guid,NULL , &lsize, db); -if (status !=EFI_SUCCESS ) { + *status = efi.get_variable (name, guid,NULL , &lsize, db); +if (*status !=EFI_SUCCESS ) {kfree (db); -pr_err ("Error reading db var: 0x%lx\n" , status); +pr_err ("Error reading db var: 0x%lx\n" , *status);return NULL ; }
@@ -74,6 +76,7 @@ static int __init load_uefi_certs(void)efi_guid_t mok_var =EFI_SHIM_LOCK_GUID ;void *db =NULL , *dbx =NULL , *mok =NULL ;unsigned long dbsize =0 , dbxsize =0 , moksize =0 ; +efi_status_t status;int rc =0 ;if (!efi.get_variable)
@@ -83,9 +86,12 @@ static int __init load_uefi_certs(void)* an error if we can't get them. */ if (!uefi_check_ignore_db ()) { - db =get_cert_list (L"db" , &secure_var, &dbsize); + db =get_cert_list (L"db" , &secure_var, &dbsize, &status);if (!db) { -pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); +if (status ==EFI_NOT_FOUND ) +pr_debug ("MODSIGN: db variable wasn't found\n" ); +else +pr_err ("MODSIGN: Couldn't get UEFI db list\n" ); }else { rc =parse_efi_signature_list ("UEFI:db" , db, dbsize, get_handler_for_db);
@@ -96,9 +102,12 @@ static int __init load_uefi_certs(void) } } - mok =get_cert_list (L"MokListRT" , &mok_var, &moksize); + mok =get_cert_list (L"MokListRT" , &mok_var, &moksize, &status);if (!mok) { -pr_info ("Couldn't get UEFI MokListRT\n" ); +if (status ==EFI_NOT_FOUND ) +pr_debug ("MokListRT variable wasn't found\n" ); +else +pr_info ("Couldn't get UEFI MokListRT\n" ); }else { rc =parse_efi_signature_list ("UEFI:MokListRT" , mok, moksize, get_handler_for_db);
@@ -107,9 +116,12 @@ static int __init load_uefi_certs(void)kfree (mok); } - dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize); + dbx =get_cert_list (L"dbx" , &secure_var, &dbxsize, &status);if (!dbx) { -pr_info ("Couldn't get UEFI dbx list\n" ); +if (status ==EFI_NOT_FOUND ) +pr_debug ("dbx variable wasn't found\n" ); +else +pr_info ("Couldn't get UEFI dbx list\n" ); }else { rc = parse_efi_signature_list("UEFI:dbx", dbx, dbxsize,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/189 net/mlx5: DR, Fix matching on vport gvmi
In reply to Greg Kroah-HartmanFrom: Hamdan Igbaria <[email protected]>
[ Upstream commit 52d214976d4f64504c1bbb52d47b46a5a3d5ee42 ]
Set vport gvmi in the tag, only when source gvmi is set in the bit mask.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c +4 -1
@@ -2307,7 +2307,9 @@ static int dr_ste_build_src_gvmi_qpn_tag(struct mlx5dr_match_param *value,struct mlx5dr_cmd_vport_cap *vport_cap;struct mlx5dr_domain *dmn = sb->dmn;struct mlx5dr_cmd_caps *caps; +u8 *bit_mask = sb->bit_mask;u8 *tag = hw_ste->tag; +bool source_gvmi_set;DR_STE_SET_TAG (src_gvmi_qp, tag, source_qp, misc, source_sqn);
@@ -2328,7 +2330,8 @@ static int dr_ste_build_src_gvmi_qpn_tag(struct mlx5dr_match_param *value,if (!vport_cap)return -EINVAL ; -if (vport_cap->vport_gvmi) + source_gvmi_set =MLX5_GET (ste_src_gvmi_qp, bit_mask, source_gvmi); +if (vport_cap->vport_gvmi && source_gvmi_set)MLX5_SET (ste_src_gvmi_qp, tag, source_gvmi, vport_cap->vport_gvmi); misc->source_eswitch_owner_vhca_id =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/189 usb: cdns3: gadget: toggle cycle bit before reset endpoint
In reply to Greg Kroah-HartmanFrom: Peter Chen <[email protected]>
commit 4bf2dd65135a2d7fe202f7c10d65b51bcf645ac6 upstream.
If there are TRBs pending during reset endpoint operation, the DMA will advance after reset operation, but it isn't expected, since the data is not yet available (For OUT, the data is not yet available). After the data is ready, there won't be any interrupt since the EP_TRADDR already points to next TRB entry and doorbell is not set.
To fix it, it toggles cycle bit before reset operation, and restores it after reset, it could avoid unexpected DMA advance due to cycle bit is for software during the endpoint reset operation.
--- drivers/usb/cdns3/gadget.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/usb/cdns3/gadget.c +14 -3
@@ -2152,11 +2152,21 @@ int __cdns3_gadget_ep_clear_halt(struct {struct cdns3_device *priv_dev = priv_ep->cdns3_dev;struct usb_request *request; +struct cdns3_request *priv_req; +struct cdns3_trb *trb =NULL ;int ret;int val;trace_cdns3_halt (priv_ep,0 ,0 ); + request =cdns3_next_request (&priv_ep->pending_req_list); +if (request) { + priv_req =to_cdns3_request (request); + trb = priv_req->trb; +if (trb) + trb->control = trb->control ^TRB_CYCLE ; + } +writel (EP_CMD_CSTALL |EP_CMD_EPRST , &priv_dev->regs->ep_cmd);/* wait for EPRST cleared */
@@ -2167,10 +2177,11 @@ int __cdns3_gadget_ep_clear_halt(struct priv_ep->flags &= ~(EP_STALLED |EP_STALL_PENDING ); - request =cdns3_next_request (&priv_ep->pending_req_list); - -if (request) +if (request) { +if (trb) + trb->control = trb->control ^TRB_CYCLE ;cdns3_rearm_transfer (priv_ep,1 ); + }cdns3_start_all_request (priv_dev, priv_ep);return ret;
Greg Kroah-Hartman
maintainerPATCH 83/189 fat: fix uninit-memory access for partial initialized inode
In reply to Greg Kroah-HartmanFrom: OGAWA Hirofumi <[email protected]>
commit bc87302a093f0eab45cd4e250c2021299f712ec6 upstream.
When get an error in the middle of reading an inode, some fields in the inode might be still not initialized. And then the evict_inode path may access those fields via iput().
To fix, this makes sure that inode fields are initialized.
--- fs/fat/inode.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
fs/fat/inode.c +7 -12
@@ -749,6 +749,13 @@ static struct inode *fat_alloc_inode(strreturn NULL ;init_rwsem (&ei->truncate_lock); +/* Zeroing to allow iput() even if partial initialized inode. */ + ei->mmu_private =0 ; + ei->i_start =0 ; + ei->i_logstart =0 ; + ei->i_attrs =0 ; + ei->i_pos =0 ; +return &ei->vfs_inode; }
@@ -1373,16 +1380,6 @@ out:return 0 ; } -static void fat_dummy_inode_init (struct inode *inode) -{ -/* Initialize this dummy inode to work as no-op. */ -MSDOS_I (inode)->mmu_private =0 ; -MSDOS_I (inode)->i_start =0 ; -MSDOS_I (inode)->i_logstart =0 ; -MSDOS_I (inode)->i_attrs =0 ; -MSDOS_I (inode)->i_pos =0 ; -} -static int fat_read_root (struct inode *inode) {struct msdos_sb_info *sbi =MSDOS_SB (inode->i_sb);
@@ -1843,13 +1840,11 @@ int fat_fill_super(struct super_block *s fat_inode =new_inode (sb);if (!fat_inode) goto out_fail; -fat_dummy_inode_init (fat_inode); sbi->fat_inode = fat_inode; fsinfo_inode =new_inode (sb);if (!fsinfo_inode) goto out_fail; -fat_dummy_inode_init (fsinfo_inode); fsinfo_inode->i_ino =MSDOS_FSINFO_INO ; sbi->fsinfo_inode = fsinfo_inode;insert_inode_hash (fsinfo_inode);
Greg Kroah-Hartman
maintainerPATCH 84/189 btrfs: fix RAID direct I/O reads with alternate csums
In reply to Greg Kroah-HartmanFrom: Omar Sandoval <[email protected]>
commit e7a04894c766daa4248cb736efee93550f2d5872 upstream.
btrfs_lookup_and_bind_dio_csum() does pointer arithmetic which assumes 32-bit checksums. If using a larger checksum, this leads to spurious failures when a direct I/O read crosses a stripe. This is easy to reproduce:
# mkfs.btrfs -f --checksum blake2 -d raid0 /dev/vdc /dev/vdd ... # mount /dev/vdc /mnt # cd /mnt # dd if=/dev/urandom of=foo bs=1M count=1 status=none # dd if=foo of=/dev/null bs=1M iflag=direct status=none dd: error reading 'foo': Input/output error # dmesg | tail -1 [ 135.821568] BTRFS warning (device vdc): csum failed root 5 ino 257 off 421888 ...
Fix it by using the actual checksum size.
--- fs/btrfs/inode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +3 -1
@@ -8444,6 +8444,7 @@ static inline blk_status_t btrfs_lookup_ {struct btrfs_io_bio *io_bio =btrfs_io_bio (bio);struct btrfs_io_bio *orig_io_bio =btrfs_io_bio (dip->orig_bio); +u16 csum_size;blk_status_t ret;/*
@@ -8463,7 +8464,8 @@ static inline blk_status_t btrfs_lookup_ file_offset -= dip->logical_offset; file_offset >>= inode->i_sb->s_blocksize_bits; - io_bio->csum = (u8 *)(((u32 *)orig_io_bio->csum) + file_offset); + csum_size =btrfs_super_csum_size (btrfs_sb (inode->i_sb)->super_copy); + io_bio->csum = orig_io_bio->csum + csum_size * file_offset;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 32/189 net: atlantic: ptp gpio adjustments
In reply to Greg Kroah-HartmanFrom: Egor Pomozov <[email protected]>
[ Upstream commit f08a464c27ca0a4050333baa271504b27ce834b7 ]
Clock adjustment data should be passed to FW as well, otherwise in some cases a drift was observed when using GPIO features.
--- drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 ++ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 +++- .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +2 -0
@@ -337,6 +337,8 @@ struct aq_fw_ops {void (*enable_ptp)(struct aq_hw_s *self,int enable); +void (*adjust_ptp)(struct aq_hw_s *self,uint64_t adj); +int (*set_eee_rate)(struct aq_hw_s *self,u32 speed); int (*get_eee_rate)(struct aq_hw_s *self, u32 *rate,
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +3 -1
@@ -1165,6 +1165,8 @@ static int hw_atl_b0_adj_sys_clock(struct aq_hw_s *self, s64 delta) { self->ptp_clk_offset += delta; + self->aq_fw_ops->adjust_ptp (self, self->ptp_clk_offset); +return 0 ; }
@@ -1215,7 +1217,7 @@ static int hw_atl_b0_gpio_pulse(struct aq_hw_s *self, u32 index, fwreq.ptp_gpio_ctrl.index = index; fwreq.ptp_gpio_ctrl.period = period;/* Apply time offset */ - fwreq.ptp_gpio_ctrl.start = start - self->ptp_clk_offset; + fwreq.ptp_gpio_ctrl.start = start; size =sizeof (fwreq.msg_id) +sizeof (fwreq.ptp_gpio_ctrl);return self->aq_fw_ops->send_fw_request (self, &fwreq, size);
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c +12 -0
@@ -30,6 +30,9 @@#define HW_ATL_FW3X_EXT_CONTROL_ADDR 0x378#define HW_ATL_FW3X_EXT_STATE_ADDR 0x37c +#define HW_ATL_FW3X_PTP_ADJ_LSW_ADDR 0x50a0 +#define HW_ATL_FW3X_PTP_ADJ_MSW_ADDR 0x50a4 +#define HW_ATL_FW2X_CAP_PAUSE BIT(CAPS_HI_PAUSE)#define HW_ATL_FW2X_CAP_ASYM_PAUSE BIT(CAPS_HI_ASYMMETRIC_PAUSE)#define HW_ATL_FW2X_CAP_SLEEP_PROXY BIT(CAPS_HI_SLEEP_PROXY)
@@ -475,6 +478,14 @@ static void aq_fw3x_enable_ptp(struct aq_hw_s *self, int enable)aq_hw_write_reg (self,HW_ATL_FW3X_EXT_CONTROL_ADDR , ptp_opts); } +static void aq_fw3x_adjust_ptp (struct aq_hw_s *self,uint64_t adj) +{ +aq_hw_write_reg (self,HW_ATL_FW3X_PTP_ADJ_LSW_ADDR , + (adj >>0 ) &0xffffffff ); +aq_hw_write_reg (self,HW_ATL_FW3X_PTP_ADJ_MSW_ADDR , + (adj >>32 ) &0xffffffff ); +} +static int aq_fw2x_led_control (struct aq_hw_s *self,u32 mode) {if (self->fw_ver_actual <HW_ATL_FW_VER_LED )
@@ -633,4 +644,5 @@ const struct aq_fw_ops aq_fw_2x_ops = { .enable_ptp = aq_fw3x_enable_ptp, .led_control = aq_fw2x_led_control, .set_phyloopback = aq_fw2x_set_phyloopback, + .adjust_ptp = aq_fw3x_adjust_ptp, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/189 arm: dts: dra76x: Fix mmc3 max-frequency
In reply to Greg Kroah-HartmanFrom: Faiz Abbas <[email protected]>
commit fa63c0039787b8fbacf4d6a51e3ff44288f5b90b upstream.
dra76x is not affected by i887 which requires mmc3 node to be limited to a max frequency of 64 MHz. Fix this by overwriting the correct value in the the dra76 specific dtsi.
--- arch/arm/boot/dts/dra76x.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/dra76x.dtsi +5 -0
@@ -86,3 +86,8 @@ &usb4_tm { status = "disabled"; }; + +&mmc3 { + /* dra76x is not affected by i887 */ + max-frequency = <96000000>; +};
Greg Kroah-Hartman
maintainerPATCH 87/189 phy: allwinner: Fix GENMASK misuse
In reply to Greg Kroah-HartmanFrom: Rikard Falkeborn <[email protected]>
commit 96b4ea324ae92386db2b0c73ace597c80cde1ecb upstream.
Arguments are supposed to be ordered high then low.
--- drivers/phy/allwinner/phy-sun50i-usb3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/allwinner/phy-sun50i-usb3.c +1 -1
@@ -49,7 +49,7 @@#define SUNXI_LOS_BIAS (n) ((n) << 3)#define SUNXI_LOS_BIAS_MASK GENMASK(5, 3)#define SUNXI_TXVBOOSTLVL (n) ((n) << 0) -#define SUNXI_TXVBOOSTLVL_MASK GENMASK(0, 2) +#define SUNXI_TXVBOOSTLVL_MASK GENMASK(2, 0)struct sun50i_usb3_phy {struct phy *phy;
Greg Kroah-Hartman
maintainerPATCH 88/189 tty:serial:mvebu-uart:fix a wrong return
In reply to Greg Kroah-HartmanFrom: tangbin <[email protected]>
commit 4a3e208474204e879d22a310b244cb2f39e5b1f8 upstream.
in this place, the function should return a
negative value and the PTR_ERR already returns
a negative,so return -PTR_ERR() is wrong.
--- drivers/tty/serial/mvebu-uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/mvebu-uart.c +1 -1
@@ -851,7 +851,7 @@ static int mvebu_uart_probe(struct platf port->membase =devm_ioremap_resource (&pdev->dev, reg);if (IS_ERR (port->membase)) -return -PTR_ERR (port->membase); +return PTR_ERR (port->membase); mvuart =devm_kzalloc (&pdev->dev,sizeof (struct mvebu_uart ),GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 89/189 tty: serial: fsl_lpuart: free IDs allocated by IDA
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
commit 2b2e71fe657510a6f71aa16ef0309fa6bc20ab3d upstream.
Since commit 3bc3206e1c0f ("serial: fsl_lpuart: Remove the alias node dependence") the port line number can also be allocated by IDA, but in case of an error the ID will no be removed again. More importantly, any ID will be freed in remove(), even if it wasn't allocated but instead fetched by of_alias_get_id(). If it was not allocated by IDA there will be a warning:
WARN(1, "ida_free called for id=%d which is not allocated.\n", id);
Move the ID allocation more to the end of the probe() so that we still can use plain return in the first error cases.
--- drivers/tty/serial/fsl_lpuart.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-)
drivers/tty/serial/fsl_lpuart.c +24 -15
@@ -268,6 +268,7 @@ struct lpuart_port {int rx_dma_rng_buf_len;unsigned int dma_tx_nents;wait_queue_head_t dma_wait; +bool id_allocated; };struct lpuart_soc_data {
@@ -2429,19 +2430,6 @@ static int lpuart_probe(struct platform_if (!sport)return -ENOMEM ; - ret =of_alias_get_id (np,"serial" ); -if (ret <0 ) { - ret =ida_simple_get (&fsl_lpuart_ida,0 ,UART_NR ,GFP_KERNEL ); -if (ret <0 ) { -dev_err (&pdev->dev,"port line is full, add device failed\n" ); -return ret; - } - } -if (ret >=ARRAY_SIZE (lpuart_ports)) { -dev_err (&pdev->dev,"serial%d out of range\n" , ret); -return -EINVAL ; - } - sport->port.line = ret; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); sport->port.membase =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (sport->port.membase))
@@ -2485,9 +2473,25 @@ static int lpuart_probe(struct platform_ } } + ret =of_alias_get_id (np,"serial" ); +if (ret <0 ) { + ret =ida_simple_get (&fsl_lpuart_ida,0 ,UART_NR ,GFP_KERNEL ); +if (ret <0 ) { +dev_err (&pdev->dev,"port line is full, add device failed\n" ); +return ret; + } + sport->id_allocated = true; + } +if (ret >=ARRAY_SIZE (lpuart_ports)) { +dev_err (&pdev->dev,"serial%d out of range\n" , ret); + ret = -EINVAL ; + goto failed_out_of_range; + } + sport->port.line = ret; + ret =lpuart_enable_clks (sport);if (ret) -return ret; + goto failed_clock_enable; sport->port.uartclk =lpuart_get_baud_clk_rate (sport); lpuart_ports[sport->port.line] = sport;
@@ -2537,6 +2541,10 @@ static int lpuart_probe(struct platform_ failed_attach_port: failed_irq_request:lpuart_disable_clks (sport); +failed_clock_enable: +failed_out_of_range: +if (sport->id_allocated) +ida_simple_remove (&fsl_lpuart_ida, sport->port.line);return ret; }
@@ -2546,7 +2554,8 @@ static int lpuart_remove(struct platformuart_remove_one_port (&lpuart_reg, &sport->port); -ida_simple_remove (&fsl_lpuart_ida, sport->port.line); +if (sport->id_allocated) +ida_simple_remove (&fsl_lpuart_ida, sport->port.line);lpuart_disable_clks (sport);
Greg Kroah-Hartman
maintainerPATCH 90/189 serial: 8250_exar: add support for ACCES cards
In reply to Greg Kroah-HartmanFrom: Jay Dolan <[email protected]>
commit 10c5ccc3c6d32f3d7d6c07de1d3f0f4b52f3e3ab upstream.
Add ACCES VIDs and PIDs that use the Exar chips
--- drivers/tty/serial/8250/8250_exar.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/tty/serial/8250/8250_exar.c +33 -0
@@ -25,6 +25,14 @@#include "8250.h" +#define PCI_DEVICE_ID_ACCES_COM_2S 0x1052 +#define PCI_DEVICE_ID_ACCES_COM_4S 0x105d +#define PCI_DEVICE_ID_ACCES_COM_8S 0x106c +#define PCI_DEVICE_ID_ACCES_COM232_8 0x10a8 +#define PCI_DEVICE_ID_ACCES_COM_2SM 0x10d2 +#define PCI_DEVICE_ID_ACCES_COM_4SM 0x10db +#define PCI_DEVICE_ID_ACCES_COM_8SM 0x10ea +#define PCI_DEVICE_ID_COMMTECH_4224PCI335 0x0002#define PCI_DEVICE_ID_COMMTECH_4222PCI335 0x0004#define PCI_DEVICE_ID_COMMTECH_2324PCI335 0x000a
@@ -677,6 +685,22 @@ static int __maybe_unused exar_resume(st static SIMPLE_DEV_PM_OPS(exar_pci_pm, exar_suspend, exar_resume); +static const struct exar8250_board acces_com_2x = { + .num_ports =2 , + .setup = pci_xr17c154_setup, +}; + +static const struct exar8250_board acces_com_4x = { + .num_ports =4 , + .setup = pci_xr17c154_setup, +}; + +static const struct exar8250_board acces_com_8x = { + .num_ports =8 , + .setup = pci_xr17c154_setup, +}; + +static const struct exar8250_board pbn_fastcom335_2 = { .num_ports =2 , .setup = pci_fastcom335_setup,
@@ -745,6 +769,15 @@ static const struct exar8250_board pbn_e }static const struct pci_device_id exar_pci_tbl[] = { +EXAR_DEVICE (ACCESSIO ,ACCES_COM_2S , acces_com_2x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_4S , acces_com_4x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_8S , acces_com_8x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM232_8 , acces_com_8x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_2SM , acces_com_2x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_4SM , acces_com_4x), +EXAR_DEVICE (ACCESSIO ,ACCES_COM_8SM , acces_com_8x), + +CONNECT_DEVICE (XR17C152 ,UART_2_232 , pbn_connect),CONNECT_DEVICE (XR17C154 ,UART_4_232 , pbn_connect),CONNECT_DEVICE (XR17C158 ,UART_8_232 , pbn_connect),
Greg Kroah-Hartman
maintainerPATCH 91/189 serdev: Fix detection of UART devices on Apple machines.
In reply to Greg Kroah-HartmanFrom: Ronald Tschalär <[email protected]>
commit 35d4670aaec7206b5ef19c842ca33076bde562e4 upstream.
On Apple devices the _CRS method returns an empty resource template, and the resource settings are instead provided by the _DSM method. But commit 33364d63c75d6182fa369cea80315cf1bb0ee38e (serdev: Add ACPI devices by ResourceSource field) changed the search for serdev devices to require valid, non-empty resource template, thereby breaking Apple devices and causing bluetooth devices to not be found.
This expands the check so that if we don't find a valid template, and we're on an Apple machine, then just check for the device being an immediate child of the controller and having a "baud" property.
--- drivers/tty/serdev/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/tty/serdev/core.c +10 -0
@@ -18,6 +18,7 @@#include <linux/sched.h> #include <linux/serdev.h> #include <linux/slab.h> +#include <linux/platform_data/x86/apple.h> static bool is_registered;static DEFINE_IDA (ctrl_ida);
@@ -630,6 +631,15 @@ static int acpi_serdev_check_resources(sif (ret)return ret; +/* +* Apple machines provide an empty resource template, so on those +* machines just look for immediate children with a "baud" property +* (from the _DSM method) instead. +*/ +if (!lookup.controller_handle && x86_apple_machine && + !acpi_dev_get_property (adev,"baud" ,ACPI_TYPE_BUFFER ,NULL )) +acpi_get_parent (adev->handle, &lookup.controller_handle); +/* Make sure controller and ResourceSource handle match */ if (ACPI_HANDLE (ctrl->dev.parent) != lookup.controller_handle)return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 92/189 vt: selection, close sel_buffer race
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
commit 07e6124a1a46b4b5a9b3cacc0c306b50da87abf5 upstream.
syzkaller reported this UAF:
BUG: KASAN: use-after-free in n_tty_receive_buf_common+0x2481/0x2940 drivers/tty/n_tty.c:1741 Read of size 1 at addr ffff8880089e40e9 by task syz-executor.1/13184 CPU: 0 PID: 13184 Comm: syz-executor.1 Not tainted 5.4.7 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 Call Trace: ... kasan_report+0xe/0x20 mm/kasan/common.c:634 n_tty_receive_buf_common+0x2481/0x2940 drivers/tty/n_tty.c:1741 tty_ldisc_receive_buf+0xac/0x190 drivers/tty/tty_buffer.c:461 paste_selection+0x297/0x400 drivers/tty/vt/selection.c:372 tioclinux+0x20d/0x4e0 drivers/tty/vt/vt.c:3044 vt_ioctl+0x1bcf/0x28d0 drivers/tty/vt/vt_ioctl.c:364 tty_ioctl+0x525/0x15a0 drivers/tty/tty_io.c:2657 vfs_ioctl fs/ioctl.c:47 [inline]
It is due to a race between parallel paste_selection (TIOCL_PASTESEL) and set_selection_user (TIOCL_SETSEL) invocations. One uses sel_buffer, while the other frees it and reallocates a new one for another selection. Add a mutex to close this race.
The mutex takes care properly of sel_buffer and sel_buffer_lth only. The other selection global variables (like sel_start, sel_end, and sel_cons) are protected only in set_selection_user. The other functions need quite some more work to close the races of the variables there. This is going to happen later.
This likely fixes (I am unsure as there is no reproducer provided) bug 206361 too. It was marked as CVE-2020-8648.
--- drivers/tty/vt/selection.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/tty/vt/selection.c +17 -6
@@ -16,6 +16,7 @@#include <linux/tty.h> #include <linux/sched.h> #include <linux/mm.h> +#include <linux/mutex.h> #include <linux/slab.h> #include <linux/types.h>
@@ -45,6 +46,7 @@ static volatile int sel_start = -1; /*static int sel_end;static int sel_buffer_lth;static char *sel_buffer; +static DEFINE_MUTEX (sel_lock);/* clear_selection, highlight and highlight_pointer can be called from interrupt (via scrollback/front) */
@@ -186,7 +188,7 @@ int set_selection_kernel(struct tiocl_sechar *bp, *obp;int i, ps, pe, multiplier;u32 c; -int mode; +int mode, ret =0 ;poke_blanked_console ();
@@ -212,6 +214,7 @@ int set_selection_kernel(struct tiocl_seif (ps > pe)/* make sel_start <= sel_end */ swap (ps, pe); +mutex_lock (&sel_lock);if (sel_cons != vc_cons[fg_console].d) {clear_selection (); sel_cons = vc_cons[fg_console].d;
@@ -257,9 +260,10 @@ int set_selection_kernel(struct tiocl_sebreak ;case TIOCL_SELPOINTER :highlight_pointer (pe); -return 0 ; + goto unlock;default : -return -EINVAL ; + ret = -EINVAL ; + goto unlock; }/* remove the pointer */
@@ -281,7 +285,7 @@ int set_selection_kernel(struct tiocl_seelse if (new_sel_start == sel_start) {if (new_sel_end == sel_end)/* no action required */ -return 0 ; + goto unlock;else if (new_sel_end > sel_end)/* extend to right */ highlight (sel_end +2 , new_sel_end);else /* contract from right */
@@ -309,7 +313,8 @@ int set_selection_kernel(struct tiocl_seif (!bp) {printk (KERN_WARNING "selection: kmalloc() failed\n" );clear_selection (); -return -ENOMEM ; + ret = -ENOMEM ; + goto unlock; }kfree (sel_buffer); sel_buffer = bp;
@@ -334,7 +339,9 @@ int set_selection_kernel(struct tiocl_se } } sel_buffer_lth = bp - sel_buffer; -return 0 ; +unlock: +mutex_unlock (&sel_lock); +return ret; }EXPORT_SYMBOL_GPL (set_selection_kernel);
@@ -364,6 +371,7 @@ int paste_selection(struct tty_struct *ttty_buffer_lock_exclusive (&vc->port);add_wait_queue (&vc->paste_wait, &wait); +mutex_lock (&sel_lock);while (sel_buffer && sel_buffer_lth > pasted) {set_current_state (TASK_INTERRUPTIBLE );if (signal_pending (current)) {
@@ -371,7 +379,9 @@ int paste_selection(struct tty_struct *tbreak ; }if (tty_throttled (tty)) { +mutex_unlock (&sel_lock);schedule (); +mutex_lock (&sel_lock);continue ; }__set_current_state (TASK_RUNNING );
@@ -380,6 +390,7 @@ int paste_selection(struct tty_struct *t count); pasted += count; } +mutex_unlock (&sel_lock);remove_wait_queue (&vc->paste_wait, &wait);__set_current_state (TASK_RUNNING );
Greg Kroah-Hartman
maintainerPATCH 93/189 vt: selection, push console lock down
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
commit 4b70dd57a15d2f4685ac6e38056bad93e81e982f upstream.
We need to nest the console lock in sel_lock, so we have to push it down a bit. Fortunately, the callers of set_selection_* just lock the console lock around the function call. So moving it down is easy.
In the next patch, we switch the order.
--- drivers/staging/speakup/selection.c | 2 -- drivers/tty/vt/selection.c | 13 ++++++++++++- drivers/tty/vt/vt.c | 2 -- 3 files changed, 12 insertions(+), 5 deletions(-)
drivers/staging/speakup/selection.c +0 -2
@@ -51,9 +51,7 @@ static void __speakup_set_selection(stru goto unref; } -console_lock ();set_selection_kernel (&sel, tty); -console_unlock (); unref:tty_kref_put (tty);
drivers/tty/vt/selection.c +12 -1
@@ -181,7 +181,7 @@ int set_selection_user(const struct tiocreturn set_selection_kernel (&v, tty); } -int set_selection_kernel (struct tiocl_selection *v,struct tty_struct *tty) +static int __set_selection_kernel (struct tiocl_selection *v,struct tty_struct *tty) {struct vc_data *vc = vc_cons[fg_console].d;int new_sel_start, new_sel_end, spc;
@@ -343,6 +343,17 @@ unlock:mutex_unlock (&sel_lock);return ret; } + +int set_selection_kernel (struct tiocl_selection *v,struct tty_struct *tty) +{ +int ret; + +console_lock (); + ret =__set_selection_kernel (v, tty); +console_unlock (); + +return ret; +}EXPORT_SYMBOL_GPL (set_selection_kernel);/* Insert the contents of the selection buffer into the
drivers/tty/vt/vt.c +0 -2
@@ -3046,10 +3046,8 @@ int tioclinux(struct tty_struct *tty, unswitch (type) {case TIOCL_SETSEL : -console_lock (); ret =set_selection_user ((struct tiocl_selection __user *)(p+1 ), tty); -console_unlock ();break ;case TIOCL_PASTESEL : ret =paste_selection (tty);
Greg Kroah-Hartman
maintainerPATCH 95/189 media: hantro: Fix broken media controller links
In reply to Greg Kroah-HartmanFrom: Ezequiel Garcia <[email protected]>
commit d171c45da874e3858a83e6377e00280a507fe2f2 upstream.
The driver currently creates a broken topology,
with a source-to-source link and a sink-to-sink
link instead of two source-to-sink links.
--- drivers/staging/media/hantro/hantro_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/hantro/hantro_drv.c +2 -2
@@ -553,13 +553,13 @@ static int hantro_attach_func(struct han goto err_rel_entity1;/* Connect the three entities */ - ret =media_create_pad_link (&func->vdev.entity,0 , &func->proc,1 , + ret =media_create_pad_link (&func->vdev.entity,0 , &func->proc,0 ,MEDIA_LNK_FL_IMMUTABLE |MEDIA_LNK_FL_ENABLED );if (ret) goto err_rel_entity2; - ret =media_create_pad_link (&func->proc,0 , &func->sink,0 , + ret =media_create_pad_link (&func->proc,1 , &func->sink,0 ,MEDIA_LNK_FL_IMMUTABLE |MEDIA_LNK_FL_ENABLED );if (ret)
Greg Kroah-Hartman
maintainerPATCH 94/189 vt: selection, push sel_lock up
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
commit e8c75a30a23c6ba63f4ef6895cbf41fd42f21aa2 upstream.
sel_lock cannot nest in the console lock. Thanks to syzkaller, the kernel states firmly:
Quoted 11 lines
WARNING: possible circular locking dependency detected
5.6.0-rc3-syzkaller #0 Not tainted
------------------------------------------------------
syz-executor.4/20336 is trying to acquire lock:ffff8880a2e952a0(&tty->termios_rwsem){++++}, at:tty_unthrottle+0x22/0x100drivers/tty/tty_ioctl.c:136but task is already holding lock:
ffffffff89462e70(sel_lock){+.+.}, at:paste_selection+0x118/0x470drivers/tty/vt/selection.c:374which lock already depends on the new lock.
Quoted 8 lines
the existing dependency chain (in reverse order) is:
-> #2 (sel_lock){+.+.}:
mutex_lock_nested+0x1b/0x30 kernel/locking/mutex.c:1118 set_selection_kernel+0x3b8/0x18a0 drivers/tty/vt/selection.c:217 set_selection_user+0x63/0x80 drivers/tty/vt/selection.c:181 tioclinux+0x103/0x530 drivers/tty/vt/vt.c:3050 vt_ioctl+0x3f1/0x3a30 drivers/tty/vt/vt_ioctl.c:364
This is ioctl(TIOCL_SETSEL).
Locks held on the path: console_lock -> sel_lock
Quoted 6 lines
-> #1 (console_lock){+.+.}:
console_lock+0x46/0x70 kernel/printk/printk.c:2289 con_flush_chars+0x50/0x650 drivers/tty/vt/vt.c:3223 n_tty_write+0xeae/0x1200 drivers/tty/n_tty.c:2350 do_tty_write drivers/tty/tty_io.c:962 [inline] tty_write+0x5a1/0x950 drivers/tty/tty_io.c:1046
This is write().
Locks held on the path: termios_rwsem -> console_lock
Quoted 8 lines
-> #0 (&tty->termios_rwsem){++++}:
down_write+0x57/0x140 kernel/locking/rwsem.c:1534 tty_unthrottle+0x22/0x100 drivers/tty/tty_ioctl.c:136 mkiss_receive_buf+0x12aa/0x1340 drivers/net/hamradio/mkiss.c:902 tty_ldisc_receive_buf+0x12f/0x170 drivers/tty/tty_buffer.c:465 paste_selection+0x346/0x470 drivers/tty/vt/selection.c:389 tioclinux+0x121/0x530 drivers/tty/vt/vt.c:3055 vt_ioctl+0x3f1/0x3a30 drivers/tty/vt/vt_ioctl.c:364
This is ioctl(TIOCL_PASTESEL).
Locks held on the path: sel_lock -> termios_rwsem
Quoted 4 lines
other info that might help us debug this:
Chain exists of: &tty->termios_rwsem --> console_lock --> sel_lock
Clearly. From the above, we have:
console_lock -> sel_lock
sel_lock -> termios_rwsem
termios_rwsem -> console_lock
Fix this by reversing the console_lock -> sel_lock dependency in ioctl(TIOCL_SETSEL). First, lock sel_lock, then console_lock.
--- drivers/tty/vt/selection.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/tty/vt/selection.c +7 -9
@@ -214,7 +214,6 @@ static int __set_selection_kernel(structif (ps > pe)/* make sel_start <= sel_end */ swap (ps, pe); -mutex_lock (&sel_lock);if (sel_cons != vc_cons[fg_console].d) {clear_selection (); sel_cons = vc_cons[fg_console].d;
@@ -260,10 +259,9 @@ static int __set_selection_kernel(structbreak ;case TIOCL_SELPOINTER :highlight_pointer (pe); - goto unlock; +return 0 ;default : - ret = -EINVAL ; - goto unlock; +return -EINVAL ; }/* remove the pointer */
@@ -285,7 +283,7 @@ static int __set_selection_kernel(structelse if (new_sel_start == sel_start) {if (new_sel_end == sel_end)/* no action required */ - goto unlock; +return 0 ;else if (new_sel_end > sel_end)/* extend to right */ highlight (sel_end +2 , new_sel_end);else /* contract from right */
@@ -313,8 +311,7 @@ static int __set_selection_kernel(structif (!bp) {printk (KERN_WARNING "selection: kmalloc() failed\n" );clear_selection (); - ret = -ENOMEM ; - goto unlock; +return -ENOMEM ; }kfree (sel_buffer); sel_buffer = bp;
@@ -339,8 +336,7 @@ static int __set_selection_kernel(struct } } sel_buffer_lth = bp - sel_buffer; -unlock: -mutex_unlock (&sel_lock); +return ret; }
@@ -348,9 +344,11 @@ int set_selection_kernel(struct tiocl_se {int ret; +mutex_lock (&sel_lock);console_lock (); ret =__set_selection_kernel (v, tty);console_unlock (); +mutex_unlock (&sel_lock);return ret; }
Greg Kroah-Hartman
maintainerPATCH 96/189 media: mc-entity.c: use & to check pad flags, not ==
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
commit 044041cd5227ec9ccf969f4bf1cc08bffe13b9d3 upstream.
These are bits so to test if a pad is a sink you use & but not ==.
It looks like the only reason this hasn't caused problems before is that media_get_pad_index() is currently only used with pads that do not set the MEDIA_PAD_FL_MUST_CONNECT flag. So a pad really had only the SINK or SOURCE flag set and nothing else.
--- drivers/media/mc/mc-entity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/mc/mc-entity.c +2 -2
@@ -639,9 +639,9 @@ int media_get_pad_index(struct media_entreturn -EINVAL ;for (i =0 ; i < entity->num_pads; i++) { -if (entity->pads[i].flags ==MEDIA_PAD_FL_SINK ) +if (entity->pads[i].flags &MEDIA_PAD_FL_SINK ) pad_is_sink = true; -else if (entity->pads[i].flags ==MEDIA_PAD_FL_SOURCE ) +else if (entity->pads[i].flags &MEDIA_PAD_FL_SOURCE ) pad_is_sink = false;else continue ;/* This is an error! */
Greg Kroah-Hartman
maintainerPATCH 75/189 usb: core: hub: fix unhandled return by employing a void function
In reply to Greg Kroah-HartmanFrom: Eugeniu Rosca <[email protected]>
commit 63d6d7ed475c53dc1cabdfedf63de1fd8dcd72ee upstream.
Address below Coverity complaint (Feb 25, 2020, 8:06 AM CET):
--- drivers/usb/core/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hub.c +1 -1
@@ -1866,7 +1866,7 @@ static int hub_probe(struct usb_interfacif (id->driver_info &HUB_QUIRK_DISABLE_AUTOSUSPEND ) { hub->quirk_disable_autosuspend =1 ; -usb_autopm_get_interface (intf); +usb_autopm_get_interface_no_resume (intf); }if (hub_configure (hub, &desc->endpoint[0 ].desc) >=0 )
Greg Kroah-Hartman
maintainerPATCH 99/189 perf intel-pt: Fix endless record after being terminated
In reply to Greg Kroah-HartmanFrom: Wei Li <[email protected]>
commit 2da4dd3d6973ffdfba4fa07f53240fda7ab22929 upstream.
In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once.
While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless.
If the intel_pt event is disabled, we don't enable it again here.
Before the patch:
huawei@huawei-2288H-V5:~/linux-5.5-rc4/tools/perf$ ./perf record -e \ intel_pt//u -p 46803 ^C^C^C^C^C^C
After the patch:
huawei@huawei-2288H-V5:~/linux-5.5-rc4/tools/perf$ ./perf record -e \ intel_pt//u -p 48591 ^C[ perf record: Woken up 0 times to write data ] Warning: AUX data lost 504 times out of 4816!
[ perf record: Captured and wrote 2024.405 MB perf.data ]
--- tools/perf/arch/x86/util/intel-pt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/arch/x86/util/intel-pt.c +4 -1
@@ -1173,9 +1173,12 @@ static int intel_pt_read_finish(struct astruct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->core.attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type) { +if (evsel->disabled) +return 0 ;return perf_evlist__enable_event_idx (ptr->evlist, evsel, idx); + } }return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 100/189 perf intel-bts: Fix endless record after being terminated
In reply to Greg Kroah-HartmanFrom: Wei Li <[email protected]>
commit 783fed2f35e2a6771c8dc6ee29b8c4b9930783ce upstream.
In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once.
While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless.
If the intel_bts event is disabled, we don't enable it again here.
Note: This patch is NOT tested since i don't have such a machine with intel_bts feature, but the code seems buggy same as arm-spe and intel-pt.
--- tools/perf/arch/x86/util/intel-bts.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/arch/x86/util/intel-bts.c +4 -1
@@ -420,9 +420,12 @@ static int intel_bts_read_finish(structstruct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->core.attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type) { +if (evsel->disabled) +return 0 ;return perf_evlist__enable_event_idx (btsr->evlist, evsel, idx); + } }return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 102/189 perf arm-spe: Fix endless record after being terminated
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit d6bc34c5ec18c3544c4b0d85963768dfbcd24184 upstream.
In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once.
While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless.
If the event is disabled, don't enable it again here.
--- tools/perf/arch/arm64/util/arm-spe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/arch/arm64/util/arm-spe.c +4 -1
@@ -165,9 +165,12 @@ static int arm_spe_read_finish(struct austruct evsel *evsel;evlist__for_each_entry (sper->evlist, evsel) { -if (evsel->core.attr.type == sper->arm_spe_pmu->type) +if (evsel->core.attr.type == sper->arm_spe_pmu->type) { +if (evsel->disabled) +return 0 ;return perf_evlist__enable_event_idx (sper->evlist, evsel, idx); + } }return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 101/189 perf cs-etm: Fix endless record after being terminated
In reply to Greg Kroah-HartmanFrom: Wei Li <[email protected]>
commit c9f2833cb472cf9e0a49b7bcdc210a96017a7bfd upstream.
In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once.
While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless.
If the cs_etm event is disabled, we don't enable it again here.
Note: This patch is NOT tested since i don't have such a machine with coresight feature, but the code seems buggy same as arm-spe and intel-pt.
Tester notes:
Thanks for looping, Adrian. Applied this patch and tested with CoreSight on juno board, it works well.
--- tools/perf/arch/arm/util/cs-etm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/arch/arm/util/cs-etm.c +4 -1
@@ -865,9 +865,12 @@ static int cs_etm_read_finish(struct auxstruct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->core.attr.type == ptr->cs_etm_pmu->type) +if (evsel->core.attr.type == ptr->cs_etm_pmu->type) { +if (evsel->disabled) +return 0 ;return perf_evlist__enable_event_idx (ptr->evlist, evsel, idx); + } }return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 103/189 spi: spidev: Fix CS polarity if GPIO descriptors are used
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 138c9c32f090894614899eca15e0bb7279f59865 upstream.
Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs") amended of_spi_parse_dt() to always set SPI_CS_HIGH for SPI slaves whose Chip Select is defined by a "cs-gpios" devicetree property.
This change broke userspace applications which issue an SPI_IOC_WR_MODE ioctl() to an spidev: Chip Select polarity will be incorrect unless the application is changed to set SPI_CS_HIGH. And once changed, it will be incompatible with kernels not containing the commit.
Fix by setting SPI_CS_HIGH in spidev_ioctl() (under the same conditions as in of_spi_parse_dt()).
--- drivers/spi/spidev.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/spi/spidev.c +5 -0
@@ -396,6 +396,7 @@ spidev_ioctl(struct file *filp, unsignedelse retval =get_user (tmp, (u32 __user *)arg);if (retval ==0 ) { +struct spi_controller *ctlr = spi->controller;u32 save = spi->mode;if (tmp & ~SPI_MODE_MASK ) {
@@ -403,6 +404,10 @@ spidev_ioctl(struct file *filp, unsignedbreak ; } +if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && + ctlr->cs_gpiods[spi->chip_select]) + tmp |=SPI_CS_HIGH ; + tmp |= spi->mode & ~SPI_MODE_MASK ; spi->mode = (u16 )tmp; retval =spi_setup (spi);
Greg Kroah-Hartman
maintainerPATCH 76/189 usb: core: hub: do error out if usb_autopm_get_interface() fails
In reply to Greg Kroah-HartmanFrom: Eugeniu Rosca <[email protected]>
commit 60e3f6e4ac5b0fda43dad01c32e09409ec710045 upstream.
Reviewing a fresh portion of coverity defects in USB core (specifically CID 1458999), Alan Stern noted below in [1]:
Quoted 5 lines · Alan Stern
A revised search finds line 997 in
drivers/usb/core/hub.cand lines 216, 269 indrivers/usb/core/port.c. (I didn't try looking in any other directories.) AFAICT all three of these should check the return value, although a error message in the kernel log probably isn't needed.
Factor out the usb_remove_device() change into a standalone patch to allow conflict-free integration on top of the earliest stable branches.
[1] https://lore.kernel.org/lkml/[email protected]
--- drivers/usb/core/hub.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/core/hub.c +5 -1
@@ -988,13 +988,17 @@ int usb_remove_device(struct usb_device {struct usb_hub *hub;struct usb_interface *intf; +int ret;if (!udev->parent)/* Can't remove a root hub */ return -EINVAL ; hub =usb_hub_to_struct_hub (udev->parent); intf =to_usb_interface (hub->intfdev); -usb_autopm_get_interface (intf); + ret =usb_autopm_get_interface (intf); +if (ret <0 ) +return ret; +set_bit (udev->portnum, hub->removed_bits);hub_port_logical_disconnect (hub, udev->portnum);usb_autopm_put_interface (intf);
Greg Kroah-Hartman
maintainerPATCH 104/189 x86/ioperm: Add new paravirt function update_io_bitmap()
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit 99bcd4a6e5b8ba201fdd252f1054689884899fee upstream.
Commit 111e7b15cf10f6 ("x86/ioperm: Extend IOPL config to control ioperm() as well") reworked the iopl syscall to use I/O bitmaps.
Unfortunately this broke Xen PV domains using that syscall as there is currently no I/O bitmap support in PV domains.
Add I/O bitmap support via a new paravirt function update_io_bitmap which Xen PV domains can use to update their I/O bitmaps via a hypercall.
--- arch/x86/include/asm/io_bitmap.h | 9 ++++++++- arch/x86/include/asm/paravirt.h | 7 +++++++ arch/x86/include/asm/paravirt_types.h | 4 ++++ arch/x86/kernel/paravirt.c | 5 +++++ arch/x86/kernel/process.c | 2 +- arch/x86/xen/enlighten_pv.c | 25 +++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 2 deletions(-)
arch/x86/include/asm/io_bitmap.h +8 -1
@@ -19,7 +19,14 @@ struct task_struct;void io_bitmap_share (struct task_struct *tsk);void io_bitmap_exit (void ); -void tss_update_io_bitmap (void ); +void native_tss_update_io_bitmap (void ); + +#ifdef CONFIG_PARAVIRT_XXL +#include <asm/paravirt.h> +#else +#define tss_update_io_bitmap native_tss_update_io_bitmap +#endif +#else static inline void io_bitmap_share (struct task_struct *tsk) { }static inline void io_bitmap_exit (void ) { }
arch/x86/include/asm/paravirt.h +7 -0
@@ -295,6 +295,13 @@ static inline void write_idt_entry(gate_PVOP_VCALL3 (cpu.write_idt_entry, dt, entry, g); } +#ifdef CONFIG_X86_IOPL_IOPERM +static inline void tss_update_io_bitmap (void ) +{ +PVOP_VCALL0 (cpu.update_io_bitmap); +} +#endif +static inline void paravirt_activate_mm (struct mm_struct *prev,struct mm_struct *next) {
arch/x86/include/asm/paravirt_types.h +4 -0
@@ -140,6 +140,10 @@ struct pv_cpu_ops {void (*load_sp0)(unsigned long sp0); +#ifdef CONFIG_X86_IOPL_IOPERM +void (*update_io_bitmap)(void ); +#endif +void (*wbinvd)(void );/* cpuid emulation, mostly so that caps bits can be disabled */
arch/x86/kernel/paravirt.c +5 -0
@@ -30,6 +30,7 @@#include <asm/timer.h> #include <asm/special_insns.h> #include <asm/tlb.h> +#include <asm/io_bitmap.h> /* * nop stub, which must not clobber anything *including the stack* to
@@ -341,6 +342,10 @@ struct paravirt_patch_template pv_ops = .cpu.iret = native_iret, .cpu.swapgs = native_swapgs, +#ifdef CONFIG_X86_IOPL_IOPERM + .cpu.update_io_bitmap = native_tss_update_io_bitmap, +#endif + .cpu.start_context_switch = paravirt_nop, .cpu.end_context_switch = paravirt_nop,
arch/x86/kernel/process.c +1 -1
@@ -374,7 +374,7 @@ static void tss_copy_io_bitmap(struct ts/** * tss_update_io_bitmap - Update I/O bitmap before exiting to usermode */ -void tss_update_io_bitmap (void ) +void native_tss_update_io_bitmap (void ) {struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw);struct thread_struct *t = ¤t->thread;
arch/x86/xen/enlighten_pv.c +25 -0
@@ -72,6 +72,9 @@#include <asm/mwait.h> #include <asm/pci_x86.h> #include <asm/cpu.h> +#ifdef CONFIG_X86_IOPL_IOPERM +#include <asm/io_bitmap.h> +#endif #ifdef CONFIG_ACPI #include <linux/acpi.h>
@@ -837,6 +840,25 @@ static void xen_load_sp0(unsigned long sthis_cpu_write (cpu_tss_rw.x86_tss.sp0, sp0); } +#ifdef CONFIG_X86_IOPL_IOPERM +static void xen_update_io_bitmap (void ) +{ +struct physdev_set_iobitmap iobitmap; +struct tss_struct *tss =this_cpu_ptr (&cpu_tss_rw); + +native_tss_update_io_bitmap (); + + iobitmap.bitmap = (uint8_t *)(&tss->x86_tss) + + tss->x86_tss.io_bitmap_base; +if (tss->x86_tss.io_bitmap_base ==IO_BITMAP_OFFSET_INVALID ) + iobitmap.nr_ports =0 ; +else + iobitmap.nr_ports =IO_BITMAP_BITS ; + +HYPERVISOR_physdev_op (PHYSDEVOP_set_iobitmap, &iobitmap); +} +#endif +static void xen_io_delay (void ) { }
@@ -1047,6 +1069,9 @@ static const struct pv_cpu_ops xen_cpu_o .write_idt_entry = xen_write_idt_entry, .load_sp0 = xen_load_sp0, +#ifdef CONFIG_X86_IOPL_IOPERM + .update_io_bitmap = xen_update_io_bitmap, +#endif .io_delay = xen_io_delay,/* Xen takes care of %gs when switching to usermode for us */
Greg Kroah-Hartman
maintainerPATCH 105/189 x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 735a6dd02222d8d070c7bb748f25895239ca8c92 upstream.
Explicitly set X86_FEATURE_OSPKE via set_cpu_cap() instead of calling get_cpu_cap() to pull the feature bit from CPUID after enabling CR4.PKE. Invoking get_cpu_cap() effectively wipes out any {set,clear}_cpu_cap() changes that were made between this_cpu->c_init() and setup_pku(), as all non-synthetic feature words are reinitialized from the CPU's CPUID values.
Blasting away capability updates manifests most visibility when running on a VMX capable CPU, but with VMX disabled by BIOS. To indicate that VMX is disabled, init_ia32_feat_ctl() clears X86_FEATURE_VMX, using clear_cpu_cap() instead of setup_clear_cpu_cap() so that KVM can report which CPU is misconfigured (KVM needs to probe every CPU anyways). Restoring X86_FEATURE_VMX from CPUID causes KVM to think VMX is enabled, ultimately leading to an unexpected #GP when KVM attempts to do VMXON.
Arguably, init_ia32_feat_ctl() should use setup_clear_cpu_cap() and let KVM figure out a different way to report the misconfigured CPU, but VMX is not the only feature bit that is affected, i.e. there is precedent that tweaking feature bits via {set,clear}_cpu_cap() after ->c_init() is expected to work. Most notably, x86_init_rdrand()'s clearing of X86_FEATURE_RDRAND when RDRAND malfunctions is also overwritten.
--- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/common.c +1 -1
@@ -462,7 +462,7 @@ static __always_inline void setup_pku(st* cpuid bit to be set. We need to ensure that we * update that bit in this CPU's "cpu_info". */ -get_cpu_cap (c); +set_cpu_cap (c,X86_FEATURE_OSPKE ); }#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
Greg Kroah-Hartman
maintainerPATCH 106/189 s390/pci: Fix unexpected write combine on resource
In reply to Greg Kroah-HartmanFrom: Niklas Schnelle <[email protected]>
commit df057c914a9c219ac8b8ed22caf7da2f80c1fe26 upstream.
In the initial MIO support introduced in
commit 71ba41c9b1d9 ("s390/pci: provide support for MIO instructions")
zpci_map_resource() and zpci_setup_resources() default to using the mio_wb address as the resource's start address. This means users of the mapping, which includes most drivers, will get write combining on PCI Stores. This may lead to problems when drivers expect write through behavior when not using an explicit ioremap_wc().
--- arch/s390/pci/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/pci/pci.c +2 -2
@@ -424,7 +424,7 @@ static void zpci_map_resources(struct pcif (zpci_use_mio (zdev)) pdev->resource[i].start = - (resource_size_t __force ) zdev->bars[i].mio_wb; + (resource_size_t __force ) zdev->bars[i].mio_wt;else pdev->resource[i].start = (resource_size_t __force )pci_iomap_range_fh (pdev, i,0 ,0 );
@@ -531,7 +531,7 @@ static int zpci_setup_bus_resources(stru flags |=IORESOURCE_MEM_64 ;if (zpci_use_mio (zdev)) - addr = (unsigned long ) zdev->bars[i].mio_wb; + addr = (unsigned long ) zdev->bars[i].mio_wt;else addr =ZPCI_ADDR (entry); size =1UL << zdev->bars[i].size;
Greg Kroah-Hartman
maintainerPATCH 107/189 s390/mm: fix panic in gup_fast on large pud
In reply to Greg Kroah-HartmanFrom: Gerald Schaefer <[email protected]>
commit 582b4e55403e053d8a48ff687a05174da9cc3fb0 upstream.
On s390 there currently is no implementation of pud_write(). That was ok as long as we had our own implementation of get_user_pages_fast() which checked for pud protection by testing the bit directly w/o using pud_write(). The other callers of pud_write() are not reachable on s390.
After commit 1a42010cdc26 ("s390/mm: convert to the generic get_user_pages_fast code") we use the generic get_user_pages_fast(), which does call pud_write() in pud_access_permitted() for FOLL_WRITE access on a large pud. Without an s390 specific pud_write(), the generic version is called, which contains a BUG() statement to remind us that we don't have a proper implementation. This results in a kernel panic.
Fix this by providing an implementation of pud_write().
--- arch/s390/include/asm/pgtable.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/s390/include/asm/pgtable.h +6 -0
@@ -750,6 +750,12 @@ static inline int pmd_write(pmd_t pmd)return (pmd_val (pmd) & _SEGMENT_ENTRY_WRITE) !=0 ; } +#define pud_write pud_write +static inline int pud_write (pud_t pud) +{ +return (pud_val (pud) & _REGION3_ENTRY_WRITE) !=0 ; +} +static inline int pmd_dirty (pmd_t pmd) {return (pmd_val (pmd) & _SEGMENT_ENTRY_DIRTY) !=0 ;
Greg Kroah-Hartman
maintainerPATCH 108/189 selftests: pidfd: Add pidfd_fdinfo_test in .gitignore
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 186e28a18aeb0fec99cc586fda337e6b23190791 upstream.
The commit identified below added pidfd_fdinfo_test but failed to add it to .gitignore
--- tools/testing/selftests/pidfd/.gitignore | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/pidfd/.gitignore +1 -0
@@ -2,3 +2,4 @@ pidfd_open_test pidfd_poll_test pidfd_test pidfd_wait +pidfd_fdinfo_test
Greg Kroah-Hartman
maintainerPATCH 109/189 powerpc/mm: Fix missing KUAP disable in flush_coherent_icache()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 59bee45b9712c759ea4d3dcc4eff1752f3a66558 upstream.
Stefan reported a strange kernel fault which turned out to be due to a missing KUAP disable in flush_coherent_icache() called from flush_icache_range().
The fault looks like:
Kernel attempted to access user page (7fffc30d9c00) - exploit attempt? (uid: 1009)
BUG: Unable to handle kernel data access on read at 0x7fffc30d9c00
Faulting instruction address: 0xc00000000007232c
Oops: Kernel access of bad area, sig: 11 [#1]
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA PowerNV
CPU: 35 PID: 5886 Comm: sigtramp Not tainted 5.6.0-rc2-gcc-8.2.0-00003-gfc37a1632d40 #79
NIP: c00000000007232c LR: c00000000003b7fc CTR: 0000000000000000
REGS: c000001e11093940 TRAP: 0300 Not tainted (5.6.0-rc2-gcc-8.2.0-00003-gfc37a1632d40)
MSR: 900000000280b033 <SF,HV,VEC,VSX,EE,FP,ME,IR,DR,RI,LE> CR: 28000884 XER: 00000000
CFAR: c0000000000722fc DAR: 00007fffc30d9c00 DSISR: 08000000 IRQMASK: 0
GPR00: c00000000003b7fc c000001e11093bd0 c0000000023ac200 00007fffc30d9c00
GPR04: 00007fffc30d9c18 0000000000000000 c000001e11093bd4 0000000000000000
GPR08: 0000000000000000 0000000000000001 0000000000000000 c000001e1104ed80
GPR12: 0000000000000000 c000001fff6ab380 c0000000016be2d0 4000000000000000
GPR16: c000000000000000 bfffffffffffffff 0000000000000000 0000000000000000
GPR20: 00007fffc30d9c00 00007fffc30d8f58 00007fffc30d9c18 00007fffc30d9c20
GPR24: 00007fffc30d9c18 0000000000000000 c000001e11093d90 c000001e1104ed80
GPR28: c000001e11093e90 0000000000000000 c0000000023d9d18 00007fffc30d9c00
NIP flush_icache_range+0x5c/0x80
LR handle_rt_signal64+0x95c/0xc2c
Call Trace:
0xc000001e11093d90 (unreliable)
handle_rt_signal64+0x93c/0xc2c
do_notify_resume+0x310/0x430
ret_from_except_lite+0x70/0x74
Instruction dump:
409e002c 7c0802a6 3c62ff31 3863f6a0 f8010080 48195fed 60000000 48fe4c8d
60000000 e8010080 7c0803a6 7c0004ac <7c00ffac> 7c0004ac 4c00012c 38210070This path through handle_rt_signal64() to setup_trampoline() and flush_icache_range() is only triggered by 64-bit processes that have unmapped their VDSO, which is rare.
flush_icache_range() takes a range of addresses to flush. In flush_coherent_icache() we implement an optimisation for CPUs where we know we don't actually have to flush the whole range, we just need to do a single icbi.
However we still execute the icbi on the user address of the start of the range we're flushing. On CPUs that also implement KUAP (Power9) that leads to the spurious fault above.
We should be able to pass any address, including a kernel address, to the icbi on these CPUs, which would avoid any interaction with KUAP. But I don't want to make that change in a bug fix, just in case it surfaces some strange behaviour on some CPU.
So for now just disable KUAP around the icbi. Note the icbi is treated as a load, so we allow read access, not write as you'd expect.
--- arch/powerpc/mm/mem.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/mm/mem.c +2 -0
@@ -369,7 +369,9 @@ static inline bool flush_coherent_icache*/ if (cpu_has_feature (CPU_FTR_COHERENT_ICACHE )) {mb ();/* sync */ +allow_read_from_user ((const void __user *)addr,L1_CACHE_BYTES );icbi ((void *)addr); +prevent_read_from_user ((const void __user *)addr,L1_CACHE_BYTES );mb ();/* sync */ isync ();return true;
Greg Kroah-Hartman
maintainerPATCH 110/189 drm/virtio: fix mmap page attributes
In reply to Greg Kroah-HartmanFrom: Gerd Hoffmann <[email protected]>
commit 6be7e07335486f5731cab748d80c68f20896581f upstream.
virtio-gpu uses cached mappings, set
drm_gem_shmem_object.map_cached accordingly.
--- drivers/gpu/drm/virtio/virtgpu_object.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/virtio/virtgpu_object.c +1 -0
@@ -99,6 +99,7 @@ struct drm_gem_object *virtio_gpu_createreturn NULL ; bo->base.base.funcs = &virtio_gpu_gem_funcs; + bo->base.map_cached = true;return &bo->base.base; }
Greg Kroah-Hartman
maintainerPATCH 111/189 drm/shmem: add support for per object caching flags.
In reply to Greg Kroah-HartmanFrom: Gerd Hoffmann <[email protected]>
commit 1cad629257e76025bcbf490c58de550fb67d4d0e upstream.
Add map_cached bool to drm_gem_shmem_object, to request cached mappings on a per-object base. Check the flag before adding writecombine to pgprot bits.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 15 +++++++++++---- include/drm/drm_gem_shmem_helper.h | 5 +++++ 2 files changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +11 -4
@@ -254,11 +254,16 @@ static void *drm_gem_shmem_vmap_locked(sif (ret) goto err_zero_use; -if (obj->import_attach) +if (obj->import_attach) { shmem->vaddr =dma_buf_vmap (obj->import_attach->dmabuf); -else + }else { +pgprot_t prot =PAGE_KERNEL ; + +if (!shmem->map_cached) + prot =pgprot_writecombine (prot); shmem->vaddr =vmap (shmem->pages, obj->size >>PAGE_SHIFT , -VM_MAP ,pgprot_writecombine (PAGE_KERNEL )); +VM_MAP , prot); + }if (!shmem->vaddr) {DRM_DEBUG_KMS ("Failed to vmap pages\n" );
@@ -537,7 +542,9 @@ int drm_gem_shmem_mmap(struct drm_gem_ob } vma->vm_flags |=VM_MIXEDMAP |VM_DONTEXPAND ; - vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); +if (!shmem->map_cached) + vma->vm_page_prot =pgprot_writecombine (vma->vm_page_prot); vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); vma->vm_ops = &drm_gem_shmem_vm_ops;
include/drm/drm_gem_shmem_helper.h +5 -0
@@ -96,6 +96,11 @@ struct drm_gem_shmem_object {* The address are un-mapped when the count reaches zero. */ unsigned int vmap_use_count; + +/** +* @map_cached: map object cached (instead of using writecombine). +*/ +bool map_cached; };#define to_drm_gem_shmem_obj (obj) \
Greg Kroah-Hartman
maintainerPATCH 112/189 drm/amdgpu: disable 3D pipe 1 on Navi1x
In reply to Greg Kroah-HartmanFrom: Tianci.Yin <[email protected]>
commit 194bcf35bce4a236059816bc41b3db9c9c92a1bb upstream.
[why]
CP firmware decide to skip setting the state for 3D pipe 1 for Navi1x as there is no use case.
[how]
Disable 3D pipe 1 on Navi1x.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 95 +++++++++++++++++---------------- 1 file changed, 50 insertions(+), 45 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +50 -45
@@ -54,7 +54,7 @@* In bring-up phase, it just used primary ring so set gfx ring number as 1 at * first. */ -#define GFX10_NUM_GFX_RINGS 2 +#define GFX10_NUM_GFX_RINGS_NV1X 1#define GFX10_MEC_HPD_SIZE 2048#define F32_CE_PROGRAM_RAM_SIZE 65536
@@ -1286,7 +1286,7 @@ static int gfx_v10_0_sw_init(void *handlcase CHIP_NAVI14 :case CHIP_NAVI12 : adev->gfx.me.num_me =1 ; - adev->gfx.me.num_pipe_per_me =2 ; + adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =1 ; adev->gfx.mec.num_mec =2 ; adev->gfx.mec.num_pipe_per_mec =4 ;
@@ -2692,18 +2692,20 @@ static int gfx_v10_0_cp_gfx_start(structamdgpu_ring_commit (ring);/* submit cs packet to copy state 0 to next available state */ - ring = &adev->gfx.gfx_ring[1 ]; - r =amdgpu_ring_alloc (ring,2 ); -if (r) { -DRM_ERROR ("amdgpu: cp failed to lock ring (%d).\n" , r); -return r; - } - -amdgpu_ring_write (ring,PACKET3 (PACKET3_CLEAR_STATE ,0 )); -amdgpu_ring_write (ring,0 ); +if (adev->gfx.num_gfx_rings >1 ) { +/* maximum supported gfx ring is 2 */ + ring = &adev->gfx.gfx_ring[1 ]; + r =amdgpu_ring_alloc (ring,2 ); +if (r) { +DRM_ERROR ("amdgpu: cp failed to lock ring (%d).\n" , r); +return r; + } -amdgpu_ring_commit (ring); +amdgpu_ring_write (ring,PACKET3 (PACKET3_CLEAR_STATE ,0 )); +amdgpu_ring_write (ring,0 ); +amdgpu_ring_commit (ring); + }return 0 ; }
@@ -2800,39 +2802,41 @@ static int gfx_v10_0_cp_gfx_resume(strucmutex_unlock (&adev->srbm_mutex);/* Init gfx ring 1 for pipe 1 */ -mutex_lock (&adev->srbm_mutex); -gfx_v10_0_cp_gfx_switch_pipe (adev,PIPE_ID1 ); - ring = &adev->gfx.gfx_ring[1 ]; - rb_bufsz =order_base_2 (ring->ring_size /8 ); - tmp =REG_SET_FIELD (0 ,CP_RB1_CNTL ,RB_BUFSZ , rb_bufsz); - tmp =REG_SET_FIELD (tmp,CP_RB1_CNTL ,RB_BLKSZ , rb_bufsz -2 ); -WREG32_SOC15 (GC ,0 , mmCP_RB1_CNTL, tmp); -/* Initialize the ring buffer's write pointers */ - ring->wptr =0 ; -WREG32_SOC15 (GC ,0 , mmCP_RB1_WPTR,lower_32_bits (ring->wptr)); -WREG32_SOC15 (GC ,0 , mmCP_RB1_WPTR_HI,upper_32_bits (ring->wptr)); -/* Set the wb address wether it's enabled or not */ - rptr_addr = adev->wb.gpu_addr + (ring->rptr_offs *4 ); -WREG32_SOC15 (GC ,0 , mmCP_RB1_RPTR_ADDR,lower_32_bits (rptr_addr)); -WREG32_SOC15 (GC ,0 , mmCP_RB1_RPTR_ADDR_HI,upper_32_bits (rptr_addr) & -CP_RB1_RPTR_ADDR_HI__RB_RPTR_ADDR_HI_MASK ); - wptr_gpu_addr = adev->wb.gpu_addr + (ring->wptr_offs *4 ); -WREG32_SOC15 (GC ,0 , mmCP_RB_WPTR_POLL_ADDR_LO, -lower_32_bits (wptr_gpu_addr)); -WREG32_SOC15 (GC ,0 , mmCP_RB_WPTR_POLL_ADDR_HI, -upper_32_bits (wptr_gpu_addr)); - -mdelay (1 ); -WREG32_SOC15 (GC ,0 , mmCP_RB1_CNTL, tmp); - - rb_addr = ring->gpu_addr >>8 ; -WREG32_SOC15 (GC ,0 , mmCP_RB1_BASE, rb_addr); -WREG32_SOC15 (GC ,0 , mmCP_RB1_BASE_HI,upper_32_bits (rb_addr)); -WREG32_SOC15 (GC ,0 , mmCP_RB1_ACTIVE,1 ); - -gfx_v10_0_cp_gfx_set_doorbell (adev, ring); -mutex_unlock (&adev->srbm_mutex); +if (adev->gfx.num_gfx_rings >1 ) { +mutex_lock (&adev->srbm_mutex); +gfx_v10_0_cp_gfx_switch_pipe (adev,PIPE_ID1 ); +/* maximum supported gfx ring is 2 */ + ring = &adev->gfx.gfx_ring[1 ]; + rb_bufsz =order_base_2 (ring->ring_size /8 ); + tmp =REG_SET_FIELD (0 ,CP_RB1_CNTL ,RB_BUFSZ , rb_bufsz); + tmp =REG_SET_FIELD (tmp,CP_RB1_CNTL ,RB_BLKSZ , rb_bufsz -2 ); +WREG32_SOC15 (GC ,0 , mmCP_RB1_CNTL, tmp); +/* Initialize the ring buffer's write pointers */ + ring->wptr =0 ; +WREG32_SOC15 (GC ,0 , mmCP_RB1_WPTR,lower_32_bits (ring->wptr)); +WREG32_SOC15 (GC ,0 , mmCP_RB1_WPTR_HI,upper_32_bits (ring->wptr)); +/* Set the wb address wether it's enabled or not */ + rptr_addr = adev->wb.gpu_addr + (ring->rptr_offs *4 ); +WREG32_SOC15 (GC ,0 , mmCP_RB1_RPTR_ADDR,lower_32_bits (rptr_addr)); +WREG32_SOC15 (GC ,0 , mmCP_RB1_RPTR_ADDR_HI,upper_32_bits (rptr_addr) & +CP_RB1_RPTR_ADDR_HI__RB_RPTR_ADDR_HI_MASK ); + wptr_gpu_addr = adev->wb.gpu_addr + (ring->wptr_offs *4 ); +WREG32_SOC15 (GC ,0 , mmCP_RB_WPTR_POLL_ADDR_LO, +lower_32_bits (wptr_gpu_addr)); +WREG32_SOC15 (GC ,0 , mmCP_RB_WPTR_POLL_ADDR_HI, +upper_32_bits (wptr_gpu_addr)); + +mdelay (1 ); +WREG32_SOC15 (GC ,0 , mmCP_RB1_CNTL, tmp); + + rb_addr = ring->gpu_addr >>8 ; +WREG32_SOC15 (GC ,0 , mmCP_RB1_BASE, rb_addr); +WREG32_SOC15 (GC ,0 , mmCP_RB1_BASE_HI,upper_32_bits (rb_addr)); +WREG32_SOC15 (GC ,0 , mmCP_RB1_ACTIVE,1 ); +gfx_v10_0_cp_gfx_set_doorbell (adev, ring); +mutex_unlock (&adev->srbm_mutex); + }/* Switch to pipe 0 */ mutex_lock (&adev->srbm_mutex);gfx_v10_0_cp_gfx_switch_pipe (adev,PIPE_ID0 );
@@ -3952,7 +3956,8 @@ static int gfx_v10_0_early_init(void *ha {struct amdgpu_device *adev = (struct amdgpu_device *)handle; - adev->gfx.num_gfx_rings =GFX10_NUM_GFX_RINGS ; + adev->gfx.num_gfx_rings =GFX10_NUM_GFX_RINGS_NV1X ; + adev->gfx.num_compute_rings =AMDGPU_MAX_COMPUTE_RINGS ;gfx_v10_0_set_kiq_pm4_funcs (adev);
Greg Kroah-Hartman
maintainerPATCH 77/189 usb: core: port: do error out if usb_autopm_get_interface() fails
In reply to Greg Kroah-HartmanFrom: Eugeniu Rosca <[email protected]>
commit 1f8b39bc99a31759e97a0428a5c3f64802c1e61d upstream.
Reviewing a fresh portion of coverity defects in USB core (specifically CID 1458999), Alan Stern noted below in [1]:
Quoted 5 lines · Alan Stern
A revised search finds line 997 in
drivers/usb/core/hub.cand lines 216, 269 indrivers/usb/core/port.c. (I didn't try looking in any other directories.) AFAICT all three of these should check the return value, although a error message in the kernel log probably isn't needed.
Factor out the usb_port_runtime_{resume,suspend}() changes into a standalone patch to allow conflict-free porting on top of stable v3.9+.
[1] https://lore.kernel.org/lkml/[email protected]
--- drivers/usb/core/port.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/usb/core/port.c +8 -2
@@ -213,7 +213,10 @@ static int usb_port_runtime_resume(strucif (!port_dev->is_superspeed && peer)pm_runtime_get_sync (&peer->dev); -usb_autopm_get_interface (intf); + retval =usb_autopm_get_interface (intf); +if (retval <0 ) +return retval; + retval =usb_hub_set_port_power (hdev, hub, port1, true);msleep (hub_power_on_good_delay (hub));if (udev && !retval) {
@@ -266,7 +269,10 @@ static int usb_port_runtime_suspend(struif (usb_port_block_power_off)return -EBUSY ; -usb_autopm_get_interface (intf); + retval =usb_autopm_get_interface (intf); +if (retval <0 ) +return retval; + retval =usb_hub_set_port_power (hdev, hub, port1, false);usb_clear_port_feature (hdev, port1,USB_PORT_FEAT_C_CONNECTION );if (!port_dev->is_superspeed)
Greg Kroah-Hartman
maintainerPATCH 113/189 drm/amd/powerplay: fix pre-check condition for setting clock range
In reply to Greg Kroah-HartmanFrom: Prike Liang <[email protected]>
commit 80381d40c9bf5218db06a7d7246c5478c95987ee upstream.
This fix will handle some MP1 FW issue like as mclk dpm table in renoir has a reverse dpm clock layout and a zero frequency dpm level as following case.
cat pp_dpm_mclk
0: 1200Mhz
1: 1200Mhz
2: 800Mhz
3: 0Mhz
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
@@ -222,7 +222,7 @@ int smu_set_soft_freq_range(struct smu_c {int ret =0 ; -if (min <=0 && max <=0 ) +if (min <0 && max <0 )return -EINVAL ;if (!smu_clk_dpm_is_enabled (smu, clk_type))
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0 -3
@@ -373,9 +373,6 @@ int smu_v12_0_set_soft_freq_limited_rang {int ret =0 ; -if (max < min) -return -EINVAL ; -switch (clk_type) {case SMU_GFXCLK :case SMU_SCLK :
Greg Kroah-Hartman
maintainerPATCH 79/189 mm, numa: fix bad pmd by atomically check for pmd_trans_huge when marking page tables prot_numa
In reply to Greg Kroah-HartmanFrom: Mel Gorman <[email protected]>
commit 8b272b3cbbb50a6a8e62d8a15affd473a788e184 upstream.
: A user reported a bug against a distribution kernel while running a : proprietary workload described as "memory intensive that is not swapping" : that is expected to apply to mainline kernels. The workload is : read/write/modifying ranges of memory and checking the contents. They : reported that within a few hours that a bad PMD would be reported followed : by a memory corruption where expected data was all zeros. A partial : report of the bad PMD looked like
:
: [ 5195.338482] ../mm/pgtable-generic.c:33: bad pmd ffff8888157ba008(000002e0396009e2) : [ 5195.341184] ------------[ cut here ]------------ : [ 5195.356880] kernel BUG at ../mm/pgtable-generic.c:35! : .... : [ 5195.410033] Call Trace: : [ 5195.410471] [<ffffffff811bc75d>] change_protection_range+0x7dd/0x930 : [ 5195.410716] [<ffffffff811d4be8>] change_prot_numa+0x18/0x30 : [ 5195.410918] [<ffffffff810adefe>] task_numa_work+0x1fe/0x310 : [ 5195.411200] [<ffffffff81098322>] task_work_run+0x72/0x90 : [ 5195.411246] [<ffffffff81077139>] exit_to_usermode_loop+0x91/0xc2 : [ 5195.411494] [<ffffffff81003a51>] prepare_exit_to_usermode+0x31/0x40 : [ 5195.411739] [<ffffffff815e56af>] retint_user+0x8/0x10
:
: Decoding revealed that the PMD was a valid prot_numa PMD and the bad PMD : was a false detection. The bug does not trigger if automatic NUMA : balancing or transparent huge pages is disabled.
:
: The bug is due a race in change_pmd_range between a pmd_trans_huge and : pmd_nond_or_clear_bad check without any locks held. During the : pmd_trans_huge check, a parallel protection update under lock can have : cleared the PMD and filled it with a prot_numa entry between the transhuge : check and the pmd_none_or_clear_bad check.
:
: While this could be fixed with heavy locking, it's only necessary to make : a copy of the PMD on the stack during change_pmd_range and avoid races. A : new helper is created for this as the check if quite subtle and the : existing similar helpful is not suitable. This passed 154 hours of : testing (usually triggers between 20 minutes and 24 hours) without : detecting bad PMDs or corruption. A basic test of an autonuma-intensive : workload showed no significant change in behaviour.
Although Mel withdrew the patch on the face of LKML comment
https://lkml.org/lkml/2017/4/10/922 the race window aforementioned is still open, and we have reports of Linpack test reporting bad residuals after the bad PMD warning is observed. In addition to that, bad rss-counter and non-zero pgtables assertions are triggered on mm teardown for the task hitting the bad PMD.
host kernel: mm/pgtable-generic.c:40: bad pmd 00000000b3152f68(8000000d2d2008e7)
....
host kernel: BUG: Bad rss-counter state mm:00000000b583043d idx:1 val:512 host kernel: BUG: non-zero pgtables_bytes on freeing mm: 4096
The issue is observed on a v4.18-based distribution kernel, but the race window is expected to be applicable to mainline kernels, as well.
--- mm/mprotect.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
mm/mprotect.c +36 -2
@@ -161,6 +161,31 @@ static unsigned long change_pte_range(streturn pages; } +/* +* Used when setting automatic NUMA hinting protection where it is +* critical that a numa hinting PMD is not confused with a bad PMD. +*/ +static inline int pmd_none_or_clear_bad_unless_trans_huge (pmd_t *pmd) +{ +pmd_t pmdval =pmd_read_atomic (pmd); + +/* See pmd_none_or_trans_huge_or_clear_bad for info on barrier */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +barrier (); +#endif + +if (pmd_none (pmdval)) +return 1 ; +if (pmd_trans_huge (pmdval)) +return 0 ; +if (unlikely (pmd_bad (pmdval))) { +pmd_clear_bad (pmd); +return 1 ; + } + +return 0 ; +} +static inline unsigned long change_pmd_range (struct vm_area_struct *vma,pud_t *pud,unsigned long addr,unsigned long end,pgprot_t newprot,int dirty_accountable,int prot_numa)
@@ -178,8 +203,17 @@ static inline unsigned long change_pmd_runsigned long this_pages; next =pmd_addr_end (addr, end); -if (!is_swap_pmd (*pmd) && !pmd_trans_huge (*pmd) && !pmd_devmap (*pmd) - &&pmd_none_or_clear_bad (pmd)) + +/* +* Automatic NUMA balancing walks the tables with mmap_sem +* held for read. It's possible a parallel update to occur +* between pmd_trans_huge() and a pmd_none_or_clear_bad() +* check leading to a false positive and clearing. +* Hence, it's necessary to atomically read the PMD value +* for all the checks. +*/ +if (!is_swap_pmd (*pmd) && !pmd_devmap (*pmd) && +pmd_none_or_clear_bad_unless_trans_huge (pmd)) goto next;/* invoke the mmu notifier if the pmd is populated */
Greg Kroah-Hartman
maintainerPATCH 80/189 mm: fix possible PMD dirty bit lost in set_pmd_migration_entry()
In reply to Greg Kroah-HartmanFrom: Huang Ying <[email protected]>
commit 8a8683ad9ba48b4b52a57f013513d1635c1ca5c4 upstream.
In set_pmd_migration_entry(), pmdp_invalidate() is used to change PMD atomically. But the PMD is read before that with an ordinary memory reading. If the THP (transparent huge page) is written between the PMD reading and pmdp_invalidate(), the PMD dirty bit may be lost, and cause data corruption. The race window is quite small, but still possible in theory, so need to be fixed.
The race is fixed via using the return value of pmdp_invalidate() to get the original content of PMD, which is a read/modify/write atomic operation. So no THP writing can occur in between.
The race has been introduced when the THP migration support is added in the commit 616b8371539a ("mm: thp: enable thp migration in generic path"). But this fix depends on the commit d52605d7cb30 ("mm: do not lose dirty and accessed bits in pmdp_invalidate()"). So it's easy to be backported after v4.16. But the race window is really small, so it may be fine not to backport the fix at all.
--- mm/huge_memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
mm/huge_memory.c +1 -2
@@ -3032,8 +3032,7 @@ void set_pmd_migration_entry(struct pagereturn ;flush_cache_range (vma, address, address +HPAGE_PMD_SIZE ); - pmdval = *pvmw->pmd; -pmdp_invalidate (vma, address, pvmw->pmd); + pmdval =pmdp_invalidate (vma, address, pvmw->pmd);if (pmd_dirty (pmdval))set_page_dirty (page); entry =make_migration_entry (page,pmd_write (pmdval));
Greg Kroah-Hartman
maintainerPATCH 78/189 vgacon: Fix a UAF in vgacon_invert_region
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
commit 513dc792d6060d5ef572e43852683097a8420f56 upstream.
When syzkaller tests, there is a UAF:
BUG: KASan: use after free in vgacon_invert_region+0x9d/0x110 at addr
ffff880000100000
Read of size 2 by task syz-executor.1/16489
page:ffffea0000004000 count:0 mapcount:-127 mapping: (null)
index:0x0
page flags: 0xfffff00000000()
page dumped because: kasan: bad access detected
CPU: 1 PID: 16489 Comm: syz-executor.1 Not tainted
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014
Call Trace:
[<ffffffffb119f309>] dump_stack+0x1e/0x20
[<ffffffffb04af957>] kasan_report+0x577/0x950
[<ffffffffb04ae652>] __asan_load2+0x62/0x80
[<ffffffffb090f26d>] vgacon_invert_region+0x9d/0x110
[<ffffffffb0a39d95>] invert_screen+0xe5/0x470
[<ffffffffb0a21dcb>] set_selection+0x44b/0x12f0
[<ffffffffb0a3bfae>] tioclinux+0xee/0x490
[<ffffffffb0a1d114>] vt_ioctl+0xff4/0x2670
[<ffffffffb0a0089a>] tty_ioctl+0x46a/0x1a10
[<ffffffffb052db3d>] do_vfs_ioctl+0x5bd/0xc40
[<ffffffffb052e2f2>] SyS_ioctl+0x132/0x170
[<ffffffffb11c9b1b>] system_call_fastpath+0x22/0x27
Memory state around the buggy address:
ffff8800000fff00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00
ffff8800000fff80: 00 00 00 00 00 00 00 00 00 00 00 00 00
00 00 00
>ffff880000100000: ff ff ff ff ff ff ff ff ff ff ff ff ff
ff ff ffIt can be reproduce in the linux mainline by the program:
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <linux/vt.h>
struct tiocl_selection {
unsigned short xs; /* X start */
unsigned short ys; /* Y start */
unsigned short xe; /* X end */
unsigned short ye; /* Y end */ unsigned short sel_mode; /* selection mode */
};
#define TIOCL_SETSEL 2
struct tiocl {
unsigned char type;
unsigned char pad;
struct tiocl_selection sel;
};
int main()
{
int fd = 0;
const char *dev = "/dev/char/4:1"; struct vt_consize v = {0};
struct tiocl tioc = {0};
fd = open(dev, O_RDWR, 0);
v.v_rows = 3346;
ioctl(fd, VT_RESIZEX, &v);
tioc.type = TIOCL_SETSEL;
ioctl(fd, TIOCLINUX, &tioc);
return 0;}
When resize the screen, update the 'vc->vc_size_row' to the new_row_size, but when 'set_origin' in 'vgacon_set_origin', vgacon use 'vga_vram_base' for 'vc_origin' and 'vc_visible_origin', not 'vc_screenbuf'. It maybe smaller than 'vc_screenbuf'. When TIOCLINUX, use the new_row_size to calc the offset, it maybe larger than the vga_vram_size in vgacon driver, then bad access.
Also, if set an larger screenbuf firstly, then set an more larger screenbuf, when copy old_origin to new_origin, a bad access may happen.
So, If the screen size larger than vga_vram, resize screen should be failed. This alse fix CVE-2020-8649 and CVE-2020-8647.
Linus pointed out that overflow checking seems absent. We're saved by the existing bounds checks in vc_do_resize() with rather strict limits:
if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW) return -EINVAL;
Reference: CVE-2020-8647 and CVE-2020-8649
--- drivers/video/console/vgacon.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/video/console/vgacon.c +3 -0
@@ -1316,6 +1316,9 @@ static int vgacon_font_get(struct vc_datstatic int vgacon_resize (struct vc_data *c,unsigned int width,unsigned int height,unsigned int user) { +if ((width <<1 ) * height > vga_vram_size) +return -EINVAL ; +if (width %2 || width > screen_info.orig_video_cols || height > (screen_info.orig_video_lines * vga_default_font_height)/ c->vc_font.height)
Greg Kroah-Hartman
maintainerPATCH 81/189 mm: avoid data corruption on CoW fault into PFN-mapped VMA
In reply to Greg Kroah-HartmanFrom: Kirill A. Shutemov <[email protected]>
commit c3e5ea6ee574ae5e845a40ac8198de1fb63bb3ab upstream.
Jeff Moyer has reported that one of xfstests triggers a warning when run on DAX-enabled filesystem:
WARNING: CPU: 76 PID: 51024 at mm/memory.c:2317 wp_page_copy+0xc40/0xd50 ... wp_page_copy+0x98c/0xd50 (unreliable) do_wp_page+0xd8/0xad0 __handle_mm_fault+0x748/0x1b90 handle_mm_fault+0x120/0x1f0 __do_page_fault+0x240/0xd70 do_page_fault+0x38/0xd0 handle_page_fault+0x10/0x30
The warning happens on failed __copy_from_user_inatomic() which tries to copy data into a CoW page.
This happens because of race between MADV_DONTNEED and CoW page fault:
CPU0 CPU1
handle_mm_fault()
do_wp_page()
wp_page_copy()
do_wp_page()
madvise(MADV_DONTNEED)
zap_page_range()
zap_pte_range()
ptep_get_and_clear_full()
<TLB flush>
__copy_from_user_inatomic()
sees empty PTE and fails
WARN_ON_ONCE(1)
clear_page()The solution is to re-try __copy_from_user_inatomic() under PTL after checking that PTE is matches the orig_pte.
The second copy attempt can still fail, like due to non-readable PTE, but there's nothing reasonable we can do about, except clearing the CoW page.
--- mm/memory.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
mm/memory.c +27 -8
@@ -2221,7 +2221,7 @@ static inline bool cow_user_page(structbool ret;void *kaddr;void __user *uaddr; -bool force_mkyoung; +bool locked = false;struct vm_area_struct *vma = vmf->vma;struct mm_struct *mm = vma->vm_mm;unsigned long addr = vmf->address;
@@ -2246,11 +2246,11 @@ static inline bool cow_user_page(struct* On architectures with software "accessed" bits, we would * take a double page fault, so mark it accessed here. */ - force_mkyoung =arch_faults_on_old_pte () && !pte_young (vmf->orig_pte); -if (force_mkyoung) { +if (arch_faults_on_old_pte () && !pte_young (vmf->orig_pte)) {pte_t entry; vmf->pte =pte_offset_map_lock (mm, vmf->pmd, addr, &vmf->ptl); + locked = true;if (!likely (pte_same (*vmf->pte, vmf->orig_pte))) {/* * Other thread has already handled the fault
@@ -2274,18 +2274,37 @@ static inline bool cow_user_page(struct* zeroes. */ if (__copy_from_user_inatomic (kaddr, uaddr,PAGE_SIZE )) { +if (locked) + goto warn; + +/* Re-validate under PTL if the page is still mapped */ + vmf->pte =pte_offset_map_lock (mm, vmf->pmd, addr, &vmf->ptl); + locked = true; +if (!likely (pte_same (*vmf->pte, vmf->orig_pte))) { +/* The PTE changed under us. Retry page fault. */ + ret = false; + goto pte_unlock; + } +/* -* Give a warn in case there can be some obscure -* use-case +* The same page can be mapped back since last copy attampt. +* Try to copy again under PTL. */ -WARN_ON_ONCE (1 ); -clear_page (kaddr); +if (__copy_from_user_inatomic (kaddr, uaddr,PAGE_SIZE )) { +/* +* Give a warn in case there can be some obscure +* use-case +*/ +warn: +WARN_ON_ONCE (1 ); +clear_page (kaddr); + } } ret = true; pte_unlock: -if (force_mkyoung) +if (locked)pte_unmap_unlock (vmf->pte, vmf->ptl);kunmap_atomic (kaddr);flush_dcache_page (dst);
Greg Kroah-Hartman
maintainerPATCH 82/189 mm, hotplug: fix page online with DEBUG_PAGEALLOC compiled but not enabled
In reply to Greg Kroah-HartmanFrom: Vlastimil Babka <[email protected]>
commit c87cbc1f007c4b46165f05ceca04e1973cda0b9c upstream.
Commit cd02cf1aceea ("mm/hotplug: fix an imbalance with DEBUG_PAGEALLOC") fixed memory hotplug with debug_pagealloc enabled, where onlining a page goes through page freeing, which removes the direct mapping. Some arches don't like when the page is not mapped in the first place, so generic_online_page() maps it first. This is somewhat wasteful, but better than special casing page freeing fast paths.
The commit however missed that DEBUG_PAGEALLOC configured doesn't mean it's actually enabled. One has to test debug_pagealloc_enabled() since 031bc5743f15 ("mm/debug-pagealloc: make debug-pagealloc boottime configurable"), or alternatively debug_pagealloc_enabled_static() since 8e57f8acbbd1 ("mm, debug_pagealloc: don't rely on static keys too early"), but this is not done.
As a result, a s390 kernel with DEBUG_PAGEALLOC configured but not enabled will crash:
Unable to handle kernel pointer dereference in virtual kernel address space Failing address: 0000000000000000 TEID: 0000000000000483 Fault in home space mode while using kernel ASCE. AS:0000001ece13400b R2:000003fff7fd000b R3:000003fff7fcc007 S:000003fff7fd7000 P:000000000000013d Oops: 0004 ilc:2 [#1] SMP CPU: 1 PID: 26015 Comm: chmem Kdump: loaded Tainted: GX 5.3.18-5-default #1 SLE15-SP2 (unreleased) Krnl PSW : 0704e00180000000 0000001ecd281b9e (__kernel_map_pages+0x166/0x188)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3
Krnl GPRS: 0000000000000000 0000000000000800 0000400b00000000 0000000000000100 0000000000000001 0000000000000000 0000000000000002 0000000000000100 0000001ece139230 0000001ecdd98d40 0000400b00000100 0000000000000000 000003ffa17e4000 001fffe0114f7d08 0000001ecd4d93ea 001fffe0114f7b20 Krnl Code: 0000001ecd281b8e: ec17ffff00d8 ahik %r1,%r7,-1 0000001ecd281b94: ec111dbc0355 risbg %r1,%r1,29,188,3
Quoted 1 line
0000001ecd281b9e:94fb5006ni 6(%r5),251
0000001ecd281ba2: 41505008 la %r5,8(%r5) 0000001ecd281ba6: ec51fffc6064 cgrj %r5,%r1,6,1ecd281b9e 0000001ecd281bac: 1a07 ar %r0,%r7 0000001ecd281bae: ec03ff584076 crj %r0,%r3,4,1ecd281a5e
Call Trace: [<0000001ecd281b9e>] __kernel_map_pages+0x166/0x188 [<0000001ecd4d9516>] online_pages_range+0xf6/0x128 [<0000001ecd2a8186>] walk_system_ram_range+0x7e/0xd8 [<0000001ecda28aae>] online_pages+0x2fe/0x3f0 [<0000001ecd7d02a6>] memory_subsys_online+0x8e/0xc0 [<0000001ecd7add42>] device_online+0x5a/0xc8 [<0000001ecd7d0430>] state_store+0x88/0x118 [<0000001ecd5b9f62>] kernfs_fop_write+0xc2/0x200 [<0000001ecd5064b6>] vfs_write+0x176/0x1e0 [<0000001ecd50676a>] ksys_write+0xa2/0x100 [<0000001ecda315d4>] system_call+0xd8/0x2c8
Fix this by checking debug_pagealloc_enabled_static() before calling kernel_map_pages(). Backports for kernel before 5.5 should use debug_pagealloc_enabled() instead. Also add comments.
--- include/linux/mm.h | 4 ++++ mm/memory_hotplug.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
include/linux/mm.h +4 -0
@@ -2687,6 +2687,10 @@ static inline bool debug_pagealloc_enabl#if defined(CONFIG_DEBUG_PAGEALLOC ) || defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP )extern void __kernel_map_pages (struct page *page,int numpages,int enable); +/* +* When called in DEBUG_PAGEALLOC context, the call should most likely be +* guarded by debug_pagealloc_enabled() or debug_pagealloc_enabled_static() +*/ static inline void kernel_map_pages (struct page *page,int numpages,int enable) {
mm/memory_hotplug.c +7 -1
@@ -599,7 +599,13 @@ EXPORT_SYMBOL_GPL(restore_online_page_cavoid generic_online_page (struct page *page,unsigned int order) { -kernel_map_pages (page,1 << order,1 ); +/* +* Freeing the page with debug_pagealloc enabled will try to unmap it, +* so we should map it first. This is better than introducing a special +* case in page freeing fast path. +*/ +if (debug_pagealloc_enabled_static ()) +kernel_map_pages (page,1 << order,1 );__free_pages_core (page, order);totalram_pages_add (1UL << order);#ifdef CONFIG_HIGHMEM
Greg Kroah-Hartman
maintainerPATCH 115/189 dmaengine: imx-sdma: Fix the event id check to include RX event for UART6
In reply to Greg Kroah-HartmanFrom: Frieder Schrempf <[email protected]>
commit 25962e1a7f1d522f1b57ead2f266fab570042a70 upstream.
On i.MX6UL/ULL and i.MX6SX the DMA event id for the RX channel of UART6 is '0'. To fix the broken DMA support for UART6, we change the check for event_id0 to include '0' as a valid id.
--- drivers/dma/imx-sdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/imx-sdma.c +2 -2
@@ -1328,7 +1328,7 @@ static void sdma_free_chan_resources(strsdma_channel_synchronize (chan); -if (sdmac->event_id0) +if (sdmac->event_id0 >=0 )sdma_event_disable (sdmac, sdmac->event_id0);if (sdmac->event_id1)sdma_event_disable (sdmac, sdmac->event_id1);
@@ -1629,7 +1629,7 @@ static int sdma_config(struct dma_chan *memcpy (&sdmac->slave_config, dmaengine_cfg,sizeof (*dmaengine_cfg));/* Set ENBLn earlier to make sure dma request triggered after that */ -if (sdmac->event_id0) { +if (sdmac->event_id0 >=0 ) {if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events)return -EINVAL ;sdma_event_enable (sdmac, sdmac->event_id0);
Greg Kroah-Hartman
maintainerPATCH 125/189 dm: fix congested_fn for request-based device
In reply to Greg Kroah-HartmanFrom: Hou Tao <[email protected]>
commit 974f51e8633f0f3f33e8f86bbb5ae66758aa63c7 upstream.
We neither assign congested_fn for requested-based blk-mq device nor implement it correctly. So fix both.
Also, remove incorrect comment from dm_init_normal_md_queue and rename it to dm_init_congested_fn.
--- drivers/md/dm.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/md/dm.c +10 -11
@@ -1788,7 +1788,8 @@ static int dm_any_congested(void *conges* With request-based DM we only need to check the * top-level queue for congestion. */ - r = md->queue->backing_dev_info->wb.state & bdi_bits; +struct backing_dev_info *bdi = md->queue->backing_dev_info; + r = bdi->wb.congested->state & bdi_bits; }else { map =dm_get_live_table_fast (md);if (map)
@@ -1854,15 +1855,6 @@ static const struct dax_operations dm_dastatic void dm_wq_work (struct work_struct *work); -static void dm_init_normal_md_queue (struct mapped_device *md) -{ -/* -* Initialize aspects of queue that aren't relevant for blk-mq -*/ - md->queue->backing_dev_info->congested_data = md; - md->queue->backing_dev_info->congested_fn = dm_any_congested; -} -static void cleanup_mapped_device (struct mapped_device *md) {if (md->wq)
@@ -2249,6 +2241,12 @@ struct queue_limits *dm_get_queue_limits }EXPORT_SYMBOL_GPL (dm_get_queue_limits); +static void dm_init_congested_fn (struct mapped_device *md) +{ + md->queue->backing_dev_info->congested_data = md; + md->queue->backing_dev_info->congested_fn = dm_any_congested; +} +/* * Setup the DM device's queue based on md's type */
@@ -2265,11 +2263,12 @@ int dm_setup_md_queue(struct mapped_deviDMERR ("Cannot initialize queue for request-based dm-mq mapped device" );return r; } +dm_init_congested_fn (md);break ;case DM_TYPE_BIO_BASED :case DM_TYPE_DAX_BIO_BASED :case DM_TYPE_NVME_BIO_BASED : -dm_init_normal_md_queue (md); +dm_init_congested_fn (md);break ;case DM_TYPE_NONE :WARN_ON_ONCE (true);
Greg Kroah-Hartman
maintainerPATCH 126/189 arm64: dts: meson-sm1-sei610: add missing interrupt-names
In reply to Greg Kroah-HartmanFrom: Guillaume La Roque <[email protected]>
commit 5bea1336ed2c939328999c64de28792e8dc0699b upstream.
add missing "host-wakeup interrupt names
--- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +1 -0
@@ -593,6 +593,7 @@ compatible = "brcm,bcm43438-bt"; interrupt-parent = <&gpio_intc>; interrupts = <95 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host-wakeup"; shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; max-speed = <2000000>; clocks = <&wifi32k>;
Greg Kroah-Hartman
maintainerPATCH 129/189 drm/virtio: fix resource id creation race
In reply to Greg Kroah-HartmanFrom: John Bates <[email protected]>
commit fbb30168c7395b9cfeb9e6f7b0c0bca854a6552d upstream.
The previous code was not thread safe and caused undefined behavior from spurious duplicate resource IDs. In this patch, an atomic_t is used instead. We no longer see any duplicate IDs in tests with this change.
--- drivers/gpu/drm/virtio/virtgpu_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_object.c +2 -2
@@ -42,8 +42,8 @@ static int virtio_gpu_resource_id_get(st* "f91a9dd35715 Fix unlinking resources from hash * table." (Feb 2019) fixes the bug. */ -static int handle; - handle++; +static atomic_t seqno =ATOMIC_INIT (0 ); +int handle =atomic_inc_return (&seqno); *resid = handle +1 ; }else {int handle =ida_alloc (&vgdev->resource_ida,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 130/189 ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
In reply to Greg Kroah-HartmanFrom: Dragos Tarcatu <[email protected]>
commit 2b2d5c4db732c027a14987cfccf767dac1b45170 upstream.
If soc_tplg_link_config() fails, _link needs to be freed in case of topology ABI version mismatch. However the current code is returning directly and ends up leaking memory in this case.
This patch fixes that.
--- sound/soc/soc-topology.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-topology.c +4 -1
@@ -2335,8 +2335,11 @@ static int soc_tplg_link_elems_load(stru } ret =soc_tplg_link_config (tplg, _link); -if (ret <0 ) +if (ret <0 ) { +if (!abi_match) +kfree (_link);return ret; + }/* offset by version-specific struct size and * real priv data size
Greg Kroah-Hartman
maintainerPATCH 131/189 ASoC: topology: Fix memleak in soc_tplg_manifest_load()
In reply to Greg Kroah-HartmanFrom: Dragos Tarcatu <[email protected]>
commit 242c46c023610dbc0213fc8fb6b71eb836bc5d95 upstream.
In case of ABI version mismatch, _manifest needs to be freed as it is just a copy of the original topology manifest. However, if a driver manifest handler is defined, that would get executed and the cleanup is never reached. Fix that by getting the return status of manifest() instead of returning directly.
--- sound/soc/soc-topology.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/soc-topology.c +6 -6
@@ -2503,7 +2503,7 @@ static int soc_tplg_manifest_load(struct {struct snd_soc_tplg_manifest *manifest, *_manifest;bool abi_match; -int err; +int ret =0 ;if (tplg->pass !=SOC_TPLG_PASS_MANIFEST )return 0 ;
@@ -2516,19 +2516,19 @@ static int soc_tplg_manifest_load(struct _manifest = manifest; }else { abi_match = false; - err =manifest_new_ver (tplg, manifest, &_manifest); -if (err <0 ) -return err; + ret =manifest_new_ver (tplg, manifest, &_manifest); +if (ret <0 ) +return ret; }/* pass control to component driver for optional further init */ if (tplg->comp && tplg->ops && tplg->ops->manifest) -return tplg->ops->manifest (tplg->comp, tplg->index, _manifest); + ret = tplg->ops->manifest (tplg->comp, tplg->index, _manifest);if (!abi_match)/* free the duplicated one */ kfree (_manifest); -return 0 ; +return ret; }/* validate header magic, size and type */
Greg Kroah-Hartman
maintainerPATCH 132/189 ASoC: SOF: Fix snd_sof_ipc_stream_posn()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 613cea5935e83cb5a7d182ee3f98d54620e102e2 upstream.
We're passing "&posn" instead of "posn" so it ends up corrupting memory instead of doing something useful.
--- sound/soc/sof/ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/ipc.c +1 -1
@@ -495,7 +495,7 @@ int snd_sof_ipc_stream_posn(struct snd_s/* send IPC to the DSP */ err =sof_ipc_tx_message (sdev->ipc, - stream.hdr.cmd, &stream,sizeof (stream), &posn, + stream.hdr.cmd, &stream,sizeof (stream), posn,sizeof (*posn));if (err <0 ) { dev_err(sdev->dev, "error: failed to get stream %d position\n",
Greg Kroah-Hartman
maintainerPATCH 133/189 ASoC: intel: skl: Fix pin debug prints
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 64bbacc5f08c01954890981c63de744df1f29a30 upstream.
skl_print_pins() loops over all given pins but it overwrites the text at the very same position while increasing the returned length. Fix this to show the all pin contents properly.
--- sound/soc/intel/skylake/skl-debug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl-debug.c +3 -1
@@ -34,7 +34,7 @@ static ssize_t skl_print_pins(struct sklint i;ssize_t ret =0 ; -for (i =0 ; i < max_pin; i++) +for (i =0 ; i < max_pin; i++) { ret +=snprintf (buf + size,MOD_BUF - size,"%s %d\n\tModule %d\n\tInstance %d\n\t" "In-used %s\n\tType %s\n"
@@ -45,6 +45,8 @@ static ssize_t skl_print_pins(struct skl m_pin[i].in_use ?"Used" :"Unused" , m_pin[i].is_dynamic ?"Dynamic" :"Static" , m_pin[i].pin_state, i); + size += ret; + }return ret; }
Greg Kroah-Hartman
maintainerPATCH 116/189 dmaengine: tegra-apb: Fix use-after-free
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 94788af4ed039476ff3527b0e6a12c1dc42cb022 upstream.
I was doing some experiments with I2C and noticed that Tegra APB DMA driver crashes sometime after I2C DMA transfer termination. The crash happens because tegra_dma_terminate_all() bails out immediately if pending list is empty, and thus, it doesn't release the half-completed descriptors which are getting re-used before ISR tasklet kicks-in.
tegra-i2c 7000c400.i2c: DMA transfer timeout elants_i2c 0-0010: elants_i2c_irq: failed to read data: -110
------------[ cut here ]------------ WARNING: CPU: 0 PID: 142 at lib/list_debug.c:45 __list_del_entry_valid+0x45/0xac list_del corruption, ddbaac44->next is LIST_POISON1 (00000100) Modules linked in: CPU: 0 PID: 142 Comm: kworker/0:2 Not tainted 5.5.0-rc2-next-20191220-00175-gc3605715758d-dirty #538 Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events_freezable_power_ thermal_zone_device_check [<c010e5c5>] (unwind_backtrace) from [<c010a1c5>] (show_stack+0x11/0x14) [<c010a1c5>] (show_stack) from [<c0973925>] (dump_stack+0x85/0x94) [<c0973925>] (dump_stack) from [<c011f529>] (__warn+0xc1/0xc4) [<c011f529>] (__warn) from [<c011f7e9>] (warn_slowpath_fmt+0x61/0x78) [<c011f7e9>] (warn_slowpath_fmt) from [<c042497d>] (__list_del_entry_valid+0x45/0xac) [<c042497d>] (__list_del_entry_valid) from [<c047a87f>] (tegra_dma_tasklet+0x5b/0x154) [<c047a87f>] (tegra_dma_tasklet) from [<c0124799>] (tasklet_action_common.constprop.0+0x41/0x7c) [<c0124799>] (tasklet_action_common.constprop.0) from [<c01022ab>] (__do_softirq+0xd3/0x2a8) [<c01022ab>] (__do_softirq) from [<c0124683>] (irq_exit+0x7b/0x98) [<c0124683>] (irq_exit) from [<c0168c19>] (__handle_domain_irq+0x45/0x80) [<c0168c19>] (__handle_domain_irq) from [<c043e429>] (gic_handle_irq+0x45/0x7c) [<c043e429>] (gic_handle_irq) from [<c0101aa5>] (__irq_svc+0x65/0x94) Exception stack(0xde2ebb90 to 0xde2ebbd8)
--- drivers/dma/tegra20-apb-dma.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/dma/tegra20-apb-dma.c +0 -4
@@ -756,10 +756,6 @@ static int tegra_dma_terminate_all(strucbool was_busy;spin_lock_irqsave (&tdc->lock, flags); -if (list_empty (&tdc->pending_sg_req)) { -spin_unlock_irqrestore (&tdc->lock, flags); -return 0 ; - }if (!tdc->busy) goto skip_dma_stop;
Greg Kroah-Hartman
maintainerPATCH 134/189 ASoC: intel: skl: Fix possible buffer overflow in debug outputs
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 549cd0ba04dcfe340c349cd983bd440480fae8ee upstream.
The debugfs output of intel skl driver writes strings with multiple snprintf() calls with the fixed size. This was supposed to avoid the buffer overflow but actually it still would, because snprintf() returns the expected size to be output, not the actual output size.
Fix it by replacing snprintf() calls with scnprintf().
--- sound/soc/intel/skylake/skl-debug.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
sound/soc/intel/skylake/skl-debug.c +14 -14
@@ -35,7 +35,7 @@ static ssize_t skl_print_pins(struct sklssize_t ret =0 ;for (i =0 ; i < max_pin; i++) { - ret += snprintf(buf + size, MOD_BUF - size, + ret += scnprintf(buf + size, MOD_BUF - size, "%s %d\n\tModule %d\n\tInstance %d\n\t" "In-used %s\n\tType %s\n" "\tState %d\n\tIndex %d\n",
@@ -53,7 +53,7 @@ static ssize_t skl_print_pins(struct sklstatic ssize_t skl_print_fmt (struct skl_module_fmt *fmt,char *buf,ssize_t size,bool direction) { - return snprintf(buf + size, MOD_BUF - size, + return scnprintf(buf + size, MOD_BUF - size, "%s\n\tCh %d\n\tFreq %d\n\tBit depth %d\n\t" "Valid bit depth %d\n\tCh config %#x\n\tInterleaving %d\n\t" "Sample Type %d\n\tCh Map %#x\n",
@@ -77,16 +77,16 @@ static ssize_t module_read(struct file *if (!buf)return -ENOMEM ; - ret =snprintf (buf,MOD_BUF ,"Module:\n\tUUID %pUL\n\tModule id %d\n" + ret =scnprintf (buf,MOD_BUF ,"Module:\n\tUUID %pUL\n\tModule id %d\n" "\tInstance id %d\n\tPvt_id %d\n" , mconfig->guid, mconfig->id.module_id, mconfig->id.instance_id, mconfig->id.pvt_id); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"Resources:\n\tCPC %#x\n\tIBS %#x\n\tOBS %#x\t\n" , res->cpc, res->ibs, res->obs); - ret += snprintf(buf + ret, MOD_BUF - ret, + ret += scnprintf(buf + ret, MOD_BUF - ret, "Module data:\n\tCore %d\n\tIn queue %d\n\t" "Out queue %d\n\tType %s\n", mconfig->core_id, mconfig->max_in_queue,
@@ -96,38 +96,38 @@ static ssize_t module_read(struct file * ret +=skl_print_fmt (mconfig->in_fmt, buf, ret, true); ret +=skl_print_fmt (mconfig->out_fmt, buf, ret, false); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"Fixup:\n\tParams %#x\n\tConverter %#x\n" , mconfig->params_fixup, mconfig->converter); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"Module Gateway:\n\tType %#x\n\tVbus %#x\n\tHW conn %#x\n\tSlot %#x\n" , mconfig->dev_type, mconfig->vbus_id, mconfig->hw_conn_type, mconfig->time_slot); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"Pipeline:\n\tID %d\n\tPriority %d\n\tConn Type %d\n\t" "Pages %#x\n" , mconfig->pipe->ppl_id, mconfig->pipe->pipe_priority, mconfig->pipe->conn_type, mconfig->pipe->memory_pages); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"\tParams:\n\t\tHost DMA %d\n\t\tLink DMA %d\n" , mconfig->pipe->p_params->host_dma_id, mconfig->pipe->p_params->link_dma_id); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"\tPCM params:\n\t\tCh %d\n\t\tFreq %d\n\t\tFormat %d\n" , mconfig->pipe->p_params->ch, mconfig->pipe->p_params->s_freq, mconfig->pipe->p_params->s_fmt); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"\tLink %#x\n\tStream %#x\n" , mconfig->pipe->p_params->linktype, mconfig->pipe->p_params->stream); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"\tState %d\n\tPassthru %s\n" , mconfig->pipe->state, mconfig->pipe->passthru ?"true" :"false" );
@@ -137,7 +137,7 @@ static ssize_t module_read(struct file * ret +=skl_print_pins (mconfig->m_out_pin, buf, mconfig->max_out_queue, ret, false); - ret +=snprintf (buf + ret,MOD_BUF - ret, + ret +=scnprintf (buf + ret,MOD_BUF - ret,"Other:\n\tDomain %d\n\tHomogeneous Input %s\n\t" "Homogeneous Output %s\n\tIn Queue Mask %d\n\t" "Out Queue Mask %d\n\tDMA ID %d\n\tMem Pages %d\n\t"
@@ -193,7 +193,7 @@ static ssize_t fw_softreg_read(struct fi__ioread32_copy (d->fw_read_buff, fw_reg_addr, w0_stat_sz >>2 );for (offset =0 ; offset <FW_REG_SIZE ; offset +=16 ) { - ret +=snprintf (tmp + ret,FW_REG_BUF - ret,"%#.4x: " , offset); + ret +=scnprintf (tmp + ret,FW_REG_BUF - ret,"%#.4x: " , offset);hex_dump_to_buffer (d->fw_read_buff + offset,16 ,16 ,4 , tmp + ret,FW_REG_BUF - ret,0 ); ret +=strlen (tmp + ret);
Greg Kroah-Hartman
maintainerPATCH 135/189 ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 6c89ffea60aa3b2a33ae7987de1e84bfb89e4c9e upstream.
dpcm_show_state() invokes multiple snprintf() calls to concatenate formatted strings on the fixed size buffer. The usage of snprintf() is supposed for avoiding the buffer overflow, but it doesn't work as expected because snprintf() doesn't return the actual output size but the size to be written.
Fix this bug by replacing all snprintf() calls with scnprintf() calls.
--- sound/soc/soc-pcm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
sound/soc/soc-pcm.c +8 -8
@@ -3192,16 +3192,16 @@ static ssize_t dpcm_show_state(struct snunsigned long flags;/* FE state */ - offset +=snprintf (buf + offset, size - offset, + offset +=scnprintf (buf + offset, size - offset,"[%s - %s]\n" , fe->dai_link->name, stream ?"Capture" :"Playback" ); - offset +=snprintf (buf + offset, size - offset,"State: %s\n" , + offset +=scnprintf (buf + offset, size - offset,"State: %s\n" ,dpcm_state_string (fe->dpcm[stream].state));if ((fe->dpcm[stream].state >=SND_SOC_DPCM_STATE_HW_PARAMS ) && (fe->dpcm[stream].state <=SND_SOC_DPCM_STATE_STOP )) - offset += snprintf(buf + offset, size - offset, + offset += scnprintf(buf + offset, size - offset, "Hardware Params: " "Format = %s, Channels = %d, Rate = %d\n", snd_pcm_format_name(params_format(params)),
@@ -3209,10 +3209,10 @@ static ssize_t dpcm_show_state(struct sn params_rate(params));/* BEs state */ - offset +=snprintf (buf + offset, size - offset,"Backends:\n" ); + offset +=scnprintf (buf + offset, size - offset,"Backends:\n" );if (list_empty (&fe->dpcm[stream].be_clients)) { - offset +=snprintf (buf + offset, size - offset, + offset +=scnprintf (buf + offset, size - offset," No active DSP links\n" ); goto out; }
@@ -3222,16 +3222,16 @@ static ssize_t dpcm_show_state(struct snstruct snd_soc_pcm_runtime *be = dpcm->be; params = &dpcm->hw_params; - offset +=snprintf (buf + offset, size - offset, + offset +=scnprintf (buf + offset, size - offset,"- %s\n" , be->dai_link->name); - offset +=snprintf (buf + offset, size - offset, + offset +=scnprintf (buf + offset, size - offset," State: %s\n" ,dpcm_state_string (be->dpcm[stream].state));if ((be->dpcm[stream].state >=SND_SOC_DPCM_STATE_HW_PARAMS ) && (be->dpcm[stream].state <=SND_SOC_DPCM_STATE_STOP )) - offset += snprintf(buf + offset, size - offset, + offset += scnprintf(buf + offset, size - offset, " Hardware Params: " "Format = %s, Channels = %d, Rate = %d\n", snd_pcm_format_name(params_format(params)),
Greg Kroah-Hartman
maintainerPATCH 137/189 ASoC: Intel: Skylake: Fix available clock counter incrementation
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit 8308a09e87d2cb51adb186dc7d5a5c1913fb0758 upstream.
Incrementation of avail_clk_cnt was incorrectly moved to error path. Put it back to success path.
--- sound/soc/intel/skylake/skl-ssp-clk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/intel/skylake/skl-ssp-clk.c +3 -1
@@ -384,9 +384,11 @@ static int skl_clk_dev_probe(struct plat &clks[i], clk_pdata, i);if (IS_ERR (data->clk[data->avail_clk_cnt])) { - ret =PTR_ERR (data->clk[data->avail_clk_cnt++]); + ret =PTR_ERR (data->clk[data->avail_clk_cnt]); goto err_unreg_skl_clk; } + + data->avail_clk_cnt++; }platform_set_drvdata (pdev, data);
Greg Kroah-Hartman
maintainerPATCH 138/189 ASoC: dapm: Correct DAPM handling of active widgets during shutdown
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
commit 9b3193089e77d3b59b045146ff1c770dd899acb1 upstream.
commit c2caa4da46a4 ("ASoC: Fix widget powerdown on shutdown") added a set of the power state during snd_soc_dapm_shutdown to ensure the widgets powered off. However, when commit 39eb5fd13dff ("ASoC: dapm: Delay w->power update until the changes are written") added the new_power member of the widget structure, to differentiate between the current power state and the target power state, it did not update the shutdown to use the new_power member.
As new_power has not updated it will be left in the state set by the last DAPM sequence, ie. 1 for active widgets. So as the DAPM sequence for the shutdown proceeds it will turn the widgets on (despite them already being on) rather than turning them off.
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -4749,7 +4749,7 @@ static void soc_dapm_shutdown_dapm(struccontinue ;if (w->power) {dapm_seq_insert (w, &down_list, false); - w->power =0 ; + w->new_power =0 ; powerdown =1 ; } }
Greg Kroah-Hartman
maintainerPATCH 139/189 ASoC: soc-component: tidyup snd_soc_pcm_component_sync_stop()
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
commit f1861a7c58ba1ba43c7adff6909d9a920338e4a8 upstream.
commit 1e5ddb6ba73894 ("ASoC: component: Add sync_stop PCM ops") added snd_soc_pcm_component_sync_stop(), but it is checking ioctrl instead of sync_stop. This is bug.
This patch fixup it.
--- sound/soc/soc-component.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-component.c +1 -1
@@ -452,7 +452,7 @@ int snd_soc_pcm_component_sync_stop(struint ret;for_each_rtd_components (rtd, rtdcom, component) { -if (component->driver->ioctl) { +if (component->driver->sync_stop) { ret = component->driver->sync_stop (component, substream);if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 141/189 drm/panfrost: Dont try to map on error faults
In reply to Greg Kroah-HartmanFrom: Tomeu Vizoso <[email protected]>
commit eb9d8ddbc107d02e489681f9dcbf93949e1a99a4 upstream.
If the exception type isn't a translation fault, don't try to map and instead go straight to a terminal fault.
Otherwise, we can get flooded by kernel warnings and further faults.
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 44 +++++++++++++------------------- 1 file changed, 19 insertions(+), 25 deletions(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +19 -25
@@ -601,33 +601,27 @@ static irqreturn_t panfrost_mmu_irq_hand source_id = (fault_status >>16 );/* Page fault only */ -if ((status & mask) ==BIT (i)) { -WARN_ON (exception_type <0xC1 || exception_type >0xC4 ); - + ret =-1 ; +if ((status & mask) ==BIT (i) && (exception_type &0xF8 ) ==0xC0 ) ret =panfrost_mmu_map_fault_addr (pfdev, i, addr); -if (!ret) { -mmu_write (pfdev,MMU_INT_CLEAR ,BIT (i)); - status &= ~mask; -continue ; - } - } -/* terminal fault, print info about the fault */ -dev_err (pfdev->dev, -"Unhandled Page fault in AS%d at VA 0x%016llX\n" -"Reason: %s\n" -"raw fault status: 0x%X\n" -"decoded fault status: %s\n" -"exception type 0x%X: %s\n" -"access type 0x%X: %s\n" -"source id 0x%X\n" , - i, addr, -"TODO" , - fault_status, - (fault_status & (1 <<10 ) ?"DECODER FAULT" :"SLAVE FAULT" ), - exception_type,panfrost_exception_name (pfdev, exception_type), - access_type,access_type_name (pfdev, fault_status), - source_id); +if (ret) +/* terminal fault, print info about the fault */ +dev_err (pfdev->dev, +"Unhandled Page fault in AS%d at VA 0x%016llX\n" +"Reason: %s\n" +"raw fault status: 0x%X\n" +"decoded fault status: %s\n" +"exception type 0x%X: %s\n" +"access type 0x%X: %s\n" +"source id 0x%X\n" , + i, addr, +"TODO" , + fault_status, + (fault_status & (1 <<10 ) ?"DECODER FAULT" :"SLAVE FAULT" ), + exception_type,panfrost_exception_name (pfdev, exception_type), + access_type,access_type_name (pfdev, fault_status), + source_id);mmu_write (pfdev,MMU_INT_CLEAR , mask);
Greg Kroah-Hartman
maintainerPATCH 142/189 drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly
In reply to Greg Kroah-HartmanFrom: Phong LE <[email protected]>
commit 3d2ed431b8f39483477bc3c3a2aefbc9778ffe12 upstream.
The larb device remains NULL if the type is MTK_DISP_OVL_2L. A kernel panic is raised when a crtc uses mtk_smi_larb_get or mtk_smi_larb_put.
--- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1 -0
@@ -358,6 +358,7 @@ int mtk_ddp_comp_init(struct device *dev/* Only DMA capable components need the LARB property */ comp->larb_dev =NULL ;if (type !=MTK_DISP_OVL && + type !=MTK_DISP_OVL_2L && type !=MTK_DISP_RDMA && type !=MTK_DISP_WDMA )return 0 ;
Greg Kroah-Hartman
maintainerPATCH 143/189 drm/ttm: fix leaking fences via ttm_buffer_object_transfer
In reply to Greg Kroah-HartmanFrom: Ahzo <[email protected]>
commit 8c8c06207bcfc5a7e5918fc0a0f7f7b9a2e196d6 upstream.
Set the drm_device to NULL, so that the newly created buffer object doesn't appear to use the embedded gem object.
This is necessary, because otherwise no corresponding dma_resv_fini for the dma_resv_init is called, resulting in a memory leak.
The dma_resv_fini in ttm_bo_release_list is only called if the embedded gem object is not used, which is determined by checking if the drm_device is NULL.
--- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/ttm/ttm_bo_util.c +1 -0
@@ -516,6 +516,7 @@ static int ttm_buffer_object_transfer(st fbo->base.base.resv = &fbo->base.base._resv;dma_resv_init (&fbo->base.base._resv); + fbo->base.base.dev =NULL ; ret =dma_resv_trylock (&fbo->base.base._resv);WARN_ON (!ret);
Greg Kroah-Hartman
maintainerPATCH 117/189 dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit c33ee1301c393a241d6424e36eff1071811b1064 upstream.
The interrupt handler puts a half-completed DMA descriptor on a free list and then schedules tasklet to process bottom half of the descriptor that executes client's callback, this creates possibility to pick up the busy descriptor from the free list. Thus, let's disallow descriptor's re-use until it is fully processed.
--- drivers/dma/tegra20-apb-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/tegra20-apb-dma.c +1 -1
@@ -281,7 +281,7 @@ static struct tegra_dma_desc *tegra_dma_/* Do not allocate if desc are waiting for ack */ list_for_each_entry (dma_desc, &tdc->free_dma_desc, node) { -if (async_tx_test_ack (&dma_desc->txd)) { +if (async_tx_test_ack (&dma_desc->txd) && !dma_desc->cb_count) {list_del (&dma_desc->node);spin_unlock_irqrestore (&tdc->lock, flags); dma_desc->txd.flags =0 ;
Greg Kroah-Hartman
maintainerPATCH 144/189 drm: kirin: Revert "Fix for hikey620 display offset problem"
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
commit 1b79cfd99ff5127e6a143767b51694a527b3ea38 upstream.
This reverts commit ff57c6513820efe945b61863cf4a51b79f18b592.
With the commit ff57c6513820 ("drm: kirin: Fix for hikey620 display offset problem") we added support for handling LDI overflows by resetting the hardware.
However, its been observed that when we do hit the LDI overflow condition, the irq seems to be screaming, and we do nothing but stream:
[drm:ade_irq_handler [kirin_drm]] *ERROR* LDI underflow!
over and over to the screen
I've tried a few appraoches to avoid this, but none has yet been successful and the cure here is worse then the original disease, so revert this for now.
--- drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 1 - drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 -------------------- 2 files changed, 21 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h +0 -1
@@ -83,7 +83,6 @@#define VSIZE_OFST 20#define LDI_INT_EN 0x741C#define FRAME_END_INT_EN_OFST 1 -#define UNDERFLOW_INT_EN_OFST 2#define LDI_CTRL 0x7420#define BPP_OFST 3#define DATA_GATE_EN BIT(2)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +0 -20
@@ -46,7 +46,6 @@ struct ade_hw_ctx {struct clk *media_noc_clk;struct clk *ade_pix_clk;struct reset_control *reset; -struct work_struct display_reset_wq;bool power_on;int irq;
@@ -136,7 +135,6 @@ static void ade_init(struct ade_hw_ctx **/ ade_update_bits (base +ADE_CTRL ,FRM_END_START_OFST ,FRM_END_START_MASK ,REG_EFFECTIVE_IN_ADEEN_FRMEND ); -ade_update_bits (base +LDI_INT_EN ,UNDERFLOW_INT_EN_OFST ,MASK (1 ),1 ); } static bool ade_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -304,17 +302,6 @@ static void ade_crtc_disable_vblank(stru MASK(1), 0); } -static void drm_underflow_wq (struct work_struct *work) -{ - struct ade_hw_ctx *ctx = container_of(work, struct ade_hw_ctx, - display_reset_wq); -struct drm_device *drm_dev = ctx->crtc->dev; -struct drm_atomic_state *state; - - state =drm_atomic_helper_suspend (drm_dev); -drm_atomic_helper_resume (drm_dev, state); -} -static irqreturn_t ade_irq_handler (int irq,void *data) {struct ade_hw_ctx *ctx = data;
@@ -331,12 +318,6 @@ static irqreturn_t ade_irq_handler(int i MASK(1), 1);drm_crtc_handle_vblank (crtc); } -if (status &BIT (UNDERFLOW_INT_EN_OFST )) { -ade_update_bits (base +LDI_INT_CLR ,UNDERFLOW_INT_EN_OFST , -MASK (1 ),1 ); -DRM_ERROR ("LDI underflow!" ); -schedule_work (&ctx->display_reset_wq); - }return IRQ_HANDLED ; }
@@ -919,7 +900,6 @@ static void *ade_hw_ctx_alloc(struct plaif (ret)return ERR_PTR (-EIO ); -INIT_WORK (&ctx->display_reset_wq, drm_underflow_wq); ctx->crtc = crtc;return ctx;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 145/189 drm/sun4i: Add separate DE3 VI layer formats
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
commit 169ca4b38932112e8b2ee8baef9cea44678625b3 upstream.
DE3 VI layers support alpha blending, but DE2 VI layers do not. Additionally, DE3 VI layers support 10-bit RGB and YUV formats.
Make a separate list for DE3.
--- drivers/gpu/drm/sun4i/sun8i_mixer.c | 36 ++++++++++++++++++++ drivers/gpu/drm/sun4i/sun8i_mixer.h | 11 ++++++ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 58 +++++++++++++++++++++++++++++++-- 3 files changed, 102 insertions(+), 3 deletions(-)
drivers/gpu/drm/sun4i/sun8i_mixer.c +36 -0
@@ -149,6 +149,30 @@ static const struct de2_fmt_info de2_for .csc = SUN8I_CSC_MODE_OFF, }, { + .drm_fmt = DRM_FORMAT_ARGB2101010, + .de2_fmt = SUN8I_MIXER_FBFMT_ARGB2101010, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { + .drm_fmt = DRM_FORMAT_ABGR2101010, + .de2_fmt = SUN8I_MIXER_FBFMT_ABGR2101010, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { + .drm_fmt = DRM_FORMAT_RGBA1010102, + .de2_fmt = SUN8I_MIXER_FBFMT_RGBA1010102, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { + .drm_fmt = DRM_FORMAT_BGRA1010102, + .de2_fmt = SUN8I_MIXER_FBFMT_BGRA1010102, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_UYVY, .de2_fmt = SUN8I_MIXER_FBFMT_UYVY, .rgb = false,
@@ -244,6 +268,18 @@ static const struct de2_fmt_info de2_for .rgb = false, .csc = SUN8I_CSC_MODE_YVU2RGB, }, + { + .drm_fmt = DRM_FORMAT_P010, + .de2_fmt = SUN8I_MIXER_FBFMT_P010_YUV, + .rgb = false, + .csc = SUN8I_CSC_MODE_YUV2RGB, + }, + { + .drm_fmt = DRM_FORMAT_P210, + .de2_fmt = SUN8I_MIXER_FBFMT_P210_YUV, + .rgb = false, + .csc = SUN8I_CSC_MODE_YUV2RGB, + }, };const struct de2_fmt_info *sun8i_mixer_format_info (u32 format)
drivers/gpu/drm/sun4i/sun8i_mixer.h +11 -0
@@ -93,6 +93,10 @@#define SUN8I_MIXER_FBFMT_ABGR1555 17#define SUN8I_MIXER_FBFMT_RGBA5551 18#define SUN8I_MIXER_FBFMT_BGRA5551 19 +#define SUN8I_MIXER_FBFMT_ARGB2101010 20 +#define SUN8I_MIXER_FBFMT_ABGR2101010 21 +#define SUN8I_MIXER_FBFMT_RGBA1010102 22 +#define SUN8I_MIXER_FBFMT_BGRA1010102 23#define SUN8I_MIXER_FBFMT_YUYV 0#define SUN8I_MIXER_FBFMT_UYVY 1
@@ -109,6 +113,13 @@/* format 12 is semi-planar YUV411 UVUV */ /* format 13 is semi-planar YUV411 VUVU */ #define SUN8I_MIXER_FBFMT_YUV411 14 +/* format 15 doesn't exist */ +/* format 16 is P010 YVU */ +#define SUN8I_MIXER_FBFMT_P010_YUV 17 +/* format 18 is P210 YVU */ +#define SUN8I_MIXER_FBFMT_P210_YUV 19 +/* format 20 is packed YVU444 10-bit */ +/* format 21 is packed YUV444 10-bit */ /* * Sub-engines listed bellow are unused for now. The EN registers are here only
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +55 -3
79 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 146/189 drm/sun4i: Fix DE2 VI layer format support
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
commit 20896ef137340e9426cf322606f764452f5eb960 upstream.
DE2 VI layer doesn't support blending which means alpha channel is ignored. Replace all formats with alpha with "don't care" (X) channel.
--- drivers/gpu/drm/sun4i/sun8i_mixer.c | 56 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 22 ++++++------ 2 files changed, 67 insertions(+), 11 deletions(-)
drivers/gpu/drm/sun4i/sun8i_mixer.c +56 -0
@@ -107,46 +107,102 @@ static const struct de2_fmt_info de2_for .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_XRGB4444, + .de2_fmt = SUN8I_MIXER_FBFMT_ARGB4444, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_ABGR4444, .de2_fmt = SUN8I_MIXER_FBFMT_ABGR4444, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_XBGR4444, + .de2_fmt = SUN8I_MIXER_FBFMT_ABGR4444, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_RGBA4444, .de2_fmt = SUN8I_MIXER_FBFMT_RGBA4444, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_RGBX4444, + .de2_fmt = SUN8I_MIXER_FBFMT_RGBA4444, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_BGRA4444, .de2_fmt = SUN8I_MIXER_FBFMT_BGRA4444, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_BGRX4444, + .de2_fmt = SUN8I_MIXER_FBFMT_BGRA4444, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_ARGB1555, .de2_fmt = SUN8I_MIXER_FBFMT_ARGB1555, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_XRGB1555, + .de2_fmt = SUN8I_MIXER_FBFMT_ARGB1555, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_ABGR1555, .de2_fmt = SUN8I_MIXER_FBFMT_ABGR1555, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_XBGR1555, + .de2_fmt = SUN8I_MIXER_FBFMT_ABGR1555, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_RGBA5551, .de2_fmt = SUN8I_MIXER_FBFMT_RGBA5551, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, }, { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_RGBX5551, + .de2_fmt = SUN8I_MIXER_FBFMT_RGBA5551, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, + }, + { .drm_fmt = DRM_FORMAT_BGRA5551, .de2_fmt = SUN8I_MIXER_FBFMT_BGRA5551, .rgb = true, .csc = SUN8I_CSC_MODE_OFF, + }, + { + /* for DE2 VI layer which ignores alpha */ + .drm_fmt = DRM_FORMAT_BGRX5551, + .de2_fmt = SUN8I_MIXER_FBFMT_BGRA5551, + .rgb = true, + .csc = SUN8I_CSC_MODE_OFF, }, { .drm_fmt = DRM_FORMAT_ARGB2101010,
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +11 -11
@@ -398,26 +398,26 @@ static const struct drm_plane_funcs sun8 };/* -* While all RGB formats are supported, VI planes don't support -* alpha blending, so there is no point having formats with alpha -* channel if their opaque analog exist. +* While DE2 VI layer supports same RGB formats as UI layer, alpha +* channel is ignored. This structure lists all unique variants +* where alpha channel is replaced with "don't care" (X) channel. */ static const u32 sun8i_vi_layer_formats[] = { -DRM_FORMAT_ABGR1555 , -DRM_FORMAT_ABGR4444 , -DRM_FORMAT_ARGB1555 , -DRM_FORMAT_ARGB4444 ,DRM_FORMAT_BGR565 ,DRM_FORMAT_BGR888 , -DRM_FORMAT_BGRA5551 , -DRM_FORMAT_BGRA4444 , +DRM_FORMAT_BGRX4444 , +DRM_FORMAT_BGRX5551 ,DRM_FORMAT_BGRX8888 ,DRM_FORMAT_RGB565 ,DRM_FORMAT_RGB888 , -DRM_FORMAT_RGBA4444 , -DRM_FORMAT_RGBA5551 , +DRM_FORMAT_RGBX4444 , +DRM_FORMAT_RGBX5551 ,DRM_FORMAT_RGBX8888 , +DRM_FORMAT_XBGR1555 , +DRM_FORMAT_XBGR4444 ,DRM_FORMAT_XBGR8888 , +DRM_FORMAT_XRGB1555 , +DRM_FORMAT_XRGB4444 ,DRM_FORMAT_XRGB8888 ,DRM_FORMAT_NV16 ,
Greg Kroah-Hartman
maintainerPATCH 149/189 drm/i915/selftests: Fix return in assert_mmap_offset()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit f4aaa44e8b20f7e0d4ea68d3bca4968b6ae5aaff upstream.
The assert_mmap_offset() returns type bool so if we return an error pointer that is "return true;" or success. If we have an error, then we should return false.
--- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +1 -1
@@ -567,7 +567,7 @@ static bool assert_mmap_offset(struct dr obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj)) -return PTR_ERR (obj); +return false; err =create_mmap_offset (obj);i915_gem_object_put (obj);
Greg Kroah-Hartman
maintainerPATCH 150/189 drm/i915/perf: Reintroduce wait on OA configuration completion
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 08f56f8f3799b2ed1c5ac7eed6d86a4926289655 upstream.
We still need to wait for the initial OA configuration to happen before we enable OA report writes to the OA buffer.
Testcase: igt/perf/stream-open-close
--- drivers/gpu/drm/i915/i915_perf.c | 58 +++++++++++++++++++++++---------- drivers/gpu/drm/i915/i915_perf_types.h | 3 + 2 files changed, 43 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +41 -17
@@ -1950,9 +1950,10 @@ out:return i915_vma_get (oa_bo->vma); } -static int emit_oa_config (struct i915_perf_stream *stream, -struct i915_oa_config *oa_config, -struct intel_context *ce) +static struct i915_request * +emit_oa_config (struct i915_perf_stream *stream, +struct i915_oa_config *oa_config, +struct intel_context *ce) {struct i915_request *rq;struct i915_vma *vma;
@@ -1960,7 +1961,7 @@ static int emit_oa_config(struct i915_pe vma =get_oa_vma (stream, oa_config);if (IS_ERR (vma)) -return PTR_ERR (vma); +return ERR_CAST (vma); err =i915_vma_pin (vma,0 ,0 ,PIN_GLOBAL |PIN_HIGH );if (err)
@@ -1983,13 +1984,17 @@ static int emit_oa_config(struct i915_pe err = rq->engine->emit_bb_start (rq, vma->node.start,0 ,I915_DISPATCH_SECURE ); +if (err) + goto err_add_request; + +i915_request_get (rq); err_add_request:i915_request_add (rq); err_vma_unpin:i915_vma_unpin (vma); err_vma_put:i915_vma_put (vma); -return err; +return err ?ERR_PTR (err) : rq; }static struct intel_context *oa_context (struct i915_perf_stream *stream)
@@ -1997,7 +2002,8 @@ static struct intel_context *oa_context(return stream->pinned_ctx ?: stream->engine->kernel_context; } -static int hsw_enable_metric_set (struct i915_perf_stream *stream) +static struct i915_request * +hsw_enable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore;
@@ -2408,7 +2414,8 @@ static int lrc_configure_all_contexts(streturn oa_configure_all_contexts (stream, regs,ARRAY_SIZE (regs)); } -static int gen8_enable_metric_set (struct i915_perf_stream *stream) +static struct i915_request * +gen8_enable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore;struct i915_oa_config *oa_config = stream->oa_config;
@@ -2450,12 +2457,13 @@ static int gen8_enable_metric_set(struct*/ ret =lrc_configure_all_contexts (stream, oa_config);if (ret) -return ret; +return ERR_PTR (ret);return emit_oa_config (stream, oa_config,oa_context (stream)); } -static int gen12_enable_metric_set (struct i915_perf_stream *stream) +static struct i915_request * +gen12_enable_metric_set (struct i915_perf_stream *stream) {struct intel_uncore *uncore = stream->uncore;struct i915_oa_config *oa_config = stream->oa_config;
@@ -2488,7 +2496,7 @@ static int gen12_enable_metric_set(struc*/ ret =gen12_configure_all_contexts (stream, oa_config);if (ret) -return ret; +return ERR_PTR (ret);/* * For Gen12, performance counters are context
@@ -2498,7 +2506,7 @@ static int gen12_enable_metric_set(strucif (stream->ctx) { ret =gen12_configure_oar_context (stream, true);if (ret) -return ret; +return ERR_PTR (ret); }return emit_oa_config (stream, oa_config,oa_context (stream));
@@ -2693,6 +2701,20 @@ static const struct i915_perf_stream_ops .read = i915_oa_read, }; +static int i915_perf_stream_enable_sync (struct i915_perf_stream *stream) +{ +struct i915_request *rq; + + rq = stream->perf->ops.enable_metric_set (stream); +if (IS_ERR (rq)) +return PTR_ERR (rq); + +i915_request_wait (rq,0 ,MAX_SCHEDULE_TIMEOUT ); +i915_request_put (rq); + +return 0 ; +} +/** * i915_oa_stream_init - validate combined props for OA stream and init * @stream: An i915 perf stream
@@ -2826,7 +2848,7 @@ static int i915_oa_stream_init(struct i9 stream->ops = &i915_oa_stream_ops; perf->exclusive_stream = stream; - ret = perf->ops.enable_metric_set (stream); + ret =i915_perf_stream_enable_sync (stream);if (ret) {DRM_DEBUG ("Unable to enable metric set\n" ); goto err_enable;
@@ -3144,7 +3166,7 @@ static long i915_perf_config_locked(strureturn -EINVAL ;if (config != stream->oa_config) { -int err; +struct i915_request *rq;/* * If OA is bound to a specific context, emit the
@@ -3155,11 +3177,13 @@ static long i915_perf_config_locked(stru* When set globally, we use a low priority kernel context, * so it will effectively take effect when idle. */ - err =emit_oa_config (stream, config,oa_context (stream)); -if (err ==0 ) + rq =emit_oa_config (stream, config,oa_context (stream)); +if (!IS_ERR (rq)) { config =xchg (&stream->oa_config, config); -else - ret = err; +i915_request_put (rq); + }else { + ret =PTR_ERR (rq); + } }i915_oa_config_put (config);
drivers/gpu/drm/i915/i915_perf_types.h +2 -1
@@ -339,7 +339,8 @@ struct i915_oa_ops {* counter reports being sampled. May apply system constraints such as * disabling EU clock gating as required. */ -int (*enable_metric_set)(struct i915_perf_stream *stream); +struct i915_request * + (*enable_metric_set)(struct i915_perf_stream *stream);/** * @disable_metric_set: Remove system constraints associated with using
Greg Kroah-Hartman
maintainerPATCH 152/189 phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
commit 46b7edf1c7b7c91004c4db2c355cbd033f2385f9 upstream.
I've noticed that when writing data to the modem the writes can time out at some point eventually. Looks like kicking the modem idle GPIO every 600 ms instead of once a second fixes the issue. Note that this rate is different from our runtime PM autosuspend rate MDM6600_MODEM_IDLE_DELAY_MS that we still want to keep at 1 second, so let's add a separate define for PHY_MDM6600_IDLE_KICK_MS.
--- drivers/phy/motorola/phy-mapphone-mdm6600.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/phy/motorola/phy-mapphone-mdm6600.c +8 -1
@@ -20,6 +20,7 @@#define PHY_MDM6600_PHY_DELAY_MS 4000/* PHY enable 2.2s to 3.5s */ #define PHY_MDM6600_ENABLED_DELAY_MS 8000/* 8s more total for MDM6600 */ +#define PHY_MDM6600_WAKE_KICK_MS 600/* time on after GPIO toggle */ #define MDM6600_MODEM_IDLE_DELAY_MS 1000/* modem after USB suspend */ #define MDM6600_MODEM_WAKE_DELAY_MS 200/* modem response after idle */
@@ -510,8 +511,14 @@ static void phy_mdm6600_modem_wake(struc ddata = container_of(work, struct phy_mdm6600, modem_wake_work.work);phy_mdm6600_wake_modem (ddata); + +/* +* The modem does not always stay awake 1.2 seconds after toggling +* the wake GPIO, and sometimes it idles after about some 600 ms +* making writes time out. +*/ schedule_delayed_work (&ddata->modem_wake_work, -msecs_to_jiffies (MDM6600_MODEM_IDLE_DELAY_MS )); +msecs_to_jiffies (PHY_MDM6600_WAKE_KICK_MS )); }static int __maybe_unused phy_mdm6600_runtime_suspend (struct device *dev)
Greg Kroah-Hartman
maintainerPATCH 153/189 ARM: dts: imx6: phycore-som: fix emmc supply
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
commit eb0bbba7636b9fc81939d6087a5fe575e150c95a upstream.
Currently the vmmc is supplied by the 1.8V pmic rail but this is wrong. The default module behaviour is to power VCCQ and VCC by the 3.3V power rail. Optional the user can connect the VCCQ to the pmic 1.8V emmc power rail using a solder jumper.
--- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +0 -1
@@ -183,7 +183,6 @@ pinctrl-0 = <&pinctrl_usdhc4>; bus-width = <8>; non-removable; - vmmc-supply = <&vdd_emmc_1p8>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 118/189 dm integrity: fix recalculation when moving from journal mode to bitmap mode
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit d5bdf66108419cdb39da361b58ded661c29ff66e upstream.
If we resume a device in bitmap mode and the on-disk format is in journal mode, we must recalculate anything above ic->sb->recalc_sector. Otherwise, there would be non-recalculated blocks which would cause I/O errors.
--- drivers/md/dm-integrity.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/md/dm-integrity.c +12 -5
@@ -2888,17 +2888,24 @@ static void dm_integrity_resume(struct d }else {replay_journal (ic);if (ic->mode =='B' ) { -int mode; ic->sb->flags |=cpu_to_le32 (SB_FLAG_DIRTY_BITMAP ); ic->sb->log2_blocks_per_bitmap_bit = ic->log2_blocks_per_bitmap_bit; r =sync_rw_sb (ic,REQ_OP_WRITE ,REQ_FUA );if (unlikely (r))dm_integrity_io_error (ic,"writing superblock" , r); - mode = ic->recalculate_flag ?BITMAP_OP_SET :BITMAP_OP_CLEAR ; -block_bitmap_op (ic, ic->journal,0 , ic->provided_data_sectors, mode); -block_bitmap_op (ic, ic->recalc_bitmap,0 , ic->provided_data_sectors, mode); -block_bitmap_op (ic, ic->may_write_bitmap,0 , ic->provided_data_sectors, mode); +block_bitmap_op (ic, ic->journal,0 , ic->provided_data_sectors,BITMAP_OP_CLEAR ); +block_bitmap_op (ic, ic->recalc_bitmap,0 , ic->provided_data_sectors,BITMAP_OP_CLEAR ); +block_bitmap_op (ic, ic->may_write_bitmap,0 , ic->provided_data_sectors,BITMAP_OP_CLEAR ); +if (ic->sb->flags &cpu_to_le32 (SB_FLAG_RECALCULATING ) && +le64_to_cpu (ic->sb->recalc_sector) < ic->provided_data_sectors) { +block_bitmap_op (ic, ic->journal,le64_to_cpu (ic->sb->recalc_sector), + ic->provided_data_sectors -le64_to_cpu (ic->sb->recalc_sector),BITMAP_OP_SET ); +block_bitmap_op (ic, ic->recalc_bitmap,le64_to_cpu (ic->sb->recalc_sector), + ic->provided_data_sectors -le64_to_cpu (ic->sb->recalc_sector),BITMAP_OP_SET ); +block_bitmap_op (ic, ic->may_write_bitmap,le64_to_cpu (ic->sb->recalc_sector), + ic->provided_data_sectors -le64_to_cpu (ic->sb->recalc_sector),BITMAP_OP_SET ); + }rw_journal_sectors (ic,REQ_OP_WRITE ,REQ_FUA |REQ_SYNC ,0 , ic->n_bitmap_blocks * (BITMAP_BLOCK_SIZE >>SECTOR_SHIFT ),NULL ); }
Greg Kroah-Hartman
maintainerPATCH 154/189 arm64: dts: imx8qxp-mek: Remove unexisting Ethernet PHY
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
commit 26c4b4758fce8f0ae744335e1762213be29db441 upstream.
There is only on Ethernet port and one Ethernet PHY on imx8qxp-mek.
Remove the unexisting ethphy1 port.
This fixes a run-time warning:
mdio_bus 5b040000.ethernet-1: MDIO device at address 1 is missing.
--- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 5 ----- 1 file changed, 5 deletions(-)
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +0 -5
@@ -52,11 +52,6 @@ compatible = "ethernet-phy-ieee802.3-c22"; reg = <0>; }; - - ethphy1: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <1>; - }; }; };
Greg Kroah-Hartman
maintainerPATCH 119/189 dm integrity: fix a deadlock due to offloading to an incorrect workqueue
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 53770f0ec5fd417429775ba006bc4abe14002335 upstream.
If we need to perform synchronous I/O in dm_integrity_map_continue(), we must make sure that we are not in the map function - in order to avoid the deadlock due to bio queuing in generic_make_request. To avoid the deadlock, we offload the request to metadata_wq.
However, metadata_wq also processes metadata updates for write requests. If there are too many requests that get offloaded to metadata_wq at the beginning of dm_integrity_map_continue, the workqueue metadata_wq becomes clogged and the system is incapable of processing any metadata updates.
This causes a deadlock because all the requests that need to do metadata updates wait for metadata_wq to proceed and metadata_wq waits inside wait_and_add_new_range until some existing request releases its range lock (which doesn't happen because the range lock is released after metadata update).
In order to fix the deadlock, we create a new workqueue offload_wq and offload requests to it - so that processing of offload_wq is independent from processing of metadata_wq.
--- drivers/md/dm-integrity.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/md/dm-integrity.c +15 -4
@@ -212,6 +212,7 @@ struct dm_integrity_c {struct list_head wait_list;wait_queue_head_t endio_wait;struct workqueue_struct *wait_wq; +struct workqueue_struct *offload_wq;unsigned char commit_seq;commit_id_t commit_ids[N_COMMIT_IDS ];
@@ -1439,7 +1440,7 @@ static void dec_in_flight(struct dm_inte dio->range.logical_sector += dio->range.n_sectors;bio_advance (bio, dio->range.n_sectors <<SECTOR_SHIFT );INIT_WORK (&dio->work, integrity_bio_wait); -queue_work (ic->wait_wq, &dio->work); +queue_work (ic->offload_wq, &dio->work);return ; }do_endio_flush (ic, dio);
@@ -1865,7 +1866,7 @@ static void dm_integrity_map_continue(stif (need_sync_io && from_map) {INIT_WORK (&dio->work, integrity_bio_wait); -queue_work (ic->metadata_wq, &dio->work); +queue_work (ic->offload_wq, &dio->work);return ; }
@@ -2501,7 +2502,7 @@ static void bitmap_block_work(struct wor dio->range.n_sectors, BITMAP_OP_TEST_ALL_SET)) { remove_range(ic, &dio->range); INIT_WORK(&dio->work, integrity_bio_wait); - queue_work(ic->wait_wq, &dio->work); + queue_work(ic->offload_wq, &dio->work); } else {block_bitmap_op (ic, ic->journal, dio->range.logical_sector, dio->range.n_sectors,BITMAP_OP_SET );
@@ -2524,7 +2525,7 @@ static void bitmap_block_work(struct worremove_range (ic, &dio->range);INIT_WORK (&dio->work, integrity_bio_wait); -queue_work (ic->wait_wq, &dio->work); +queue_work (ic->offload_wq, &dio->work); }queue_delayed_work (ic->commit_wq, &ic->bitmap_flush_work, ic->bitmap_flush_interval);
@@ -3843,6 +3844,14 @@ static int dm_integrity_ctr(struct dm_ta goto bad; } + ic->offload_wq =alloc_workqueue ("dm-integrity-offload" ,WQ_MEM_RECLAIM , +METADATA_WORKQUEUE_MAX_ACTIVE ); +if (!ic->offload_wq) { + ti->error ="Cannot allocate workqueue" ; + r = -ENOMEM ; + goto bad; + } + ic->commit_wq =alloc_workqueue ("dm-integrity-commit" ,WQ_MEM_RECLAIM ,1 );if (!ic->commit_wq) { ti->error ="Cannot allocate workqueue" ;
@@ -4147,6 +4156,8 @@ static void dm_integrity_dtr(struct dm_tdestroy_workqueue (ic->metadata_wq);if (ic->wait_wq)destroy_workqueue (ic->wait_wq); +if (ic->offload_wq) +destroy_workqueue (ic->offload_wq);if (ic->commit_wq)destroy_workqueue (ic->commit_wq);if (ic->writer_wq)
Greg Kroah-Hartman
maintainerPATCH 155/189 firmware: imx: misc: Align imx sc msg structs to 4
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit 1e6a4eba693ac72e6f91b4252458c933110e5f4c upstream.
The imx SC api strongly assumes that messages are composed out of 4-bytes words but some of our message structs have odd sizeofs.
This produces many oopses with CONFIG_KASAN=y:
BUG: KASAN: stack-out-of-bounds in imx_mu_send_data+0x108/0x1f0
It shouldn't cause an issues in normal use because these structs are always allocated on the stack.
--- drivers/firmware/imx/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/imx/misc.c +3 -3
@@ -16,7 +16,7 @@ struct imx_sc_msg_req_misc_set_ctrl {u32 ctrl;u32 val;u16 resource; -} __packed; +} __packed__aligned(4) ;struct imx_sc_msg_req_cpu_start {struct imx_sc_rpc_msg hdr;
@@ -30,12 +30,12 @@ struct imx_sc_msg_req_misc_get_ctrl {struct imx_sc_rpc_msg hdr;u32 ctrl;u16 resource; -} __packed; +} __packed__aligned(4) ;struct imx_sc_msg_resp_misc_get_ctrl {struct imx_sc_rpc_msg hdr;u32 val; -} __packed; +} __packed__aligned(4) ;/* * This function sets a miscellaneous control value.
Greg Kroah-Hartman
maintainerPATCH 120/189 dm integrity: fix invalid table returned due to argument count mismatch
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 7fc2e47f40dd77ab1fcbda6db89614a0173d89c7 upstream.
If the flag SB_FLAG_RECALCULATE is present in the superblock, but it was not specified on the command line (i.e. ic->recalculate_flag is false), dm-integrity would return invalid table line - the reported number of arguments would not match the real number.
--- drivers/md/dm-integrity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-integrity.c +1 -1
@@ -2975,7 +2975,7 @@ static void dm_integrity_status(struct dDMEMIT (" meta_device:%s" , ic->meta_dev->name);if (ic->sectors_per_block !=1 )DMEMIT (" block_size:%u" , ic->sectors_per_block <<SECTOR_SHIFT ); -if (ic->recalculate_flag) +if (ic->sb->flags &cpu_to_le32 (SB_FLAG_RECALCULATING ))DMEMIT (" recalculate" );DMEMIT (" journal_sectors:%u" , ic->initial_sectors -SB_SECTORS );DMEMIT (" interleave_sectors:%u" ,1U << ic->sb->log2_interleave_sectors);
Greg Kroah-Hartman
maintainerPATCH 122/189 dm: report suspended device during destroy
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit adc0daad366b62ca1bce3e2958a40b0b71a8b8b3 upstream.
The function dm_suspended returns true if the target is suspended. However, when the target is being suspended during unload, it returns false.
An example where this is a problem: the test "!dm_suspended(wc->ti)" in writecache_writeback is not sufficient, because dm_suspended returns zero while writecache_suspend is in progress. As is, without an enhanced dm_suspended, simply switching from flush_workqueue to drain_workqueue still emits warnings:
workqueue writecache-writeback: drain_workqueue() isn't complete after 10 tries workqueue writecache-writeback: drain_workqueue() isn't complete after 100 tries workqueue writecache-writeback: drain_workqueue() isn't complete after 200 tries workqueue writecache-writeback: drain_workqueue() isn't complete after 300 tries workqueue writecache-writeback: drain_workqueue() isn't complete after 400 tries
writecache_suspend calls flush_workqueue(wc->writeback_wq) - this function flushes the current work. However, the workqueue may re-queue itself and flush_workqueue doesn't wait for re-queued works to finish. Because of this - the function writecache_writeback continues execution after the device was suspended and then concurrently with writecache_dtr, causing a crash in writecache_writeback.
We must use drain_workqueue - that waits until the work and all re-queued works finish.
As a prereq for switching to drain_workqueue, this commit fixes dm_suspended to return true after the presuspend hook and before the postsuspend hook - just like during a normal suspend. It allows simplifying the dm-integrity and dm-writecache targets so that they don't have to maintain suspended flags on their own.
With this change use of drain_workqueue() can be used effectively. This change was tested with the lvm2 testsuite and cryptsetup testsuite and the are no regressions.
--- drivers/md/dm-integrity.c | 12 +++++------- drivers/md/dm-writecache.c | 2 +- drivers/md/dm.c | 1 + 3 files changed, 7 insertions(+), 8 deletions(-)
drivers/md/dm-integrity.c +5 -7
@@ -201,12 +201,13 @@ struct dm_integrity_c {__u8 log2_blocks_per_bitmap_bit;unsigned char mode; -int suspending;int failed;struct crypto_shash *internal_hash; +struct dm_target *ti; +/* these variables are locked with endio_wait.lock */ struct rb_root in_progress;struct list_head wait_list;
@@ -2316,7 +2317,7 @@ static void integrity_writer(struct workunsigned prev_free_sectors;/* the following test is not needed, but it tests the replay code */ -if (READ_ONCE (ic->suspending) && !ic->meta_dev) +if (unlikely (dm_suspended (ic->ti)) && !ic->meta_dev)return ;spin_lock_irq (&ic->endio_wait.lock);
@@ -2377,7 +2378,7 @@ static void integrity_recalc(struct work next_chunk: -if (unlikely (READ_ONCE (ic->suspending))) +if (unlikely (dm_suspended (ic->ti))) goto unlock_ret; range.logical_sector =le64_to_cpu (ic->sb->recalc_sector);
@@ -2805,8 +2806,6 @@ static void dm_integrity_postsuspend(strdel_timer_sync (&ic->autocommit_timer); -WRITE_ONCE (ic->suspending,1 ); -if (ic->recalc_wq)drain_workqueue (ic->recalc_wq);
@@ -2835,8 +2834,6 @@ static void dm_integrity_postsuspend(str#endif } -WRITE_ONCE (ic->suspending,0 ); -BUG_ON (!RB_EMPTY_ROOT (&ic->in_progress)); ic->journal_uptodate = true;
@@ -3631,6 +3628,7 @@ static int dm_integrity_ctr(struct dm_ta } ti->private = ic; ti->per_io_data_size =sizeof (struct dm_integrity_io ); + ic->ti = ti; ic->in_progress =RB_ROOT ;INIT_LIST_HEAD (&ic->wait_list);
drivers/md/dm-writecache.c +1 -1
@@ -838,7 +838,7 @@ static void writecache_suspend(struct dm }wc_unlock (wc); -flush_workqueue (wc->writeback_wq); +drain_workqueue (wc->writeback_wq);wc_lock (wc);if (flush_on_suspend)
drivers/md/dm.c +1 -0
@@ -2368,6 +2368,7 @@ static void __dm_destroy(struct mapped_d map =dm_get_live_table (md, &srcu_idx);if (!dm_suspended_md (md)) {dm_table_presuspend_targets (map); +set_bit (DMF_SUSPENDED , &md->flags);dm_table_postsuspend_targets (map); }/* dm_put_live_table must be before msleep, otherwise deadlock is possible */
Greg Kroah-Hartman
maintainerPATCH 114/189 dmaengine: imx-sdma: fix context cache
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit d288bddd8374e0a043ac9dde64a1ae6a09411d74 upstream.
There is a DMA problem with the serial ports on i.MX6.
When the following sequence is performed:
1) Open a port
2) Write some data
3) Close the port
4) Open a *different* port
5) Write some data
6) Close the port
The second write sends nothing and the second close hangs. If the first close() is omitted it works.
Adding logs to the the UART driver shows that the DMA is being setup but the callback is never invoked for the second write.
This used to work in 4.19.
Git bisect leads to:
ad0d92d: "dmaengine: imx-sdma: refine to load context only once"
This commit adds a "context_loaded" flag used to avoid unnecessary context setups.
However the flag is only reset in sdma_channel_terminate_work(), which is only invoked in a worker triggered by sdma_terminate_all() IF there is an active descriptor.
So, if no active descriptor remains when the channel is terminated, the flag is not reset and, when the channel is later reused the old context is used.
Fix the problem by always resetting the flag in sdma_free_chan_resources().
--- drivers/dma/imx-sdma.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/imx-sdma.c +1 -0
@@ -1335,6 +1335,7 @@ static void sdma_free_chan_resources(str sdmac->event_id0 =0 ; sdmac->event_id1 =0 ; + sdmac->context_loaded = false;sdma_set_channel_priority (sdmac,0 );
Greg Kroah-Hartman
maintainerPATCH 157/189 firmware: imx: Align imx_sc_msg_req_cpu_start to 4
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit f5bfeff44612d304deb100065a9f712309dc2783 upstream.
The imx SC api strongly assumes that messages are composed out of 4-bytes words but some of our message structs have odd sizeofs.
This produces many oopses with CONFIG_KASAN=y.
Fix by marking with __aligned(4).
--- drivers/firmware/imx/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/imx/misc.c +1 -1
@@ -24,7 +24,7 @@ struct imx_sc_msg_req_cpu_start {u32 address_lo;u16 resource;u8 enable; -} __packed; +} __packed__aligned(4) ;struct imx_sc_msg_req_misc_get_ctrl {struct imx_sc_rpc_msg hdr;
Greg Kroah-Hartman
maintainerPATCH 166/189 regulator: stm32-vrefbuf: fix a possible overshoot when re-enabling
In reply to Greg Kroah-HartmanFrom: Fabrice Gasnier <[email protected]>
commit 02fbabd5f4ed182d2c616e49309f5a3efd9ec671 upstream.
There maybe an overshoot, when disabling, then re-enabling vrefbuf too quickly. VREFBUF is used by ADC/DAC on some boards. When re-enabling too quickly, an overshoot on the reference voltage make the conversions inaccurate for a short period of time.
- Don't put the VREFBUF in HiZ when disabling, to force an active discharge.
- Enforce a 1ms OFF/ON delay
Message-Id: <[email protected]>
--- drivers/regulator/stm32-vrefbuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/regulator/stm32-vrefbuf.c +2 -1
@@ -88,7 +88,7 @@ static int stm32_vrefbuf_disable(struct } val =readl_relaxed (priv->base +STM32_VREFBUF_CSR ); - val = (val & ~STM32_ENVR ) |STM32_HIZ ; + val &= ~STM32_ENVR ;writel_relaxed (val, priv->base +STM32_VREFBUF_CSR );pm_runtime_mark_last_busy (priv->dev);
@@ -175,6 +175,7 @@ static const struct regulator_desc stm32 .volt_table = stm32_vrefbuf_voltages, .n_voltages = ARRAY_SIZE(stm32_vrefbuf_voltages), .ops = &stm32_vrefbuf_volt_ops, + .off_on_delay = 1000, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, };
Greg Kroah-Hartman
maintainerPATCH 167/189 regulator: qcom_spmi: Fix docs for PM8004
In reply to Greg Kroah-HartmanFrom: Petr Vorel <[email protected]>
commit a5b0cda136f4f420a8e24e50d19dfcef2f81df2e upstream.
--- Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt +1 -1
@@ -161,7 +161,7 @@ The regulator node houses sub-nodes for sub-node is identified using the node's name, with valid values listed for each of the PMICs below. -pm8005: +pm8004: s2, s5 pm8005:
Greg Kroah-Hartman
maintainerPATCH 168/189 RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
commit c14dfddbd869bf0c2bafb7ef260c41d9cebbcfec upstream.
The algorithm pre-allocates a cm_id since allocation cannot be done while holding the cm.lock spinlock, however it doesn't free it on one error path, leading to a memory leak.
--- drivers/infiniband/core/cm.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/cm.c +1 -0
@@ -1202,6 +1202,7 @@ struct ib_cm_id *ib_cm_insert_listen(str/* Sharing an ib_cm_id with different handlers is not * supported */ spin_unlock_irqrestore (&cm.lock, flags); +ib_destroy_cm_id (cm_id);return ERR_PTR (-EINVAL ); }refcount_inc (&cm_id_priv->refcount);
Greg Kroah-Hartman
maintainerPATCH 170/189 IB/hfi1, qib: Ensure RCU is locked when accessing list
In reply to Greg Kroah-HartmanFrom: Dennis Dalessandro <[email protected]>
commit 817a68a6584aa08e323c64283fec5ded7be84759 upstream.
The packet handling function, specifically the iteration of the qp list for mad packet processing misses locking RCU before running through the list. Not only is this incorrect, but the list_for_each_entry_rcu() call can not be called with a conditional check for lock dependency. Remedy this by invoking the rcu lock and unlock around the critical section.
This brings MAD packet processing in line with what is done for non-MAD packets.
--- drivers/infiniband/hw/hfi1/verbs.c | 4 +++- drivers/infiniband/hw/qib/qib_verbs.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/verbs.c +3 -1
@@ -515,10 +515,11 @@ static inline void hfi1_handle_packet(st opa_get_lid(packet->dlid, 9B));if (!mcast) goto drop; +rcu_read_lock ();list_for_each_entry_rcu (p, &mcast->qp_list, list) { packet->qp = p->qp;if (hfi1_do_pkey_check (packet)) - goto drop; + goto unlock_drop;spin_lock_irqsave (&packet->qp->r_lock, flags); packet_handler =qp_ok (packet);if (likely (packet_handler))
@@ -527,6 +528,7 @@ static inline void hfi1_handle_packet(st ibp->rvp.n_pkt_drops++;spin_unlock_irqrestore (&packet->qp->r_lock, flags); } +rcu_read_unlock ();/* * Notify rvt_multicast_detach() if it is waiting for us * to finish.
drivers/infiniband/hw/qib/qib_verbs.c +2 -0
@@ -329,8 +329,10 @@ void qib_ib_rcv(struct qib_ctxtdata *rcdif (mcast ==NULL ) goto drop;this_cpu_inc (ibp->pmastats->n_multicast_rcv); +rcu_read_lock ();list_for_each_entry_rcu (p, &mcast->qp_list, list)qib_qp_rcv (rcd, hdr,1 , data, tlen, p->qp); +rcu_read_unlock ();/* * Notify rvt_multicast_detach() if it is waiting for us * to finish.
Greg Kroah-Hartman
maintainerPATCH 173/189 ARM: dts: am437x-idk-evm: Fix incorrect OPP node names
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
commit 31623468be0bf57617b8057dcd335693935a9491 upstream.
The commit 337c6c9a69af ("ARM: dts: am437x-idk-evm: Disable OPP50 for MPU") adjusts couple of OPP nodes defined in the common am4372.dtsi file, but used outdated node names. This results in these getting treated as new OPP nodes with missing properties.
Fix this properly by using the correct node names as updated in commit b9cb2ba71848 ("ARM: dts: Use - instead of @ for DT OPP entries for TI SoCs").
--- arch/arm/boot/dts/am437x-idk-evm.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am437x-idk-evm.dts +2 -2
@@ -526,11 +526,11 @@ * Supply voltage supervisor on board will not allow opp50 so * disable it and set opp100 as suspend OPP. */ - opp50@300000000 { + opp50-300000000 { status = "disabled"; }; - opp100@600000000 { + opp100-600000000 { opp-suspend; }; };
Greg Kroah-Hartman
maintainerPATCH 175/189 ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit bcbf53a0dab50980867476994f6079c1ec5bb3a3 upstream.
The sram-node compatible properties have mistakingly combined the model-specific string with the generic "mtd-ram" string.
Note that neither "cy7c1019dv33-10zsxi, mtd-ram" or "cy7c1019dv33-10zsxi" are used by any in-kernel driver and they are not present in any binding.
The physmap driver will however bind to platform devices that specify "mtd-ram".
--- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +2 -2
@@ -275,7 +275,7 @@ /* SRAM on Colibri nEXT_CS0 */ sram@0,0 { - compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; + compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram"; reg = <0 0 0x00010000>; #address-cells = <1>; #size-cells = <1>;
@@ -286,7 +286,7 @@ /* SRAM on Colibri nEXT_CS1 */ sram@1,0 { - compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; + compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram"; reg = <1 0 0x00010000>; #address-cells = <1>; #size-cells = <1>;
Greg Kroah-Hartman
maintainerPATCH 158/189 soc: imx-scu: Align imx sc msg structs to 4
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit f10e58a5d20e1cf3a39a842da92c9dd0c3c23849 upstream.
The imx SC api strongly assumes that messages are composed out of 4-bytes words but some of our message structs have odd sizeofs.
This produces many oopses with CONFIG_KASAN=y.
Fix by marking with __aligned(4).
--- drivers/soc/imx/soc-imx-scu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/imx/soc-imx-scu.c +1 -1
@@ -25,7 +25,7 @@ struct imx_sc_msg_misc_get_soc_id {u32 id; } resp; } data; -} __packed; +} __packed__aligned(4) ;struct imx_sc_msg_misc_get_soc_uid {struct imx_sc_rpc_msg hdr;
Greg Kroah-Hartman
maintainerPATCH 176/189 ARM: dts: imx7-colibri: Fix frequency for sd/mmc
In reply to Greg Kroah-HartmanFrom: Oleksandr Suvorov <[email protected]>
commit 2773fe1d31c42ffae2a9cb9a6055d99dd86e2fee upstream.
SD/MMC on Colibri iMX7S/D modules successfully support 200Mhz frequency in HS200 mode.
Removing the unnecessary max-frequency limit significantly increases the performance:
== before fix ====
root@colibri-imx7-emmc:~# hdparm -t /dev/mmcblk0 /dev/mmcblk0: Timing buffered disk reads: 252 MB in 3.02 seconds = 83.54 MB/sec ==================
=== after fix ====
root@colibri-imx7-emmc:~# hdparm -t /dev/mmcblk0 /dev/mmcblk0: Timing buffered disk reads: 408 MB in 3.00 seconds = 135.94 MB/sec ==================
--- arch/arm/boot/dts/imx7-colibri.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx7-colibri.dtsi +0 -1
@@ -336,7 +336,6 @@ assigned-clock-rates = <400000000>; bus-width = <8>; fsl,tuning-step = <2>; - max-frequency = <100000000>; vmmc-supply = <®_module_3v3>; vqmmc-supply = <®_DCDC3>; non-removable;
Greg Kroah-Hartman
maintainerPATCH 177/189 hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 44f2f882909fedfc3a56e4b90026910456019743 upstream.
This is only called from adt7462_update_device(). The caller expects it to return zero on error. I fixed a similar issue earlier in commit a4bf06d58f21 ("hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0") but I missed this one.
--- drivers/hwmon/adt7462.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/adt7462.c +1 -1
@@ -413,7 +413,7 @@ static int ADT7462_REG_VOLT(struct adt74return 0x95 ;break ; } -return -ENODEV ; +return 0 ; }/* Provide labels for sysfs */
Greg Kroah-Hartman
maintainerPATCH 178/189 dma-buf: free dmabuf->name in dma_buf_release()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
commit d1f37226431f5d9657aa144a40f2383adbcf27e1 upstream.
dma-buf name can be set via DMA_BUF_SET_NAME ioctl, but once set it never gets freed.
Free it in dma_buf_release().
--- drivers/dma-buf/dma-buf.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma-buf/dma-buf.c +1 -0
@@ -108,6 +108,7 @@ static int dma_buf_release(struct inodedma_resv_fini (dmabuf->resv);module_put (dmabuf->owner); +kfree (dmabuf->name);kfree (dmabuf);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 179/189 dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 36d5d22090d13fd3a7a8c9663a711cbe6970aac8 upstream.
The caller is already holding the lock so this will deadlock.
--- drivers/dma/coh901318.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/dma/coh901318.c +0 -4
@@ -1947,8 +1947,6 @@ static void dma_tc_handle(struct coh9013return ; } -spin_lock (&cohc->lock); -/* * When we reach this point, at least one queue item * should have been moved over from cohc->queue to
@@ -1969,8 +1967,6 @@ static void dma_tc_handle(struct coh9013if (coh901318_queue_start (cohc) ==NULL ) cohc->busy =0 ; -spin_unlock (&cohc->lock); -/* * This tasklet will remove items from cohc->active * and thus terminates them.
Greg Kroah-Hartman
maintainerPATCH 180/189 sched/fair: Fix statistics for find_idlest_group()
In reply to Greg Kroah-HartmanFrom: Vincent Guittot <[email protected]>
commit 289de35984815576793f579ec27248609e75976e upstream.
sgs->group_weight is not set while gathering statistics in update_sg_wakeup_stats(). This means that a group can be classified as fully busy with 0 running tasks if utilization is high enough.
This path is mainly used for fork and exec.
--- kernel/sched/fair.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sched/fair.c +2 -0
@@ -8315,6 +8315,8 @@ static inline void update_sg_wakeup_stat sgs->group_capacity = group->sgc->capacity; + sgs->group_weight = group->group_weight; + sgs->group_type =group_classify (sd->imbalance_pct, group, sgs);/*
Greg Kroah-Hartman
maintainerPATCH 181/189 arm64: dts: meson: fix gxm-khadas-vim2 wifi
In reply to Greg Kroah-HartmanFrom: Christian Hewitt <[email protected]>
commit 146033562e7e5d1c9aae9653986806664995f1d5 upstream.
before
[6.418252] brcmfmac: F1 signature read @0x18000000=0x17224356 [6.435663] brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac4356-sdio for chip BCM4356/2 [6.551259] brcmfmac: brcmf_sdiod_ramrw: membytes transfer failed [6.551275] brcmfmac: brcmf_sdio_verifymemory: error -84 on reading 2048 membytes at 0x00184000 [6.551352] brcmfmac: brcmf_sdio_download_firmware: dongle image file download failed
after
[6.657165] brcmfmac: F1 signature read @0x18000000=0x17224356 [6.660807] brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac4356-sdio for chip BCM4356/2 [6.918643] brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac4356-sdio for chip BCM4356/2 [6.918734] brcmfmac: brcmf_c_process_clm_blob: no clm_blob available (err=-2), device may have limited channels available [6.922724] brcmfmac: brcmf_c_preinit_dcmds: Firmware: BCM4356/2 wl0: Jun 16 2015 14:25:06 version 7.35.184.r1 (TOB) (r559293) FWID 01-b22ae69c
--- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +1 -1
@@ -327,7 +327,7 @@ #size-cells = <0>; bus-width = <4>; - max-frequency = <50000000>; + max-frequency = <60000000>; non-removable; disable-wp;
Greg Kroah-Hartman
maintainerPATCH 182/189 bus: ti-sysc: Fix 1-wire reset quirk
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
commit aec551c7a00fb7eae049c0c4cc3208ca53e26355 upstream.
Because of the i2c quirk we have the reset quirks named in a confusing way. Let's fix the 1-wire quirk accordinlyg. Then let's switch to using better naming later on.
--- drivers/bus/ti-sysc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bus/ti-sysc.c +2 -2
@@ -1406,7 +1406,7 @@ static void sysc_init_revision_quirks(st }/* 1-wire needs module's internal clocks enabled for reset */ -static void sysc_clk_enable_quirk_hdq1w (struct sysc *ddata) +static void sysc_pre_reset_quirk_hdq1w (struct sysc *ddata) {int offset =0x0c ;/* HDQ_CTRL_STATUS */ u16 val;
@@ -1494,7 +1494,7 @@ static void sysc_init_module_quirks(strureturn ;if (ddata->cfg.quirks &SYSC_MODULE_QUIRK_HDQ1W ) { - ddata->clk_enable_quirk = sysc_clk_enable_quirk_hdq1w; + ddata->clk_disable_quirk = sysc_pre_reset_quirk_hdq1w;return ; }
Greg Kroah-Hartman
maintainerPATCH 183/189 dt-bindings: arm: fsl: fix APF6Dev compatible
In reply to Greg Kroah-HartmanFrom: Sébastien Szymanski <[email protected]>
commit ab4562f4dd92c455f6b313717af5e7d72a55d7b4 upstream.
APF6 Dev compatible is armadeus,imx6dl-apf6dev and not armadeus,imx6dl-apf6dldev.
--- Documentation/devicetree/bindings/arm/fsl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/fsl.yaml +1 -1
@@ -139,7 +139,7 @@ properties: items: - enum: - armadeus,imx6dl-apf6 # APF6 (Solo) SoM - - armadeus,imx6dl-apf6dldev # APF6 (Solo) SoM on APF6Dev board + - armadeus,imx6dl-apf6dev # APF6 (Solo) SoM on APF6Dev board - eckelmann,imx6dl-ci4x10 - emtrion,emcon-mx6 # emCON-MX6S or emCON-MX6DL SoM - emtrion,emcon-mx6-avari # emCON-MX6S or emCON-MX6DL SoM on Avari Base
Greg Kroah-Hartman
maintainerPATCH 184/189 EDAC/synopsys: Do not print an error with back-to-back snprintf() calls
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
commit dfc6014e3b60713f375d0601d7549eed224c4615 upstream.
handle_error() currently calls snprintf() a couple of times in succession to output the message for a CE/UE, therefore overwriting each part of the message which was formatted with the previous snprintf() call. As a result, only the part of the message from the last snprintf() call will be printed.
The simplest and most effective way to fix this problem is to combine the whole string into one which to supply to a single snprintf() call.
[ bp: Massage. ]
--- drivers/edac/synopsys_edac.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/edac/synopsys_edac.c +7 -15
@@ -479,20 +479,14 @@ static void handle_error(struct mem_ctl_ pinf = &p->ceinfo;if (!priv->p_data->quirks) {snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"DDR ECC error type:%s Row %d Bank %d Col %d " , -"CE" , pinf->row, pinf->bank, pinf->col); -snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"Bit Position: %d Data: 0x%08x\n" , +"DDR ECC error type:%s Row %d Bank %d Col %d Bit Position: %d Data: 0x%08x" , +"CE" , pinf->row, pinf->bank, pinf->col, pinf->bitpos, pinf->data); }else {snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"DDR ECC error type:%s Row %d Bank %d Col %d " , -"CE" , pinf->row, pinf->bank, pinf->col); -snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"BankGroup Number %d Block Number %d " , - pinf->bankgrpnr, pinf->blknr); -snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"Bit Position: %d Data: 0x%08x\n" , +"DDR ECC error type:%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d Bit Position: %d Data: 0x%08x" , +"CE" , pinf->row, pinf->bank, pinf->col, + pinf->bankgrpnr, pinf->blknr, pinf->bitpos, pinf->data); }
@@ -509,10 +503,8 @@ static void handle_error(struct mem_ctl_ "UE", pinf->row, pinf->bank, pinf->col); }else {snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"DDR ECC error type :%s Row %d Bank %d Col %d " , -"UE" , pinf->row, pinf->bank, pinf->col); -snprintf (priv->message,SYNPS_EDAC_MSG_SIZE , -"BankGroup Number %d Block Number %d" , +"DDR ECC error type :%s Row %d Bank %d Col %d BankGroup Number %d Block Number %d" , +"UE" , pinf->row, pinf->bank, pinf->col, pinf->bankgrpnr, pinf->blknr); }
Greg Kroah-Hartman
maintainerPATCH 185/189 powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems
In reply to Greg Kroah-HartmanFrom: Desnes A. Nunes do Rosario <[email protected]>
commit fc37a1632d40c80c067eb1bc235139f5867a2667 upstream.
PowerVM systems running compatibility mode on a few Power8 revisions are still vulnerable to the hardware defect that loses PMU exceptions arriving prior to a context switch.
The software fix for this issue is enabled through the CPU_FTR_PMAO_BUG cpu_feature bit, nevertheless this bit also needs to be set for PowerVM compatibility mode systems.
--- arch/powerpc/kernel/cputable.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/kernel/cputable.c +3 -1
@@ -2193,11 +2193,13 @@ static struct cpu_spec * __init setup_cp* oprofile_cpu_type already has a value, then we are * possibly overriding a real PVR with a logical one, * and, in that case, keep the current value for -* oprofile_cpu_type. +* oprofile_cpu_type. Futhermore, let's ensure that the +* fix for the PMAO bug is enabled on compatibility mode. */ if (old.oprofile_cpu_type !=NULL ) { t->oprofile_cpu_type = old.oprofile_cpu_type; t->oprofile_type = old.oprofile_type; + t->cpu_features |= old.cpu_features &CPU_FTR_PMAO_BUG ; } }
Greg Kroah-Hartman
maintainerPATCH 186/189 efi/x86: Align GUIDs to their size in the mixed mode runtime wrapper
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 63056e8b5ebf41d52170e9f5ba1fc83d1855278c upstream.
Hans reports that his mixed mode systems running v5.6-rc1 kernels hit the WARN_ON() in virt_to_phys_or_null_size(), caused by the fact that efi_guid_t objects on the vmap'ed stack happen to be misaligned with respect to their sizes. As a quick (i.e., backportable) fix, copy GUID pointer arguments to the local stack into a buffer that is naturally aligned to its size, so that it is guaranteed to cover only one physical page.
Note that on x86, we cannot rely on the stack pointer being aligned the way the compiler expects, so we need to allocate an 8-byte aligned buffer of sufficient size, and copy the GUID into that buffer at an offset that is aligned to 16 bytes.
--- arch/x86/platform/efi/efi_64.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
arch/x86/platform/efi/efi_64.c +21 -4
@@ -791,6 +791,8 @@ static efi_status_tefi_thunk_get_variable (efi_char16_t *name, efi_guid_t *vendor, u32 *attr, unsigned long *data_size, void *data) { +u8 buf[24 ]__aligned(8) ; +efi_guid_t *vnd =PTR_ALIGN ((efi_guid_t *)buf,sizeof (*vnd));efi_status_t status;u32 phys_name, phys_vendor, phys_attr;u32 phys_data_size, phys_data;
@@ -798,8 +800,10 @@ efi_thunk_get_variable(efi_char16_t *namspin_lock_irqsave (&efi_runtime_lock, flags); + *vnd = *vendor; + phys_data_size =virt_to_phys_or_null (data_size); - phys_vendor =virt_to_phys_or_null (vendor); + phys_vendor =virt_to_phys_or_null (vnd); phys_name =virt_to_phys_or_null_size (name,efi_name_size (name)); phys_attr =virt_to_phys_or_null (attr); phys_data =virt_to_phys_or_null_size (data, *data_size);
@@ -816,14 +820,18 @@ static efi_status_tefi_thunk_set_variable (efi_char16_t *name, efi_guid_t *vendor, u32 attr, unsigned long data_size, void *data) { +u8 buf[24 ]__aligned(8) ; +efi_guid_t *vnd =PTR_ALIGN ((efi_guid_t *)buf,sizeof (*vnd));u32 phys_name, phys_vendor, phys_data;efi_status_t status;unsigned long flags;spin_lock_irqsave (&efi_runtime_lock, flags); + *vnd = *vendor; + phys_name =virt_to_phys_or_null_size (name,efi_name_size (name)); - phys_vendor =virt_to_phys_or_null (vendor); + phys_vendor =virt_to_phys_or_null (vnd); phys_data =virt_to_phys_or_null_size (data, data_size);/* If data_size is > sizeof(u32) we've got problems */
@@ -840,6 +848,8 @@ efi_thunk_set_variable_nonblocking(efi_c u32 attr, unsigned long data_size, void *data) { + u8 buf[24] __aligned(8); +efi_guid_t *vnd =PTR_ALIGN ((efi_guid_t *)buf,sizeof (*vnd));u32 phys_name, phys_vendor, phys_data;efi_status_t status;unsigned long flags;
@@ -847,8 +857,10 @@ efi_thunk_set_variable_nonblocking(efi_cif (!spin_trylock_irqsave (&efi_runtime_lock, flags))return EFI_NOT_READY ; + *vnd = *vendor; + phys_name =virt_to_phys_or_null_size (name,efi_name_size (name)); - phys_vendor =virt_to_phys_or_null (vendor); + phys_vendor =virt_to_phys_or_null (vnd); phys_data =virt_to_phys_or_null_size (data, data_size);/* If data_size is > sizeof(u32) we've got problems */
@@ -865,14 +877,18 @@ efi_thunk_get_next_variable(unsigned lon efi_char16_t *name, efi_guid_t *vendor) { +u8 buf[24 ]__aligned(8) ; +efi_guid_t *vnd =PTR_ALIGN ((efi_guid_t *)buf,sizeof (*vnd));efi_status_t status;u32 phys_name_size, phys_name, phys_vendor;unsigned long flags;spin_lock_irqsave (&efi_runtime_lock, flags); + *vnd = *vendor; + phys_name_size =virt_to_phys_or_null (name_size); - phys_vendor =virt_to_phys_or_null (vendor); + phys_vendor =virt_to_phys_or_null (vnd); phys_name =virt_to_phys_or_null_size (name, *name_size); status = efi_thunk(get_next_variable, phys_name_size,
@@ -880,6 +896,7 @@ efi_thunk_get_next_variable(unsigned lonspin_unlock_irqrestore (&efi_runtime_lock, flags); + *vendor = *vnd;return status; }
Greg Kroah-Hartman
maintainerPATCH 159/189 Revert "RDMA/cma: Simplify rdma_resolve_addr() error flow"
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
commit e4103312d7b7afb8a3a7a842a33ef2b1856b2c0f upstream.
This reverts commit 219d2e9dfda9431b808c28d5efc74b404b95b638.
The call chain below requires the cm_id_priv's destination address to be setup before performing rdma_bind_addr(). Otherwise source port allocation fails as cma_port_is_unique() no longer sees the correct tuple to allow duplicate users of the source port.
rdma_resolve_addr()
cma_bind_addr()
rdma_bind_addr()
cma_get_port()
cma_alloc_any_port()
cma_port_is_unique() <- compared with zero daddr
This can result in false failures to connect, particularly if the source port range is restricted.
--- drivers/infiniband/core/cma.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/infiniband/core/cma.c +11 -4
@@ -3182,19 +3182,26 @@ int rdma_resolve_addr(struct rdma_cm_idint ret; id_priv = container_of(id, struct rdma_id_private, id); +memcpy (cma_dst_addr (id_priv), dst_addr,rdma_addr_size (dst_addr));if (id_priv->state ==RDMA_CM_IDLE ) { ret =cma_bind_addr (id, src_addr, dst_addr); -if (ret) +if (ret) { +memset (cma_dst_addr (id_priv),0 , +rdma_addr_size (dst_addr));return ret; + } } -if (cma_family (id_priv) != dst_addr->sa_family) +if (cma_family (id_priv) != dst_addr->sa_family) { +memset (cma_dst_addr (id_priv),0 ,rdma_addr_size (dst_addr));return -EINVAL ; + } -if (!cma_comp_exch (id_priv,RDMA_CM_ADDR_BOUND ,RDMA_CM_ADDR_QUERY )) +if (!cma_comp_exch (id_priv,RDMA_CM_ADDR_BOUND ,RDMA_CM_ADDR_QUERY )) { +memset (cma_dst_addr (id_priv),0 ,rdma_addr_size (dst_addr));return -EINVAL ; + } -memcpy (cma_dst_addr (id_priv), dst_addr,rdma_addr_size (dst_addr));if (cma_any_addr (dst_addr)) { ret =cma_resolve_loopback (id_priv); }else {
Greg Kroah-Hartman
maintainerPATCH 187/189 efi/x86: Handle by-ref arguments covering multiple pages in mixed mode
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 8319e9d5ad98ffccd19f35664382c73cea216193 upstream.
The mixed mode runtime wrappers are fragile when it comes to how the memory referred to by its pointer arguments are laid out in memory, due to the fact that it translates these addresses to physical addresses that the runtime services can dereference when running in 1:1 mode. Since vmalloc'ed pages (including the vmap'ed stack) are not contiguous in the physical address space, this scheme only works if the referenced memory objects do not cross page boundaries.
Currently, the mixed mode runtime service wrappers require that all by-ref arguments that live in the vmalloc space have a size that is a power of 2, and are aligned to that same value. While this is a sensible way to construct an object that is guaranteed not to cross a page boundary, it is overly strict when it comes to checking whether a given object violates this requirement, as we can simply take the physical address of the first and the last byte, and verify that they point into the same physical page.
When this check fails, we emit a WARN(), but then simply proceed with the call, which could cause data corruption if the next physical page belongs to a mapping that is entirely unrelated.
Given that with vmap'ed stacks, this condition is much more likely to trigger, let's relax the condition a bit, but fail the runtime service call if it does trigger.
--- arch/x86/platform/efi/efi_64.c | 45 +++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 19 deletions(-)
arch/x86/platform/efi/efi_64.c +26 -19
@@ -316,7 +316,7 @@ void efi_sync_low_kernel_mappings(void)static inline phys_addr_t virt_to_phys_or_null_size (void *va,unsigned long size) { -bool bad_size; +phys_addr_t pa;if (!va)return 0 ;
@@ -324,16 +324,13 @@ virt_to_phys_or_null_size(void *va, unsiif (virt_addr_valid (va))return virt_to_phys (va); -/* -* A fully aligned variable on the stack is guaranteed not to -* cross a page bounary. Try to catch strings on the stack by -* checking that 'size' is a power of two. -*/ - bad_size = size >PAGE_SIZE || !is_power_of_2 (size); + pa =slow_virt_to_phys (va); -WARN_ON (!IS_ALIGNED ((unsigned long )va, size) || bad_size); +/* check if the object crosses a page boundary */ +if (WARN_ON ((pa ^ (pa + size -1 )) &PAGE_MASK )) +return 0 ; -return slow_virt_to_phys (va); +return pa; }#define virt_to_phys_or_null (addr) \
@@ -808,8 +805,11 @@ efi_thunk_get_variable(efi_char16_t *nam phys_attr =virt_to_phys_or_null (attr); phys_data =virt_to_phys_or_null_size (data, *data_size); - status =efi_thunk (get_variable, phys_name, phys_vendor, - phys_attr, phys_data_size, phys_data); +if (!phys_name || (data && !phys_data)) + status =EFI_INVALID_PARAMETER ; +else + status =efi_thunk (get_variable, phys_name, phys_vendor, + phys_attr, phys_data_size, phys_data);spin_unlock_irqrestore (&efi_runtime_lock, flags);
@@ -834,9 +834,11 @@ efi_thunk_set_variable(efi_char16_t *nam phys_vendor =virt_to_phys_or_null (vnd); phys_data =virt_to_phys_or_null_size (data, data_size); -/* If data_size is > sizeof(u32) we've got problems */ - status =efi_thunk (set_variable, phys_name, phys_vendor, - attr, data_size, phys_data); +if (!phys_name || !phys_data) + status =EFI_INVALID_PARAMETER ; +else + status =efi_thunk (set_variable, phys_name, phys_vendor, + attr, data_size, phys_data);spin_unlock_irqrestore (&efi_runtime_lock, flags);
@@ -863,9 +865,11 @@ efi_thunk_set_variable_nonblocking(efi_c phys_vendor =virt_to_phys_or_null (vnd); phys_data =virt_to_phys_or_null_size (data, data_size); -/* If data_size is > sizeof(u32) we've got problems */ - status =efi_thunk (set_variable, phys_name, phys_vendor, - attr, data_size, phys_data); +if (!phys_name || !phys_data) + status =EFI_INVALID_PARAMETER ; +else + status =efi_thunk (set_variable, phys_name, phys_vendor, + attr, data_size, phys_data);spin_unlock_irqrestore (&efi_runtime_lock, flags);
@@ -891,8 +895,11 @@ efi_thunk_get_next_variable(unsigned lon phys_vendor =virt_to_phys_or_null (vnd); phys_name =virt_to_phys_or_null_size (name, *name_size); - status =efi_thunk (get_next_variable, phys_name_size, - phys_name, phys_vendor); +if (!phys_name) + status =EFI_INVALID_PARAMETER ; +else + status =efi_thunk (get_next_variable, phys_name_size, + phys_name, phys_vendor);spin_unlock_irqrestore (&efi_runtime_lock, flags);
Greg Kroah-Hartman
maintainerPATCH 189/189 net: stmmac: fix notifier registration
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
commit 474a31e13a4e9749fb3ee55794d69d0f17ee0998 upstream.
We cannot register the same netdev notifier multiple times when probing stmmac devices. Register the notifier only once in module init, and also make debugfs creation/deletion safe against simultaneous notifier call.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +8 -5
@@ -4289,6 +4289,8 @@ static void stmmac_init_fs(struct net_de {struct stmmac_priv *priv =netdev_priv (dev); +rtnl_lock (); +/* Create per netdev entries */ priv->dbgfs_dir =debugfs_create_dir (dev->name, stmmac_fs_dir);
@@ -4300,14 +4302,13 @@ static void stmmac_init_fs(struct net_dedebugfs_create_file ("dma_cap" ,0444 , priv->dbgfs_dir, dev, &stmmac_dma_cap_fops); - register_netdevice_notifier(&stmmac_notifier); + rtnl_unlock(); }static void stmmac_exit_fs (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev); -unregister_netdevice_notifier (&stmmac_notifier);debugfs_remove_recursive (priv->dbgfs_dir); }#endif /* CONFIG_DEBUG_FS */
@@ -4825,14 +4826,14 @@ int stmmac_dvr_remove(struct device *devnetdev_info (priv->dev,"%s: removing driver" , __func__); -#ifdef CONFIG_DEBUG_FS -stmmac_exit_fs (ndev); -#endif stmmac_stop_all_dma (priv);stmmac_mac_set (priv, priv->ioaddr, false);netif_carrier_off (ndev);unregister_netdev (ndev); +#ifdef CONFIG_DEBUG_FS +stmmac_exit_fs (ndev); +#endif phylink_destroy (priv->phylink);if (priv->plat->stmmac_rst)reset_control_assert (priv->plat->stmmac_rst);
@@ -5052,6 +5053,7 @@ static int __init stmmac_init(void)/* Create debugfs main directory if it doesn't exist yet */ if (!stmmac_fs_dir) stmmac_fs_dir =debugfs_create_dir (STMMAC_RESOURCE_NAME ,NULL ); +register_netdevice_notifier (&stmmac_notifier);#endif return 0 ;
@@ -5060,6 +5062,7 @@ static int __init stmmac_init(void) static void __exit stmmac_exit(void) {#ifdef CONFIG_DEBUG_FS +unregister_netdevice_notifier (&stmmac_notifier);debugfs_remove_recursive (stmmac_fs_dir);#endif }
Greg Kroah-Hartman
maintainerPATCH 188/189 efi: READ_ONCE rng seed size before munmap
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit be36f9e7517e17810ec369626a128d7948942259 upstream.
This function is consistent with using size instead of seed->size (except for one place that this patch fixes), but it reads seed->size without using READ_ONCE, which means the compiler might still do something unwanted. So, this commit simply adds the READ_ONCE wrapper.
--- drivers/firmware/efi/efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/efi/efi.c +2 -2
@@ -552,7 +552,7 @@ int __init efi_config_parse_tables(void seed =early_memremap (efi.rng_seed,sizeof (*seed));if (seed !=NULL ) { - size = seed->size; + size =READ_ONCE (seed->size);early_memunmap (seed,sizeof (*seed)); }else {pr_err ("Could not map UEFI random seed!\n" );
@@ -562,7 +562,7 @@ int __init efi_config_parse_tables(void sizeof(*seed) + size);if (seed !=NULL ) {pr_notice ("seeding entropy pool\n" ); -add_bootloader_randomness (seed->bits, seed->size); +add_bootloader_randomness (seed->bits, size);early_memunmap (seed,sizeof (*seed) + size); }else {pr_err ("Could not map UEFI random seed!\n" );
Greg Kroah-Hartman
maintainerPATCH 160/189 RDMA/rw: Fix error flow during RDMA context initialization
In reply to Greg Kroah-HartmanFrom: Max Gurtovoy <[email protected]>
commit 6affca140cbea01f497c4f4e16f1e2be7f74bd04 upstream.
In case the SGL was mapped for P2P DMA operation, we must unmap it using pci_p2pdma_unmap_sg during the error unwind of rdma_rw_ctx_init()
--- drivers/infiniband/core/rw.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/infiniband/core/rw.c +20 -11
@@ -273,6 +273,23 @@ static int rdma_rw_init_single_wr(structreturn 1 ; } +static void rdma_rw_unmap_sg (struct ib_device *dev,struct scatterlist *sg, +u32 sg_cnt,enum dma_data_direction dir) +{ +if (is_pci_p2pdma_page (sg_page (sg))) +pci_p2pdma_unmap_sg (dev->dma_device, sg, sg_cnt, dir); +else +ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +} + +static int rdma_rw_map_sg (struct ib_device *dev,struct scatterlist *sg, +u32 sg_cnt,enum dma_data_direction dir) +{ +if (is_pci_p2pdma_page (sg_page (sg))) +return pci_p2pdma_map_sg (dev->dma_device, sg, sg_cnt, dir); +return ib_dma_map_sg (dev, sg, sg_cnt, dir); +} +/** * rdma_rw_ctx_init - initialize a RDMA READ/WRITE context * @ctx: context to initialize
@@ -295,11 +312,7 @@ int rdma_rw_ctx_init(struct rdma_rw_ctxstruct ib_device *dev = qp->pd->device;int ret; -if (is_pci_p2pdma_page (sg_page (sg))) - ret =pci_p2pdma_map_sg (dev->dma_device, sg, sg_cnt, dir); -else - ret =ib_dma_map_sg (dev, sg, sg_cnt, dir); - + ret =rdma_rw_map_sg (dev, sg, sg_cnt, dir);if (!ret)return -ENOMEM ; sg_cnt = ret;
@@ -338,7 +351,7 @@ int rdma_rw_ctx_init(struct rdma_rw_ctxreturn ret; out_unmap_sg: -ib_dma_unmap_sg (dev, sg, sg_cnt, dir); +rdma_rw_unmap_sg (dev, sg, sg_cnt, dir);return ret; }EXPORT_SYMBOL (rdma_rw_ctx_init);
@@ -588,11 +601,7 @@ void rdma_rw_ctx_destroy(struct rdma_rw_break ; } -if (is_pci_p2pdma_page (sg_page (sg))) -pci_p2pdma_unmap_sg (qp->pd->device->dma_device, sg, - sg_cnt, dir); -else -ib_dma_unmap_sg (qp->pd->device, sg, sg_cnt, dir); +rdma_rw_unmap_sg (qp->pd->device, sg, sg_cnt, dir); }EXPORT_SYMBOL (rdma_rw_ctx_destroy);
Greg Kroah-Hartman
maintainerPATCH 162/189 RDMA/nldev: Fix crash when set a QP to a new counter but QPN is missing
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
commit 78f34a16c28654cb47791257006f90d0948f2f0c upstream.
This fixes the kernel crash when a RDMA_NLDEV_CMD_STAT_SET command is received, but the QP number parameter is not available.
iwpm_register_pid: Unable to send a nlmsg (client = 2) infiniband syz1: RDMA CMA: cma_listen_on_dev, error -98
general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007]
CPU: 0 PID: 9754 Comm: syz-executor069 Not tainted 5.6.0-rc2-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
RIP: 0010:nla_get_u32 include/net/netlink.h:1474 [inline]
RIP: 0010:nldev_stat_set_doit+0x63c/0xb70 drivers/infiniband/core/nldev.c:1760
Code: fc 01 0f 84 58 03 00 00 e8 41 83 bf fb 4c 8b a3 58 fd ff ff 48 b8 00 00 00 00 00 fc ff df 49 8d 7c 24 04 48 89 fa 48 c1 ea 03 <0f> b6 14 02 48 89 f8 83 e0 07 83 c0 03 38 d0 7c 08 84 d2 0f 85 6d
RSP: 0018:ffffc900068bf350 EFLAGS: 00010247
RAX: dffffc0000000000 RBX: ffffc900068bf728 RCX: ffffffff85b60470
RDX: 0000000000000000 RSI: ffffffff85b6047f RDI: 0000000000000004
RBP: ffffc900068bf750 R08: ffff88808c3ee140 R09: ffff8880a25e6010
R10: ffffed10144bcddc R11: ffff8880a25e6ee3 R12: 0000000000000000
R13: ffff88809acb0000 R14: ffff888092a42c80 R15: 000000009ef2e29a
FS: 0000000001ff0880(0000) GS:ffff8880ae800000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f4733e34000 CR3: 00000000a9b27000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
rdma_nl_rcv_msg drivers/infiniband/core/netlink.c:195 [inline]
rdma_nl_rcv_skb drivers/infiniband/core/netlink.c:239 [inline]
rdma_nl_rcv+0x5d9/0x980 drivers/infiniband/core/netlink.c:259
netlink_unicast_kernel net/netlink/af_netlink.c:1303 [inline]
netlink_unicast+0x59e/0x7e0 net/netlink/af_netlink.c:1329
netlink_sendmsg+0x91c/0xea0 net/netlink/af_netlink.c:1918
sock_sendmsg_nosec net/socket.c:652 [inline]
sock_sendmsg+0xd7/0x130 net/socket.c:672
____sys_sendmsg+0x753/0x880 net/socket.c:2343
___sys_sendmsg+0x100/0x170 net/socket.c:2397
__sys_sendmsg+0x105/0x1d0 net/socket.c:2430
__do_sys_sendmsg net/socket.c:2439 [inline]
__se_sys_sendmsg net/socket.c:2437 [inline]
__x64_sys_sendmsg+0x78/0xb0 net/socket.c:2437
do_syscall_64+0xfa/0x790 arch/x86/entry/common.c:294
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x4403d9
Code: 18 89 d0 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 fb 13 fc ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007ffc0efbc5c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
RAX: ffffffffffffffda RBX: 00000000004002c8 RCX: 00000000004403d9
RDX: 0000000000000000 RSI: 0000000020000240 RDI: 0000000000000004
RBP: 00000000006ca018 R08: 0000000000000008 R09: 00000000004002c8
R10: 000000000000004a R11: 0000000000000246 R12: 0000000000401c60
R13: 0000000000401cf0 R14: 0000000000000000 R15: 0000000000000000--- drivers/infiniband/core/nldev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/core/nldev.c +2 -0
@@ -1756,6 +1756,8 @@ static int nldev_stat_set_doit(struct skif (ret) goto err_msg; }else { +if (!tb[RDMA_NLDEV_ATTR_RES_LQPN ]) + goto err_msg; qpn =nla_get_u32 (tb[RDMA_NLDEV_ATTR_RES_LQPN ]);if (tb[RDMA_NLDEV_ATTR_STAT_COUNTER_ID ]) { cntn =nla_get_u32 (tb[RDMA_NLDEV_ATTR_STAT_COUNTER_ID ]);
Greg Kroah-Hartman
maintainerPATCH 163/189 RDMA/siw: Fix failure handling during device creation
In reply to Greg Kroah-HartmanFrom: Bernard Metzler <[email protected]>
commit 12e5eef0f4d8087ea7b559f6630be08ffea2d851 upstream.
A failing call to ib_device_set_netdev() during device creation caused system crash due to xa_destroy of uninitialized xarray hit by device deallocation. Fixed by moving xarray initialization before potential device deallocation.
--- drivers/infiniband/sw/siw/siw_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/sw/siw/siw_main.c +3 -3
@@ -388,6 +388,9 @@ static struct siw_device *siw_device_cre { .max_segment_size = SZ_2G }; base_dev->num_comp_vectors =num_possible_cpus (); +xa_init_flags (&sdev->qp_xa,XA_FLAGS_ALLOC1 ); +xa_init_flags (&sdev->mem_xa,XA_FLAGS_ALLOC1 ); +ib_set_device_ops (base_dev, &siw_device_ops); rv =ib_device_set_netdev (base_dev, netdev,1 );if (rv)
@@ -415,9 +418,6 @@ static struct siw_device *siw_device_cre sdev->attrs.max_srq_wr =SIW_MAX_SRQ_WR ; sdev->attrs.max_srq_sge =SIW_MAX_SGE ; -xa_init_flags (&sdev->qp_xa,XA_FLAGS_ALLOC1 ); -xa_init_flags (&sdev->mem_xa,XA_FLAGS_ALLOC1 ); -INIT_LIST_HEAD (&sdev->cep_list);INIT_LIST_HEAD (&sdev->qp_list);
Greg Kroah-Hartman
maintainerPATCH 165/189 RDMA/core: Fix protection fault in ib_mr_pool_destroy
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
commit e38b55ea0443da35a50a3eb2079ad3612cf763b9 upstream.
Fix NULL pointer dereference in the error flow of ib_create_qp_user when accessing to uninitialized list pointers - rdma_mrs and sig_mrs. The following crash from syzkaller revealed it.
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN PTI CPU: 1 PID: 23167 Comm: syz-executor.1 Not tainted 5.5.0-rc5 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 RIP: 0010:ib_mr_pool_destroy+0x81/0x1f0 Code: 00 00 fc ff df 49 c1 ec 03 4d 01 fc e8 a8 ea 72 fe 41 80 3c 24 00 0f 85 62 01 00 00 48 8b 13 48 89 d6 4c 8d 6a c8 48 c1 ee 03 <42> 80 3c 3e 00 0f 85 34 01 00 00 48 8d 7a 08 4c 8b 02 48 89 fe 48 RSP: 0018:ffffc9000951f8b0 EFLAGS: 00010046 RAX: 0000000000040000 RBX: ffff88810f268038 RCX: ffffffff82c41628 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffc9000951f850 RBP: ffff88810f268020 R08: 0000000000000004 R09: fffff520012a3f0a R10: 0000000000000001 R11: fffff520012a3f0a R12: ffffed1021e4d007 R13: ffffffffffffffc8 R14: 0000000000000246 R15: dffffc0000000000 FS: 00007f54bc788700(0000) GS:ffff88811b100000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000116920002 CR4: 0000000000360ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: rdma_rw_cleanup_mrs+0x15/0x30 ib_destroy_qp_user+0x674/0x7d0 ib_create_qp_user+0xb01/0x11c0 create_qp+0x1517/0x2130 ib_uverbs_create_qp+0x13e/0x190 ib_uverbs_write+0xaa5/0xdf0 __vfs_write+0x7c/0x100 vfs_write+0x168/0x4a0 ksys_write+0xc8/0x200 do_syscall_64+0x9c/0x390 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x465b49 Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f54bc787c58 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000465b49 RDX: 0000000000000040 RSI: 0000000020000540 RDI: 0000000000000003 RBP: 00007f54bc787c70 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f54bc7886bc R13: 00000000004ca2ec R14: 000000000070ded0 R15: 0000000000000005
--- drivers/infiniband/core/core_priv.h | 15 +++++++++++++++ drivers/infiniband/core/uverbs_cmd.c | 10 ---------- drivers/infiniband/core/verbs.c | 10 ---------- 3 files changed, 15 insertions(+), 20 deletions(-)
drivers/infiniband/core/core_priv.h +15 -0
@@ -338,6 +338,21 @@ static inline struct ib_qp *_ib_create_q qp->pd = pd; qp->uobject = uobj; qp->real_qp = qp; + + qp->qp_type = attr->qp_type; + qp->qp_context = attr->qp_context; + qp->rwq_ind_tbl = attr->rwq_ind_tbl; + qp->send_cq = attr->send_cq; + qp->recv_cq = attr->recv_cq; + qp->srq = attr->srq; + qp->rwq_ind_tbl = attr->rwq_ind_tbl; + qp->event_handler = attr->event_handler; + +atomic_set (&qp->usecnt,0 ); +spin_lock_init (&qp->mr_lock); +INIT_LIST_HEAD (&qp->rdma_mrs); +INIT_LIST_HEAD (&qp->sig_mrs); +/* * We don't track XRC QPs for now, because they don't have PD * and more importantly they are created internaly by driver,
drivers/infiniband/core/uverbs_cmd.c +0 -10
@@ -1433,17 +1433,7 @@ static int create_qp(struct uverbs_attr_if (ret) goto err_cb; - qp->pd = pd; - qp->send_cq = attr.send_cq; - qp->recv_cq = attr.recv_cq; - qp->srq = attr.srq; - qp->rwq_ind_tbl = ind_tbl; - qp->event_handler = attr.event_handler; - qp->qp_context = attr.qp_context; - qp->qp_type = attr.qp_type; -atomic_set (&qp->usecnt,0 );atomic_inc (&pd->usecnt); - qp->port =0 ;if (attr.send_cq)atomic_inc (&attr.send_cq->usecnt);if (attr.recv_cq)
drivers/infiniband/core/verbs.c +0 -10
@@ -1182,16 +1182,6 @@ struct ib_qp *ib_create_qp_user(struct iif (ret) goto err; - qp->qp_type = qp_init_attr->qp_type; - qp->rwq_ind_tbl = qp_init_attr->rwq_ind_tbl; - -atomic_set (&qp->usecnt,0 ); - qp->mrs_used =0 ; -spin_lock_init (&qp->mr_lock); -INIT_LIST_HEAD (&qp->rdma_mrs); -INIT_LIST_HEAD (&qp->sig_mrs); - qp->port =0 ; -if (qp_init_attr->qp_type ==IB_QPT_XRC_TGT ) {struct ib_qp *xrc_qp =create_xrc_qp_user (qp, qp_init_attr, udata);
Greg Kroah-Hartman
maintainerPATCH 156/189 firmware: imx: scu-pd: Align imx sc msg structs to 4
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit 7c1a1c814ccc858633c761951c2546041202b24e upstream.
The imx SC api strongly assumes that messages are composed out of 4-bytes words but some of our message structs have odd sizeofs.
This produces many oopses with CONFIG_KASAN=y.
Fix by marking with __aligned(4).
--- drivers/firmware/imx/scu-pd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/imx/scu-pd.c +1 -1
@@ -61,7 +61,7 @@ struct imx_sc_msg_req_set_resource_powerstruct imx_sc_rpc_msg hdr;u16 resource;u8 mode; -} __packed; +} __packed__aligned(4) ;#define IMX_SCU_PD_NAME_SIZE 20struct imx_sc_pm_domain {
Greg Kroah-Hartman
maintainerPATCH 164/189 RDMA/iwcm: Fix iwcm work deallocation
In reply to Greg Kroah-HartmanFrom: Bernard Metzler <[email protected]>
commit 810dbc69087b08fd53e1cdd6c709f385bc2921ad upstream.
The dealloc_work_entries() function must update the work_free_list pointer while freeing its entries, since potentially called again on same list. A second iteration of the work list caused system crash. This happens, if work allocation fails during cma_iw_listen() and free_cm_id() tries to free the list again during cleanup.
--- drivers/infiniband/core/iwcm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/core/iwcm.c +3 -1
@@ -159,8 +159,10 @@ static void dealloc_work_entries(struct {struct list_head *e, *tmp; -list_for_each_safe (e, tmp, &cm_id_priv->work_free_list) +list_for_each_safe (e, tmp, &cm_id_priv->work_free_list) { +list_del (e);kfree (list_entry(e ,struct iwcm_work ,free_list )); + } }static int alloc_work_entries (struct iwcm_id_private *cm_id_priv,int count)
Greg Kroah-Hartman
maintainerPATCH 161/189 RDMA/odp: Ensure the mm is still alive before creating an implicit child
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
commit a4e63bce1414df7ab6eb82ca9feb8494ce13e554 upstream.
Registration of a mmu_notifier requires the caller to hold a mmget() on the mm as registration is not permitted to race with exit_mmap(). There is a BUG_ON inside the mmu_notifier to guard against this.
Normally creating a umem is done against current which implicitly holds the mmget(), however an implicit ODP child is created from a pagefault work queue and is not guaranteed to have a mmget().
Call mmget() around this registration and abort faulting if the MM has gone to exit_mmap().
Before the patch below the notifier was registered when the implicit ODP parent was created, so there was no chance to register a notifier outside of current.
--- drivers/infiniband/core/umem_odp.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/infiniband/core/umem_odp.c +19 -5
@@ -187,14 +187,28 @@ ib_umem_odp_alloc_child(struct ib_umem_o odp_data->page_shift =PAGE_SHIFT ; odp_data->notifier.ops = ops; +/* +* A mmget must be held when registering a notifier, the owming_mm only +* has a mm_grab at this point. +*/ +if (!mmget_not_zero (umem->owning_mm)) { + ret = -EFAULT ; + goto out_free; + } + odp_data->tgid =get_pid (root->tgid); ret =ib_init_umem_odp (odp_data, ops); -if (ret) { -put_pid (odp_data->tgid); -kfree (odp_data); -return ERR_PTR (ret); - } +if (ret) + goto out_tgid; +mmput (umem->owning_mm);return odp_data; + +out_tgid: +put_pid (odp_data->tgid); +mmput (umem->owning_mm); +out_free: +kfree (odp_data); +return ERR_PTR (ret); }EXPORT_SYMBOL (ib_umem_odp_alloc_child);
Greg Kroah-Hartman
maintainerPATCH 171/189 ARM: imx: build v7_cpu_resume() unconditionally
In reply to Greg Kroah-HartmanFrom: Ahmad Fatoum <[email protected]>
commit 512a928affd51c2dc631401e56ad5ee5d5dd68b6 upstream.
This function is not only needed by the platform suspend code, but is also reused as the CPU resume function when the ARM cores can be powered down completely in deep idle, which is the case on i.MX6SX and i.MX6UL(L).
Providing the static inline stub whenever CONFIG_SUSPEND is disabled means that those platforms will hang on resume from cpuidle if suspend is disabled.
So there are two problems:
- The static inline stub masks the linker error
- The function is not available where needed
Fix both by just building the function unconditionally, when CONFIG_SOC_IMX6 is enabled. The actual code is three instructions long, so it's arguably ok to just leave it in for all i.MX6 kernel configurations.
--- arch/arm/mach-imx/Makefile | 2 ++ arch/arm/mach-imx/common.h | 4 ++-- arch/arm/mach-imx/resume-imx6.S | 24 ++++++++++++++++++++++++ arch/arm/mach-imx/suspend-imx6.S | 14 -------------- 4 files changed, 28 insertions(+), 16 deletions(-)
arch/arm/mach-imx/Makefile +2 -0
@@ -91,6 +91,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7 obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o endif +AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a +obj-$(CONFIG_SOC_IMX6) += resume-imx6.o obj-$(CONFIG_SOC_IMX6) += pm-imx6.o obj-$(CONFIG_SOC_IMX1) += mach-imx1.o
arch/arm/mach-imx/common.h +2 -2
@@ -109,17 +109,17 @@ void imx_cpu_die(unsigned int cpu);int imx_cpu_kill (unsigned int cpu);#ifdef CONFIG_SUSPEND -void v7_cpu_resume (void );void imx53_suspend (void __iomem *ocram_vbase);extern const u32 imx53_suspend_sz;void imx6_suspend (void __iomem *ocram_vbase);#else -static inline void v7_cpu_resume (void ) {}static inline void imx53_suspend (void __iomem *ocram_vbase) {}static const u32 imx53_suspend_sz;static inline void imx6_suspend (void __iomem *ocram_vbase) {}#endif +void v7_cpu_resume (void ); +void imx6_pm_ccm_init (const char *ccm_compat);void imx6q_pm_init (void );void imx6dl_pm_init (void );
arch/arm/mach-imx/resume-imx6.S new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright 2014 Freescale Semiconductor, Inc. + */ + +#include <linux/linkage.h> +#include <asm/assembler.h> +#include <asm/asm-offsets.h> +#include <asm/hardware/cache-l2x0.h> +#include "hardware.h" + +/* + * The following code must assume it is running from physical address + * where absolute virtual addresses to the data section have to be + * turned into relative ones. + */ + +ENTRY(v7_cpu_resume) + bl v7_invalidate_l1 +#ifdef CONFIG_CACHE_L2X0 + bl l2c310_early_resume +#endif + b cpu_resume +ENDPROC(v7_cpu_resume)
arch/arm/mach-imx/suspend-imx6.S +0 -14
@@ -327,17 +327,3 @@ resume: ret lr ENDPROC(imx6_suspend) - -/* - * The following code must assume it is running from physical address - * where absolute virtual addresses to the data section have to be - * turned into relative ones. - */ - -ENTRY(v7_cpu_resume) - bl v7_invalidate_l1 -#ifdef CONFIG_CACHE_L2X0 - bl l2c310_early_resume -#endif - b cpu_resume -ENDPROC(v7_cpu_resume)
Greg Kroah-Hartman
maintainerPATCH 174/189 ARM: dts: dra7xx-clocks: Fixup IPU1 mux clock parent source
In reply to Greg Kroah-HartmanFrom: Suman Anna <[email protected]>
commit 78722d37b2b4cf9178295e2aa5510880e6135fd7 upstream.
The IPU1 functional clock is the output of a mux clock (represented by ipu1_gfclk_mux previously) and the clock source for this has been updated to be sourced from dpll_core_h22x2_ck in commit 39879c7d963e ("ARM: dts: dra7xx-clocks: Source IPU1 functional clock from CORE DPLL"). ipu1_gfclk_mux is an obsolete clock now with the clkctrl conversion, and this clock source parenting is lost during the new clkctrl layout conversion.
Remove this stale clock and fix up the clock source for this mux clock using the latest equivalent clkctrl clock. This restores the previous logic and ensures that the IPU1 continues to run at the same frequency of IPU2 and independent of the ABE DPLL.
--- arch/arm/boot/dts/dra7xx-clocks.dtsi | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
arch/arm/boot/dts/dra7xx-clocks.dtsi +2 -10
@@ -796,16 +796,6 @@ clock-div = <1>; }; - ipu1_gfclk_mux: ipu1_gfclk_mux@520 { - #clock-cells = <0>; - compatible = "ti,mux-clock"; - clocks = <&dpll_abe_m2x2_ck>, <&dpll_core_h22x2_ck>; - ti,bit-shift = <24>; - reg = <0x0520>; - assigned-clocks = <&ipu1_gfclk_mux>; - assigned-clock-parents = <&dpll_core_h22x2_ck>; - }; - dummy_ck: dummy_ck { #clock-cells = <0>; compatible = "fixed-clock";
@@ -1564,6 +1554,8 @@ compatible = "ti,clkctrl"; reg = <0x20 0x4>; #clock-cells = <2>; + assigned-clocks = <&ipu1_clkctrl DRA7_IPU1_MMU_IPU1_CLKCTRL 24>; + assigned-clock-parents = <&dpll_core_h22x2_ck>; }; ipu_clkctrl: ipu-clkctrl@50 {
Greg Kroah-Hartman
maintainerPATCH 172/189 ARM: dts: imx7d: fix opp-supported-hw
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
commit 54d6477dca3b65b7b77a903fe60a9447bc836e7f upstream.
Per i.MX7D Document Number: IMX7DCEC Rev. 6, 03/2019, there are only consumer/industrial parts, and 1.2GHz is only support in consumer parts.
So exclude automotive from 792/996MHz/1.2GHz and exclude industrial from 1.2GHz.
--- arch/arm/boot/dts/imx7d.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx7d.dtsi +3 -3
@@ -44,7 +44,7 @@ opp-hz = /bits/ 64 <792000000>; opp-microvolt = <1000000>; clock-latency-ns = <150000>; - opp-supported-hw = <0xd>, <0xf>; + opp-supported-hw = <0xd>, <0x7>; opp-suspend; };
@@ -52,7 +52,7 @@ opp-hz = /bits/ 64 <996000000>; opp-microvolt = <1100000>; clock-latency-ns = <150000>; - opp-supported-hw = <0xc>, <0xf>; + opp-supported-hw = <0xc>, <0x7>; opp-suspend; };
@@ -60,7 +60,7 @@ opp-hz = /bits/ 64 <1200000000>; opp-microvolt = <1225000>; clock-latency-ns = <150000>; - opp-supported-hw = <0x8>, <0xf>; + opp-supported-hw = <0x8>, <0x3>; opp-suspend; }; };