6.4.16-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 1/737 Revert "bridge: Add extack warning when enabling STP in netns."
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 7ebd00a5a20c48e6020d49a3b2afb3cdfd2da8b7 ]
This reverts commit 56a16035bb6effb37177867cea94c13a8382f745.
Since the previous commit, STP works on bridge in netns.
# unshare -n # ip link add br0 type bridge # ip link add veth0 type veth peer name veth1
# ip link set veth0 master br0 up [ 50.558135] br0: port 1(veth0) entered blocking state [ 50.558366] br0: port 1(veth0) entered disabled state [ 50.558798] veth0: entered allmulticast mode [ 50.564401] veth0: entered promiscuous mode
# ip link set veth1 master br0 up [ 54.215487] br0: port 2(veth1) entered blocking state [ 54.215657] br0: port 2(veth1) entered disabled state [ 54.215848] veth1: entered allmulticast mode [ 54.219577] veth1: entered promiscuous mode
# ip link set br0 type bridge stp_state 1 # ip link set br0 up [ 61.960726] br0: port 2(veth1) entered blocking state [ 61.961097] br0: port 2(veth1) entered listening state [ 61.961495] br0: port 1(veth0) entered blocking state [ 61.961653] br0: port 1(veth0) entered listening state [ 63.998835] br0: port 2(veth1) entered blocking state [ 77.437113] br0: port 1(veth0) entered learning state [ 86.653501] br0: received packet on veth0 with own address as source address (addr:6e:0f:e7:6f:5f:5f, vlan:0) [ 92.797095] br0: port 1(veth0) entered forwarding state [ 92.797398] br0: topology change detected, propagating
Let's remove the warning.
--- net/bridge/br_stp_if.c | 3 --- 1 file changed, 3 deletions(-)
net/bridge/br_stp_if.c +0 -3
@@ -201,9 +201,6 @@ int br_stp_set_enabled(struct net_bridge *br, unsigned long val, {ASSERT_RTNL (); -if (!net_eq (dev_net (br->dev), &init_net)) -NL_SET_ERR_MSG_MOD (extack,"STP does not work in non-root netns" ); -if (br_mrp_enabled (br)) {NL_SET_ERR_MSG_MOD (extack,"STP can't be enabled if MRP is already enabled" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 10/737 9p: virtio: make sure offs is initialized in zc_request
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
[ Upstream commit 4a73edab69d3a6623f03817fe950a2d9585f80e4 ]
Similarly to the previous patch: offs can be used in handle_rerrors without initializing on small payloads; in this case handle_rerrors will not use it because of the size check, but it doesn't hurt to make sure it is zero to please scan-build.
This fixes the following warning:net/9p/trans_virtio.c:539:3: warning: 3rd function call argument is an uninitialized value [core.CallAndMessage]
handle_rerror(req, in_hdr_len, offs, in_pages);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- net/9p/trans_virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/9p/trans_virtio.c +1 -1
@@ -428,7 +428,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,struct page **in_pages =NULL , **out_pages =NULL ;struct virtio_chan *chan = client->trans;struct scatterlist *sgs[4 ]; -size_t offs; +size_t offs =0 ;int need_drop =0 ;int kicked =0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 11/737 ksmbd: fix out of bounds in smb3_decrypt_req()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit dc318846f3dd54574a36ae97fc8d8b75dd7cdb1e ]
smb3_decrypt_req() validate if pdu_length is smaller than smb2_transform_hdr size.
--- fs/smb/server/smb2pdu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/smb/server/smb2pdu.c +2 -1
@@ -8623,7 +8623,8 @@ int smb3_decrypt_req(struct ksmbd_work *work)struct smb2_transform_hdr *tr_hdr =smb2_get_msg (buf);int rc =0 ; -if (buf_data_size <sizeof (struct smb2_hdr )) { +if (pdu_length <sizeof (struct smb2_transform_hdr ) || + buf_data_size <sizeof (struct smb2_hdr )) {pr_err ("Transform message is too small (%u)\n" , pdu_length);return -ECONNABORTED ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 12/737 ksmbd: validate session id and tree id in compound request
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 3df0411e132ee74a87aa13142dfd2b190275332e ]
smb2_get_msg() in smb2_get_ksmbd_tcon() and smb2_check_user_session() will always return the first request smb2 header in a compound request. if SMB2_TREE_CONNECT_HE is the first command in compound request, will return 0, i.e. The tree id check is skipped.
This patch use ksmbd_req_buf_next() to get current command in compound.
--- fs/smb/server/smb2pdu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/smb/server/smb2pdu.c +6 -6
@@ -87,9 +87,9 @@ struct channel *lookup_chann_list(struct ksmbd_session *sess, struct ksmbd_conn*/ int smb2_get_ksmbd_tcon (struct ksmbd_work *work) { -struct smb2_hdr *req_hdr =smb2_get_msg (work->request_buf); +struct smb2_hdr *req_hdr =ksmbd_req_buf_next (work);unsigned int cmd =le16_to_cpu (req_hdr->Command); -int tree_id; +unsigned int tree_id; if (cmd == SMB2_TREE_CONNECT_HE || cmd == SMB2_CANCEL_HE ||
@@ -114,7 +114,7 @@ int smb2_get_ksmbd_tcon(struct ksmbd_work *work)pr_err ("The first operation in the compound does not have tcon\n" );return -EINVAL ; } -if (work->tcon->id != tree_id) { +if (tree_id !=UINT_MAX && work->tcon->id != tree_id) {pr_err ("tree id(%u) is different with id(%u) in first operation\n" , tree_id, work->tcon->id);return -EINVAL ;
@@ -559,9 +559,9 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)*/ int smb2_check_user_session (struct ksmbd_work *work) { -struct smb2_hdr *req_hdr =smb2_get_msg (work->request_buf); +struct smb2_hdr *req_hdr =ksmbd_req_buf_next (work);struct ksmbd_conn *conn = work->conn; -unsigned int cmd = conn->ops->get_cmd_val (work); +unsigned int cmd =le16_to_cpu (req_hdr->Command);unsigned long long sess_id;/*
@@ -587,7 +587,7 @@ int smb2_check_user_session(struct ksmbd_work *work)pr_err ("The first operation in the compound does not have sess\n" );return -EINVAL ; } -if (work->sess->id != sess_id) { +if (sess_id !=ULLONG_MAX && work->sess->id != sess_id) {pr_err ("session id(%llu) is different with the first operation(%lld)\n" , sess_id, work->sess->id);return -EINVAL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 13/737 ksmbd: no response from compound read
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit e202a1e8634b186da38cbbff85382ea2b9e297cf ]
ksmbd doesn't support compound read. If client send read-read in compound to ksmbd, there can be memory leak from read buffer. Windows and linux clients doesn't send it to server yet. For now, No response from compound read. compound read will be supported soon.
--- fs/smb/server/smb2pdu.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/smb/server/smb2pdu.c +5 -0
@@ -6223,6 +6223,11 @@ int smb2_read(struct ksmbd_work *work)unsigned int max_read_size = conn->vals->max_read_size;WORK_BUFFERS (work, req, rsp); +if (work->next_smb2_rcv_hdr_off) { + work->send_no_response =1 ; + err = -EOPNOTSUPP ; + goto out; + }if (test_share_config_flag (work->tcon->share_conf,KSMBD_SHARE_FLAG_PIPE )) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 14/737 ksmbd: fix out of bounds in init_smb2_rsp_hdr()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 536bb492d39bb6c080c92f31e8a55fe9934f452b ]
If client send smb2 negotiate request and then send smb1 negotiate request, init_smb2_rsp_hdr is called for smb1 negotiate request since need_neg is set to false. This patch ignore smb1 packets after ->need_neg is set to false.
--- fs/smb/server/server.c | 7 ++++++- fs/smb/server/smb_common.c | 19 +++++++++++-------- fs/smb/server/smb_common.h | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-)
fs/smb/server/server.c +6 -1
@@ -286,6 +286,7 @@ static void handle_ksmbd_work(struct work_struct *wk)static int queue_ksmbd_work (struct ksmbd_conn *conn) {struct ksmbd_work *work; +int err; work =ksmbd_alloc_work_struct ();if (!work) {
@@ -297,7 +298,11 @@ static int queue_ksmbd_work(struct ksmbd_conn *conn) work->request_buf = conn->request_buf; conn->request_buf =NULL ; -ksmbd_init_smb_server (work); + err =ksmbd_init_smb_server (work); +if (err) { +ksmbd_free_work_struct (work); +return 0 ; + }ksmbd_conn_enqueue_request (work);atomic_inc (&conn->r_count);
fs/smb/server/smb_common.c +11 -8
@@ -388,26 +388,29 @@ static struct smb_version_cmds smb1_server_cmds[1] = { [SMB_COM_NEGOTIATE_EX] = { .proc = smb1_negotiate, }, }; -static void init_smb1_server (struct ksmbd_conn *conn) +static int init_smb1_server (struct ksmbd_conn *conn) { conn->ops = &smb1_server_ops; conn->cmds = smb1_server_cmds; conn->max_cmds =ARRAY_SIZE (smb1_server_cmds); +return 0 ; } -void ksmbd_init_smb_server (struct ksmbd_work *work) +int ksmbd_init_smb_server (struct ksmbd_work *work) {struct ksmbd_conn *conn = work->conn;__le32 proto; -if (conn->need_neg == false) -return ; - proto = *(__le32 *)((struct smb_hdr *)work->request_buf)->Protocol; +if (conn->need_neg == false) { +if (proto ==SMB1_PROTO_NUMBER ) +return -EINVAL ; +return 0 ; + } +if (proto ==SMB1_PROTO_NUMBER ) -init_smb1_server (conn); -else -init_smb3_11_server (conn); +return init_smb1_server (conn); +return init_smb3_11_server (conn); } int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work, int info_level,
fs/smb/server/smb_common.h +1 -1
@@ -427,7 +427,7 @@ bool ksmbd_smb_request(struct ksmbd_conn *conn);int ksmbd_lookup_dialect_by_id (__le16 *cli_dialects,__le16 dialects_count); -void ksmbd_init_smb_server (struct ksmbd_work *work); +int ksmbd_init_smb_server (struct ksmbd_work *work);struct ksmbd_kstat ; int ksmbd_populate_dot_dotdot_entries(struct ksmbd_work *work,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 15/737 ASoC: da7219: Flush pending AAD IRQ when suspending
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmytro Maluka <[email protected]>
[ Upstream commit 91e292917dad64ab8d1d5ca2ab3069ad9dac6f72 ]
da7219_aad_suspend() disables jack detection, which should prevent generating new interrupts by DA7219 while suspended. However, there is a theoretical possibility that there is a pending interrupt generated just before suspending DA7219 and not handled yet, so the IRQ handler may still run after DA7219 is suspended. To prevent that, wait until the pending IRQ handling is done.
This patch arose as an attempt to fix the following I2C failure occurring sometimes during system suspend or resume:
[ 355.876211] i2c_designware i2c_designware.3: Transfer while suspended [ 355.876245] WARNING: CPU: 2 PID: 3576 at drivers/i2c/busses/i2c-designware-master.c:570 i2c_dw_xfer+0x411/0x440 ... [ 355.876462] Call Trace: [ 355.876468] <TASK> [ 355.876475] ? update_load_avg+0x1b3/0x615 [ 355.876484] __i2c_transfer+0x101/0x1d8 [ 355.876494] i2c_transfer+0x74/0x10d [ 355.876504] regmap_i2c_read+0x6a/0x9c [ 355.876513] _regmap_raw_read+0x179/0x223 [ 355.876521] regmap_raw_read+0x1e1/0x28e [ 355.876527] regmap_bulk_read+0x17d/0x1ba [ 355.876532] ? __wake_up+0xed/0x1bb [ 355.876542] da7219_aad_irq_thread+0x54/0x2c9 [snd_soc_da7219 5fb8ebb2179cf2fea29af090f3145d68ed8e2184] [ 355.876556] irq_thread+0x13c/0x231 [ 355.876563] ? irq_forced_thread_fn+0x5f/0x5f [ 355.876570] ? irq_thread_fn+0x4d/0x4d [ 355.876576] kthread+0x13a/0x152 [ 355.876581] ? synchronize_irq+0xc3/0xc3 [ 355.876587] ? kthread_blkcg+0x31/0x31 [ 355.876592] ret_from_fork+0x1f/0x30 [ 355.876601] </TASK>
which indicates that the AAD IRQ handler is unexpectedly running when DA7219 is suspended, and as a result, is trying to read data from DA7219 over I2C and is hitting the I2C driver "Transfer while suspended" failure.
However, with this patch the above failure is still reproducible. So this patch does not fix any real observed issue so far, but at least is useful for confirming that the above issue is not caused by a pending IRQ but rather looks like a DA7219 hardware issue with an IRQ unexpectedly generated after jack detection is already disabled.
--- sound/soc/codecs/da7219-aad.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/da7219-aad.c +2 -0
@@ -910,6 +910,8 @@ void da7219_aad_suspend(struct snd_soc_component *component) } } } + +synchronize_irq (da7219_aad->irq); }void da7219_aad_resume (struct snd_soc_component *component)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 16/737 ASoC: da7219: Check for failure reading AAD IRQ events
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmytro Maluka <[email protected]>
[ Upstream commit f0691dc16206f21b13c464434366e2cd632b8ed7 ]
When handling an AAD interrupt, if IRQ events read failed (for example, due to i2c "Transfer while suspended" failure, i.e. when attempting to read it while DA7219 is suspended, which may happen due to a spurious AAD interrupt), the events array contains garbage uninitialized values. So instead of trying to interprete those values and doing any actions based on them (potentially resulting in misbehavior, e.g. reporting bogus events), refuse to handle the interrupt.
--- sound/soc/codecs/da7219-aad.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/soc/codecs/da7219-aad.c +7 -3
@@ -361,11 +361,15 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data)struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component);u8 events[DA7219_AAD_IRQ_REG_MAX ];u8 statusa; -int i, report =0 , mask =0 ; +int i, ret, report =0 , mask =0 ;/* Read current IRQ events */ -regmap_bulk_read (da7219->regmap,DA7219_ACCDET_IRQ_EVENT_A , - events,DA7219_AAD_IRQ_REG_MAX ); + ret =regmap_bulk_read (da7219->regmap,DA7219_ACCDET_IRQ_EVENT_A , + events,DA7219_AAD_IRQ_REG_MAX ); +if (ret) { +dev_warn_ratelimited (component->dev,"Failed to read IRQ events: %d\n" , ret); +return IRQ_NONE ; + }if (!events[DA7219_AAD_IRQ_REG_A ] && !events[DA7219_AAD_IRQ_REG_B ])return IRQ_NONE ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 17/737 ASoC: nau8821: Add DMI quirk mechanism for active-high jack-detect
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edson Juliano Drosdeck <[email protected]>
[ Upstream commit 1bc40efdaf4a0ccfdb10a1c8e4b458f4764e8e5f ]
Add a quirk mechanism to allow specifying that active-high jack-detection should be used on platforms where this info is not available in devicetree.
And add an entry for the Positivo CW14Q01P-V2 to the DMI table, so that jack-detection will work properly on this laptop.
--- sound/soc/codecs/nau8821.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
sound/soc/codecs/nau8821.c +41 -0
@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/dmi.h> #include <linux/init.h> #include <linux/i2c.h> #include <linux/module.h>
@@ -25,6 +26,13 @@#include <sound/tlv.h> #include "nau8821.h" +#define NAU8821_JD_ACTIVE_HIGH BIT(0) + +static int nau8821_quirk; +static int quirk_override =-1 ; +module_param_named (quirk, quirk_override, uint,0444 ); +MODULE_PARM_DESC (quirk,"Board-specific quirk override" ); +#define NAU_FREF_MAX 13500000#define NAU_FVCO_MAX 100000000#define NAU_FVCO_MIN 90000000
@@ -1792,6 +1800,33 @@ static int nau8821_setup_irq(struct nau8821 *nau8821)return 0 ; } +/* Please keep this list alphabetically sorted */ +static const struct dmi_system_id nau8821_quirk_table[] = { + { +/* Positivo CW14Q01P-V2 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Positivo Tecnologia SA" ), +DMI_MATCH (DMI_BOARD_NAME ,"CW14Q01P-V2" ), + }, + .driver_data = (void *)(NAU8821_JD_ACTIVE_HIGH ), + }, + {} +}; + +static void nau8821_check_quirks (void ) +{ +const struct dmi_system_id *dmi_id; + +if (quirk_override !=-1 ) { + nau8821_quirk = quirk_override; +return ; + } + + dmi_id =dmi_first_match (nau8821_quirk_table); +if (dmi_id) + nau8821_quirk = (unsigned long )dmi_id->driver_data; +} +static int nau8821_i2c_probe (struct i2c_client *i2c) {struct device *dev = &i2c->dev;
@@ -1812,6 +1847,12 @@ static int nau8821_i2c_probe(struct i2c_client *i2c) nau8821->dev = dev; nau8821->irq = i2c->irq; + +nau8821_check_quirks (); + +if (nau8821_quirk &NAU8821_JD_ACTIVE_HIGH ) + nau8821->jkdet_polarity =0 ; +nau8821_print_device_properties (nau8821);nau8821_reset_chip (nau8821->regmap);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 18/737 thermal: core: constify params in thermal_zone_device_register
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit 80ddce5f2dbd0e83eadc9f9d373439180d599fe5 ]
Since commit 3d439b1a2ad3 ("thermal/core: Alloc-copy-free the thermal zone parameters structure"), thermal_zone_device_register() allocates a copy of the tzp argument and callers need not explicitly manage its lifetime.
This means the function no longer cares about the parameter being mutable, so constify it.
No functional change.
--- drivers/thermal/thermal_core.c | 4 ++-- include/linux/thermal.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/thermal/thermal_core.c +2 -2
@@ -1203,7 +1203,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_get_crit_temp);struct thermal_zone_device *thermal_zone_device_register_with_trips (const char *type,struct thermal_trip *trips,int num_trips,int mask,void *devdata,struct thermal_zone_device_ops *ops, -struct thermal_zone_params *tzp,int passive_delay, +const struct thermal_zone_params *tzp,int passive_delay,int polling_delay) {struct thermal_zone_device *tz;
@@ -1371,7 +1371,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);struct thermal_zone_device *thermal_zone_device_register (const char *type,int ntrips,int mask,void *devdata,struct thermal_zone_device_ops *ops, -struct thermal_zone_params *tzp,int passive_delay, +const struct thermal_zone_params *tzp,int passive_delay,int polling_delay) { return thermal_zone_device_register_with_trips(type, NULL, ntrips, mask,
include/linux/thermal.h +3 -3
@@ -301,14 +301,14 @@ int thermal_acpi_critical_trip_temp(struct acpi_device *adev, int *ret_temp);#ifdef CONFIG_THERMAL struct thermal_zone_device *thermal_zone_device_register (const char *,int ,int ,void *,struct thermal_zone_device_ops *, -struct thermal_zone_params *,int ,int ); +const struct thermal_zone_params *,int ,int );void thermal_zone_device_unregister (struct thermal_zone_device *);struct thermal_zone_device *thermal_zone_device_register_with_trips (const char *,struct thermal_trip *,int ,int ,void *,struct thermal_zone_device_ops *, -struct thermal_zone_params *,int ,int ); +const struct thermal_zone_params *,int ,int );void *thermal_zone_device_priv (struct thermal_zone_device *tzd);const char *thermal_zone_device_type (struct thermal_zone_device *tzd);
@@ -348,7 +348,7 @@ void thermal_zone_device_critical(struct thermal_zone_device *tz);static inline struct thermal_zone_device *thermal_zone_device_register (const char *type,int trips,int mask,void *devdata,struct thermal_zone_device_ops *ops, -struct thermal_zone_params *tzp, +const struct thermal_zone_params *tzp,int passive_delay,int polling_delay) {return ERR_PTR (-ENODEV ); } static inline void thermal_zone_device_unregister(
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 2/737 Partially revert "drm/amd/display: Fix possible underflow for displays with large vblank"
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Miess <[email protected]>
[ Upstream commit a99a4ff6ef205d125002fc7e0857074e4e6597b6 ]
This partially reverts commit de231189e7bf ("drm/amd/display: Fix possible underflow for displays with large vblank").
[Why]
The increased value of VBlankNomDefaultUS causes underflow at the desktop of an IP KVM setup
[How]
Change the value from 800 back to 668
--- drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +1 -1
@@ -33,7 +33,7 @@#include "dml/display_mode_vba.h" struct _vcs_dpi_ip_params_st dcn3_14_ip = { - .VBlankNomDefaultUS =800 , + .VBlankNomDefaultUS =668 , .gpuvm_enable =1 , .gpuvm_max_page_table_levels =1 , .hostvm_enable =1 ,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 3/737 ksmbd: Fix unsigned expression compared with zero
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Ming <[email protected]>
[ Upstream commit 0266a2f791294e0b4ba36f4a1d89b8615ea3cac0 ]
The return value of the ksmbd_vfs_getcasexattr() is signed. However, the return value is being assigned to an unsigned variable and subsequently recasted, causing warnings. Use a signed type.
--- fs/smb/server/vfs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/smb/server/vfs.c +4 -3
@@ -423,7 +423,8 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos, {char *stream_buf =NULL , *wbuf;struct mnt_idmap *idmap =file_mnt_idmap (fp->filp); -size_t size, v_len; +size_t size; +ssize_t v_len;int err =0 ; ksmbd_debug(VFS, "write stream data pos : %llu, count : %zd\n",
@@ -440,9 +441,9 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos, fp->stream.name, fp->stream.size, &stream_buf); -if ((int )v_len <0 ) { +if (v_len <0 ) {pr_err ("not found stream in xattr : %zd\n" , v_len); - err = (int )v_len; + err = v_len; goto out; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 4/737 phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adrien Thierry <[email protected]>
[ Upstream commit 8932089b566c24ea19b57e37704c492678de1420 ]
The return value from qcom_snps_hsphy_suspend/resume is not used. Make sure qcom_snps_hsphy_runtime_suspend/resume return this value as well.
--- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +2 -4
@@ -214,8 +214,7 @@ static int __maybe_unused qcom_snps_hsphy_runtime_suspend(struct device *dev)if (!hsphy->phy_initialized)return 0 ; -qcom_snps_hsphy_suspend (hsphy); -return 0 ; +return qcom_snps_hsphy_suspend (hsphy); }static int __maybe_unused qcom_snps_hsphy_runtime_resume (struct device *dev)
@@ -225,8 +224,7 @@ static int __maybe_unused qcom_snps_hsphy_runtime_resume(struct device *dev)if (!hsphy->phy_initialized)return 0 ; -qcom_snps_hsphy_resume (hsphy); -return 0 ; +return qcom_snps_hsphy_resume (hsphy); } static int qcom_snps_hsphy_set_mode(struct phy *phy, enum phy_mode mode,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 5/737 media: amphion: use dev_err_probe
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit 517f088385e1b8015606143e6212cb30f8714070 ]
This simplifies the code and silences -517 error messages. Also the reason is listed in /sys/kernel/debug/devices_deferred.
--- drivers/media/platform/amphion/vpu_mbox.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/media/platform/amphion/vpu_mbox.c +4 -5
@@ -46,11 +46,10 @@ static int vpu_mbox_request_channel(struct device *dev, struct vpu_mbox *mbox) cl->rx_callback = vpu_mbox_rx_callback; ch =mbox_request_channel_byname (cl, mbox->name); -if (IS_ERR (ch)) { -dev_err (dev,"Failed to request mbox chan %s, ret : %ld\n" , - mbox->name,PTR_ERR (ch)); -return PTR_ERR (ch); - } +if (IS_ERR (ch)) +return dev_err_probe (dev,PTR_ERR (ch), +"Failed to request mbox chan %s\n" , + mbox->name); mbox->ch = ch;return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 6/737 media: imx-jpeg: Support to assign slot for encoder/decoder
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit 53ebeea50599c1ed05277d7a57e331a34e6d6a82 ]
imx jpeg encoder and decoder support 4 slots each, aim to support some virtualization scenarios.
driver should only enable one slot one time.
but due to some hardware issue,
only slot 0 can be enabled in imx8q platform, and they may be fixed in imx9 platform.
--- .../media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 1 - .../media/platform/nxp/imx-jpeg/mxc-jpeg.c | 135 +++++++++--------- .../media/platform/nxp/imx-jpeg/mxc-jpeg.h | 5 +- 3 files changed, 68 insertions(+), 73 deletions(-)
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h +0 -1
@@ -58,7 +58,6 @@#define CAST_OFBSIZE_LO CAST_STATUS18#define CAST_OFBSIZE_HI CAST_STATUS19 -#define MXC_MAX_SLOTS 1/* TODO use all 4 slots*/ /* JPEG-Decoder Wrapper Slot Registers 0..3 */ #define SLOT_BASE 0x10000#define SLOT_STATUS 0x0
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +65 -70
273 lines not on this page · raw message
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h +3 -2
@@ -97,7 +97,7 @@ struct mxc_jpeg_ctx {struct mxc_jpeg_q_data cap_q;struct v4l2_fh fh;enum mxc_jpeg_enc_state enc_state; -unsigned int slot; +int slot;unsigned int source_change;bool header_parsed;struct v4l2_ctrl_handler ctrl_handler;
@@ -106,6 +106,7 @@ struct mxc_jpeg_ctx { };struct mxc_jpeg_slot_data { +int slot;bool used;struct mxc_jpeg_desc *desc;// enc/dec descriptor struct mxc_jpeg_desc *cfg_desc;// configuration descriptor
@@ -128,7 +129,7 @@ struct mxc_jpeg_dev {struct v4l2_device v4l2_dev;struct v4l2_m2m_dev *m2m_dev;struct video_device *dec_vdev; -struct mxc_jpeg_slot_data slot_data[MXC_MAX_SLOTS ]; +struct mxc_jpeg_slot_data slot_data;int num_domains;struct device **pd_dev;struct device_link **pd_link;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 7/737 media: pulse8-cec: handle possible ping error
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 92cbf865ea2e0f2997ff97815c6db182eb23df1b ]
Handle (and warn about) possible error waiting for MSGCODE_PING result.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/cec/usb/pulse8/pulse8-cec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/cec/usb/pulse8/pulse8-cec.c +5 -2
@@ -809,8 +809,11 @@ static void pulse8_ping_eeprom_work_handler(struct work_struct *work)mutex_lock (&pulse8->lock); cmd =MSGCODE_PING ; -pulse8_send_and_wait (pulse8, &cmd,1 , -MSGCODE_COMMAND_ACCEPTED ,0 ); +if (pulse8_send_and_wait (pulse8, &cmd,1 , +MSGCODE_COMMAND_ACCEPTED ,0 )) { +dev_warn (pulse8->dev,"failed to ping EEPROM\n" ); + goto unlock; + }if (pulse8->vers <2 ) goto unlock;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 8/737 media: pci: cx23885: fix error handling for cx23885 ATSC boards
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Burykin <[email protected]>
[ Upstream commit 4aaa96b59df5fac41ba891969df6b092061ea9d7 ]
After having been assigned to NULL value at cx23885-dvb.c:1202, pointer '0' is dereferenced at cx23885-dvb.c:2469.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/pci/cx23885/cx23885-dvb.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/media/pci/cx23885/cx23885-dvb.c +0 -12
@@ -2459,16 +2459,10 @@ static int dvb_register(struct cx23885_tsport *port)request_module ("%s" , info.type); client_tuner =i2c_new_client_device (&dev->i2c_bus[1 ].i2c_adap, &info);if (!i2c_client_has_driver (client_tuner)) { -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; }if (!try_module_get (client_tuner->dev.driver->owner)) {i2c_unregister_device (client_tuner); -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; } port->i2c_client_tuner = client_tuner;
@@ -2505,16 +2499,10 @@ static int dvb_register(struct cx23885_tsport *port)request_module ("%s" , info.type); client_tuner =i2c_new_client_device (&dev->i2c_bus[1 ].i2c_adap, &info);if (!i2c_client_has_driver (client_tuner)) { -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; }if (!try_module_get (client_tuner->dev.driver->owner)) {i2c_unregister_device (client_tuner); -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; } port->i2c_client_tuner = client_tuner;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 9/737 9p: virtio: fix unlikely null pointer deref in handle_rerror
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
[ Upstream commit 13ade4ac5c28e8a014fa85278f5a4270b215f906 ]
handle_rerror can dereference the pages pointer, but it is not necessarily set for small payloads.
In practice these should be filtered out by the size check, but might as well double-check explicitly.
This fixes the following scan-build warnings:net/9p/trans_virtio.c:401:24: warning: Dereference of null pointer [core.NullDereference]
memcpy_from_page(to, *pages++, offs, n);
^~~~~~~~
net/9p/trans_virtio.c:406:23: warning: Dereference of null pointer (loaded from variable 'pages') [core.NullDereference]
memcpy_from_page(to, *pages, offs, size);
^~~~~~--- net/9p/trans_virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/9p/trans_virtio.c +1 -1
@@ -384,7 +384,7 @@ static void handle_rerror(struct p9_req_t *req, int in_hdr_len,void *to = req->rc.sdata + in_hdr_len;// Fits entirely into the static data? Nothing to do. -if (req->rc.size < in_hdr_len) +if (req->rc.size < in_hdr_len || !pages)return ;// Really long error message? Tough, truncate the reply. Might get
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainercover 6.4.16-rc1 review
This is the start of the stable review cycle for the 6.4.16 release. There are 737 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 Wed, 13 Sep 2023 13:44:56 +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/v6.x/stable-review/patch-6.4.16-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-6.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.4.16-rc1
Michel Dänzer <[email protected]>
Revert "drm/amd/display: Do not set drr on pipe commit"
Brian Foster <[email protected]>
tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY
Lorenz Bauer <[email protected]>
net: remove duplicate INDIRECT_CALLABLE_DECLARE of udp[6]_ehashfn
Andrew Morton <[email protected]>
revert "memfd: improve userspace warnings for missing exec-related flags".
Aleksa Sarai <[email protected]>
memfd: improve userspace warnings for missing exec-related flags
Aleksa Sarai <[email protected]>
memfd: do not -EACCES old memfd_create() users with vm.memfd_noexec=2
Jeff Xu <[email protected]>
selftests/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED
Jeff Xu <[email protected]>
mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED
Hugo Villeneuve <[email protected]>
serial: sc16is7xx: fix regression with GPIO configuration
Hugo Villeneuve <[email protected]>
serial: sc16is7xx: remove obsolete out_thread label
Luiz Augusto von Dentz <[email protected]>
Bluetooth: HCI: Introduce HCI_QUIRK_BROKEN_LE_CODED
Hilda Wu <[email protected]>
Bluetooth: msft: Extended monitor tracking by address filter
Huacai Chen <[email protected]>
LoongArch: Ensure FP/SIMD registers in the core dump file is up to date
Arnd Bergmann <[email protected]>
media: ipu3-cio2: allow ipu_bridge to be a module again
Kan Liang <[email protected]>
perf/x86/uncore: Correct the number of CHAs on EMR
Song Liu <[email protected]>
x86/build: Fix linker fill bytes quirk/incompatibility for ld.lld
Jack Wang <[email protected]>
x86/sgx: Break up long non-preemptible delays in sgx_vepc_release()
Alan Stern <[email protected]>
USB: core: Fix oversight in SuperSpeed initialization
Alan Stern <[email protected]>
USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
Alan Stern <[email protected]>
USB: core: Change usb_get_device_descriptor() API
Alan Stern <[email protected]>
USB: core: Unite old scheme and new scheme descriptor reads
RD Babiera <[email protected]>
usb: typec: bus: verify partner exists in typec_altmode_attention
RD Babiera <[email protected]>
usb: typec: tcpm: set initial svdm version based on pd revision
Douglas Anderson <[email protected]>
of: property: fw_devlink: Add a devlink for panel followers
Gustavo A. R. Silva <[email protected]>
cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
Thomas Bourgoin <[email protected]>
crypto: stm32 - fix MDMAT condition
Thomas Bourgoin <[email protected]>
crypto: stm32 - fix loop iterating through scatterlist for DMA
Benjamin Tissoires <[email protected]>
HID: logitech-hidpp: rework one more time the retries attempts
Heiko Carstens <[email protected]>
s390/dasd: fix string length handling
Sven Schnelle <[email protected]>
s390/ipl: add missing secure/has_secure file to ipl type 'unknown'
Gerald Schaefer <[email protected]>
s390/dcssblk: fix kernel crash with list_add corruption
David Howells <[email protected]>
iov_iter: Fix iov_iter_extract_pages() with zero-sized entries
Krzysztof Kozlowski <[email protected]>
regulator: dt-bindings: qcom,rpm: fix pattern for children
D Scott Phillips <[email protected]>
arm64: sdei: abort running SDEI handlers during crash
Enlin Mu <[email protected]>
pstore/ram: Check start of empty przs during init
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: register irqs before registering controller
Tzung-Bi Shih <[email protected]>
platform/chrome: chromeos_acpi: print hex string for ACPI_TYPE_BUFFER
Frederick Lawler <[email protected]>
crypto: af_alg - Decrement struct key.usage in alg_set_by_key_serial()
Yazen Ghannam <[email protected]>
x86/MCE: Always save CS register on AMD Zen IF Poison errors
Eric Biggers <[email protected]>
fsverity: skip PKCS#7 parser when keyring is empty
Nicolas Dichtel <[email protected]>
net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
Thore Sommer <[email protected]>
X.509: if signature is unsupported skip validation
Heiner Kallweit <[email protected]>
r8169: fix ASPM-related issues on a number of systems with NIC version from RTL8168h
Steve Rutherford <[email protected]>
x86/sev: Make enc_dec_hypercall() accept a size instead of npages
Jann Horn <[email protected]>
dccp: Fix out of bounds access in DCCP error handler
Alexander Aring <[email protected]>
dlm: fix plock lookup when using multiple lockspaces
Yafang Shao <[email protected]>
bpf: Fix issue in verifying allow_ptr_leaks
Fudong Wang <[email protected]>
drm/amd/display: Add smu write msg id fail retry process
Ekansh Gupta <[email protected]>
misc: fastrpc: Pass proper scm arguments for static process init
Helge Deller <[email protected]>
parisc: Fix /proc/cpuinfo output for lscpu
Aleksa Sarai <[email protected]>
procfs: block chmod on /proc/thread-self/comm
Li Lingfeng <[email protected]>
block: don't add or resize partition on the disk with GENHD_FL_NO_PART
Bjorn Helgaas <[email protected]>
Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
Dave Jiang <[email protected]>
ntb: Fix calculation ntb_transport_tx_free_entry()
Dave Jiang <[email protected]>
ntb: Clean up tx tail index on link down
Dave Jiang <[email protected]>
ntb: Drop packets when qp link is down
Feiyang Chen <[email protected]>
PCI/PM: Only read PCI_PM_CTRL register when available
Dexuan Cui <[email protected]>
PCI: hv: Fix a crash in hv_pci_restore_msi_msg() during hibernation
Ross Lagerwall <[email protected]>
PCI: Free released resource after coalescing
Ranjan Kumar <[email protected]>
scsi: mpt3sas: Perform additional retries if doorbell read returns 0
Nilesh Javali <[email protected]>
Revert "scsi: qla2xxx: Fix buffer overrun"
Yang Yingliang <[email protected]>
media: nxp: Fix wrong return pointer check in mxc_isi_crossbar_init()
Konrad Dybcio <[email protected]>
media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
Greg Kroah-Hartman <[email protected]>
media: dvb: symbol fixup for dvb_attach()
Vitaly Rodionov <[email protected]>
ALSA: hda/cirrus: Fix broken audio on hardware with two CS42L42 codecs.
Will Deacon <[email protected]>
arm64: csum: Fix OoB access in IP checksum code for negative lengths
Gabriel Krisman Bertazi <[email protected]>
io_uring: Don't set affinity on a dying sqpoll thread
Frank Li <[email protected]>
i3c: master: svc: fix probe failure when no i3c device exist
Naveen N Rao <[email protected]>
powerpc/ftrace: Fix dropping weak symbols with older toolchains
Hongchen Zhang <[email protected]>
LoongArch: mm: Add p?d_leaf() definitions
Max Filippov <[email protected]>
xtensa: PMU: fix base address for the newer hardware
Hamza Mahfooz <[email protected]>
drm/amd/display: register edp_backlight_control() for DCN301
Thomas Zimmermann <[email protected]>
backlight/lv5207lp: Compare against struct fb_info.device
Thomas Zimmermann <[email protected]>
backlight/bd6107: Compare against struct fb_info.device
Thomas Zimmermann <[email protected]>
backlight/gpio_backlight: Compare against struct fb_info.device
Pavel Begunkov <[email protected]>
io_uring: break out of iowq iopoll on teardown
Jens Axboe <[email protected]>
io_uring/sqpoll: fix io-wq affinity when IORING_SETUP_SQPOLL is used
Pavel Begunkov <[email protected]>
io_uring: break iopolling on signal
Pavel Begunkov <[email protected]>
io_uring: fix false positive KASAN warnings
Matthew Wilcox (Oracle) <[email protected]>
XArray: Do not return sibling entries from xa_load()
Alexandre Ghiti <[email protected]>
riscv: Mark KASAN tmp* page tables variables as static
Alexandre Ghiti <[email protected]>
riscv: Move create_tmp_mapping() to init sections
Gustavo A. R. Silva <[email protected]>
ARM: OMAP2+: Fix -Warray-bounds warning in _pwrdm_state_switch()
Yi Yang <[email protected]>
ipmi_si: fix a memleak in try_smi_init()
Rick Wertenbroek <[email protected]>
PCI: rockchip: Use 64-bit mask on MSI 64-bit PCI address
Sakari Ailus <[email protected]>
media: i2c: Add a camera sensor top level menu
Sakari Ailus <[email protected]>
media: i2c: ccs: Check rules is non-NULL
Thomas Gleixner <[email protected]>
cpu/hotplug: Prevent self deadlock on CPU hot-unplug
Joel Fernandes (Google) <[email protected]>
mm/vmalloc: add a safer version of find_vm_area() for debug
Bart Van Assche <[email protected]>
scsi: core: Fix the scsi_set_resid() documentation
Kees Cook <[email protected]>
printk: ringbuffer: Fix truncating buffer size min_t cast
Zqiang <[email protected]>
rcu: dump vmalloc memory info safely
Hou Tao <[email protected]>
virtio_pmem: add the missing REQ_OP_WRITE for flush bio
Takashi Iwai <[email protected]>
ALSA: pcm: Fix missing fixup call in compat hw_refine ioctl
Kalesh Singh <[email protected]>
Multi-gen LRU: fix per-zone reclaim
Boris Brezillon <[email protected]>
PM / devfreq: Fix leak in devfreq_dev_release()
Radoslaw Tyl <[email protected]>
igb: set max size RX buffer when store bad packet is enabled
Mohamed Khalfella <[email protected]>
skbuff: skb_segment, Call zero copy functions before using skbuff frags
Wander Lairson Costa <[email protected]>
netfilter: xt_sctp: validate the flag_info count
Wander Lairson Costa <[email protected]>
netfilter: xt_u32: validate user space input
Xiao Liang <[email protected]>
netfilter: nft_exthdr: Fix non-linear header modification
Kyle Zeng <[email protected]>
netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
Eric Dumazet <[email protected]>
igmp: limit igmpv3_newpack() packet size to IP_MAX_MTU
Eric Dumazet <[email protected]>
net: deal with integer overflows in kmalloc_reserve()
Yuan Yao <[email protected]>
virtio_ring: fix avail_wrap_counter in virtqueue_add_packed
Jason Wang <[email protected]>
virtio_vdpa: build affinity masks conditionally
Liao Chang <[email protected]>
cpufreq: Fix the race condition while updating the transition_task of policy
Vincent Whitchurch <[email protected]>
um: virt-pci: fix missing declaration warning
Maciej S. Szmigiero <[email protected]>
Drivers: hv: vmbus: Don't dereference ACPI root object handle
Fenghua Yu <[email protected]>
dmaengine: idxd: Fix issues with PRS disable sysfs knob
Fenghua Yu <[email protected]>
dmaengine: idxd: Allow ATS disable update only for configurable devices
Fenghua Yu <[email protected]>
dmaengine: idxd: Expose ATS disable knob only when WQ ATS is supported
Fenghua Yu <[email protected]>
dmaengine: idxd: Simplify WQ attribute visibility checks
ruanjinjie <[email protected]>
dmaengine: ste_dma40: Add missing IRQ check in d40_probe
Randy Dunlap <[email protected]>
um: Fix hostaudio build errors
Yi Yang <[email protected]>
mtd: rawnand: fsmc: handle clk prepare error in fsmc_nand_resume()
Hsin-Yi Wang <[email protected]>
mtd: spi-nor: Check bus width while setting QE bit
Marek Behún <[email protected]>
leds: trigger: tty: Do not use LED_ON/OFF constants, use led_blink_set_oneshot instead
Marek Behún <[email protected]>
leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false
Marek Behún <[email protected]>
leds: multicolor: Use rounded division when calculating color components
Ahmad Fatoum <[email protected]>
thermal/drivers/imx8mm: Suppress log message on probe deferral
Nícolas F. R. A. Prado <[email protected]>
thermal/drivers/mediatek/lvts_thermal: Manage threshold between sensors
Nícolas F. R. A. Prado <[email protected]>
thermal/drivers/mediatek/lvts_thermal: Don't leave threshold zeroed
Nícolas F. R. A. Prado <[email protected]>
thermal/drivers/mediatek/lvts_thermal: Disable undesired interrupts
Nícolas F. R. A. Prado <[email protected]>
thermal/drivers/mediatek/lvts_thermal: Use offset threshold for IRQ
Nícolas F. R. A. Prado <[email protected]>
thermal/drivers/mediatek/lvts_thermal: Honor sensors in immediate mode
Nícolas F. R. A. Prado <[email protected]>
thermal/drivers/mediatek/lvts_thermal: Handle IRQ on all controllers
Dan Carpenter <[email protected]>
leds: pwm: Fix error code in led_pwm_create_fwnode()
Jiasheng Jiang <[email protected]>
rpmsg: glink: Add check for kstrdup
Jonas Karlman <[email protected]>
phy/rockchip: inno-hdmi: do not power on rk3328 post pll on reg write
Zheng Yang <[email protected]>
phy/rockchip: inno-hdmi: round fractal pixclock in rk3328 recalc_rate
Jonas Karlman <[email protected]>
phy/rockchip: inno-hdmi: use correct vco_div_5 macro on rk3328
Rex Zhang <[email protected]>
dmaengine: idxd: Modify the dependence of attribute pasid_enabled
William Zhang <[email protected]>
mtd: rawnand: brcmnand: Fix mtd oobsize
Zheng Yejian <[email protected]>
tracing: Fix race issue between cpu buffer write and swap
Mikhail Kobuk <[email protected]>
tracing: Remove extra space at the end of hwlat_detector/mode
Dave Hansen <[email protected]>
x86/speculation: Mark all Skylake CPUs as vulnerable to GDS
Paul Gortmaker <[email protected]>
tick/rcu: Fix false positive "softirq work is pending" messages
Mario Limonciello <[email protected]>
platform/x86/amd/pmf: Fix a missing cleanup path
Rahul Rameshbabu <[email protected]>
HID: multitouch: Correct devm device reference for hidinput input_dev name
Rahul Rameshbabu <[email protected]>
HID: uclogic: Correct devm device reference for hidinput input_dev name
Miquel Raynal <[email protected]>
nvmem: core: Return NULL when no nvmem layout is found
Nikita Zhandarovich <[email protected]>
HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode()
Yonatan Nachum <[email protected]>
RDMA/efa: Fix wrong resources deallocation order
Guoqing Jiang <[email protected]>
RDMA/siw: Correct wrong debug message
Guoqing Jiang <[email protected]>
RDMA/siw: Balance the reference of cep->kref in the error path
Leon Romanovsky <[email protected]>
Revert "IB/isert: Fix incorrect release of isert connection"
Peng Fan <[email protected]>
amba: bus: fix refcount leak
Yi Yang <[email protected]>
serial: tegra: handle clk prepare error in tegra_uart_hw_init()
Konrad Dybcio <[email protected]>
interconnect: qcom: bcm-voter: Use enable_maks for keepalive voting
Konrad Dybcio <[email protected]>
interconnect: qcom: bcm-voter: Improve enable_mask handling
Konrad Dybcio <[email protected]>
interconnect: qcom: sm8450: Enable sync_state
Chengfeng Ye <[email protected]>
scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock
Tony Battersby <[email protected]>
scsi: core: Use 32-bit hostnum in scsi_host_lookup()
Christopher Bednarz <[email protected]>
RDMA/irdma: Prevent zero-length STAG registration
Junhao He <[email protected]>
coresight: trbe: Fix TRBE potential sleep in atomic context
Chao Yu <[email protected]>
f2fs: fix to account cp stats correctly
Chao Yu <[email protected]>
f2fs: fix to drop all dirty meta/node pages during umount()
Chao Yu <[email protected]>
f2fs: fix to account gc stats correctly
Yangtao Li <[email protected]>
f2fs: refactor struct f2fs_attr macro
Chao Yu <[email protected]>
Revert "f2fs: fix to do sanity check on extent cache correctly"
Chunhai Guo <[email protected]>
f2fs: Only lfs mode is allowed with zoned block device feature
Chao Yu <[email protected]>
f2fs: fix to avoid mmap vs set_compress_option case
Randy Dunlap <[email protected]>
f2fs: fix spelling in ABI documentation
Jacopo Mondi <[email protected]>
media: i2c: rdacm21: Fix uninitialized value
Hans de Goede <[email protected]>
media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors
Hans de Goede <[email protected]>
media: ov2680: Fix ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY not working
Hans de Goede <[email protected]>
media: ov2680: Add ov2680_fill_format() helper function
Hans de Goede <[email protected]>
media: ov2680: Don't take the lock for try_fmt calls
Hans de Goede <[email protected]>
media: ov2680: Remove VIDEO_V4L2_SUBDEV_API ifdef-s
Hans de Goede <[email protected]>
media: ov2680: Fix vflip / hflip set functions
Hans de Goede <[email protected]>
media: ov2680: Fix ov2680_bayer_order()
Hans de Goede <[email protected]>
media: ov2680: Remove auto-gain and auto-exposure controls
Tomi Valkeinen <[email protected]>
media: Documentation: Fix [GS]_ROUTING documentation
Marek Vasut <[email protected]>
media: ov5640: Fix initial RESETB state and annotate timings
Marek Vasut <[email protected]>
media: ov5640: Enable MIPI interface in ov5640_set_power_mipi()
Illia Ostapyshyn <[email protected]>
HID: input: Support devices sending Eraser without Invert
David Gow <[email protected]>
drivers: base: Free devm resources when unregistering a device
Alan Stern <[email protected]>
USB: gadget: f_mass_storage: Fix unused variable warning
Alan Stern <[email protected]>
USB: gadget: core: Add missing kerneldoc for vbus_work
Randy Dunlap <[email protected]>
docs: ABI: fix spelling/grammar in SBEFIFO timeout interface
Hans de Goede <[email protected]>
media: ipu-bridge: Do not use on stack memory for software_node.name field
Bingbu Cao <[email protected]>
media: ipu3-cio2: rename cio2 bridge to ipu bridge and move out of ipu3
Hans de Goede <[email protected]>
media: ipu-bridge: Fix null pointer deref on SSDB/PLD parsing warnings
Laurent Pinchart <[email protected]>
arm64: defconfig: Drop CONFIG_VIDEO_IMX_MEDIA
Konrad Dybcio <[email protected]>
media: venus: hfi_venus: Only consider sys_idle_indicator on V1
Colin Ian King <[email protected]>
media: go7007: Remove redundant if statement
Hans Verkuil <[email protected]>
media: cec: core: add adap_unconfigured() callback
Hans Verkuil <[email protected]>
media: cec: core: add adap_nb_transmit_canceled() callback
Armin Wolf <[email protected]>
platform/x86: dell-sysman: Fix reference leak
Yanfei Xu <[email protected]>
iommu/vt-d: Fix to flush cache of PASID directory table
Vijaya Krishna Nivarthi <[email protected]>
tty: serial: qcom-geni-serial: Poll primary sequencer irq status after cancel_tx
AngeloGioacchino Del Regno <[email protected]>
iommu/qcom: Disable and reset context bank before programming
Eddie James <[email protected]>
fsi: aspeed: Reset master errors after CFAM reset
Xiang Yang <[email protected]>
IB/uverbs: Fix an potential error pointer dereference
Chengchang Tang <[email protected]>
RDMA/hns: Fix CQ and QP cache affinity
Junxian Huang <[email protected]>
RDMA/hns: Fix inaccurate error label name in init instance
Junxian Huang <[email protected]>
RDMA/hns: Fix incorrect post-send with direct wqe of wr-list
Chengchang Tang <[email protected]>
RDMA/hns: Fix port active speed
Kalesh AP <[email protected]>
RDMA/bnxt_re: Remove a redundant flag
Zhu Wang <[email protected]>
iommu: Remove kernel-doc warnings
Jason Gunthorpe <[email protected]>
iommu/sprd: Add missing force_aperture
Chengci.Xu <[email protected]>
iommu/mediatek: Fix two IOMMU share pagetable issue
Arnd Bergmann <[email protected]>
extcon: cht_wc: add POWER_SUPPLY dependency
Arnd Bergmann <[email protected]>
kernfs: add stub helper for kernfs_generic_poll()
Jason Gunthorpe <[email protected]>
driver core: Call dma_cleanup() on the test_remove path
Dan Carpenter <[email protected]>
driver core: test_async: fix an error code
Rob Clark <[email protected]>
dma-buf/sync_file: Fix docs syntax
Konrad Dybcio <[email protected]>
interconnect: qcom: qcm2290: Enable sync state
Ruidong Tian <[email protected]>
coresight: tmc: Explicit type conversions to prevent integer overflow
Gustavo A. R. Silva <[email protected]>
RDMA/irdma: Replace one-element array with flexible-array member
Oleksandr Natalenko <[email protected]>
scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly
Oleksandr Natalenko <[email protected]>
scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly
Oleksandr Natalenko <[email protected]>
scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly
Bob Pearson <[email protected]>
RDMA/rxe: Fix incomplete state save in rxe_requester
Bob Pearson <[email protected]>
RDMA/rxe: Fix rxe_modify_srq
Bob Pearson <[email protected]>
RDMA/rxe: Fix unsafe drain work queue code
Bob Pearson <[email protected]>
RDMA/rxe: Move work queue code to subroutines
Randy Dunlap <[email protected]>
x86/APM: drop the duplicate APM_MINOR_DEV macro
Chunyan Zhang <[email protected]>
serial: sprd: Fix DMA buffer leak issue
Chunyan Zhang <[email protected]>
serial: sprd: Assign sprd_port after initialized to avoid wrong access
Biju Das <[email protected]>
iio: accel: adxl313: Fix adxl313_i2c_id[] table
Lin Ma <[email protected]>
scsi: qla4xxx: Add length check when parsing nlattrs
Lin Ma <[email protected]>
scsi: be2iscsi: Add length check when parsing nlattrs
Lin Ma <[email protected]>
scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()
Lin Ma <[email protected]>
scsi: iscsi: Add length check for nlattr payload
Bart Van Assche <[email protected]>
scsi: ufs: Fix residual handling
Bart Van Assche <[email protected]>
scsi: RDMA/srp: Fix residual handling
Xu Yang <[email protected]>
usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host()
Dan Carpenter <[email protected]>
media: mediatek: vcodec: fix resource leaks in vdec_msg_queue_init()
Dan Carpenter <[email protected]>
media: mediatek: vcodec: fix potential double free
Irui Wang <[email protected]>
media: mediatek: vcodec: Return NULL if no vdec_fb is found
Ming Qian <[email protected]>
media: amphion: ensure the bitops don't cross boundaries
Ming Qian <[email protected]>
media: amphion: fix UNUSED_VALUE issue reported by coverity
Ming Qian <[email protected]>
media: amphion: fix UNINIT issues reported by coverity
Ming Qian <[email protected]>
media: amphion: fix REVERSE_INULL issues reported by coverity
Ming Qian <[email protected]>
media: amphion: fix CHECKED_RETURN issues reported by coverity
Benjamin Gaignard <[email protected]>
media: rkvdec: increase max supported height for H.264
Ming Qian <[email protected]>
media: amphion: decoder support display delay for all formats
Zheng Wang <[email protected]>
media: mtk-jpeg: Fix use after free bug due to uncanceled work
Michael Tretter <[email protected]>
media: verisilicon: Fix TRY_FMT on encoder OUTPUT
Ming Qian <[email protected]>
media: amphion: add helper function to get id name
Ming Qian <[email protected]>
media: amphion: reinit vpu if reqbufs output 0
Krzysztof Kozlowski <[email protected]>
dt-bindings: extcon: maxim,max77843: restrict connector properties
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix normally completed I/O analysed as failed
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix warnings detected by sparse
Chuck Lever <[email protected]>
RDMA/siw: Fabricate a GID on tun and loopback devices
Daniil Dulov <[email protected]>
media: cx24120: Add retval check for cx24120_message_send()
Christophe JAILLET <[email protected]>
media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer()
Daniil Dulov <[email protected]>
media: dib7000p: Fix potential division by zero
Dongliang Mu <[email protected]>
drivers: usb: smsusb: fix error handling code in smsusb_init_device
Jonas Karlman <[email protected]>
iommu: rockchip: Fix directory table address encoding
Daniel Marcovitch <[email protected]>
iommu/amd/iommu_v2: Fix pasid_state refcount dec hit 0 warning on pasid unbind
Christophe JAILLET <[email protected]>
media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()
Claudiu Beznea <[email protected]>
media: i2c: tvp5150: check return value of devm_kasprintf()
Hans de Goede <[email protected]>
media: ad5820: Drop unsupported ad5823 from i2c_ and of_device_id tables
Tommaso Merciai <[email protected]>
media: i2c: imx290: drop format param from imx290_ctrl_update
Guoniu.zhou <[email protected]>
media: ov5640: fix low resolution image abnormal issue
Minjie Du <[email protected]>
RDMA/qedr: Remove a duplicate assignment in irdma_query_ah()
Waiman Long <[email protected]>
cgroup/cpuset: Inherit parent's load balance state in v2
Anna Schumaker <[email protected]>
pNFS: Fix assignment of xprtdata.cred
Olga Kornievskaia <[email protected]>
NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ
Benjamin Coddington <[email protected]>
NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN
Chuck Lever <[email protected]>
NFSD: da_addr_body field missing in some GETDEVICEINFO replies
Su Hui <[email protected]>
fs: lockd: avoid possible wrong NULL parameter
Alexei Filippov <[email protected]>
jfs: validate max amount of blocks before allocation.
Zhihao Cheng <[email protected]>
ext4: fix unttached inode after power cut with orphan file feature enabled
Russell Currey <[email protected]>
powerpc/iommu: Fix notifiers being shared by PCI and VIO buses
Liang He <[email protected]>
powerpc/mpc5xxx: Add missing fwnode_handle_put()
Nicholas Piggin <[email protected]>
powerpc/pseries: Fix hcall tracepoints with JUMP_LABEL=n
Dan Carpenter <[email protected]>
nfs/blocklayout: Use the passed in gfp flags
Russell Currey <[email protected]>
powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT
Michael Ellerman <[email protected]>
powerpc: Don't include lppaca.h in paca.h
Anna Schumaker <[email protected]>
NFSv4.2: Rework scratch handling for READ_PLUS (again)
Anna Schumaker <[email protected]>
NFSv4.2: Fix READ_PLUS size calculations
Anna Schumaker <[email protected]>
NFSv4.2: Fix READ_PLUS smatch warnings
Ilpo Järvinen <[email protected]>
wifi: ath10k: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
wifi: ath12k: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
wifi: ath11k: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
net/mlx5: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
drm/radeon: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
drm/amdgpu: Use RMW accessors for changing LNKCTL
Daniel Golle <[email protected]>
pinctrl: mediatek: assign functions to configure pin bias on MT7986
Daniel Golle <[email protected]>
pinctrl: mediatek: fix pull_type data for MT7981
Christophe Leroy <[email protected]>
powerpc/perf: Convert fsl_emb notifier to state machine callbacks
Sourabh Jain <[email protected]>
powerpc/fadump: reset dump area size if fadump memory reserve fails
Konstantin Meskhidze <[email protected]>
nvdimm: Fix dereference after free in register_nvdimm_pmu()
Konstantin Meskhidze <[email protected]>
nvdimm: Fix memleak of pmu attr_groups in unregister_nvdimm_pmu()
Stefan Hajnoczi <[email protected]>
vfio/type1: fix cap_migration information leak
Christophe Leroy <[email protected]>
powerpc/radix: Move some functions into #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
Ahmad Fatoum <[email protected]>
clk: imx: composite-8m: fix clock pauses when set_rate would be a no-op
Marco Felsch <[email protected]>
clk: imx8mp: fix sai4 clock
Peng Fan <[email protected]>
clk: imx: imx8ulp: update SPLL2 type
Ye Li <[email protected]>
clk: imx: pllv4: Fix SPLL2 MULT range
Imran Shaik <[email protected]>
clk: qcom: gcc-qdu1000: Register gcc_gpll1_out_even clock
Imran Shaik <[email protected]>
dt-bindings: clock: Update GCC clocks for QDU1000 and QRU1000 SoCs
Imran Shaik <[email protected]>
clk: qcom: gcc-qdu1000: Fix clkref clocks handling
Imran Shaik <[email protected]>
clk: qcom: gcc-qdu1000: Fix gcc_pcie_0_pipe_clk_src clock handling
Konrad Dybcio <[email protected]>
clk: qcom: gcc-sm8450: Use floor ops for SDCC RCGs
Ilpo Järvinen <[email protected]>
PCI/ASPM: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
PCI: pciehp: Use RMW accessors for changing LNKCTL
Ilpo Järvinen <[email protected]>
PCI: Add locking to RMW PCI Express Capability Register accessors
Claudiu Beznea <[email protected]>
pinctrl: mcp23s08: check return value of devm_kasprintf()
Wu Zongyong <[email protected]>
PCI: Mark NVIDIA T4 GPUs to avoid bus reset
Daire McNamara <[email protected]>
PCI: microchip: Correct the DED and SEC interrupt bit offsets
Luca Weiss <[email protected]>
clk: qcom: gcc-sm6350: Fix gcc_sdcc2_apps_clk_src
Konrad Dybcio <[email protected]>
clk: qcom: reset: Use the correct type of sleep/delay based on length
Dmitry Torokhov <[email protected]>
kvm/vfio: ensure kvg instance stays around in kvm_vfio_group_add()
Yi Liu <[email protected]>
kvm/vfio: Prepare for accepting vfio device fd
Patrick Whewell <[email protected]>
clk: qcom: gcc-sm8250: Fix gcc_sdcc2_apps_clk_src
Kemeng Shi <[email protected]>
ext4: avoid potential data overflow in next_linear_group
Kemeng Shi <[email protected]>
ext4: correct grp validation in ext4_mb_good_group
Qiuxu Zhuo <[email protected]>
EDAC/igen6: Fix the issue of no error events
David Wronek <[email protected]>
clk: qcom: gcc-sc7180: Fix up gcc_sdcc2_apps_clk_src
Zhang Jianhua <[email protected]>
clk: sunxi-ng: Modify mismatched function name
Konrad Dybcio <[email protected]>
clk: qcom: dispcc-sc8280xp: Use ret registers on GDSCs
Ira Weiny <[email protected]>
PCI/DOE: Fix destroy_work_on_stack() race
Jason Gunthorpe <[email protected]>
iommufd: Fix locking around hwpt allocation
Qiuxu Zhuo <[email protected]>
EDAC/i10nm: Skip the absent memory controllers
Minjie Du <[email protected]>
drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()
Manivannan Sadhasivam <[email protected]>
PCI: qcom-ep: Switch MHI bus master clock off during L1SS
Sven Peter <[email protected]>
PCI: apple: Initialize pcie->nvecs before use
Alibek Omarov <[email protected]>
clk: rockchip: rk3568: Fix PLL rate setting for 78.75MHz
Danila Tikhonov <[email protected]>
clk: qcom: gcc-sm7150: Add CLK_OPS_PARENT_ENABLE to sdcc2 rcg
Konrad Dybcio <[email protected]>
clk: qcom: gcc-sc8280xp: Add missing GDSCs
Konrad Dybcio <[email protected]>
dt-bindings: clock: qcom,gcc-sc8280xp: Add missing GDSCs
Konrad Dybcio <[email protected]>
clk: qcom: gcc-sc8280xp: Add missing GDSC flags
Konrad Dybcio <[email protected]>
clk: qcom: gpucc-sm6350: Fix clock source names
Konrad Dybcio <[email protected]>
clk: qcom: gpucc-sm6350: Introduce index-based clk lookup
Corey Minyard <[email protected]>
ipmi:ssif: Fix a memory leak when scanning for an adapter
Jiasheng Jiang <[email protected]>
ipmi:ssif: Add check for kstrdup
Su Hui <[email protected]>
ALSA: ac97: Fix possible error value of *rac97
Geert Uytterhoeven <[email protected]>
of: unittest: Fix overlay type in apply/revert check
Geert Uytterhoeven <[email protected]>
of: overlay: Call of_changeset_init() early
Vijendar Mukunda <[email protected]>
ASoC: SOF: amd: clear dsp to host interrupt status
David Jeffery <[email protected]>
md: raid0: account for split bio in iostat accounting
Jan Kara <[email protected]>
md/raid0: Fix performance regression for large sequential writes
Jan Kara <[email protected]>
md/raid0: Factor out helper for mapping and submitting a bio
Xueshi Hu <[email protected]>
md/raid1: hold the barrier until handle_read_error() finishes
Xueshi Hu <[email protected]>
md/raid1: free the r1bio before waiting for blocked rdev
Tejun Heo <[email protected]>
blk-cgroup: Fix NULL deref caused by blkg_policy_data being installed before init
Vlad Karpovich <[email protected]>
firmware: cs_dsp: Fix new control name check
Yu Kuai <[email protected]>
md/raid5-cache: fix null-ptr-deref for r5l_flush_stripe_to_raid()
Yu Kuai <[email protected]>
md/raid5-cache: fix a deadlock in r5l_exit_log()
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix cast to enum warning
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sc8280xp-x13s: Unreserve NC pins
David Wronek <[email protected]>
arm64: dts: qcom: msm8996: Fix dsi1 interrupts
Rohit Agarwal <[email protected]>
ARM: dts: qcom: sdx65-mtp: Update the pmic used in sdx65
Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8998: Add missing power domain to MMSS SMMU
Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8998: Drop bus clock reference from MMSS SMMU
Bryan O'Donoghue <[email protected]>
arm64: dts: qcom: apq8016-sbc: Rename ov5640 enable-gpios to powerdown-gpios
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Define regulator constraints next to usage
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Disable audio codecs by default
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Fix regulator constraints
André Apitzsch <[email protected]>
arm64: dts: qcom: msm8916-longcheer-l8910: Add front flash LED
Bryan O'Donoghue <[email protected]>
arm64: dts: qcom: apq8016-sbc: Fix ov5640 regulator supply names
Jason-JH.Lin <[email protected]>
drm/mediatek: Fix void-pointer-to-enum-cast warning
Sui Jingfeng <[email protected]>
drm/mediatek: Fix potential memory leak if vmap() fail
Aradhya Bhatia <[email protected]>
arm64: dts: ti: k3-am62x-sk-common: Update main-i2c1 frequency
Robert Marko <[email protected]>
ARM: dts: qcom: ipq4019: correct SDHCI XO clock
Marco Felsch <[email protected]>
arm64: dts: imx8mp-debix: remove unused fec pinctrl node
Jason-JH.Lin <[email protected]>
drm/mediatek: Add cnt checking for coverity issue
Jason-JH.Lin <[email protected]>
drm/mediatek: Remove freeing not dynamic allocated memory
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix build warning for 64-bit build
Apelete Seketeli <[email protected]>
arm64: dts: ti: k3-j784s4: Fix interrupt ranges for wkup & main gpio
AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: dp: Add missing error checks in mtk_dp_parse_capabilities
Pavel Begunkov <[email protected]>
io_uring: fix drain stalls by invalid SQE
Zhiguo Niu <[email protected]>
block/mq-deadline: use correct way to throttling write requests
Gaosheng Cui <[email protected]>
audit: fix possible soft lockup in __audit_inode_child()
Nancy.Lin <[email protected]>
drm/mediatek: Fix uninitialized symbol
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: fix u16/32 confusion in LSDIID
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: hda-mlink: fix off-by-one error
Rob Clark <[email protected]>
drm/msm/a6xx: Fix GMU lockdep splat
Fabio Estevam <[email protected]>
drm/msm/a2xx: Call adreno_gpu_init() earlier
Yang Wang <[email protected]>
drm/amd/pm: fix variable dereferenced issue in amdgpu_device_attr_create()
Dan Carpenter <[email protected]>
smackfs: Prevent underflow in smk_set_cipso()
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done
Zhang Shurong <[email protected]>
firmware: meson_sm: fix to avoid potential NULL pointer dereference
Daniel Vetter <[email protected]>
drm/msm/mdp5: Don't leak some plane state
Chen Jiahao <[email protected]>
soc: qcom: smem: Fix incompatible types in comparison
Abel Vesa <[email protected]>
arm64: dts: qcom: sm8550-mtp: Add missing supply for L1B regulator
Jonathan Marek <[email protected]>
drm/msm/dpu: increase memtype count to 16 for sm8550
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: drop the regdma configuration
Jiasheng Jiang <[email protected]>
drm: xlnx: zynqmp_dpsub: Add missing check for dma_set_mask
Nayna Jain <[email protected]>
ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
Marek Vasut <[email protected]>
drm/panel: simple: Add missing connector type and pixel format for AUO T215HVN01
Geert Uytterhoeven <[email protected]>
drm/repaper: Reduce temporary buffer size in repaper_fb_dirty()
Geert Uytterhoeven <[email protected]>
drm/armada: Fix off-by-one error in armada_overlay_get_property()
Rafał Miłecki <[email protected]>
ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
Jocelyn Falempe <[email protected]>
drm/ast: report connection status on Display Port.
Zeyan Li <[email protected]>
arm64: dts: qcom: sm8150: Fix the I2C7 interrupt
Ruan Jinjie <[email protected]>
of: unittest: fix null pointer dereferencing in of_unittest_find_node_by_name()
Yangtao Li <[email protected]>
drm/tegra: dpaux: Fix incorrect return value of platform_get_irq
Ryan McCann <[email protected]>
drm/msm: Update dev core dump to not print backwards
Yu Kuai <[email protected]>
md/md-bitmap: hold 'reconfig_mutex' in backlog_store()
Yu Kuai <[email protected]>
md/md-bitmap: remove unnecessary local variable in backlog_store()
Li Nan <[email protected]>
md/raid10: use dereference_rdev_and_rrdev() to get devices
Li Nan <[email protected]>
md/raid10: factor out dereference_rdev_and_rrdev()
Yu Kuai <[email protected]>
md: restore 'noio_flag' for the last mddev_resume()
Herve Codina <[email protected]>
ASoC: fsl: fsl_qmc_audio: Fix snd_pcm_format_t values handling
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Enable SATA on Radxa E25
Jonas Karlman <[email protected]>
arm64: dts: rockchip: Fix PCIe regulators on Radxa E25
Srinivasan Shanmugam <[email protected]>
drm/amdgpu: Update min() to min_t() in 'amdgpu_info_ioctl'
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8996-gemini: fix touchscreen VIO supply
Manivannan Sadhasivam <[email protected]>
arm64: dts: qcom: sdm845: Fix the min frequency of "ice_core_clk"
Manivannan Sadhasivam <[email protected]>
arm64: dts: qcom: sdm845: Add missing RPMh power domain to GCC
Rafał Miłecki <[email protected]>
ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
Bogdan Togorean <[email protected]>
drm: adv7511: Fix low refresh rate register for ADV7533/5
Krzysztof Kozlowski <[email protected]>
ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split)
Krzysztof Kozlowski <[email protected]>
ARM: dts: s5pv210: add dummy 5V regulator for backlight on SMDKv210
Krzysztof Kozlowski <[email protected]>
ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split)
Chen-Yu Tsai <[email protected]>
drm/bridge: anx7625: Use common macros for HDCP capabilities
Chen-Yu Tsai <[email protected]>
drm/bridge: anx7625: Use common macros for DP power sequencing commands
Janusz Krzysztofik <[email protected]>
x86/mm: Fix PAT bit missing from page protection modify mask
Christoph Hellwig <[email protected]>
block: don't allow enabling a cache on devices that don't support it
Christoph Hellwig <[email protected]>
block: cleanup queue_wc_store
Lucas Stach <[email protected]>
drm/etnaviv: fix dumping of active MMU context
Diogo Ivo <[email protected]>
arm64: tegra: Fix HSUART for Smaug
Konrad Dybcio <[email protected]>
arm64: dts: qcom: pmi8994: Add missing OVP interrupt
Konrad Dybcio <[email protected]>
arm64: dts: qcom: pmi8950: Add missing OVP interrupt
Konrad Dybcio <[email protected]>
arm64: dts: qcom: pm660l: Add missing short interrupt
Konrad Dybcio <[email protected]>
arm64: dts: qcom: pm6150l: Add missing short interrupt
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: sm8250-sony-xperia: correct GPIO keys wakeup again
Jon Hunter <[email protected]>
arm64: tegra: Fix HSUART for Jetson AGX Orin
Rafał Miłecki <[email protected]>
ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
Rafał Miłecki <[email protected]>
ARM: dts: BCM53573: Add cells sizes to PCIe node
Rafał Miłecki <[email protected]>
ARM: dts: BCM53573: Drop nonexistent #usb-cells
Rafał Miłecki <[email protected]>
ARM: dts: BCM53573: Drop nonexistent "default-off" LED trigger
Arnd Bergmann <[email protected]>
drm/amdgpu: avoid integer overflow warning in amdgpu_device_resize_fb_bar()
Nishanth Menon <[email protected]>
firmware: ti_sci: Use system_state to determine polling
Marek Vasut <[email protected]>
ARM: dts: stm32: Add missing detach mailbox for DHCOR SoM
Marek Vasut <[email protected]>
ARM: dts: stm32: Add missing detach mailbox for DHCOM SoM
Marek Vasut <[email protected]>
ARM: dts: stm32: Update to generic ADC channel binding on DHSOM systems
Marek Vasut <[email protected]>
ARM: dts: stm32: Add missing detach mailbox for Odyssey SoM
Marek Vasut <[email protected]>
ARM: dts: stm32: Add missing detach mailbox for emtrion emSBC-Argon
Olivier Moysan <[email protected]>
ARM: dts: stm32: adopt generic iio bindings for adc channels on emstamp-argon
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8250: Mark PCIe hosts as DMA coherent
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8450-hdk: remove pmr735b PMIC inclusion
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: pmk8350: fix ADC-TM compatible string
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: pmr735b: fix thermal zone name
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: pm8350b: fix thermal zone name
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: pm8350: fix thermal zone name
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8350: Use proper CPU compatibles
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8350: Add missing LMH interrupts to cpufreq
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8350: Fix CPU idle state residency times
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sdm845-tama: Set serial indices and stdout-path
Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sc8280xp: Add missing SCM interconnect
Bjorn Andersson <[email protected]>
arm64: dts: qcom: sc8280xp-crd: Correct vreg_misc_3p3 GPIO
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8250-edo: Rectify gpio-keys
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8250-edo: Add GPIO line names for PMIC GPIOs
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm8250-edo: Add gpio line names for TLMM
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8916-l8150: correct light sensor VDDIO supply
Vincent Guittot <[email protected]>
arm64: dts: qcom: sm8250: correct dynamic power coefficients
Konrad Dybcio <[email protected]>
arm64: dts: qcom: sm6350: Fix ZAP region
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sm8150: use proper DSI PHY compatible
Dmitry Baryshkov <[email protected]>
arm64: defconfig: enable Qualcomm MSM8996 Global Clock Controller as built-in
Luca Weiss <[email protected]>
soc: qcom: ocmem: Fix NUM_PORTS & NUM_MACROS macros
Luca Weiss <[email protected]>
soc: qcom: ocmem: Add OCMEM hardware version print
Randy Dunlap <[email protected]>
ASoC: stac9766: fix build errors with REGMAP_AC97
Sui Jingfeng <[email protected]>
drm/hyperv: Fix a compilation issue because of not including screen_info.h
Wesley Chalmers <[email protected]>
drm/amd/display: Do not set drr on pipe commit
Baokun Li <[email protected]>
quota: fix dqput() to follow the guarantees dquot_srcu should provide
Baokun Li <[email protected]>
quota: add new helper dquot_active()
Baokun Li <[email protected]>
quota: rename dquot_active() to inode_quota_active()
Baokun Li <[email protected]>
quota: factor out dquot_write_dquot()
Ondrej Jirman <[email protected]>
drm: bridge: dw-mipi-dsi: Fix enable/disable of DSI controller
Phil Elwell <[email protected]>
ASoC: cs43130: Fix numerator/denominator mixup
yixuanjiang <[email protected]>
ASoC: soc-compress: Fix deadlock in soc_compr_open_fe
Marek Vasut <[email protected]>
drm/bridge: tc358764: Fix debug print parameter order
Kuniyuki Iwashima <[email protected]>
netrom: Deny concurrent connect().
Shannon Nelson <[email protected]>
pds_core: pass opcode to devcmd_wait
Shannon Nelson <[email protected]>
pds_core: check for work queue before use
Shannon Nelson <[email protected]>
pds_core: no reset command for VF
Shannon Nelson <[email protected]>
pds_core: no health reporter in VF
Shannon Nelson <[email protected]>
pds_core: protect devlink callbacks from fw_down state
Budimir Markovic <[email protected]>
net/sched: sch_hfsc: Ensure inner classes have fsc curve
Alex Austin <[email protected]>
sfc: Check firmware supports Ethernet PTP filter
Suman Ghosh <[email protected]>
cteonxt2-pf: Fix backpressure config for multiple PFC priorities to work simultaneously
Hariprasad Kelam <[email protected]>
octeontx2-af: CN10KB: fix PFC configuration
Suman Ghosh <[email protected]>
octeontx2-pf: Fix PFC TX scheduler free
Hariprasad Kelam <[email protected]>
octeontx2-pf: Refactor schedular queue alloc/free calls
Biju Das <[email protected]>
hwmon: (tmp513) Fix the channel number in tmp51x_is_visible()
Vadim Pasternak <[email protected]>
mlxsw: core_hwmon: Adjust module label names based on MTCAP sensor counter
Vadim Pasternak <[email protected]>
mlxsw: i2c: Limit single transaction buffer size
Vadim Pasternak <[email protected]>
mlxsw: i2c: Fix chunk size setting in output mailbox buffer
Jinjie Ruan <[email protected]>
net: arcnet: Do not call kfree_skb() under local_irq_disable()
Jacob Keller <[email protected]>
ice: avoid executing commands on other ports when driving sync
Wang Ming <[email protected]>
wifi: ath9k: use IS_ERR() with debugfs_create_dir()
Rahul Rameshbabu <[email protected]>
net/mlx5: Dynamic cyclecounter shift calculation for PTP free running clock
Qi Zheng <[email protected]>
arm64: mm: use ptep_clear() instead of pte_clear() in clear_flush()
Jinjie Ruan <[email protected]>
Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave()
Pauli Virtanen <[email protected]>
Bluetooth: hci_conn: fail SCO/ISO via hci_conn_failed if ACL gone early
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix UAF on hci_abort_conn_sync
Iulia Tanasescu <[email protected]>
Bluetooth: ISO: Notify user space about failed bis connections
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_conn: Consolidate code for aborting connections
Dmitry Antipov <[email protected]>
wifi: mwifiex: avoid possible NULL skb pointer dereference
Kumar Kartikeya Dwivedi <[email protected]>
bpf: Fix check_func_arg_reg_off bug for graph root/node
Arnd Bergmann <[email protected]>
mac80211: make ieee80211_tx_info padding explicit
Lin Ma <[email protected]>
wifi: nl80211/cfg80211: add forgotten nla_policy for BSS color attribute
Johannes Berg <[email protected]>
wifi: mac80211: fix puncturing bitmap handling in CSA
Yonghong Song <[email protected]>
bpf: Fix a bpf_kptr_xchg() issue with local kptr
Fedor Pchelkin <[email protected]>
wifi: ath9k: protect WMI command response buffer replacement with a lock
Fedor Pchelkin <[email protected]>
wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx
Daniel T. Lee <[email protected]>
samples/bpf: fix broken map lookup probe
Daniel T. Lee <[email protected]>
samples/bpf: fix bio latency check with tracepoint
Rob Herring <[email protected]>
ARM: dts: Add .dts files missing from the build
Aleksa Sarai <[email protected]>
selftests: memfd: error out test process when child test fails
Ping-Ke Shih <[email protected]>
wifi: rtw89: 8852b: rfk: fine tune IQK parameters to improve performance on 2GHz band
Polaris Pi <[email protected]>
wifi: mwifiex: Fix missed return in oob checks failed path
Dmitry Antipov <[email protected]>
wifi: mwifiex: fix memory leak in mwifiex_histogram_read()
Eric Dumazet <[email protected]>
net: annotate data-races around sk->sk_lingertime
Ruan Jinjie <[email protected]>
net: lan966x: Fix return value check for vcap_get_rule()
Artem Chernyshev <[email protected]>
fs: ocfs2: namei: check return value of ocfs2_add_entry()
Kuan-Ying Lee <[email protected]>
scripts/gdb: fix 'lx-lsmod' show the wrong size
Yan Zhai <[email protected]>
lwt: Check LWTUNNEL_XMIT_CONTINUE strictly
Yan Zhai <[email protected]>
lwt: Fix return values of BPF xmit ops
Florian Fainelli <[email protected]>
hwrng: iproc-rng200 - Implement suspend and resume calls
Gaurav Jain <[email protected]>
crypto: caam - fix unchecked return value error
Przemek Kitszel <[email protected]>
ice: ice_aq_check_events: fix off-by-one check when filling buffer
Abel Wu <[email protected]>
net-memcg: Fix scope of sockmem pressure indicators
Jijie Shao <[email protected]>
net: hns3: fix wrong rpu tln reg issue
Jijie Shao <[email protected]>
net: hns3: Support tlv in regs data for HNS3 PF driver
Jijie Shao <[email protected]>
net: hns3: move dump regs function to a separate file
Lorenz Bauer <[email protected]>
net: Fix slab-out-of-bounds in inet[6]_steal_sock
Alexander Danilenko <[email protected]>
spi: tegra114: Remove unnecessary NULL-pointer checks
Yipeng Zou <[email protected]>
selftests/bpf: Clean up fmod_ret in bench_rename test script
Yipeng Zou <[email protected]>
selftests/bpf: Fix repeat option when kfunc_call verification fails
Menglong Dong <[email protected]>
net: tcp: fix unexcepted socket die when snd_wnd is 0
Pauli Virtanen <[email protected]>
Bluetooth: hci_event: drop only unbound CIS if Set CIG Parameters fails
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_conn: Always allocate unique handles
Manish Mandlik <[email protected]>
Bluetooth: hci_sync: Avoid use-after-free in dbg for hci_add_adv_monitor()
Douglas Anderson <[email protected]>
Bluetooth: hci_sync: Don't double print name in add/remove adv_monitor
Min Li <[email protected]>
Bluetooth: Fix potential use-after-free when clear keys
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_conn: Fix hci_le_set_cig_params
Jiapeng Chong <[email protected]>
Bluetooth: hci_conn: Use kmemdup() to replace kzalloc + memcpy
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_conn: Fix not allowing valid CIS ID
Luiz Augusto von Dentz <[email protected]>
Bluetooth: ISO: Fix not checking for valid CIG/CIS IDs
Yuanjun Gong <[email protected]>
Bluetooth: nokia: fix value check in nokia_bluetooth_serdev_probe()
Pauli Virtanen <[email protected]>
Bluetooth: ISO: do not emit new LE Create CIS if previous is pending
Iulia Tanasescu <[email protected]>
Bluetooth: ISO: Add support for connecting multiple BISes
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_event: Fix parsing of CIS Established Event
Herbert Xu <[email protected]>
crypto: api - Use work queue in crypto_destroy_instance
Uwe Kleine-König <[email protected]>
crypto: stm32 - Properly handle pm_runtime_get failing
Miguel Ojeda <[email protected]>
kbuild: rust_is_available: fix confusion when a version appears in the path
Miguel Ojeda <[email protected]>
kbuild: rust_is_available: add check for bindgen invocation
Russell Currey <[email protected]>
kbuild: rust_is_available: fix version check when CC has multiple arguments
Masahiro Yamada <[email protected]>
kbuild: rust_is_available: remove -v option
Kui-Feng Lee <[email protected]>
bpf: fix bpf_dynptr_slice() to stop return an ERR_PTR.
Li Zetao <[email protected]>
spi: mpc5xxx-psc: Fix unsigned expression compared with zero
Alan Maguire <[email protected]>
selftests/bpf: fix static assert compilation issue for test_cls_*.c
Arnd Bergmann <[email protected]>
wifi: ath12k: fix memcpy array overflow in ath12k_peer_assoc_h_he()
Aditya Kumar Singh <[email protected]>
wifi: ath11k: fix band selection for ppdu received in channel 177 of 5 GHz
Dmitry Antipov <[email protected]>
wifi: mwifiex: fix error recovery in PCIE buffer descriptor management
Polaris Pi <[email protected]>
wifi: mwifiex: Fix OOB and integer underflow when rx packets
Larry Finger <[email protected]>
wifi: rtw89: Fix loading of compressed firmware
Ryder Lee <[email protected]>
wifi: mt76: mt7915: fix power-limits while chan_switch
Ryder Lee <[email protected]>
wifi: mt76: mt7915: fix tlv length of mt7915_mcu_get_chan_mib_info
Markus Schneider-Pargmann <[email protected]>
can: tcan4x5x: Remove reserved register 0x814 from writable table
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM
Zhang Shurong <[email protected]>
spi: tegra20-sflash: fix to check return value of platform_get_irq() in tegra_sflash_probe()
Lin Ma <[email protected]>
wifi: mt76: testmode: add nla_policy for MT76_TM_ATTR_TX_LENGTH
Felix Fietkau <[email protected]>
wifi: mt76: mt7915: remove VHT160 capability on MT7915
Felix Fietkau <[email protected]>
wifi: mt76: mt7915: fix capabilities in non-AP mode
Rany Hany <[email protected]>
wifi: mt76: mt7915: fix command timeout in AP stop period
Lorenz Bauer <[email protected]>
bpf, net: Support SO_REUSEPORT sockets with bpf_sk_assign
Lorenz Bauer <[email protected]>
net: remove duplicate reuseport_lookup functions
Lorenz Bauer <[email protected]>
net: export inet_lookup_reuseport and inet6_lookup_reuseport
Lorenz Bauer <[email protected]>
bpf: reject unhashed sockets in bpf_sk_assign
Lorenz Bauer <[email protected]>
udp: re-score reuseport groups when connected sockets are present
StanleyYP Wang <[email protected]>
wifi: mt76: mt7996: fix WA event ring size
StanleyYP Wang <[email protected]>
wifi: mt76: mt7996: use correct phy for background radar event
Peter Chiu <[email protected]>
wifi: mt76: mt7996: fix bss wlan_idx when sending bss_info command
Ming Yen Hsieh <[email protected]>
wifi: mt76: mt7921: fix non-PSC channel scan fail
Peter Chiu <[email protected]>
wifi: mt76: mt7915: rework tx bytes counting when WED is active
Peter Chiu <[email protected]>
wifi: mt76: mt7915: rework tx packets counting when WED is active
StanleyYP Wang <[email protected]>
wifi: mt76: mt7915: fix background radar event being blocked
Ryder Lee <[email protected]>
wifi: mt76: mt7996: fix header translation logic
Zhang Shurong <[email protected]>
wifi: rtw89: debug: Fix error handling in rtw89_debug_priv_btc_manual_set()
Dan Carpenter <[email protected]>
regmap: rbtree: Use alloc_flags for memory allocations
Guenter Roeck <[email protected]>
regmap: maple: Use alloc_flags for memory allocations
Mark Brown <[email protected]>
regmap: Load register defaults in blocks rather than register by register
Martin Kaiser <[email protected]>
hwrng: pic32 - use devm_clk_get_enabled
Martin Kaiser <[email protected]>
hwrng: nomadik - keep clock enabled while hwrng is registered
Eric Dumazet <[email protected]>
tcp: tcp_enter_quickack_mode() should be static
Giovanni Cabiddu <[email protected]>
crypto: qat - change value of default idle filter
Yafang Shao <[email protected]>
bpf: Fix an error in verifying a field in a union
Yafang Shao <[email protected]>
bpf: Fix an error around PTR_UNTRUSTED
Yafang Shao <[email protected]>
bpf: Clear the probe_addr for uprobe
Andrii Nakryiko <[email protected]>
libbpf: Fix realloc API handling in zero-sized edge cases
Alexander Lobakin <[email protected]>
bpftool: Use a local bpf_perf_event_value to fix accessing its fields
Quentin Monnet <[email protected]>
bpftool: Use a local copy of BPF_LINK_TYPE_PERF_EVENT in pid_iter.bpf.c
Alexander Lobakin <[email protected]>
bpftool: Define a local bpf_perf_link to fix accessing its fields
Alexander Lobakin <[email protected]>
bpftool: use a local copy of perf_event to fix accessing :: Bpf_cookie
Andrii Nakryiko <[email protected]>
libbpf: only reset sec_def handler when necessary
Daniel Borkmann <[email protected]>
selftests/bpf: Fix bpf_nf failure upon test rerun
Sumit Gupta <[email protected]>
cpufreq: tegra194: remove opp table in exit hook
Sumit Gupta <[email protected]>
cpufreq: tegra194: add online/offline hooks
Liao Chang <[email protected]>
cpufreq: powernow-k8: Use related_cpus instead of cpus in driver.exit()
Mikel Rychliski <[email protected]>
x86/efistub: Fix PCI ROM preservation in mixed mode
Swapnil Sapkal <[email protected]>
cpufreq: amd-pstate-ut: Fix kernel panic when loading the driver
Swapnil Sapkal <[email protected]>
cpufreq: amd-pstate-ut: Remove module parameter access
Peng Fan <[email protected]>
thermal/of: Fix potential uninitialized value access
Mario Limonciello <[email protected]>
ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table
Mario Limonciello <[email protected]>
ACPI: x86: s2idle: Post-increment variables when getting constraints
Bibo Mao <[email protected]>
irqchip/loongson-eiointc: Fix return value checking of eiointc_index
Holger Dengler <[email protected]>
s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs
Holger Dengler <[email protected]>
s390/pkey: fix PKEY_TYPE_EP11_AES handling for sysfs attributes
Holger Dengler <[email protected]>
s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_GENSECK2 IOCTL
Holger Dengler <[email protected]>
s390/pkey: fix/harmonize internal keyblob headers
Nysal Jan K.A <[email protected]>
selftests/futex: Order calls to futex_lock_pi
Xu Yang <[email protected]>
perf/imx_ddr: don't enable counter0 if none of 4 counters are used
Cyril Hrubis <[email protected]>
sched/rt: Fix sysctl_sched_rr_timeslice intial value
Mark Brown <[email protected]>
arm64/fpsimd: Only provide the length to cpufeature for xCR registers
Ard Biesheuvel <[email protected]>
x86/decompressor: Don't rely on upper 32 bits of GPRs being preserved
Rafael J. Wysocki <[email protected]>
cpuidle: teo: Update idle duration estimate when choosing shallower state
Randy Dunlap <[email protected]>
sched/psi: Select KERNFS as needed
Christophe JAILLET <[email protected]>
arm64/ptrace: Clean up error handling path in sve_set_common()
Ilpo Järvinen <[email protected]>
selftests/resctrl: Close perf value read fd on errors
Ilpo Järvinen <[email protected]>
selftests/resctrl: Unmount resctrl FS if child fails to run benchmark
Ilpo Järvinen <[email protected]>
selftests/resctrl: Don't leak buffer in fill_cache()
Ilpo Järvinen <[email protected]>
selftests/resctrl: Add resctrl.h into build deps
Manivannan Sadhasivam <[email protected]>
OPP: Fix passing 0 to PTR_ERR in _opp_attach_genpd()
Cristian Marussi <[email protected]>
powercap: arm_scmi: Remove recursion while parsing zones
Paul E. McKenney <[email protected]>
clocksource: Handle negative skews in "skew is too large" messages
Waiman Long <[email protected]>
refscale: Fix uninitalized use of wait_queue_head_t
Uros Bizjak <[email protected]>
locking/arch: Avoid variable shadowing in local_try_cmpxchg()
Kees Cook <[email protected]>
ARM: ptrace: Restore syscall skipping for tracers
Kees Cook <[email protected]>
ARM: ptrace: Restore syscall restart tracing
David Howells <[email protected]>
vfs, security: Fix automount superblock LSM init problem, preventing NFS sb sharing
Kees Cook <[email protected]>
selftests/harness: Actually report SKIP for signal tests
Christian Brauner <[email protected]>
tmpfs: verify {g,u}id mount options correctly
Matthew Wilcox (Oracle) <[email protected]>
iomap: Remove large folio handling in iomap_invalidate_folio()
Wang Ming <[email protected]>
fs: Fix error checking for d_hash_and_lookup()
Wen Yang <[email protected]>
eventfd: prevent underflow for eventfd semaphores
Ahelenia Ziemiańska <[email protected]>
splice: fsnotify_access(in), fsnotify_modify(out) on success in tee
Ahelenia Ziemiańska <[email protected]>
splice: fsnotify_access(fd)/fsnotify_modify(fd) in vmsplice
Ahelenia Ziemiańska <[email protected]>
splice: always fsnotify_access(in), fsnotify_modify(out) on success
Matthew Wilcox <[email protected]>
reiserfs: Check the return value from __getblk()
Sabrina Dubroca <[email protected]>
Revert "net: macsec: preserve ingress frame ordering"
Vidya Sagar <[email protected]>
Revert "PCI: tegra194: Enable support for 256 Byte payload"
Miklos Szeredi <[email protected]>
Revert "fuse: in fuse_flush only wait if someone wants the return code"
Werner Sembach <[email protected]>
Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
Hamza Mahfooz <[email protected]>
drm/amd/display: ensure async flips are only accepted for fast updates
Max Chou <[email protected]>
Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C
Jordan Rife <[email protected]>
net: Avoid address overwrite in kernel_connect
Sean Christopherson <[email protected]>
KVM: x86/mmu: Add "never" option to allow sticky disabling of nx_huge_pages
Jarkko Sakkinen <[email protected]>
tpm: Enable hwrng only for Pluton on AMD CPUs
Doug Smythies <[email protected]>
cpufreq: intel_pstate: set stale CPU frequency to minimum
David Jeffery <[email protected]>
sbitmap: fix batching wakeup
Shih-Yi Chen <[email protected]>
platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications
Zheng Yejian <[email protected]>
tracing: Introduce pipe_cpumask to avoid race on trace_pipes
Josua Mayer <[email protected]>
net: sfp: handle 100G/25G active optical cables in sfp_parse_support
Simon Trimmer <[email protected]>
ASoC: cs35l56: Add an ACPI match table
Lijo Lazar <[email protected]>
drm/amd/pm: Fix temperature unit of SMU v13.0.6
Bartosz Golaszewski <[email protected]>
gpiolib: fix reference leaks when removing GPIO chips still in use
Artem Chernyshev <[email protected]>
broadcom: b44: Use b44_writephy() return value
Zhu Wang <[email protected]>
fbdev: goldfishfb: Do not check 0 for platform_get_irq()
Carlos Song <[email protected]>
i2c: imx-lpi2c: return -EINVAL when i2c peripheral clk doesn't work
Shuming Fan <[email protected]>
ASoC: rt1308-sdw: fix random louder sound
Lin Yujun <[email protected]>
ARM: dts: integrator: fix PCI bus dtc warnings
Stefan Binding <[email protected]>
ALSA: hda/cs8409: Support new Dell Dolphin Variants
David Hildenbrand <[email protected]>
virtio-mem: check if the config changed before fake offlining memory
David Hildenbrand <[email protected]>
virtio-mem: keep retrying on offline_and_remove_memory() errors in Sub Block Mode (SBM)
David Hildenbrand <[email protected]>
virtio-mem: convert most offline_and_remove_memory() errors to -EBUSY
David Hildenbrand <[email protected]>
virtio-mem: remove unsafe unplug in Big Block Mode (BBM)
Dragos Tatulea <[email protected]>
vdpa/mlx5: Correct default number of queues when MQ is on
Mike Christie <[email protected]>
vhost-scsi: Fix alignment handling with windows
Krzysztof Kozlowski <[email protected]>
arm64: dts: rockchip: correct wifi interrupt flag in Box Demo
Krzysztof Kozlowski <[email protected]>
arm64: dts: rockchip: correct wifi interrupt flag in Rock Pi 4B
Krzysztof Kozlowski <[email protected]>
arm64: dts: rockchip: correct wifi interrupt flag in eaidk-610
Lijo Lazar <[email protected]>
drm/amdgpu: Match against exact bootloader status
Wen Gong <[email protected]>
wifi: ath12k: Fix buffer overflow when scanning with extraie
Jian Shen <[email protected]>
net: hns3: restore user pause configure when disable autoneg
Chengfeng Ye <[email protected]>
scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock
Justin Tee <[email protected]>
scsi: lpfc: Remove reftag check in DIF paths
Yang Li <[email protected]>
platform/x86/amd/pmf: Fix unsigned comparison with less than zero
Baoquan He <[email protected]>
idmaengine: make FSL_EDMA and INTEL_IDMA64 depends on HAS_IOMEM
Saurabh Sengar <[email protected]>
x86/hyperv: add noop functions to x86_init mpparse functions
Benjamin Gray <[email protected]>
powerpc/powermac: Use early_* IO variants in via_calibrate_decr()
Hans de Goede <[email protected]>
wifi: brcmfmac: Fix field-spanning write in brcmf_scan_params_v2_to_v1()
Martin Kohn <[email protected]>
net: usb: qmi_wwan: add Quectel EM05GV2
Eric Dumazet <[email protected]>
net: annotate data-races around sk->sk_{rcv|snd}timeoLukasz Majewski <[email protected]>
net: dsa: microchip: KSZ9477 register regmap alignment to 32 bit boundaries
Kalle Valo <[email protected]>
Revert "wifi: ath6k: silence false positive -Wno-dangling-pointer warning on GCC 12"
Ani Sinha <[email protected]>
vmbus_testing: fix wrong python syntax for integer value comparison
Baoquan He <[email protected]>
clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM
Masami Hiramatsu (Google) <[email protected]>
kprobes: Prohibit probing on CFI preamble symbol
Christian Göttsche <[email protected]>
security: keys: perform capable check only on privileged operations
Zhihong Dong <[email protected]>
LoongArch: Fix CMDLINE_EXTEND and CMDLINE_BOOTLOADER handling
Huacai Chen <[email protected]>
LoongArch: Only fiddle with CHECKFLAGS if `need-compiler'
Raphael Gallais-Pou <[email protected]>
staging: fbtft: ili9341: use macro FBTFT_REGISTER_SPI_DRIVER
Jussi Laako <[email protected]>
ALSA: usb-audio: Update for native DSD support quirks
Minjie Du <[email protected]>
ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer()
Eric Snowberg <[email protected]>
ovl: Always reevaluate the file signature for IMA
Leo Chen <[email protected]>
drm/amd/display: Exit idle optimizations before attempt to access PHY
George Shen <[email protected]>
drm/amd/display: Guard DCN31 PHYD32CLK logic against chip family
Jane Jian <[email protected]>
drm/amd/smu: use AverageGfxclkFrequency* to replace previous GFX Curr Clock
Konstantin Shelekhin <[email protected]>
platform/x86: huawei-wmi: Silence ambient light sensor
Kristian Angelov <[email protected]>
platform/x86: asus-wmi: Fix setting RGB mode on some TUF laptops
Wang Ming <[email protected]>
platform/x86: think-lmi: Use kfree_sensitive instead of kfree
Maxim Mikityanskiy <[email protected]>
platform/x86/intel/hid: Add HP Dragonfly G2 to VGBS DMI quirks
Hans de Goede <[email protected]>
platform/x86: intel: hid: Always call BTNL ACPI method
Takashi Iwai <[email protected]>
ALSA: usb-audio: Add quirk for Microsoft Modern Wireless Headset
Guiting Shen <[email protected]>
ASoC: atmel: Fix the 8K sample parameter in I2SC master
Shuming Fan <[email protected]>
ASoC: rt711-sdca: fix for JD event handling in ClockStop Mode0
Shuming Fan <[email protected]>
ASoC: rt711: fix for JD event handling in ClockStop Mode0
Shuming Fan <[email protected]>
ASoC: rt712-sdca: fix for JD event handling in ClockStop Mode0
Edgar <[email protected]>
ASoc: codecs: ES8316: Fix DMIC config
Shuming Fan <[email protected]>
ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0
Winston Wen <[email protected]>
cifs: fix charset issue in reconnection
Winston Wen <[email protected]>
fs/nls: make load_nls() take a const parameter
Stefan Haberland <[email protected]>
s390/dasd: fix hanging device after request requeue
Stefan Haberland <[email protected]>
s390/dasd: use correct number of retries for ERP requests
Ben Hutchings <[email protected]>
m68k: Fix invalid .section syntax
Yuanjun Gong <[email protected]>
ethernet: atheros: fix return value check in atl1c_tso_csum()
Hao Lan <[email protected]>
net: hns3: add tm flush when setting tm
Ahmad Fatoum <[email protected]>
thermal: core: constify params in thermal_zone_device_register
Edson Juliano Drosdeck <[email protected]>
ASoC: nau8821: Add DMI quirk mechanism for active-high jack-detect
Dmytro Maluka <[email protected]>
ASoC: da7219: Check for failure reading AAD IRQ events
Dmytro Maluka <[email protected]>
ASoC: da7219: Flush pending AAD IRQ when suspending
Namjae Jeon <[email protected]>
ksmbd: fix out of bounds in init_smb2_rsp_hdr()
Namjae Jeon <[email protected]>
ksmbd: no response from compound read
Namjae Jeon <[email protected]>
ksmbd: validate session id and tree id in compound request
Namjae Jeon <[email protected]>
ksmbd: fix out of bounds in smb3_decrypt_req()
Dominique Martinet <[email protected]>
9p: virtio: make sure 'offs' is initialized in zc_request
Dominique Martinet <[email protected]>
9p: virtio: fix unlikely null pointer deref in handle_rerror
Nikolay Burykin <[email protected]>
media: pci: cx23885: fix error handling for cx23885 ATSC boards
Dmitry Antipov <[email protected]>
media: pulse8-cec: handle possible ping error
Ming Qian <[email protected]>
media: imx-jpeg: Support to assign slot for encoder/decoder
Alexander Stein <[email protected]>
media: amphion: use dev_err_probe
Adrien Thierry <[email protected]>
phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code
Wang Ming <[email protected]>
ksmbd: Fix unsigned expression compared with zero
Daniel Miess <[email protected]>
Partially revert "drm/amd/display: Fix possible underflow for displays with large vblank"
Kuniyuki Iwashima <[email protected]>
Revert "bridge: Add extack warning when enabling STP in netns."
-------------
Diffstat:
.../ABI/testing/sysfs-bus-fsi-devices-sbefifo | 6 +-
.../ABI/testing/sysfs-driver-chromeos-acpi | 2 +-
Documentation/ABI/testing/sysfs-fs-f2fs | 8 +-
.../bindings/clock/qcom,qdu1000-gcc.yaml | 3 +-
.../devicetree/bindings/extcon/maxim,max77843.yaml | 1 +
.../bindings/regulator/qcom,rpm-regulator.yaml | 2 +-
Documentation/scsi/scsi_mid_low_api.rst | 4 +-
.../media/v4l/vidioc-subdev-g-routing.rst | 7 +-
Makefile | 8 +-
arch/arm/boot/dts/Makefile | 8 +
arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 14 +-
arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 15 +-
arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 4 +-
arch/arm/boot/dts/bcm53573.dtsi | 5 +-
arch/arm/boot/dts/bcm947189acdbmr.dts | 6 +-
arch/arm/boot/dts/integratorap.dts | 2 +-
arch/arm/boot/dts/qcom-ipq4019.dtsi | 9 +-
arch/arm/boot/dts/qcom-sdx65-mtp.dts | 2 +-
arch/arm/boot/dts/s3c6410-mini6410.dts | 2 +-
arch/arm/boot/dts/s5pv210-smdkv210.dts | 10 +-
arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 10 +-
arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 4 +-
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 22 +-
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 38 +-
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 4 +-
arch/arm/include/asm/syscall.h | 3 +
arch/arm/kernel/entry-common.S | 1 +
arch/arm/kernel/ptrace.c | 5 +-
arch/arm/mach-omap2/powerdomain.c | 2 +-
.../boot/dts/freescale/imx8mp-debix-model-a.dts | 22 -
arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 1 +
.../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 +
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 188 ++----
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 129 +---
.../boot/dts/qcom/msm8916-alcatel-idol347.dts | 134 +----
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 130 +---
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 130 +---
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 159 ++---
.../boot/dts/qcom/msm8916-longcheer-l8150.dts | 132 +---
.../boot/dts/qcom/msm8916-longcheer-l8910.dts | 144 ++---
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 102 +++-
.../dts/qcom/msm8916-samsung-a2015-common.dtsi | 150 +----
.../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 12 +-
.../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 +-
.../dts/qcom/msm8916-samsung-e2015-common.dtsi | 6 +-
.../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +-
.../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 124 +---
arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 12 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 8 +-
.../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 119 +---
.../boot/dts/qcom/msm8916-samsung-serranove.dts | 145 +----
arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 8 +-
arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 10 +-
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 105 +---
.../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 135 +----
.../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts | 8 +-
arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 +-
arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8996.dtsi | 5 +-
arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 +-
arch/arm64/boot/dts/qcom/pm6150l.dtsi | 5 +-
arch/arm64/boot/dts/qcom/pm660l.dtsi | 5 +-
arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +-
arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +-
arch/arm64/boot/dts/qcom/pm8916.dtsi | 1 +
arch/arm64/boot/dts/qcom/pmi8950.dtsi | 5 +-
arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +-
arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +-
arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 4 +-
.../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +-
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 +
.../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 9 +
arch/arm64/boot/dts/qcom/sdm845.dtsi | 3 +-
arch/arm64/boot/dts/qcom/sm6350.dtsi | 10 +-
arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +-
.../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 233 +++++++
.../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 243 ++++++++
.../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 54 +-
arch/arm64/boot/dts/qcom/sm8250.dtsi | 11 +-
arch/arm64/boot/dts/qcom/sm8350.dtsi | 31 +-
arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 1 -
arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 +
arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 2 +-
.../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +-
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 2 +-
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 24 +-
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 2 +-
arch/arm64/configs/defconfig | 2 +-
arch/arm64/include/asm/sdei.h | 6 +
arch/arm64/kernel/entry.S | 27 +-
arch/arm64/kernel/fpsimd.c | 22 +-
arch/arm64/kernel/ptrace.c | 3 +-
arch/arm64/kernel/sdei.c | 3 +
arch/arm64/kernel/smp.c | 8 +-
arch/arm64/lib/csum.c | 2 +-
arch/arm64/mm/hugetlbpage.c | 2 +-
arch/loongarch/Makefile | 2 +-
arch/loongarch/include/asm/fpu.h | 22 +-
arch/loongarch/include/asm/local.h | 4 +-
arch/loongarch/include/asm/pgtable.h | 3 +
arch/loongarch/kernel/ptrace.c | 2 +
arch/loongarch/kernel/setup.c | 16 +
arch/m68k/fpsp040/skeleton.S | 4 +-
arch/m68k/ifpsp060/os.S | 4 +-
arch/m68k/kernel/relocate_kernel.S | 4 +-
arch/mips/include/asm/local.h | 4 +-
arch/parisc/kernel/processor.c | 13 +-
arch/powerpc/include/asm/ftrace.h | 2 +-
arch/powerpc/include/asm/lppaca.h | 13 +-
arch/powerpc/include/asm/paca.h | 6 +-
arch/powerpc/include/asm/paravirt.h | 1 +
arch/powerpc/include/asm/plpar_wrappers.h | 1 +
arch/powerpc/kernel/fadump.c | 1 +
arch/powerpc/kernel/iommu.c | 17 +-
arch/powerpc/kvm/book3s_hv_ras.c | 1 +
arch/powerpc/mm/book3s64/radix_tlb.c | 240 ++++----
arch/powerpc/mm/book3s64/slb.c | 1 +
arch/powerpc/perf/core-fsl-emb.c | 8 +-
arch/powerpc/platforms/powermac/time.c | 6 +-
arch/powerpc/platforms/pseries/hvCall.S | 1 +
arch/powerpc/platforms/pseries/lpar.c | 10 +-
arch/powerpc/platforms/pseries/lparcfg.c | 4 +-
arch/powerpc/platforms/pseries/setup.c | 2 +-
arch/powerpc/sysdev/mpc5xxx_clocks.c | 4 +-
arch/powerpc/xmon/xmon.c | 1 +
arch/riscv/mm/kasan_init.c | 8 +-
arch/s390/crypto/paes_s390.c | 2 +-
arch/s390/include/uapi/asm/pkey.h | 2 +-
arch/s390/kernel/ipl.c | 2 +
arch/um/configs/i386_defconfig | 1 +
arch/um/configs/x86_64_defconfig | 1 +
arch/um/drivers/Kconfig | 16 +-
arch/um/drivers/Makefile | 2 +-
arch/um/drivers/virt-pci.c | 2 +
arch/x86/boot/compressed/head_64.S | 30 +-
arch/x86/events/intel/uncore_snbep.c | 12 +-
arch/x86/hyperv/hv_vtl.c | 4 +
arch/x86/include/asm/local.h | 4 +-
arch/x86/include/asm/mem_encrypt.h | 6 +-
arch/x86/include/asm/pgtable_types.h | 11 +-
arch/x86/kernel/apm_32.c | 6 -
arch/x86/kernel/cpu/common.c | 8 +-
arch/x86/kernel/cpu/mce/core.c | 26 +
arch/x86/kernel/cpu/mce/internal.h | 5 +-
arch/x86/kernel/cpu/sgx/virt.c | 3 +
arch/x86/kernel/kvm.c | 4 +-
arch/x86/kernel/vmlinux.lds.S | 2 +-
arch/x86/kvm/mmu/mmu.c | 41 +-
arch/x86/mm/mem_encrypt_amd.c | 13 +-
arch/xtensa/include/asm/core.h | 9 +
arch/xtensa/kernel/perf_event.c | 17 +-
block/blk-cgroup.c | 32 +-
block/blk-settings.c | 7 +-
block/blk-sysfs.c | 21 +-
block/ioctl.c | 2 +
block/mq-deadline.c | 3 +-
crypto/af_alg.c | 3 +
crypto/algapi.c | 16 +-
crypto/asymmetric_keys/x509_public_key.c | 5 +
drivers/acpi/x86/s2idle.c | 39 +-
drivers/amba/bus.c | 1 +
drivers/ata/pata_arasan_cf.c | 3 +-
drivers/base/core.c | 11 +
drivers/base/dd.c | 2 +
drivers/base/regmap/regcache-maple.c | 70 ++-
drivers/base/regmap/regcache-rbtree.c | 10 +-
drivers/base/test/test_async_driver_probe.c | 2 +-
drivers/bluetooth/btintel.c | 6 +
drivers/bluetooth/btrtl.c | 74 ++-
drivers/bluetooth/btusb.c | 2 +-
drivers/bluetooth/hci_nokia.c | 6 +-
drivers/bus/ti-sysc.c | 2 +-
drivers/char/hw_random/iproc-rng200.c | 25 +
drivers/char/hw_random/nomadik-rng.c | 12 +-
drivers/char/hw_random/pic32-rng.c | 19 +-
drivers/char/ipmi/ipmi_si_intf.c | 5 +
drivers/char/ipmi/ipmi_ssif.c | 7 +-
drivers/char/tpm/tpm_crb.c | 33 +-
drivers/clk/Kconfig | 1 +
drivers/clk/imx/clk-composite-8m.c | 12 +-
drivers/clk/imx/clk-imx8mp.c | 5 -
drivers/clk/imx/clk-imx8ulp.c | 2 +-
drivers/clk/imx/clk-pllv4.c | 46 +-
drivers/clk/imx/clk.h | 1 +
drivers/clk/keystone/pll.c | 2 +-
drivers/clk/qcom/dispcc-sc8280xp.c | 8 +-
drivers/clk/qcom/gcc-qdu1000.c | 34 +-
drivers/clk/qcom/gcc-sc7180.c | 1 +
drivers/clk/qcom/gcc-sc8280xp.c | 121 +++-
drivers/clk/qcom/gcc-sm6350.c | 1 +
drivers/clk/qcom/gcc-sm7150.c | 1 +
drivers/clk/qcom/gcc-sm8250.c | 1 +
drivers/clk/qcom/gcc-sm8450.c | 4 +-
drivers/clk/qcom/gpucc-sm6350.c | 18 +-
drivers/clk/qcom/reset.c | 3 +-
drivers/clk/rockchip/clk-rk3568.c | 2 +-
drivers/clk/sunxi-ng/ccu_mmc_timing.c | 2 +-
drivers/cpufreq/amd-pstate-ut.c | 46 +-
drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 +-
drivers/cpufreq/cpufreq.c | 2 +
drivers/cpufreq/intel_pstate.c | 5 +
drivers/cpufreq/powernow-k8.c | 3 +-
drivers/cpufreq/tegra194-cpufreq.c | 29 +
drivers/cpuidle/cpuidle-pseries.c | 8 +-
drivers/cpuidle/governors/teo.c | 40 +-
drivers/crypto/caam/caampkc.c | 4 +-
drivers/crypto/intel/qat/qat_common/adf_gen4_pm.h | 2 +-
drivers/crypto/stm32/stm32-hash.c | 11 +-
drivers/devfreq/devfreq.c | 1 +
drivers/dma/Kconfig | 2 +
drivers/dma/idxd/sysfs.c | 33 +-
drivers/dma/ste_dma40.c | 4 +
drivers/edac/i10nm_base.c | 54 +-
drivers/edac/igen6_edac.c | 8 +-
drivers/extcon/Kconfig | 1 +
drivers/firmware/arm_sdei.c | 19 +
drivers/firmware/cirrus/cs_dsp.c | 3 +-
drivers/firmware/efi/libstub/x86-stub.c | 2 +-
drivers/firmware/meson/meson_sm.c | 2 +
drivers/firmware/ti_sci.c | 36 +-
drivers/fsi/fsi-master-aspeed.c | 2 +
drivers/gpio/gpiolib.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 +-
drivers/gpu/drm/amd/amdgpu/cik.c | 36 +-
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 +-
drivers/gpu/drm/amd/amdgpu/si.c | 36 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 12 -
.../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 20 +-
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +
.../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 +
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 3 +-
.../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +-
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 10 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 9 +-
drivers/gpu/drm/armada/armada_overlay.c | 6 +-
drivers/gpu/drm/ast/ast_dp.c | 11 +
drivers/gpu/drm/ast/ast_dp501.c | 37 +-
drivers/gpu/drm/ast/ast_drv.h | 2 +
drivers/gpu/drm/ast/ast_mode.c | 30 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 9 +-
drivers/gpu/drm/bridge/analogix/anx7625.c | 12 +-
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 28 +-
drivers/gpu/drm/bridge/tc358764.c | 2 +-
drivers/gpu/drm/etnaviv/etnaviv_dump.c | 14 +-
drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 +
drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 2 +-
drivers/gpu/drm/mediatek/mtk_dp.c | 15 +-
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 7 +-
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 16 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +-
drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +-
drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 8 +-
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 11 +-
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 -
.../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 1 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 2 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 2 -
.../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 2 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 2 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 2 -
.../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 2 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 2 -
.../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 6 +-
.../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 56 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 18 -
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +-
drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 +-
drivers/gpu/drm/panel/panel-simple.c | 4 +-
drivers/gpu/drm/radeon/cik.c | 36 +-
drivers/gpu/drm/radeon/si.c | 37 +-
drivers/gpu/drm/tegra/dpaux.c | 2 +-
drivers/gpu/drm/tiny/repaper.c | 2 +-
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 4 +-
drivers/hid/hid-input.c | 18 +-
drivers/hid/hid-logitech-dj.c | 5 +-
drivers/hid/hid-logitech-hidpp.c | 115 ++--
drivers/hid/hid-multitouch.c | 13 +-
drivers/hid/hid-uclogic-core.c | 13 +-
drivers/hv/vmbus_drv.c | 3 +-
drivers/hwmon/tmp513.c | 2 +-
drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +-
drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +-
drivers/hwtracing/coresight/coresight-tmc.h | 2 +-
drivers/hwtracing/coresight/coresight-trbe.c | 32 +-
drivers/i2c/busses/i2c-imx-lpi2c.c | 3 +
drivers/i3c/master/svc-i3c-master.c | 14 +-
drivers/iio/accel/adxl313_i2c.c | 4 +-
.../infiniband/core/uverbs_std_types_counters.c | 2 +
drivers/infiniband/hw/bnxt_re/bnxt_re.h | 1 -
drivers/infiniband/hw/bnxt_re/main.c | 5 +-
drivers/infiniband/hw/efa/efa_verbs.c | 6 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 1 +
drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 +-
drivers/infiniband/hw/hns/hns_roce_main.c | 7 +-
drivers/infiniband/hw/hns/hns_roce_qp.c | 28 +-
drivers/infiniband/hw/irdma/ctrl.c | 6 +
drivers/infiniband/hw/irdma/main.h | 2 +-
drivers/infiniband/hw/irdma/type.h | 2 +
drivers/infiniband/hw/irdma/verbs.c | 11 +-
drivers/infiniband/sw/rxe/rxe_comp.c | 4 +
drivers/infiniband/sw/rxe/rxe_loc.h | 6 -
drivers/infiniband/sw/rxe/rxe_qp.c | 159 +++--
drivers/infiniband/sw/rxe/rxe_req.c | 45 +-
drivers/infiniband/sw/rxe/rxe_resp.c | 4 +
drivers/infiniband/sw/rxe/rxe_srq.c | 60 +-
drivers/infiniband/sw/siw/siw.h | 1 +
drivers/infiniband/sw/siw/siw_cm.c | 1 -
drivers/infiniband/sw/siw/siw_main.c | 22 +-
drivers/infiniband/sw/siw/siw_verbs.c | 6 +-
drivers/infiniband/ulp/isert/ib_isert.c | 2 +
drivers/infiniband/ulp/srp/ib_srp.c | 4 -
drivers/input/serio/i8042-acpipnpio.h | 7 +
drivers/interconnect/qcom/bcm-voter.c | 43 +-
drivers/interconnect/qcom/qcm2290.c | 1 +
drivers/interconnect/qcom/sm8450.c | 1 +
drivers/iommu/amd/iommu_v2.c | 4 +-
drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +
drivers/iommu/intel/pasid.c | 2 +-
drivers/iommu/iommu.c | 4 +-
drivers/iommu/iommufd/device.c | 2 +-
drivers/iommu/mtk_iommu.c | 22 +-
drivers/iommu/rockchip-iommu.c | 43 +-
drivers/iommu/sprd-iommu.c | 1 +
drivers/irqchip/irq-loongson-eiointc.c | 2 +-
drivers/leds/led-class-multicolor.c | 8 +-
drivers/leds/led-core.c | 8 +-
drivers/leds/leds-pwm.c | 2 +-
drivers/leds/trigger/ledtrig-tty.c | 12 +-
drivers/md/md-bitmap.c | 9 +-
drivers/md/md.c | 6 +-
drivers/md/raid0.c | 82 +--
drivers/md/raid1.c | 8 +-
drivers/md/raid10.c | 42 +-
drivers/md/raid5-cache.c | 12 +-
drivers/media/cec/core/cec-adap.c | 8 +-
drivers/media/cec/usb/pulse8/pulse8-cec.c | 7 +-
drivers/media/dvb-frontends/ascot2e.c | 2 +-
drivers/media/dvb-frontends/atbm8830.c | 2 +-
drivers/media/dvb-frontends/au8522_dig.c | 2 +-
drivers/media/dvb-frontends/bcm3510.c | 2 +-
drivers/media/dvb-frontends/cx22700.c | 2 +-
drivers/media/dvb-frontends/cx22702.c | 2 +-
drivers/media/dvb-frontends/cx24110.c | 2 +-
drivers/media/dvb-frontends/cx24113.c | 2 +-
drivers/media/dvb-frontends/cx24116.c | 2 +-
drivers/media/dvb-frontends/cx24120.c | 6 +-
drivers/media/dvb-frontends/cx24123.c | 2 +-
drivers/media/dvb-frontends/cxd2820r_core.c | 2 +-
drivers/media/dvb-frontends/cxd2841er.c | 4 +-
drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +-
drivers/media/dvb-frontends/dib0070.c | 2 +-
drivers/media/dvb-frontends/dib0090.c | 4 +-
drivers/media/dvb-frontends/dib3000mb.c | 2 +-
drivers/media/dvb-frontends/dib3000mc.c | 2 +-
drivers/media/dvb-frontends/dib7000m.c | 2 +-
drivers/media/dvb-frontends/dib7000p.c | 4 +-
drivers/media/dvb-frontends/dib8000.c | 2 +-
drivers/media/dvb-frontends/dib9000.c | 2 +-
drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +-
drivers/media/dvb-frontends/drxd_hard.c | 2 +-
drivers/media/dvb-frontends/drxk_hard.c | 2 +-
drivers/media/dvb-frontends/ds3000.c | 2 +-
drivers/media/dvb-frontends/dvb-pll.c | 2 +-
drivers/media/dvb-frontends/ec100.c | 2 +-
drivers/media/dvb-frontends/helene.c | 4 +-
drivers/media/dvb-frontends/horus3a.c | 2 +-
drivers/media/dvb-frontends/isl6405.c | 2 +-
drivers/media/dvb-frontends/isl6421.c | 2 +-
drivers/media/dvb-frontends/isl6423.c | 2 +-
drivers/media/dvb-frontends/itd1000.c | 2 +-
drivers/media/dvb-frontends/ix2505v.c | 2 +-
drivers/media/dvb-frontends/l64781.c | 2 +-
drivers/media/dvb-frontends/lg2160.c | 2 +-
drivers/media/dvb-frontends/lgdt3305.c | 2 +-
drivers/media/dvb-frontends/lgdt3306a.c | 2 +-
drivers/media/dvb-frontends/lgdt330x.c | 2 +-
drivers/media/dvb-frontends/lgs8gxx.c | 2 +-
drivers/media/dvb-frontends/lnbh25.c | 2 +-
drivers/media/dvb-frontends/lnbp21.c | 4 +-
drivers/media/dvb-frontends/lnbp22.c | 2 +-
drivers/media/dvb-frontends/m88ds3103.c | 2 +-
drivers/media/dvb-frontends/m88rs2000.c | 2 +-
drivers/media/dvb-frontends/mb86a16.c | 2 +-
drivers/media/dvb-frontends/mb86a20s.c | 2 +-
drivers/media/dvb-frontends/mt312.c | 2 +-
drivers/media/dvb-frontends/mt352.c | 2 +-
drivers/media/dvb-frontends/nxt200x.c | 2 +-
drivers/media/dvb-frontends/nxt6000.c | 2 +-
drivers/media/dvb-frontends/or51132.c | 2 +-
drivers/media/dvb-frontends/or51211.c | 2 +-
drivers/media/dvb-frontends/s5h1409.c | 2 +-
drivers/media/dvb-frontends/s5h1411.c | 2 +-
drivers/media/dvb-frontends/s5h1420.c | 2 +-
drivers/media/dvb-frontends/s5h1432.c | 2 +-
drivers/media/dvb-frontends/s921.c | 2 +-
drivers/media/dvb-frontends/si21xx.c | 2 +-
drivers/media/dvb-frontends/sp887x.c | 2 +-
drivers/media/dvb-frontends/stb0899_drv.c | 2 +-
drivers/media/dvb-frontends/stb6000.c | 2 +-
drivers/media/dvb-frontends/stb6100.c | 2 +-
drivers/media/dvb-frontends/stv0288.c | 2 +-
drivers/media/dvb-frontends/stv0297.c | 2 +-
drivers/media/dvb-frontends/stv0299.c | 2 +-
drivers/media/dvb-frontends/stv0367.c | 6 +-
drivers/media/dvb-frontends/stv0900_core.c | 2 +-
drivers/media/dvb-frontends/stv090x.c | 2 +-
drivers/media/dvb-frontends/stv6110.c | 2 +-
drivers/media/dvb-frontends/stv6110x.c | 2 +-
drivers/media/dvb-frontends/tda10021.c | 2 +-
drivers/media/dvb-frontends/tda10023.c | 2 +-
drivers/media/dvb-frontends/tda10048.c | 2 +-
drivers/media/dvb-frontends/tda1004x.c | 4 +-
drivers/media/dvb-frontends/tda10086.c | 2 +-
drivers/media/dvb-frontends/tda665x.c | 2 +-
drivers/media/dvb-frontends/tda8083.c | 2 +-
drivers/media/dvb-frontends/tda8261.c | 2 +-
drivers/media/dvb-frontends/tda826x.c | 2 +-
drivers/media/dvb-frontends/ts2020.c | 2 +-
drivers/media/dvb-frontends/tua6100.c | 2 +-
drivers/media/dvb-frontends/ves1820.c | 2 +-
drivers/media/dvb-frontends/ves1x93.c | 2 +-
drivers/media/dvb-frontends/zl10036.c | 2 +-
drivers/media/dvb-frontends/zl10039.c | 2 +-
drivers/media/dvb-frontends/zl10353.c | 2 +-
drivers/media/i2c/Kconfig | 13 +-
drivers/media/i2c/ad5820.c | 2 -
drivers/media/i2c/ccs/ccs-data.c | 101 ++--
drivers/media/i2c/imx290.c | 7 +-
drivers/media/i2c/ov2680.c | 330 +++-------
drivers/media/i2c/ov5640.c | 22 +-
drivers/media/i2c/rdacm21.c | 2 +-
drivers/media/i2c/tvp5150.c | 4 +
drivers/media/pci/Kconfig | 2 +-
drivers/media/pci/bt8xx/dst.c | 2 +-
drivers/media/pci/bt8xx/dst_ca.c | 2 +-
drivers/media/pci/cx23885/cx23885-dvb.c | 12 -
drivers/media/pci/ddbridge/ddbridge-dummy-fe.c | 2 +-
drivers/media/pci/intel/Kconfig | 10 +
drivers/media/pci/intel/Makefile | 4 +-
.../pci/intel/{ipu3/cio2-bridge.c => ipu-bridge.c} | 192 +++---
.../pci/intel/{ipu3/cio2-bridge.h => ipu-bridge.h} | 57 +-
drivers/media/pci/intel/ipu3/Kconfig | 1 +
drivers/media/pci/intel/ipu3/Makefile | 1 -
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 4 +-
drivers/media/pci/intel/ipu3/ipu3-cio2.h | 6 -
drivers/media/platform/amphion/vdec.c | 41 +-
drivers/media/platform/amphion/venc.c | 6 +-
drivers/media/platform/amphion/vpu.h | 3 +
drivers/media/platform/amphion/vpu_cmds.c | 16 +-
drivers/media/platform/amphion/vpu_core.c | 2 +
drivers/media/platform/amphion/vpu_dbg.c | 17 +-
drivers/media/platform/amphion/vpu_helpers.c | 61 ++
drivers/media/platform/amphion/vpu_mbox.c | 9 +-
drivers/media/platform/amphion/vpu_msgs.c | 14 +-
drivers/media/platform/amphion/vpu_v4l2.c | 7 +-
.../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 +
.../platform/mediatek/vcodec/vdec/vdec_vp9_if.c | 5 +-
.../platform/mediatek/vcodec/vdec_msg_queue.c | 2 +
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 1 -
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 135 ++---
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 5 +-
.../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 2 +-
drivers/media/platform/qcom/venus/hfi_venus.c | 20 +-
drivers/media/platform/verisilicon/hantro_v4l2.c | 9 +-
drivers/media/tuners/fc0011.c | 2 +-
drivers/media/tuners/fc0012.c | 2 +-
drivers/media/tuners/fc0013.c | 2 +-
drivers/media/tuners/max2165.c | 2 +-
drivers/media/tuners/mc44s803.c | 2 +-
drivers/media/tuners/mt2060.c | 2 +-
drivers/media/tuners/mt2131.c | 2 +-
drivers/media/tuners/mt2266.c | 2 +-
drivers/media/tuners/mxl5005s.c | 2 +-
drivers/media/tuners/qt1010.c | 2 +-
drivers/media/tuners/tda18218.c | 2 +-
drivers/media/tuners/xc2028.c | 2 +-
drivers/media/tuners/xc4000.c | 2 +-
drivers/media/tuners/xc5000.c | 2 +-
drivers/media/usb/dvb-usb/m920x.c | 5 +-
drivers/media/usb/go7007/go7007-i2c.c | 2 -
drivers/media/usb/siano/smsusb.c | 21 +-
drivers/media/v4l2-core/v4l2-fwnode.c | 18 +-
drivers/misc/fastrpc.c | 13 +-
drivers/mmc/host/renesas_sdhi_core.c | 10 +-
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 7 +-
drivers/mtd/nand/raw/fsmc_nand.c | 7 +-
drivers/mtd/spi-nor/core.c | 19 +-
drivers/net/arcnet/arcnet.c | 2 +-
drivers/net/can/m_can/tcan4x5x-regmap.c | 1 -
drivers/net/can/usb/gs_usb.c | 5 +-
drivers/net/dsa/microchip/ksz_common.c | 35 +-
drivers/net/ethernet/amd/pds_core/core.c | 11 +-
drivers/net/ethernet/amd/pds_core/dev.c | 9 +-
drivers/net/ethernet/amd/pds_core/devlink.c | 3 +
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 7 +-
drivers/net/ethernet/broadcom/b44.c | 8 +-
drivers/net/ethernet/hisilicon/hns3/Makefile | 4 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.h | 5 +
.../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 1 +
.../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 2 +
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 3 +
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 34 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 1 +
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 565 +----------------
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 -
.../ethernet/hisilicon/hns3/hns3pf/hclge_regs.c | 668 +++++++++++++++++++++
.../ethernet/hisilicon/hns3/hns3pf/hclge_regs.h | 17 +
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 33 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 +
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 121 +---
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 1 +
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c | 127 ++++
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h | 13 +
drivers/net/ethernet/intel/ice/ice_main.c | 13 +-
drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 55 +-
drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 3 +-
drivers/net/ethernet/intel/igb/igb_main.c | 11 +-
drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +-
.../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 45 ++
.../ethernet/marvell/octeontx2/nic/otx2_common.c | 68 ++-
.../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 +-
.../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 19 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 13 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 4 -
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 9 +-
.../net/ethernet/mellanox/mlx5/core/lib/clock.c | 32 +-
drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 3 +-
drivers/net/ethernet/mellanox/mlxsw/i2c.c | 5 +-
.../net/ethernet/microchip/lan966x/lan966x_ptp.c | 4 +-
drivers/net/ethernet/realtek/r8169_main.c | 4 -
drivers/net/ethernet/sfc/ptp.c | 4 +-
drivers/net/macsec.c | 3 +-
drivers/net/phy/sfp-bus.c | 10 +
drivers/net/usb/qmi_wwan.c | 1 +
drivers/net/wireless/ath/ath10k/pci.c | 9 +-
drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +-
drivers/net/wireless/ath/ath11k/pci.c | 10 +-
drivers/net/wireless/ath/ath12k/mac.c | 4 +-
drivers/net/wireless/ath/ath12k/pci.c | 10 +-
drivers/net/wireless/ath/ath12k/wmi.c | 3 +-
drivers/net/wireless/ath/ath6kl/Makefile | 5 -
drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +-
drivers/net/wireless/ath/ath9k/wmi.c | 20 +-
.../broadcom/brcm80211/brcmfmac/fwil_types.h | 7 +-
drivers/net/wireless/marvell/mwifiex/debugfs.c | 9 +-
drivers/net/wireless/marvell/mwifiex/pcie.c | 25 +-
drivers/net/wireless/marvell/mwifiex/sta_rx.c | 12 +-
drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 30 +-
drivers/net/wireless/marvell/mwifiex/util.c | 10 +-
drivers/net/wireless/mediatek/mt76/mt76.h | 2 +-
.../net/wireless/mediatek/mt76/mt76_connac_mac.c | 11 +-
.../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 1 +
drivers/net/wireless/mediatek/mt76/mt7915/init.c | 7 +-
drivers/net/wireless/mediatek/mt76/mt7915/main.c | 93 ++-
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 105 +++-
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 30 +-
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 15 +
drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 +-
drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 13 +-
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 11 +-
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 1 +
drivers/net/wireless/mediatek/mt76/testmode.c | 1 +
drivers/net/wireless/mediatek/mt76/tx.c | 9 +-
drivers/net/wireless/realtek/rtw89/debug.c | 8 +-
drivers/net/wireless/realtek/rtw89/fw.c | 27 +-
drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4 +-
drivers/ntb/ntb_transport.c | 19 +-
drivers/nvdimm/nd_perf.c | 3 +-
drivers/nvdimm/nd_virtio.c | 3 +-
drivers/of/overlay.c | 3 +-
drivers/of/property.c | 2 +
drivers/of/unittest.c | 12 +-
drivers/opp/core.c | 2 +-
drivers/pci/access.c | 20 +-
drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +-
drivers/pci/controller/dwc/pcie-tegra194.c | 10 -
drivers/pci/controller/pci-hyperv.c | 3 +
drivers/pci/controller/pcie-apple.c | 6 +-
drivers/pci/controller/pcie-microchip-host.c | 8 +-
drivers/pci/controller/pcie-rockchip.h | 6 +-
drivers/pci/doe.c | 2 +-
drivers/pci/hotplug/pciehp_hpc.c | 12 +-
drivers/pci/pci.c | 13 +-
drivers/pci/pcie/aspm.c | 30 +-
drivers/pci/probe.c | 2 +
drivers/perf/fsl_imx8_ddr_perf.c | 24 +-
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 6 +-
drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 18 +-
drivers/pinctrl/mediatek/pinctrl-mt7981.c | 44 +-
drivers/pinctrl/mediatek/pinctrl-mt7986.c | 8 +
drivers/pinctrl/pinctrl-mcp23s08_spi.c | 10 +
drivers/platform/chrome/chromeos_acpi.c | 31 +-
drivers/platform/mellanox/mlxbf-tmfifo.c | 1 +
drivers/platform/x86/amd/pmf/core.c | 3 +-
drivers/platform/x86/amd/pmf/sps.c | 3 +-
drivers/platform/x86/asus-wmi.c | 14 +-
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 9 +-
drivers/platform/x86/huawei-wmi.c | 2 +
drivers/platform/x86/intel/hid.c | 27 +-
drivers/platform/x86/think-lmi.c | 4 +-
drivers/powercap/arm_scmi_powercap.c | 159 ++---
drivers/rpmsg/qcom_glink_native.c | 4 +
drivers/s390/block/dasd.c | 125 ++--
drivers/s390/block/dasd_3990_erp.c | 2 +-
drivers/s390/block/dasd_devmap.c | 6 +-
drivers/s390/block/dasd_eckd.c | 10 +-
drivers/s390/block/dasd_int.h | 4 +
drivers/s390/block/dcssblk.c | 4 +-
drivers/s390/crypto/pkey_api.c | 22 +-
drivers/s390/crypto/zcrypt_ep11misc.c | 105 +++-
drivers/s390/crypto/zcrypt_ep11misc.h | 11 +-
drivers/scsi/be2iscsi/be_iscsi.c | 4 +
drivers/scsi/fcoe/fcoe_ctlr.c | 20 +-
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 11 +-
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 13 +-
drivers/scsi/hosts.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 20 +-
drivers/scsi/mpt3sas/mpt3sas_base.c | 46 +-
drivers/scsi/mpt3sas/mpt3sas_base.h | 1 +
drivers/scsi/qedf/qedf_dbg.h | 2 +
drivers/scsi/qedf/qedf_debugfs.c | 35 +-
drivers/scsi/qedi/qedi_main.c | 5 +-
drivers/scsi/qla2xxx/qla_init.c | 2 +-
drivers/scsi/qla4xxx/ql4_os.c | 15 +
drivers/scsi/scsi_transport_iscsi.c | 80 ++-
drivers/soc/qcom/ocmem.c | 14 +-
drivers/soc/qcom/smem.c | 2 +-
drivers/spi/spi-mpc512x-psc.c | 2 +-
drivers/spi/spi-tegra114.c | 18 +-
drivers/spi/spi-tegra20-sflash.c | 6 +-
drivers/staging/fbtft/fb_ili9341.c | 2 +-
drivers/staging/media/av7110/sp8870.c | 2 +-
drivers/staging/media/rkvdec/rkvdec.c | 2 +-
drivers/thermal/imx8mm_thermal.c | 6 +-
drivers/thermal/mediatek/lvts_thermal.c | 152 +++--
drivers/thermal/thermal_core.c | 4 +-
drivers/thermal/thermal_of.c | 8 +-
drivers/tty/serial/qcom_geni_serial.c | 7 +-
drivers/tty/serial/sc16is7xx.c | 145 +++--
drivers/tty/serial/serial-tegra.c | 6 +-
drivers/tty/serial/sprd_serial.c | 30 +-
drivers/ufs/core/ufshcd.c | 12 +-
drivers/usb/core/hcd.c | 10 +-
drivers/usb/core/hub.c | 349 ++++++-----
drivers/usb/core/message.c | 29 +-
drivers/usb/core/usb.h | 4 +-
drivers/usb/gadget/function/f_mass_storage.c | 2 +-
drivers/usb/gadget/udc/core.c | 1 +
drivers/usb/phy/phy-mxs-usb.c | 10 +-
drivers/usb/typec/bus.c | 12 +-
drivers/usb/typec/tcpm/tcpm.c | 38 +-
drivers/vdpa/mlx5/net/mlx5_vnet.c | 10 +-
drivers/vfio/vfio_iommu_type1.c | 2 +-
drivers/vhost/scsi.c | 186 +++++-
drivers/video/backlight/bd6107.c | 2 +-
drivers/video/backlight/gpio_backlight.c | 2 +-
drivers/video/backlight/lv5207lp.c | 2 +-
drivers/video/fbdev/goldfishfb.c | 4 +-
drivers/virtio/virtio_mem.c | 168 ++++--
drivers/virtio/virtio_ring.c | 2 +-
drivers/virtio/virtio_vdpa.c | 17 +-
fs/dlm/plock.c | 6 +-
fs/eventfd.c | 2 +-
fs/ext4/mballoc.c | 7 +-
fs/ext4/namei.c | 3 +
fs/f2fs/checkpoint.c | 2 +-
fs/f2fs/debug.c | 33 +-
fs/f2fs/f2fs.h | 56 +-
fs/f2fs/file.c | 27 +-
fs/f2fs/gc.c | 18 +-
fs/f2fs/inode.c | 12 +-
fs/f2fs/recovery.c | 1 +
fs/f2fs/segment.c | 4 +-
fs/f2fs/super.c | 37 +-
fs/f2fs/sysfs.c | 250 +++++---
fs/fs_context.c | 23 +-
fs/fuse/file.c | 89 +--
fs/iomap/buffered-io.c | 5 -
fs/jfs/jfs_extent.c | 5 +
fs/lockd/mon.c | 3 +
fs/namei.c | 2 +-
fs/nfs/blocklayout/dev.c | 4 +-
fs/nfs/internal.h | 1 +
fs/nfs/nfs2xdr.c | 2 +-
fs/nfs/nfs3xdr.c | 2 +-
fs/nfs/nfs42.h | 1 +
fs/nfs/nfs42proc.c | 5 +-
fs/nfs/nfs42xdr.c | 17 +-
fs/nfs/nfs4proc.c | 13 +-
fs/nfs/pnfs_nfs.c | 2 +-
fs/nfs/read.c | 10 +
fs/nfsd/blocklayoutxdr.c | 9 +
fs/nfsd/flexfilelayoutxdr.c | 9 +
fs/nfsd/nfs4xdr.c | 25 +-
fs/nls/nls_base.c | 4 +-
fs/ocfs2/namei.c | 4 +
fs/overlayfs/super.c | 2 +-
fs/proc/base.c | 3 +-
fs/pstore/ram_core.c | 2 +-
fs/quota/dquot.c | 174 ++++--
fs/reiserfs/journal.c | 4 +-
fs/smb/client/cifsglob.h | 1 +
fs/smb/client/cifssmb.c | 3 +-
fs/smb/client/connect.c | 5 +
fs/smb/client/misc.c | 1 +
fs/smb/client/smb2pdu.c | 3 +-
fs/smb/server/server.c | 7 +-
fs/smb/server/smb2pdu.c | 20 +-
fs/smb/server/smb_common.c | 19 +-
fs/smb/server/smb_common.h | 2 +-
fs/smb/server/vfs.c | 7 +-
fs/splice.c | 44 +-
fs/verity/signature.c | 16 +
include/crypto/algapi.h | 3 +
include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 +
include/dt-bindings/clock/qcom,qdu1000-gcc.h | 4 +-
include/linux/arm_sdei.h | 2 +
include/linux/blkdev.h | 1 +
include/linux/hid.h | 1 +
include/linux/if_arp.h | 4 +
include/linux/kernfs.h | 4 +
include/linux/lsm_hook_defs.h | 1 +
include/linux/memcontrol.h | 9 +-
include/linux/nls.h | 2 +-
include/linux/nvmem-consumer.h | 2 +-
include/linux/pci.h | 34 +-
include/linux/pid_namespace.h | 16 +-
include/linux/security.h | 6 +
include/linux/thermal.h | 6 +-
include/linux/trace_events.h | 3 +-
include/linux/usb/typec_altmode.h | 2 +-
include/media/cec.h | 11 +-
include/net/bluetooth/hci.h | 20 +
include/net/bluetooth/hci_core.h | 67 ++-
include/net/bluetooth/hci_sync.h | 2 +-
include/net/inet6_hashtables.h | 72 ++-
include/net/inet_hashtables.h | 67 ++-
include/net/lwtunnel.h | 5 +-
include/net/mac80211.h | 4 +-
include/net/sock.h | 7 +-
include/net/tcp.h | 1 -
include/scsi/scsi_host.h | 2 +-
include/uapi/linux/bpf.h | 3 -
include/uapi/linux/sync_file.h | 2 +-
include/ufs/ufs.h | 6 +
init/Kconfig | 1 +
io_uring/io-wq.c | 19 +-
io_uring/io-wq.h | 3 +-
io_uring/io_uring.c | 37 +-
io_uring/io_uring.h | 1 -
io_uring/sqpoll.c | 17 +
io_uring/sqpoll.h | 1 +
kernel/auditsc.c | 2 +
kernel/bpf/btf.c | 22 +-
kernel/bpf/helpers.c | 2 +-
kernel/bpf/verifier.c | 58 +-
kernel/cgroup/cpuset.c | 33 +-
kernel/cpu.c | 24 +-
kernel/kprobes.c | 14 +-
kernel/printk/printk_ringbuffer.c | 2 +-
kernel/rcu/refscale.c | 3 +-
kernel/sched/rt.c | 2 +-
kernel/time/clocksource.c | 8 +-
kernel/time/tick-sched.c | 2 +-
kernel/trace/bpf_trace.c | 2 +-
kernel/trace/trace.c | 72 ++-
kernel/trace/trace.h | 2 +
kernel/trace/trace_hwlat.c | 2 +-
kernel/trace/trace_uprobe.c | 3 +-
lib/iov_iter.c | 30 +-
lib/sbitmap.c | 15 +-
lib/xarray.c | 2 +-
mm/memfd.c | 55 +-
mm/shmem.c | 28 +-
mm/util.c | 4 +-
mm/vmalloc.c | 26 +-
mm/vmpressure.c | 8 +
mm/vmscan.c | 18 +-
net/9p/trans_virtio.c | 4 +-
net/bluetooth/hci_conn.c | 624 +++++++++----------
net/bluetooth/hci_core.c | 28 +-
net/bluetooth/hci_event.c | 178 ++++--
net/bluetooth/hci_sync.c | 188 ++++--
net/bluetooth/iso.c | 78 ++-
net/bluetooth/mgmt.c | 15 +-
net/bluetooth/msft.c | 412 ++++++++++++-
net/bluetooth/sco.c | 2 +-
net/bridge/br_stp_if.c | 3 -
net/core/filter.c | 4 +-
net/core/lwt_bpf.c | 7 +-
net/core/skbuff.c | 44 +-
net/core/sock.c | 42 +-
net/dccp/ipv4.c | 13 +-
net/dccp/ipv6.c | 15 +-
net/ipv4/igmp.c | 3 +-
net/ipv4/inet_hashtables.c | 27 +-
net/ipv4/ip_output.c | 2 +-
net/ipv4/tcp_input.c | 3 +-
net/ipv4/tcp_timer.c | 18 +-
net/ipv4/udp.c | 60 +-
net/ipv6/inet6_hashtables.c | 25 +-
net/ipv6/ip6_output.c | 2 +-
net/ipv6/udp.c | 66 +-
net/mac80211/cfg.c | 12 +-
net/netfilter/ipset/ip_set_hash_netportnet.c | 1 +
net/netfilter/nft_exthdr.c | 20 +-
net/netfilter/xt_sctp.c | 2 +
net/netfilter/xt_u32.c | 21 +
net/netrom/af_netrom.c | 5 +
net/sched/em_meta.c | 6 +-
net/sched/sch_hfsc.c | 4 +
net/smc/af_smc.c | 2 +-
net/socket.c | 6 +-
net/wireless/nl80211.c | 1 +
samples/bpf/tracex3_kern.c | 36 +-
samples/bpf/tracex6_kern.c | 17 +-
scripts/gdb/linux/constants.py.in | 3 +
scripts/gdb/linux/modules.py | 12 +-
scripts/rust_is_available.sh | 122 ++--
security/integrity/ima/Kconfig | 12 -
security/keys/keyctl.c | 11 +-
security/security.c | 14 +
security/selinux/hooks.c | 22 +
security/smack/smack_lsm.c | 51 ++
security/smack/smackfs.c | 2 +-
sound/Kconfig | 2 +-
sound/core/pcm_compat.c | 8 +-
sound/pci/ac97/ac97_codec.c | 5 +-
sound/pci/hda/patch_cs8409-tables.c | 4 +
sound/pci/hda/patch_cs8409.c | 2 +-
sound/pci/hda/patch_cs8409.h | 1 +
sound/soc/atmel/atmel-i2s.c | 5 +-
sound/soc/codecs/Kconfig | 1 +
sound/soc/codecs/cs35l56-i2c.c | 9 +
sound/soc/codecs/cs35l56-spi.c | 9 +
sound/soc/codecs/cs43130.h | 138 ++---
sound/soc/codecs/da7219-aad.c | 12 +-
sound/soc/codecs/es8316.c | 2 +-
sound/soc/codecs/nau8821.c | 41 ++
sound/soc/codecs/rt1308-sdw.c | 13 +-
sound/soc/codecs/rt5682-sdw.c | 9 +-
sound/soc/codecs/rt711-sdca-sdw.c | 10 +-
sound/soc/codecs/rt711-sdw.c | 9 +-
sound/soc/codecs/rt712-sdca-sdw.c | 10 +-
sound/soc/fsl/fsl_qmc_audio.c | 28 +-
sound/soc/soc-compress.c | 1 +
sound/soc/sof/amd/acp.c | 6 +-
sound/soc/sof/intel/hda-mlink.c | 20 +-
sound/usb/mixer_maps.c | 14 +
sound/usb/quirks.c | 37 +-
tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 26 +-
tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 +-
tools/hv/vmbus_testing | 4 +-
tools/include/uapi/linux/bpf.h | 3 -
tools/lib/bpf/libbpf.c | 42 +-
tools/lib/bpf/usdt.c | 5 +-
tools/testing/radix-tree/multiorder.c | 68 ++-
.../selftests/bpf/benchs/run_bench_rename.sh | 2 +-
tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +-
.../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +-
.../selftests/bpf/progs/test_cls_redirect.h | 9 +
.../futex/functional/futex_wait_timeout.c | 7 +
tools/testing/selftests/kselftest_harness.h | 11 +-
tools/testing/selftests/memfd/memfd_test.c | 40 +-
tools/testing/selftests/resctrl/Makefile | 2 +-
tools/testing/selftests/resctrl/cache.c | 18 +-
tools/testing/selftests/resctrl/fill_buf.c | 3 +-
tools/testing/selftests/resctrl/resctrl.h | 1 +
virt/kvm/vfio.c | 115 ++--
880 files changed, 10347 insertions(+), 7235 deletions(-)Greg Kroah-Hartman
maintainerPATCH 20/737 ethernet: atheros: fix return value check in atl1c_tso_csum()
6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuanjun Gong <[email protected]>
[ Upstream commit 8d01da0a1db237c44c92859ce3612df7af8d3a53 ]
in atl1c_tso_csum, it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim().
--- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +5 -2
@@ -2094,8 +2094,11 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, real_len = (((unsigned char *)ip_hdr (skb) - skb->data) +ntohs (ip_hdr (skb)->tot_len)); -if (real_len < skb->len) -pskb_trim (skb, real_len); +if (real_len < skb->len) { + err =pskb_trim (skb, real_len); +if (err) +return err; + } hdr_len =skb_tcp_all_headers (skb);if (unlikely (skb->len == hdr_len)) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 29/737 ASoC: rt711: fix for JD event handling in ClockStop Mode0
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuming Fan <[email protected]>
[ Upstream commit b69de265bd0e877015a00fbba453ef72af162e0f ]
When the system suspends, peripheral Imp-defined interrupt is disabled. When system level resume is invoked, the peripheral Imp-defined interrupts should be enabled to handle JD events.
--- sound/soc/codecs/rt711-sdw.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/soc/codecs/rt711-sdw.c +8 -1
@@ -541,8 +541,15 @@ static int __maybe_unused rt711_dev_resume(struct device *dev)if (!rt711->first_hw_init)return 0 ; -if (!slave->unattach_request) +if (!slave->unattach_request) { +if (rt711->disable_irq == true) { +mutex_lock (&rt711->disable_irq_lock); +sdw_write_no_pm (slave,SDW_SCP_INTMASK1 ,SDW_SCP_INT1_IMPL_DEF ); + rt711->disable_irq = false; +mutex_unlock (&rt711->disable_irq_lock); + } goto regmap_sync; + } time =wait_for_completion_timeout (&slave->initialization_complete,msecs_to_jiffies (RT711_PROBE_TIMEOUT ));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 30/737 ASoC: rt711-sdca: fix for JD event handling in ClockStop Mode0
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuming Fan <[email protected]>
[ Upstream commit 23adeb7056acd4fd866969f4afb91441776cc4f5 ]
When the system suspends, peripheral SDCA interrupts are disabled. When system level resume is invoked, the peripheral SDCA interrupts should be enabled to handle JD events.
Enable SDCA interrupts in resume sequence when ClockStop Mode0 is applied.
--- sound/soc/codecs/rt711-sdca-sdw.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
sound/soc/codecs/rt711-sdca-sdw.c +9 -1
@@ -441,8 +441,16 @@ static int __maybe_unused rt711_sdca_dev_resume(struct device *dev)if (!rt711->first_hw_init)return 0 ; -if (!slave->unattach_request) +if (!slave->unattach_request) { +if (rt711->disable_irq == true) { +mutex_lock (&rt711->disable_irq_lock); +sdw_write_no_pm (slave,SDW_SCP_SDCA_INTMASK1 ,SDW_SCP_SDCA_INTMASK_SDCA_0 ); +sdw_write_no_pm (slave,SDW_SCP_SDCA_INTMASK2 ,SDW_SCP_SDCA_INTMASK_SDCA_8 ); + rt711->disable_irq = false; +mutex_unlock (&rt711->disable_irq_lock); + } goto regmap_sync; + } time =wait_for_completion_timeout (&slave->initialization_complete,msecs_to_jiffies (RT711_PROBE_TIMEOUT ));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 31/737 ASoC: atmel: Fix the 8K sample parameter in I2SC master
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guiting Shen <[email protected]>
[ Upstream commit f85739c0b2b0d98a32f5ca4fcc5501d2b76df4f6 ]
The 8K sample parameter of 12.288Mhz main system bus clock doesn't work because the I2SC_MR.IMCKDIV must not be 0 according to the sama5d2 series datasheet(I2SC Mode Register of Register Summary).
So use the 6.144Mhz instead of 12.288Mhz to support 8K sample.
--- sound/soc/atmel/atmel-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/atmel/atmel-i2s.c +4 -1
@@ -163,11 +163,14 @@ struct atmel_i2s_gck_param {#define I2S_MCK_12M288 12288000UL#define I2S_MCK_11M2896 11289600UL +#define I2S_MCK_6M144 6144000UL/* mck = (32 * (imckfs+1) / (imckdiv+1)) * fs */ static const struct atmel_i2s_gck_param gck_params[] = { +/* mck = 6.144Mhz */ + {8000 ,I2S_MCK_6M144 ,1 ,47 },/* mck = 768 fs */ +/* mck = 12.288MHz */ - {8000 ,I2S_MCK_12M288 ,0 ,47 },/* mck = 1536 fs */ {16000 ,I2S_MCK_12M288 ,1 ,47 },/* mck = 768 fs */ {24000 ,I2S_MCK_12M288 ,3 ,63 },/* mck = 512 fs */ {32000 ,I2S_MCK_12M288 ,3 ,47 },/* mck = 384 fs */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 32/737 ALSA: usb-audio: Add quirk for Microsoft Modern Wireless Headset
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 3da435063777f8d861ba5a165344e3f75f839357 ]
Microsoft Modern Wireless Headset (appearing on the host as "Microsoft USB Link") has a playback and a capture mixer volume/switch, but they are fairly broken. The descriptor reports wrong dB ranges for playback, and the capture volume/switch don't influence on the actual recording at all. Moreover, there seem instabilities in the connection, and at best, we should disable the runtime PM.
So this ended up with a quirk entry for:
- Correct the playback dB range;
I picked up some reasonable values but it's a guess work
- Disable the capture mixer;
it's completely useless and confuses PA/PW
- Suppress get-sample-rate, apply the delay for message handling, and suppress the auto-suspend
The behavior of the wheel control on the headset is somehow flaky, too, but it's an issue of HID.
--- sound/usb/mixer_maps.c | 14 ++++++++++++++ sound/usb/quirks.c | 3 +++ 2 files changed, 17 insertions(+)
sound/usb/mixer_maps.c +14 -0
@@ -374,6 +374,15 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = { { 0 } }; +/* Microsoft USB Link headset */ +/* a guess work: raw playback volume values are from 2 to 129 */ +static const struct usbmix_dB_map ms_usb_link_dB = {-3225 ,0 , true }; +static const struct usbmix_name_map ms_usb_link_map[] = { + {9 ,NULL , .dB = &ms_usb_link_dB }, + {10 ,NULL },/* Headset Capture volume; seems non-working, disabled */ + {0 }/* terminator */ +}; +/* ASUS ROG Zenith II with Realtek ALC1220-VB */ static const struct usbmix_name_map asus_zenith_ii_map[] = { {19 ,NULL ,12 },/* FU, Input Gain Pad - broken response, disabled */
@@ -668,6 +677,11 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x1395, 0x0025), .map = sennheiser_pc8_map, }, + { +/* Microsoft USB Link headset */ + .id = USB_ID(0x045e, 0x083c), + .map = ms_usb_link_map, + }, { 0 } /* terminator */ };
sound/usb/quirks.c +3 -0
@@ -2011,6 +2011,9 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_IGNORE_CTL_ERROR),DEVICE_FLG (0x041e ,0x4080 ,/* Creative Live Cam VF0610 */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x045e ,0x083c ,/* MS USB Link headset */ +QUIRK_FLAG_GET_SAMPLE_RATE |QUIRK_FLAG_CTL_MSG_DELAY | +QUIRK_FLAG_DISABLE_AUTOSUSPEND ),DEVICE_FLG (0x046d ,0x084c ,/* Logitech ConferenceCam Connect */ QUIRK_FLAG_GET_SAMPLE_RATE |QUIRK_FLAG_CTL_MSG_DELAY_1M ), DEVICE_FLG(0x046d, 0x0991, /* Logitech QuickCam Pro */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 33/737 platform/x86: intel: hid: Always call BTNL ACPI method
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit e3ab18de2b09361d6f0e4aafb9cfd6d002ce43a1 ]
On a HP Elite Dragonfly G2 the 0xcc and 0xcd events for SW_TABLET_MODE are only send after the BTNL ACPI method has been called.
Likely more devices need this, so make the BTNL ACPI method unconditional instead of only doing it on devices with a 5 button array.
Note this also makes the intel_button_array_enable() call in probe() unconditional, that function does its own priv->array check. This makes the intel_button_array_enable() call in probe() consistent with the calls done on suspend/resume which also rely on the priv->array check inside the function.
--- drivers/platform/x86/intel/hid.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/platform/x86/intel/hid.c +9 -12
@@ -620,7 +620,7 @@ static bool button_array_present(struct platform_device *device)static int intel_hid_probe (struct platform_device *device) {acpi_handle handle =ACPI_HANDLE (&device->dev); -unsigned long long mode; +unsigned long long mode, dummy;struct intel_hid_priv *priv;acpi_status status;int err;
@@ -692,18 +692,15 @@ static int intel_hid_probe(struct platform_device *device)if (err) goto err_remove_notify; -if (priv->array) { -unsigned long long dummy; +intel_button_array_enable (&device->dev, true); -intel_button_array_enable (&device->dev, true); - -/* Call button load method to enable HID power button */ -if (!intel_hid_evaluate_method (handle,INTEL_HID_DSM_BTNL_FN , - &dummy)) { -dev_warn (&device->dev, -"failed to enable HID power button\n" ); - } - } +/* +* Call button load method to enable HID power button +* Always do this since it activates events on some devices without +* a button array too. +*/ +if (!intel_hid_evaluate_method (handle,INTEL_HID_DSM_BTNL_FN , &dummy)) +dev_warn (&device->dev,"failed to enable HID power button\n" );device_init_wakeup (&device->dev, true);/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 34/737 platform/x86/intel/hid: Add HP Dragonfly G2 to VGBS DMI quirks
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxim Mikityanskiy <[email protected]>
[ Upstream commit 7783e97f8558ad7a4d1748922461bc88483fbcdf ]
HP Elite Dragonfly G2 (a convertible laptop/tablet) has a reliable VGBS method. If VGBS is not called on boot, the firmware sends an initial 0xcd event shortly after calling the BTNL method, but only if the device is booted in the laptop mode. However, if the device is booted in the tablet mode and VGBS is not called, there is no initial 0xcc event, and the input device for SW_TABLET_MODE is not registered up until the user turns the device into the laptop mode.
Call VGBS on boot on this device to get the initial state of SW_TABLET_MODE in a reliable way.
Tested with BIOS 1.13.1.
--- drivers/platform/x86/intel/hid.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/platform/x86/intel/hid.c +6 -0
@@ -150,6 +150,12 @@ static const struct dmi_system_id dmi_vgbs_allow_list[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "HP"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Elite Dragonfly G2 Notebook PC"), + }, + }, { } };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 35/737 platform/x86: think-lmi: Use kfree_sensitive instead of kfree
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Ming <[email protected]>
[ Upstream commit 1da0893aed2e48e2bdf37c29b029f2e060d25927 ]
key might contain private part of the key, so better use kfree_sensitive to free it.
--- drivers/platform/x86/think-lmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/think-lmi.c +2 -2
@@ -719,12 +719,12 @@ static ssize_t cert_to_password_store(struct kobject *kobj,/* Format: 'Password,Signature' */ auth_str =kasprintf (GFP_KERNEL ,"%s,%s" , passwd, setting->signature);if (!auth_str) { -kfree (passwd); +kfree_sensitive (passwd);return -ENOMEM ; } ret =tlmi_simple_call (LENOVO_CERT_TO_PASSWORD_GUID , auth_str);kfree (auth_str); -kfree (passwd); +kfree_sensitive (passwd);return ret ?: count; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 36/737 platform/x86: asus-wmi: Fix setting RGB mode on some TUF laptops
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kristian Angelov <[email protected]>
[ Upstream commit 6a758a3e831ce1a84c9c209ac6dc755f4c8ce77a ]
This patch fixes setting the cmd values to 0xb3 and 0xb4. This is necessary on some TUF laptops in order to set the RGB mode.
--- drivers/platform/x86/asus-wmi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/platform/x86/asus-wmi.c +12 -2
@@ -738,13 +738,23 @@ static ssize_t kbd_rgb_mode_store(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - u32 cmd, mode, r, g, b, speed; + u32 cmd, mode, r, g, b, speed;int err;if (sscanf (buf,"%d %d %d %d %d %d" , &cmd, &mode, &r, &g, &b, &speed) !=6 )return -EINVAL ; - cmd = !!cmd; +/* B3 is set and B4 is save to BIOS */ +switch (cmd) { +case 0 : + cmd =0xb3 ; +break ; +case 1 : + cmd =0xb4 ; +break ; +default : +return -EINVAL ; + }/* These are the known usable modes across all TUF/ROG */ if (mode >=12 || mode ==9 )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 37/737 platform/x86: huawei-wmi: Silence ambient light sensor
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Shelekhin <[email protected]>
[ Upstream commit c21733754cd6ecbca346f2adf9b17d4cfa50504f ]
Currently huawei-wmi causes a lot of spam in dmesg on my Huawei MateBook X Pro 2022:
...
[36409.328463] input input9: Unknown key pressed, code: 0x02c1 [36411.335104] input input9: Unknown key pressed, code: 0x02c1 [36412.338674] input input9: Unknown key pressed, code: 0x02c1 [36414.848564] input input9: Unknown key pressed, code: 0x02c1 [36416.858706] input input9: Unknown key pressed, code: 0x02c1 ...
Fix that by ignoring events generated by ambient light sensor.
This issue was reported on GitHub and resolved with the following merge request:
https://github.com/aymanbagabas/Huawei-WMI/pull/70
I've contacted the mainter of this repo and he gave me the "go ahead" to send this patch to the maling list.
--- drivers/platform/x86/huawei-wmi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/platform/x86/huawei-wmi.c +2 -0
@@ -85,6 +85,8 @@ static const struct key_entry huawei_wmi_keymap[] = { { KE_IGNORE, 0x293, { KEY_KBDILLUMTOGGLE } }, { KE_IGNORE, 0x294, { KEY_KBDILLUMUP } }, { KE_IGNORE, 0x295, { KEY_KBDILLUMUP } }, +// Ignore Ambient Light Sensoring + { KE_KEY, 0x2c1, { KEY_RESERVED } }, { KE_END, 0 } };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 38/737 drm/amd/smu: use AverageGfxclkFrequency* to replace previous GFX Curr Clock
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jane Jian <[email protected]>
[ Upstream commit 4a37c55b859a69f429bfa7fab4fc43ee470b60ed ]
Report current GFX clock also from average clock value as the original CurrClock data is not valid/accurate any more as per FW team
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +1 -1
@@ -1323,7 +1323,7 @@ static ssize_t smu_v13_0_0_get_gpu_metrics(struct smu_context *smu, gpu_metrics->average_vclk1_frequency = metrics->AverageVclk1Frequency; gpu_metrics->average_dclk1_frequency = metrics->AverageDclk1Frequency; - gpu_metrics->current_gfxclk = metrics->CurrClock[PPCLK_GFXCLK ]; + gpu_metrics->current_gfxclk = gpu_metrics->average_gfxclk_frequency; gpu_metrics->current_socclk = metrics->CurrClock[PPCLK_SOCCLK ]; gpu_metrics->current_uclk = metrics->CurrClock[PPCLK_UCLK ]; gpu_metrics->current_vclk0 = metrics->CurrClock[PPCLK_VCLK_0 ];
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 21/737 m68k: Fix invalid .section syntax
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit 922a9bd138101e3e5718f0f4d40dba68ef89bb43 ]
gas supports several different forms for .section for ELF targets, including:
.section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]]
and:
.section "NAME"[, #FLAGS...]
In several places we use a mix of these two forms:
.section NAME, #FLAGS...
A current development snapshot of binutils (2.40.50.20230611) treats this mixed syntax as an error.
Change to consistently use:
.section NAME, "FLAGS"
as is used elsewhere in the kernel.
--- arch/m68k/fpsp040/skeleton.S | 4 ++-- arch/m68k/ifpsp060/os.S | 4 ++-- arch/m68k/kernel/relocate_kernel.S | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/m68k/fpsp040/skeleton.S +2 -2
@@ -499,13 +499,13 @@ in_ea: dbf %d0,morein rts - .section .fixup,#alloc,#execinstr + .section .fixup,"ax" .even 1: jbsr fpsp040_die jbra .Lnotkern - .section __ex_table,#alloc + .section __ex_table,"a" .align 4 .long in_ea,1b
arch/m68k/ifpsp060/os.S +2 -2
@@ -379,11 +379,11 @@ _060_real_access: | Execption handling for movs access to illegal memory - .section .fixup,#alloc,#execinstr + .section .fixup,"ax" .even 1: moveq #-1,%d1 rts -.section __ex_table,#alloc +.section __ex_table,"a" .align 4 .long dmrbuae,1b .long dmrwuae,1b
arch/m68k/kernel/relocate_kernel.S +2 -2
@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) lea %pc@(.Lcopy),%a4 2: addl #0x00000000,%a4 /* virt_to_phys() */ - .section ".m68k_fixup","aw" + .section .m68k_fixup,"aw" .long M68K_FIXUP_MEMOFFSET, 2b+2 .previous
@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) lea %pc@(.Lcont040),%a4 5: addl #0x00000000,%a4 /* virt_to_phys() */ - .section ".m68k_fixup","aw" + .section .m68k_fixup,"aw" .long M68K_FIXUP_MEMOFFSET, 5b+2 .previous
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 39/737 drm/amd/display: Guard DCN31 PHYD32CLK logic against chip family
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Shen <[email protected]>
[ Upstream commit 25b054c3c89cb6a7106a7982f0f70e83d0797dab ]
[Why]
Current yellow carp B0 PHYD32CLK logic is incorrectly applied to other ASICs.
[How]
Add guard to check chip family is yellow carp before applying logic.
--- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +2 -1
@@ -84,7 +84,8 @@ static enum phyd32clk_clock_source get_phy_mux_symclk( struct dcn_dccg *dccg_dcn, enum phyd32clk_clock_source src) { -if (dccg_dcn->base.ctx->asic_id.hw_internal_rev ==YELLOW_CARP_B0 ) { +if (dccg_dcn->base.ctx->asic_id.chip_family ==FAMILY_YELLOW_CARP && + dccg_dcn->base.ctx->asic_id.hw_internal_rev ==YELLOW_CARP_B0 ) {if (src ==PHYD32CLKC ) src =PHYD32CLKF ;if (src ==PHYD32CLKD )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 40/737 drm/amd/display: Exit idle optimizations before attempt to access PHY
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Chen <[email protected]>
[ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ]
[Why & How]
DMUB may hang when powering down pixel clocks due to no dprefclk.
It is fixed by exiting idle optimization before the attempt to access PHY.
--- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3 -0
@@ -1795,10 +1795,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control (edp_link_with_sink, false); }/*resume from S3, no vbios posting, no need to power down again*/ +clk_mgr_exit_optimized_pwr_state (dc, dc->clk_mgr); +power_down_all_hw_blocks (dc);disable_vga_and_power_gate_all_controllers (dc);if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control (edp_link_with_sink, false); +clk_mgr_optimize_pwr_state (dc, dc->clk_mgr); }bios_set_scratch_acc_mode_change (dc->ctx->dc_bios,1 ); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 41/737 ovl: Always reevaluate the file signature for IMA
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Snowberg <[email protected]>
[ Upstream commit 18b44bc5a67275641fb26f2c54ba7eef80ac5950 ]
Commit db1d1e8b9867 ("IMA: use vfs_getattr_nosec to get the i_version") partially closed an IMA integrity issue when directly modifying a file on the lower filesystem. If the overlay file is first opened by a user and later the lower backing file is modified by root, but the extended attribute is NOT updated, the signature validation succeeds with the old original signature.
Update the super_block s_iflags to SB_I_IMA_UNVERIFIABLE_SIGNATURE to force signature reevaluation on every file access until a fine grained solution can be found.
--- fs/overlayfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/overlayfs/super.c +1 -1
@@ -2052,7 +2052,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ovl_trusted_xattr_handlers; sb->s_fs_info = ofs; sb->s_flags |=SB_POSIXACL ; - sb->s_iflags |=SB_I_SKIP_SYNC ; + sb->s_iflags |=SB_I_SKIP_SYNC |SB_I_IMA_UNVERIFIABLE_SIGNATURE ; err = -ENOMEM ; root_dentry =ovl_get_root (sb, upperpath.dentry, oe);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 42/737 ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minjie Du <[email protected]>
[ Upstream commit 4139f992c49356391fb086c0c8ce51f66c26d623 ]
It is possible for dma_request_chan() to return EPROBE_DEFER, which means acdev->host->dev is not ready yet. At this point dev_err() will have no output. Use dev_err_probe() instead.
--- drivers/ata/pata_arasan_cf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ata/pata_arasan_cf.c +2 -1
@@ -529,7 +529,8 @@ static void data_xfer(struct work_struct *work)/* dma_request_channel may sleep, so calling from process context */ acdev->dma_chan =dma_request_chan (acdev->host->dev,"data" );if (IS_ERR (acdev->dma_chan)) { -dev_err (acdev->host->dev,"Unable to get dma_chan\n" ); +dev_err_probe (acdev->host->dev,PTR_ERR (acdev->dma_chan), +"Unable to get dma_chan\n" ); acdev->dma_chan =NULL ; goto chan_request_fail; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 43/737 ALSA: usb-audio: Update for native DSD support quirks
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jussi Laako <[email protected]>
[ Upstream commit f7fea075edfa085c25eb34c44ceacf3602537f98 ]
Maintenance patch for native DSD support.
Remove incorrect T+A device quirks. Move set of device quirks to vendor quirks. Add set of missing device and vendor quirks.
--- sound/usb/quirks.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
sound/usb/quirks.c +28 -6
@@ -1874,8 +1874,10 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,/* XMOS based USB DACs */ switch (chip->usb_id) { -case USB_ID (0x1511 ,0x0037 ):/* AURALiC VEGA */ -case USB_ID (0x21ed ,0xd75a ):/* Accuphase DAC-60 option card */ +case USB_ID (0x139f ,0x5504 ):/* Nagra DAC */ +case USB_ID (0x20b1 ,0x3089 ):/* Mola-Mola DAC */ +case USB_ID (0x2522 ,0x0007 ):/* LH Labs Geek Out 1V5 */ +case USB_ID (0x2522 ,0x0009 ):/* LH Labs Geek Pulse X Inifinity 2V0 */ case USB_ID (0x2522 ,0x0012 ):/* LH Labs VI DAC Infinity */ case USB_ID (0x2772 ,0x0230 ):/* Pro-Ject Pre Box S2 Digital */ if (fp->altsetting ==2 )
@@ -1885,14 +1887,18 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,case USB_ID (0x0d8c ,0x0316 ):/* Hegel HD12 DSD */ case USB_ID (0x10cb ,0x0103 ):/* The Bit Opus #3; with fp->dsd_raw */ case USB_ID (0x16d0 ,0x06b2 ):/* NuPrime DAC-10 */ -case USB_ID (0x16d0 ,0x09dd ):/* Encore mDSD */ +case USB_ID (0x16d0 ,0x06b4 ):/* NuPrime Audio HD-AVP/AVA */ case USB_ID (0x16d0 ,0x0733 ):/* Furutech ADL Stratos */ +case USB_ID (0x16d0 ,0x09d8 ):/* NuPrime IDA-8 */ case USB_ID (0x16d0 ,0x09db ):/* NuPrime Audio DAC-9 */ +case USB_ID (0x16d0 ,0x09dd ):/* Encore mDSD */ case USB_ID (0x1db5 ,0x0003 ):/* Bryston BDA3 */ +case USB_ID (0x20a0 ,0x4143 ):/* WaveIO USB Audio 2.0 */ case USB_ID (0x22e1 ,0xca01 ):/* HDTA Serenade DSD */ case USB_ID (0x249c ,0x9326 ):/* M2Tech Young MkIII */ case USB_ID (0x2616 ,0x0106 ):/* PS Audio NuWave DAC */ case USB_ID (0x2622 ,0x0041 ):/* Audiolab M-DAC+ */ +case USB_ID (0x278b ,0x5100 ):/* Rotel RC-1590 */ case USB_ID (0x27f7 ,0x3002 ):/* W4S DAC-2v2SE */ case USB_ID (0x29a2 ,0x0086 ):/* Mutec MC3+ USB */ case USB_ID (0x6b42 ,0x0042 ):/* MSB Technology */
@@ -1902,9 +1908,6 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,/* Amanero Combo384 USB based DACs with native DSD support */ case USB_ID (0x16d0 ,0x071a ):/* Amanero - Combo384 */ -case USB_ID (0x2ab6 ,0x0004 ):/* T+A DAC8DSD-V2.0, MP1000E-V2.0, MP2000R-V2.0, MP2500R-V2.0, MP3100HV-V2.0 */ -case USB_ID (0x2ab6 ,0x0005 ):/* T+A USB HD Audio 1 */ -case USB_ID (0x2ab6 ,0x0006 ):/* T+A USB HD Audio 2 */ if (fp->altsetting ==2 ) {switch (le16_to_cpu (chip->dev->descriptor.bcdDevice)) {case 0x199 :
@@ -2049,6 +2052,9 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_IFACE_DELAY),DEVICE_FLG (0x0644 ,0x805f ,/* TEAC Model 12 */ QUIRK_FLAG_FORCE_IFACE_RESET ), +DEVICE_FLG (0x0644 ,0x806b ,/* TEAC UD-701 */ +QUIRK_FLAG_ITF_USB_DSD_DAC |QUIRK_FLAG_CTL_MSG_DELAY | +QUIRK_FLAG_IFACE_DELAY ),DEVICE_FLG (0x06f8 ,0xb000 ,/* Hercules DJ Console (Windows Edition) */ QUIRK_FLAG_IGNORE_CTL_ERROR ), DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */
@@ -2087,6 +2093,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),DEVICE_FLG (0x154e ,0x3006 ,/* Marantz SA-14S1 */ QUIRK_FLAG_ITF_USB_DSD_DAC |QUIRK_FLAG_CTL_MSG_DELAY ), +DEVICE_FLG (0x154e ,0x300b ,/* Marantz SA-KI RUBY / SA-12 */ +QUIRK_FLAG_DSD_RAW ),DEVICE_FLG (0x154e ,0x500e ,/* Denon DN-X1600 */ QUIRK_FLAG_IGNORE_CLOCK_SOURCE ), DEVICE_FLG(0x1686, 0x00dd, /* Zoom R16/24 */
@@ -2131,6 +2139,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x21b4 ,0x0081 ,/* AudioQuest DragonFly */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x21b4 ,0x0230 ,/* Ayre QB-9 Twenty */ +QUIRK_FLAG_DSD_RAW ), +DEVICE_FLG (0x21b4 ,0x0232 ,/* Ayre QX-5 Twenty */ +QUIRK_FLAG_DSD_RAW ),DEVICE_FLG (0x2522 ,0x0007 ,/* LH Labs Geek Out HD Audio 1V5 */ QUIRK_FLAG_SET_IFACE_FIRST ), DEVICE_FLG(0x2708, 0x0002, /* Audient iD14 */
@@ -2173,12 +2185,18 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_VALIDATE_RATES),VENDOR_FLG (0x1235 ,/* Focusrite Novation */ QUIRK_FLAG_VALIDATE_RATES ), +VENDOR_FLG (0x1511 ,/* AURALiC */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x152a ,/* Thesycon devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x18d1 ,/* iBasso devices */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x1de7 ,/* Phoenix Audio */ QUIRK_FLAG_GET_SAMPLE_RATE ),VENDOR_FLG (0x20b1 ,/* XMOS based devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x21ed ,/* Accuphase Laboratory */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x22d9 ,/* Oppo */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0x23ba, /* Playback Design */
@@ -2194,10 +2212,14 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_DSD_RAW),VENDOR_FLG (0x2ab6 ,/* T+A devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x2d87 ,/* Cayin device */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3336 ,/* HEM devices */ QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3353 ,/* Khadas devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x35f4 ,/* MSB Technology */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3842 ,/* EVGA */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0xc502, /* HiBy devices */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 44/737 staging: fbtft: ili9341: use macro FBTFT_REGISTER_SPI_DRIVER
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raphael Gallais-Pou <[email protected]>
[ Upstream commit 4912649e1cf0317bf563f91655e04a303cacaf8d ]
Using FBTFT_REGISTER_DRIVER resolves to a NULL struct spi_device_id. This ultimately causes a warning when the module probes. Fixes it.
--- drivers/staging/fbtft/fb_ili9341.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/fbtft/fb_ili9341.c +1 -1
@@ -145,7 +145,7 @@ static struct fbtft_display display = { }, }; -FBTFT_REGISTER_DRIVER (DRVNAME ,"ilitek,ili9341" , &display); +FBTFT_REGISTER_SPI_DRIVER (DRVNAME ,"ilitek" ,"ili9341" , &display);MODULE_ALIAS ("spi:" DRVNAME );MODULE_ALIAS ("platform:" DRVNAME );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 45/737 LoongArch: Only fiddle with CHECKFLAGS if `need-compiler
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 54c2c9df083fe1d4a9df54d9876f32582ce6d77a ]
This is a port of commit 4fe4a6374c4db9ae2b ("MIPS: Only fiddle with CHECKFLAGS if `need-compiler'") to LoongArch.
We have originally guarded fiddling with CHECKFLAGS in our arch Makefile by checking for the CONFIG_LOONGARCH variable, not set for targets such as distclean', etc. that neither include .config' nor use the compiler.
Starting from commit 805b2e1d427aab4 ("kbuild: include Makefile.compiler only when compiler is needed") we have had a generic `need-compiler' variable explicitly telling us if the compiler will be used and thus its capabilities need to be checked and expressed in the form of compilation flags. If this variable is not set, then make' functions such as cc-option' are undefined, causing all kinds of weirdness to happen if we expect specific results to be returned.
It doesn't cause problems on LoongArch now. But as a guard we replace the check for CONFIG_LOONGARCH with one for `need-compiler' instead, so as to prevent the compiler from being ever called for CHECKFLAGS when not needed.
--- arch/loongarch/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/loongarch/Makefile +1 -1
@@ -106,7 +106,7 @@ KBUILD_CFLAGS += -isystem $(shell $(CC) -print-file-name=include) KBUILD_LDFLAGS += -m $(ld-emul) -ifdef CONFIG_LOONGARCH +ifdef need-compiler CHECKFLAGS += $(shell $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \ grep -E -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \ sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 46/737 LoongArch: Fix CMDLINE_EXTEND and CMDLINE_BOOTLOADER handling
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhihong Dong <[email protected]>
[ Upstream commit 83da30d73b86ab5898fb84f8b49c11557c3fcc67 ]
On FDT systems these command line processing are already taken care of by early_init_dt_scan_chosen(). Add similar handling to the ACPI (non- FDT) code path to allow these config options to work for ACPI (non-FDT) systems too.
--- arch/loongarch/kernel/setup.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/loongarch/kernel/setup.c +16 -0
@@ -332,9 +332,25 @@ static void __init bootcmdline_init(char **cmdline_p)strlcat (boot_command_line," " ,COMMAND_LINE_SIZE );strlcat (boot_command_line, init_command_line,COMMAND_LINE_SIZE ); + goto out; }#endif +/* +* Append built-in command line to the bootloader command line if +* CONFIG_CMDLINE_EXTEND is enabled. +*/ +if (IS_ENABLED (CONFIG_CMDLINE_EXTEND ) &&CONFIG_CMDLINE [0 ]) { +strlcat (boot_command_line," " ,COMMAND_LINE_SIZE ); +strlcat (boot_command_line,CONFIG_CMDLINE ,COMMAND_LINE_SIZE ); + } + +/* +* Use built-in command line if the bootloader command line is empty. +*/ +if (IS_ENABLED (CONFIG_CMDLINE_BOOTLOADER ) && !boot_command_line[0 ]) +strscpy (boot_command_line,CONFIG_CMDLINE ,COMMAND_LINE_SIZE ); + out: *cmdline_p = boot_command_line; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 47/737 security: keys: perform capable check only on privileged operations
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Göttsche <[email protected]>
[ Upstream commit 2d7f105edbb3b2be5ffa4d833abbf9b6965e9ce7 ]
If the current task fails the check for the queried capability via capable(CAP_SYS_ADMIN) LSMs like SELinux generate a denial message. Issuing such denial messages unnecessarily can lead to a policy author granting more privileges to a subject than needed to silence them.
Reorder CAP_SYS_ADMIN checks after the check whether the operation is actually privileged.
--- security/keys/keyctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
security/keys/keyctl.c +8 -3
@@ -980,14 +980,19 @@ long keyctl_chown_key(key_serial_t id, uid_t user, gid_t group) ret = -EACCES ;down_write (&key->sem); -if (!capable (CAP_SYS_ADMIN )) { + { +bool is_privileged_op = false; +/* only the sysadmin can chown a key to some other UID */ if (user != (uid_t) -1 && !uid_eq (key->uid, uid)) - goto error_put; + is_privileged_op = true;/* only the sysadmin can set the key's GID to a group other * than one of those that the current process subscribes to */ if (group != (gid_t) -1 && !gid_eq (gid, key->gid) && !in_group_p (gid)) + is_privileged_op = true; + +if (is_privileged_op && !capable (CAP_SYS_ADMIN )) goto error_put; }
@@ -1088,7 +1093,7 @@ long keyctl_setperm_key(key_serial_t id, key_perm_t perm)down_write (&key->sem);/* if we're not the sysadmin, we can only change a key that we own */ -if (capable (CAP_SYS_ADMIN ) ||uid_eq (key->uid,current_fsuid ())) { +if (uid_eq (key->uid,current_fsuid ()) ||capable (CAP_SYS_ADMIN )) { key->perm = perm;notify_key (key,NOTIFY_KEY_SETATTR ,0 ); ret =0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 48/737 kprobes: Prohibit probing on CFI preamble symbol
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
[ Upstream commit de02f2ac5d8cfb311f44f2bf144cc20002f1fbbd ]
Do not allow to probe on "__cfi_" or "__pfx_" started symbol, because those are used for CFI and not executed. Probing it will break the CFI.
--- kernel/kprobes.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
kernel/kprobes.c +13 -1
@@ -1545,6 +1545,17 @@ static int check_ftrace_location(struct kprobe *p)return 0 ; } +static bool is_cfi_preamble_symbol (unsigned long addr) +{ +char symbuf[KSYM_NAME_LEN ]; + +if (lookup_symbol_name (addr, symbuf)) +return false; + +return str_has_prefix ("__cfi_" , symbuf) || +str_has_prefix ("__pfx_" , symbuf); +} +static int check_kprobe_address_safe (struct kprobe *p,struct module **probed_mod) {
@@ -1563,7 +1574,8 @@ static int check_kprobe_address_safe(struct kprobe *p,within_kprobe_blacklist ((unsigned long ) p->addr) ||jump_label_text_reserved (p->addr, p->addr) ||static_call_text_reserved (p->addr, p->addr) || - find_bug((unsigned long)p->addr)) { +find_bug ((unsigned long )p->addr) || + is_cfi_preamble_symbol((unsigned long)p->addr)) { ret = -EINVAL; goto out; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 22/737 s390/dasd: use correct number of retries for ERP requests
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Haberland <[email protected]>
[ Upstream commit acea28a6b74f458defda7417d2217b051ba7d444 ]
If a DASD request fails an error recovery procedure (ERP) request might be built as a copy of the original request to do error recovery.
The ERP request gets a number of retries assigned.
This number is always 256 no matter what other value might have been set for the original request. This is not what is expected when a user specifies a certain amount of retries for the device via sysfs.
Correctly use the number of retries of the original request for ERP requests.
--- drivers/s390/block/dasd_3990_erp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/block/dasd_3990_erp.c +1 -1
@@ -2441,7 +2441,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) erp->block = cqr->block; erp->magic = cqr->magic; erp->expires = cqr->expires; - erp->retries =256 ; + erp->retries = device->default_retries; erp->buildclk =get_tod_clock (); erp->status =DASD_CQR_FILLED ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 49/737 clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baoquan He <[email protected]>
[ Upstream commit e7dd44f4f3166db45248414f5df8f615392de47a ]
On s390 systems (aka mainframes), it has classic channel devices for networking and permanent storage that are currently even more common than PCI devices. Hence it could have a fully functional s390 kernel with CONFIG_PCI=n, then the relevant iomem mapping functions [including ioremap(), devm_ioremap(), etc.] are not available.
Here let COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM so that it won't be built to cause below compiling error if PCI is unset:
------
ld: drivers/clk/clk-fixed-mmio.o: in function `fixed_mmio_clk_setup':
clk-fixed-mmio.c:(.text+0x5e): undefined reference to `of_iomap'
ld: clk-fixed-mmio.c:(.text+0xba): undefined reference to `iounmap'
------
--- drivers/clk/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/clk/Kconfig +1 -0
@@ -444,6 +444,7 @@ config COMMON_CLK_BD718XX config COMMON_CLK_FIXED_MMIO bool "Clock driver for Memory Mapped Fixed values" depends on COMMON_CLK && OF + depends on HAS_IOMEM help Support for Memory Mapped IO Fixed clocks
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 50/737 vmbus_testing: fix wrong python syntax for integer value comparison
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ani Sinha <[email protected]>
[ Upstream commit ed0cf84e9cc42e6310961c87709621f1825c2bb8 ]
It is incorrect in python to compare integer values using the "is" keyword. The "is" keyword in python is used to compare references to two objects, not their values. Newer version of python3 (version 3.8) throws a warning when such incorrect comparison is made. For value comparison, "==" should be used.
Fix this in the code and suppress the following warning:
/usr/sbin/vmbus_testing:167: SyntaxWarning: "is" with a literal. Did you mean "=="?
--- tools/hv/vmbus_testing | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/hv/vmbus_testing +2 -2
@@ -164,7 +164,7 @@ def recursive_file_lookup(path, file_map): def get_all_devices_test_status(file_map): for device in file_map: - if (get_test_state(locate_state(device, file_map)) is 1): + if (get_test_state(locate_state(device, file_map)) == 1): print("Testing = ON for: {}" .format(device.split("/")[5])) else:
@@ -203,7 +203,7 @@ def write_test_files(path, value): def set_test_state(state_path, state_value, quiet): write_test_files(state_path, state_value) - if (get_test_state(state_path) is 1): + if (get_test_state(state_path) == 1): if (not quiet): print("Testing = ON for device: {}" .format(state_path.split("/")[5]))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 51/737 Revert "wifi: ath6k: silence false positive -Wno-dangling-pointer warning on GCC 12"
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalle Valo <[email protected]>
[ Upstream commit a1ce186db7f0e449f35d12fb55ae0da2a1b400e2 ]
This reverts commit bd1d129daa3ede265a880e2c6a7f91eab0f4dc62.
The dangling-pointer warnings were disabled kernel-wide by commit 49beadbd47c2 ("gcc-12: disable '-Wdangling-pointer' warning for now") for v5.19. So this hack in ath6kl is not needed anymore.
--- drivers/net/wireless/ath/ath6kl/Makefile | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/wireless/ath/ath6kl/Makefile +0 -5
@@ -36,11 +36,6 @@ ath6kl_core-y += wmi.o ath6kl_core-y += core.o ath6kl_core-y += recovery.o -# FIXME: temporarily silence -Wdangling-pointer on non W=1+ builds -ifndef KBUILD_EXTRA_WARN -CFLAGS_htc_mbox.o += $(call cc-disable-warning, dangling-pointer) -endif - ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o ath6kl_core-$(CONFIG_ATH6KL_TRACING) += trace.o
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 52/737 net: dsa: microchip: KSZ9477 register regmap alignment to 32 bit boundaries
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukasz Majewski <[email protected]>
[ Upstream commit 8d7ae22ae9f8c8a4407f8e993df64440bdbd0cee ]
The commit (SHA1: 5c844d57aa7894154e49cf2fc648bfe2f1aefc1c) provided code to apply "Module 6: Certain PHY registers must be written as pairs instead of singly" errata for KSZ9477 as this chip for certain PHY registers (0xN120 to 0xN13F, N=1,2,3,4,5) must be accesses as 32 bit words instead of 16 or 8 bit access.
Otherwise, adjacent registers (no matter if reserved or not) are overwritten with 0x0.
Without this patch some registers (e.g. 0x113c or 0x1134) required for 32 bit access are out of valid regmap ranges.
As a result, following error is observed and KSZ9477 is not properly configured:
ksz-switch spi1.0: can't rmw 32bit reg 0x113c: -EIO
ksz-switch spi1.0: can't rmw 32bit reg 0x1134: -EIO
ksz-switch spi1.0 lan1 (uninitialized): failed to connect to PHY: -EIO ksz-switch spi1.0 lan1 (uninitialized): error -5 setting up PHY for tree 0, switch 0, port 0
The solution is to modify regmap_reg_range to allow accesses with 4 bytes boundaries.
--- drivers/net/dsa/microchip/ksz_common.c | 35 +++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +15 -20
@@ -635,10 +635,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {regmap_reg_range (0x1030 ,0x1030 ),regmap_reg_range (0x1100 ,0x1115 ),regmap_reg_range (0x111a ,0x111f ), -regmap_reg_range (0x1122 ,0x1127 ), -regmap_reg_range (0x112a ,0x112b ), -regmap_reg_range (0x1136 ,0x1139 ), -regmap_reg_range (0x113e ,0x113f ), +regmap_reg_range (0x1120 ,0x112b ), +regmap_reg_range (0x1134 ,0x113b ), +regmap_reg_range (0x113c ,0x113f ),regmap_reg_range (0x1400 ,0x1401 ),regmap_reg_range (0x1403 ,0x1403 ), regmap_reg_range(0x1410, 0x1417),
@@ -669,10 +668,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {regmap_reg_range (0x2030 ,0x2030 ),regmap_reg_range (0x2100 ,0x2115 ),regmap_reg_range (0x211a ,0x211f ), -regmap_reg_range (0x2122 ,0x2127 ), -regmap_reg_range (0x212a ,0x212b ), -regmap_reg_range (0x2136 ,0x2139 ), -regmap_reg_range (0x213e ,0x213f ), +regmap_reg_range (0x2120 ,0x212b ), +regmap_reg_range (0x2134 ,0x213b ), +regmap_reg_range (0x213c ,0x213f ),regmap_reg_range (0x2400 ,0x2401 ),regmap_reg_range (0x2403 ,0x2403 ), regmap_reg_range(0x2410, 0x2417),
@@ -703,10 +701,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {regmap_reg_range (0x3030 ,0x3030 ),regmap_reg_range (0x3100 ,0x3115 ),regmap_reg_range (0x311a ,0x311f ), -regmap_reg_range (0x3122 ,0x3127 ), -regmap_reg_range (0x312a ,0x312b ), -regmap_reg_range (0x3136 ,0x3139 ), -regmap_reg_range (0x313e ,0x313f ), +regmap_reg_range (0x3120 ,0x312b ), +regmap_reg_range (0x3134 ,0x313b ), +regmap_reg_range (0x313c ,0x313f ),regmap_reg_range (0x3400 ,0x3401 ),regmap_reg_range (0x3403 ,0x3403 ), regmap_reg_range(0x3410, 0x3417),
@@ -737,10 +734,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {regmap_reg_range (0x4030 ,0x4030 ),regmap_reg_range (0x4100 ,0x4115 ),regmap_reg_range (0x411a ,0x411f ), -regmap_reg_range (0x4122 ,0x4127 ), -regmap_reg_range (0x412a ,0x412b ), -regmap_reg_range (0x4136 ,0x4139 ), -regmap_reg_range (0x413e ,0x413f ), +regmap_reg_range (0x4120 ,0x412b ), +regmap_reg_range (0x4134 ,0x413b ), +regmap_reg_range (0x413c ,0x413f ),regmap_reg_range (0x4400 ,0x4401 ),regmap_reg_range (0x4403 ,0x4403 ), regmap_reg_range(0x4410, 0x4417),
@@ -771,10 +767,9 @@ static const struct regmap_range ksz9477_valid_regs[] = {regmap_reg_range (0x5030 ,0x5030 ),regmap_reg_range (0x5100 ,0x5115 ),regmap_reg_range (0x511a ,0x511f ), -regmap_reg_range (0x5122 ,0x5127 ), -regmap_reg_range (0x512a ,0x512b ), -regmap_reg_range (0x5136 ,0x5139 ), -regmap_reg_range (0x513e ,0x513f ), +regmap_reg_range (0x5120 ,0x512b ), +regmap_reg_range (0x5134 ,0x513b ), +regmap_reg_range (0x513c ,0x513f ),regmap_reg_range (0x5400 ,0x5401 ),regmap_reg_range (0x5403 ,0x5403 ), regmap_reg_range(0x5410, 0x5417),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 53/737 net: annotate data-races around sk->sk_{rcv|snd}timeo
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 285975dd674258ccb33e77a1803e8f2015e67105 ]
sk_getsockopt() runs without locks, we must add annotations to sk->sk_rcvtimeo and sk->sk_sndtimeo.
In the future we might allow fetching these fields before we lock the socket in TCP fast path.
--- net/core/sock.c | 24 ++++++++++++++---------- net/sched/em_meta.c | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-)
net/core/sock.c +14 -10
@@ -425,6 +425,7 @@ static int sock_set_timeout(long *timeo_p, sockptr_t optval, int optlen, {struct __kernel_sock_timeval tv;int err =sock_copy_user_timeval (&tv, optval, optlen, old_timeval); +long val;if (err)return err;
@@ -435,7 +436,7 @@ static int sock_set_timeout(long *timeo_p, sockptr_t optval, int optlen,if (tv.tv_sec <0 ) {static int warned__read_mostly ; - *timeo_p =0 ; +WRITE_ONCE (*timeo_p,0 );if (warned <10 &&net_ratelimit ()) { warned++; pr_info("%s: `%s' (pid %d) tries to set negative timeout\n",
@@ -443,11 +444,12 @@ static int sock_set_timeout(long *timeo_p, sockptr_t optval, int optlen, }return 0 ; } - *timeo_p =MAX_SCHEDULE_TIMEOUT ; -if (tv.tv_sec ==0 && tv.tv_usec ==0 ) -return 0 ; -if (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT /HZ -1 )) - *timeo_p = tv.tv_sec *HZ +DIV_ROUND_UP ((unsigned long )tv.tv_usec,USEC_PER_SEC /HZ ); + val =MAX_SCHEDULE_TIMEOUT ; +if ((tv.tv_sec || tv.tv_usec) && + (tv.tv_sec < (MAX_SCHEDULE_TIMEOUT /HZ -1 ))) + val = tv.tv_sec *HZ +DIV_ROUND_UP ((unsigned long )tv.tv_usec, +USEC_PER_SEC /HZ ); +WRITE_ONCE (*timeo_p, val);return 0 ; }
@@ -809,9 +811,9 @@ void sock_set_sndtimeo(struct sock *sk, s64 secs) {lock_sock (sk);if (secs && secs <MAX_SCHEDULE_TIMEOUT /HZ -1 ) - sk->sk_sndtimeo = secs *HZ ; +WRITE_ONCE (sk->sk_sndtimeo, secs *HZ );else - sk->sk_sndtimeo =MAX_SCHEDULE_TIMEOUT ; +WRITE_ONCE (sk->sk_sndtimeo,MAX_SCHEDULE_TIMEOUT );release_sock (sk); }EXPORT_SYMBOL (sock_set_sndtimeo);
@@ -1710,12 +1712,14 @@ int sk_getsockopt(struct sock *sk, int level, int optname,case SO_RCVTIMEO_OLD :case SO_RCVTIMEO_NEW : - lv =sock_get_timeout (sk->sk_rcvtimeo, &v,SO_RCVTIMEO_OLD == optname); + lv =sock_get_timeout (READ_ONCE (sk->sk_rcvtimeo), &v, +SO_RCVTIMEO_OLD == optname);break ;case SO_SNDTIMEO_OLD :case SO_SNDTIMEO_NEW : - lv =sock_get_timeout (sk->sk_sndtimeo, &v,SO_SNDTIMEO_OLD == optname); + lv =sock_get_timeout (READ_ONCE (sk->sk_sndtimeo), &v, +SO_SNDTIMEO_OLD == optname);break ;case SO_RCVLOWAT :
net/sched/em_meta.c +2 -2
@@ -568,7 +568,7 @@ META_COLLECTOR(int_sk_rcvtimeo) *err =-1 ;return ; } - dst->value = sk->sk_rcvtimeo /HZ ; + dst->value =READ_ONCE (sk->sk_rcvtimeo) /HZ ; }META_COLLECTOR (int_sk_sndtimeo)
@@ -579,7 +579,7 @@ META_COLLECTOR(int_sk_sndtimeo) *err =-1 ;return ; } - dst->value = sk->sk_sndtimeo /HZ ; + dst->value =READ_ONCE (sk->sk_sndtimeo) /HZ ; }META_COLLECTOR (int_sk_sendmsg_off)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 54/737 net: usb: qmi_wwan: add Quectel EM05GV2
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kohn <[email protected]>
[ Upstream commit d4480c9bb9258db9ddf2e632f6ef81e96b41089c ]
Add support for Quectel EM05GV2 (G=global) with vendor ID 0x2c7c and product ID 0x030e
Enabling DTR on this modem was necessary to ensure stable operation. Patch for usb: serial: option: is also in progress.
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=030e Rev= 3.18 S: Manufacturer=Quectel S: Product=Quectel EM05-G C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan E: Ad=89(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1423,6 +1423,7 @@ static const struct usb_device_id products[] = { {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ + {QMI_QUIRK_SET_DTR(0x2c7c, 0x030e, 4)}, /* Quectel EM05GV2 */ {QMI_QUIRK_SET_DTR(0x2cb7, 0x0104, 4)}, /* Fibocom NL678 series */ {QMI_FIXED_INTF(0x0489, 0xe0b4, 0)}, /* Foxconn T77W968 LTE */ {QMI_FIXED_INTF(0x0489, 0xe0b5, 0)}, /* Foxconn T77W968 LTE with eSIM support*/
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 55/737 wifi: brcmfmac: Fix field-spanning write in brcmf_scan_params_v2_to_v1()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 16e455a465fca91907af0108f3d013150386df30 ]
Using brcmfmac with 6.5-rc3 on a brcmfmac43241b4-sdio triggers a backtrace caused by the following field-spanning warning:
memcpy: detected field-spanning write (size 120) of single field
"¶ms_le->channel_list[0]" at drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:1072 (size 2)
The driver still works after this warning. The warning was introduced by the new field-spanning write checks which were enabled recently.
Fix this by replacing the channel_list[1] declaration at the end of the struct with a flexible array declaration.
Most users of struct brcmf_scan_params_le calculate the size to alloc using the size of the non flex-array part of the struct + needed extra space, so they do not care about sizeof(struct brcmf_scan_params_le).
brcmf_notify_escan_complete() however uses the struct on the stack, expecting there to be room for at least 1 entry in the channel-list to store the special -1 abort channel-id.
To make this work use an anonymous union with a padding member added + the actual channel_list flexible array.
--- .../net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +6 -1
@@ -398,7 +398,12 @@ struct brcmf_scan_params_le {* fixed parameter portion is assumed, otherwise * ssid in the fixed portion is ignored */ -__le16 channel_list[1 ];/* list of chanspecs */ +union { +__le16 padding;/* Reserve space for at least 1 entry for abort +* which uses an on stack brcmf_scan_params_le +*/ + DECLARE_FLEX_ARRAY(__le16, channel_list); /* chanspecs */ + }; };struct brcmf_scan_params_v2_le {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 56/737 powerpc/powermac: Use early_* IO variants in via_calibrate_decr()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Gray <[email protected]>
[ Upstream commit 86582e6189dd8f9f52c25d46c70fe5d111da6345 ]
On a powermac platform, via the call path:
start_kernel()
time_init()
ppc_md.calibrate_decr() (pmac_calibrate_decr)
via_calibrate_decr()ioremap() and iounmap() are called. The unmap can enable interrupts unexpectedly (cond_resched() in vunmap_pmd_range()), which causes a warning later in the boot sequence in start_kernel().
Use the early_* variants of these IO functions to prevent this.
The issue is pre-existing, but is surfaced by commit 721255b9826b ("genirq: Use a maple tree for interrupt descriptor management").
--- arch/powerpc/platforms/powermac/time.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/platforms/powermac/time.c +3 -3
@@ -26,8 +26,8 @@#include <linux/rtc.h> #include <linux/of_address.h> +#include <asm/early_ioremap.h> #include <asm/sections.h> -#include <asm/io.h> #include <asm/machdep.h> #include <asm/time.h> #include <asm/nvram.h>
@@ -182,7 +182,7 @@ static int __init via_calibrate_decr(void)return 0 ; }of_node_put (vias); - via =ioremap (rsrc.start,resource_size (&rsrc)); + via =early_ioremap (rsrc.start,resource_size (&rsrc));if (via ==NULL ) {printk (KERN_ERR "Failed to map VIA for timer calibration !\n" );return 0 ;
@@ -207,7 +207,7 @@ static int __init via_calibrate_decr(void) ppc_tb_freq = (dstart - dend) *100 /6 ; -iounmap (via); +early_iounmap ((void *)via,resource_size (&rsrc));return 1 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 23/737 s390/dasd: fix hanging device after request requeue
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Haberland <[email protected]>
[ Upstream commit 8a2278ce9c25048d999fe1a3561def75d963f471 ]
The DASD device driver has a function to requeue requests to the blocklayer.
This function is used in various cases when basic settings for the device have to be changed like High Performance Ficon related parameters or copy pair settings.
The functions iterates over the device->ccw_queue and also removes the requests from the block->ccw_queue.
In case the device is started on an alias device instead of the base device it might be removed from the block->ccw_queue without having it canceled properly before. This might lead to a hanging device since the request is no longer on a queue and can not be handled properly.
Fix by iterating over the block->ccw_queue instead of the device->ccw_queue. This will take care of all blocklayer related requests and handle them on all associated DASD devices.
--- drivers/s390/block/dasd.c | 125 +++++++++++++++----------------------- 1 file changed, 48 insertions(+), 77 deletions(-)
drivers/s390/block/dasd.c +48 -77
@@ -2938,41 +2938,32 @@ static void _dasd_wake_block_flush_cb(struct dasd_ccw_req *cqr, void *data)* Requeue a request back to the block request queue * only works for block requests */ -static int _dasd_requeue_request (struct dasd_ccw_req *cqr) +static void _dasd_requeue_request (struct dasd_ccw_req *cqr) { -struct dasd_block *block = cqr->block;struct request *req; -if (!block) -return -EINVAL ;/* * If the request is an ERP request there is nothing to requeue. * This will be done with the remaining original request. */ if (cqr->refers) -return 0 ; +return ;spin_lock_irq (&cqr->dq->lock); req = (struct request *) cqr->callback_data;blk_mq_requeue_request (req, true);spin_unlock_irq (&cqr->dq->lock); -return 0 ; +return ; } -/* -* Go through all request on the dasd_block request queue, cancel them -* on the respective dasd_device, and return them to the generic -* block layer. -*/ -static int dasd_flush_block_queue (struct dasd_block *block) +static int _dasd_requests_to_flushqueue (struct dasd_block *block, +struct list_head *flush_queue) {struct dasd_ccw_req *cqr, *n; -int rc, i; -struct list_head flush_queue;unsigned long flags; +int rc, i; -INIT_LIST_HEAD (&flush_queue); -spin_lock_bh (&block->queue_lock); +spin_lock_irqsave (&block->queue_lock, flags); rc =0 ; restart:list_for_each_entry_safe (cqr, n, &block->ccw_queue, blocklist) {
@@ -2987,13 +2978,32 @@ static int dasd_flush_block_queue(struct dasd_block *block)* is returned from the dasd_device layer. */ cqr->callback = _dasd_wake_block_flush_cb; -for (i =0 ; cqr !=NULL ; cqr = cqr->refers, i++) -list_move_tail (&cqr->blocklist, &flush_queue); +for (i =0 ; cqr; cqr = cqr->refers, i++) +list_move_tail (&cqr->blocklist, flush_queue);if (i >1 )/* moved more than one request - need to restart */ goto restart; } -spin_unlock_bh (&block->queue_lock); +spin_unlock_irqrestore (&block->queue_lock, flags); + +return rc; +} + +/* +* Go through all request on the dasd_block request queue, cancel them +* on the respective dasd_device, and return them to the generic +* block layer. +*/ +static int dasd_flush_block_queue (struct dasd_block *block) +{ +struct dasd_ccw_req *cqr, *n; +struct list_head flush_queue; +unsigned long flags; +int rc; + +INIT_LIST_HEAD (&flush_queue); + rc =_dasd_requests_to_flushqueue (block, &flush_queue); +/* Now call the callback function of flushed requests */ restart_cb:list_for_each_entry_safe (cqr, n, &flush_queue, blocklist) {
@@ -3878,75 +3888,36 @@ EXPORT_SYMBOL_GPL(dasd_generic_space_avail);*/ int dasd_generic_requeue_all_requests (struct dasd_device *device) { +struct dasd_block *block = device->block;struct list_head requeue_queue;struct dasd_ccw_req *cqr, *n; -struct dasd_ccw_req *refers;int rc; -INIT_LIST_HEAD (&requeue_queue); -spin_lock_irq (get_ccwdev_lock (device->cdev)); - rc =0 ; -list_for_each_entry_safe (cqr, n, &device->ccw_queue, devlist) { -/* Check status and move request to flush_queue */ -if (cqr->status ==DASD_CQR_IN_IO ) { - rc = device->discipline->term_IO (cqr); -if (rc) { -/* unable to terminate requeust */ -dev_err (&device->cdev->dev, -"Unable to terminate request %p " -"on suspend\n" , cqr); -spin_unlock_irq (get_ccwdev_lock (device->cdev)); -dasd_put_device (device); -return rc; - } - } -list_move_tail (&cqr->devlist, &requeue_queue); - } -spin_unlock_irq (get_ccwdev_lock (device->cdev)); - -list_for_each_entry_safe (cqr, n, &requeue_queue, devlist) { -wait_event (dasd_flush_wq, - (cqr->status !=DASD_CQR_CLEAR_PENDING )); +if (!block) +return 0 ; -/* -* requeue requests to blocklayer will only work -* for block device requests -*/ -if (_dasd_requeue_request (cqr)) -continue ; +INIT_LIST_HEAD (&requeue_queue); + rc =_dasd_requests_to_flushqueue (block, &requeue_queue); -/* remove requests from device and block queue */ -list_del_init (&cqr->devlist); -while (cqr->refers !=NULL ) { - refers = cqr->refers; -/* remove the request from the block queue */ -list_del (&cqr->blocklist); -/* free the finished erp request */ -dasd_free_erp_request (cqr, cqr->memdev); - cqr = refers; +/* Now call the callback function of flushed requests */ +restart_cb: +list_for_each_entry_safe (cqr, n, &requeue_queue, blocklist) { +wait_event (dasd_flush_wq, (cqr->status <DASD_CQR_QUEUED )); +/* Process finished ERP request. */ +if (cqr->refers) { +spin_lock_bh (&block->queue_lock); +__dasd_process_erp (block->base, cqr); +spin_unlock_bh (&block->queue_lock); +/* restart list_for_xx loop since dasd_process_erp +* might remove multiple elements +*/ + goto restart_cb; } - -/* -* _dasd_requeue_request already checked for a valid -* blockdevice, no need to check again -* all erp requests (cqr->refers) have a cqr->block -* pointer copy from the original cqr -*/ +_dasd_requeue_request (cqr);list_del_init (&cqr->blocklist); cqr->block->base->discipline->free_cp ( cqr, (struct request *) cqr->callback_data); } - -/* -* if requests remain then they are internal request -* and go back to the device queue -*/ -if (!list_empty (&requeue_queue)) { -/* move freeze_queue to start of the ccw_queue */ -spin_lock_irq (get_ccwdev_lock (device->cdev)); -list_splice_tail (&requeue_queue, &device->ccw_queue); -spin_unlock_irq (get_ccwdev_lock (device->cdev)); - }dasd_schedule_device_bh (device);return rc; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 24/737 fs/nls: make load_nls() take a const parameter
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Winston Wen <[email protected]>
[ Upstream commit c1ed39ec116272935528ca9b348b8ee79b0791da ]
load_nls() take a char * parameter, use it to find nls module in list or construct the module name to load it.
This change make load_nls() take a const parameter, so we don't need do some cast like this:
ses->local_nls = load_nls((char *)ctx->local_nls->charset);
--- fs/nls/nls_base.c | 4 ++-- include/linux/nls.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/nls/nls_base.c +2 -2
@@ -272,7 +272,7 @@ int unregister_nls(struct nls_table * nls)return -EINVAL ; } -static struct nls_table *find_nls (char *charset) +static struct nls_table *find_nls (const char *charset) {struct nls_table *nls;spin_lock (&nls_lock);
@@ -288,7 +288,7 @@ static struct nls_table *find_nls(char *charset)return nls; } -struct nls_table *load_nls (char *charset) +struct nls_table *load_nls (const char *charset) {return try_then_request_module (find_nls (charset),"nls_%s" , charset); }
include/linux/nls.h +1 -1
@@ -47,7 +47,7 @@ enum utf16_endian {/* nls_base.c */ extern int __register_nls (struct nls_table *,struct module *);extern int unregister_nls (struct nls_table *); -extern struct nls_table *load_nls (char *); +extern struct nls_table *load_nls (const char *charset);extern void unload_nls (struct nls_table *);extern struct nls_table *load_nls_default (void );#define register_nls (nls) __register_nls((nls), THIS_MODULE)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 25/737 cifs: fix charset issue in reconnection
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Winston Wen <[email protected]>
[ Upstream commit a43f95fdd39490f7b156fd126f1e90ec2d5553f1 ]
We need to specify charset, like "iocharset=utf-8", in mount options for Chinese path if the nls_default don't support it, such as iso8859-1, the default value for CONFIG_NLS_DEFAULT.
But now in reconnection the nls_default is used, instead of the one we specified and used in mount, and this can lead to mount failure.
--- fs/smb/client/cifsglob.h | 1 + fs/smb/client/cifssmb.c | 3 +-- fs/smb/client/connect.c | 5 +++++ fs/smb/client/misc.c | 1 + fs/smb/client/smb2pdu.c | 3 +-- 5 files changed, 9 insertions(+), 4 deletions(-)
fs/smb/client/cifsglob.h +1 -0
@@ -1062,6 +1062,7 @@ struct cifs_ses {unsigned long chans_need_reconnect;/* ========= end: protected by chan_lock ======== */ struct cifs_ses *dfs_root_ses; +struct nls_table *local_nls; }; static inline bool
fs/smb/client/cifssmb.c +1 -2
@@ -129,7 +129,7 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command) }spin_unlock (&server->srv_lock); - nls_codepage =load_nls_default (); + nls_codepage = ses->local_nls;/* * need to prevent multiple threads trying to simultaneously
@@ -200,7 +200,6 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command) rc = -EAGAIN ; } -unload_nls (nls_codepage);return rc; }
fs/smb/client/connect.c +5 -0
@@ -1837,6 +1837,10 @@ static int match_session(struct cifs_ses *ses, struct smb3_fs_context *ctx) CIFS_MAX_PASSWORD_LEN))return 0 ; } + +if (strcmp (ctx->local_nls->charset, ses->local_nls->charset)) +return 0 ; +return 1 ; }
@@ -2280,6 +2284,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx) ses->sectype = ctx->sectype; ses->sign = ctx->sign; + ses->local_nls =load_nls (ctx->local_nls->charset);/* add server as first channel */ spin_lock (&ses->chan_lock);
fs/smb/client/misc.c +1 -0
@@ -95,6 +95,7 @@ sesInfoFree(struct cifs_ses *buf_to_free)return ; } +unload_nls (buf_to_free->local_nls);atomic_dec (&sesInfoAllocCount);kfree (buf_to_free->serverOS);kfree (buf_to_free->serverDomain);
fs/smb/client/smb2pdu.c +1 -2
@@ -242,7 +242,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon, }spin_unlock (&server->srv_lock); - nls_codepage =load_nls_default (); + nls_codepage = ses->local_nls;/* * need to prevent multiple threads trying to simultaneously
@@ -324,7 +324,6 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon, rc = -EAGAIN ; } failed: -unload_nls (nls_codepage);return rc; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 26/737 ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuming Fan <[email protected]>
[ Upstream commit 02fb23d72720df2b6be3f29fc5787ca018eb92c3 ]
When the system suspends, peripheral Imp-defined interrupt is disabled. When system level resume is invoked, the peripheral Imp-defined interrupts should be enabled to handle JD events.
--- sound/soc/codecs/rt5682-sdw.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/soc/codecs/rt5682-sdw.c +8 -1
@@ -753,8 +753,15 @@ static int __maybe_unused rt5682_dev_resume(struct device *dev)if (!rt5682->first_hw_init)return 0 ; -if (!slave->unattach_request) +if (!slave->unattach_request) { +if (rt5682->disable_irq == true) { +mutex_lock (&rt5682->disable_irq_lock); +sdw_write_no_pm (slave,SDW_SCP_INTMASK1 ,SDW_SCP_INT1_IMPL_DEF ); + rt5682->disable_irq = false; +mutex_unlock (&rt5682->disable_irq_lock); + } goto regmap_sync; + } time =wait_for_completion_timeout (&slave->initialization_complete,msecs_to_jiffies (RT5682_PROBE_TIMEOUT ));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 27/737 ASoc: codecs: ES8316: Fix DMIC config
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edgar <[email protected]>
[ Upstream commit d20d35d1ad62c6cca36368c1e8f29335a068659e ]
According to the datasheet, the DMIC config should be changed to { 0, 2 ,3 }
--- sound/soc/codecs/es8316.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/es8316.c +1 -1
@@ -153,7 +153,7 @@ static const char * const es8316_dmic_txt[] = {"dmic data at high level" , "dmic data at low level", }; -static const unsigned int es8316_dmic_values[] = {0 ,1 ,2 }; +static const unsigned int es8316_dmic_values[] = {0 ,2 ,3 };static const struct soc_enum es8316_dmic_src_enum = SOC_VALUE_ENUM_SINGLE(ES8316_ADC_DMIC, 0, 3, ARRAY_SIZE(es8316_dmic_txt),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 28/737 ASoC: rt712-sdca: fix for JD event handling in ClockStop Mode0
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuming Fan <[email protected]>
[ Upstream commit 7a8735c1551e489351172d0da96128f6f8b52b2d ]
When the system suspends, peripheral SDCA interrupts are disabled. When system level resume is invoked, the peripheral SDCA interrupts should be enabled to handle JD events.
Enable SDCA interrupts in resume sequence when ClockStop Mode0 is applied.
--- sound/soc/codecs/rt712-sdca-sdw.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
sound/soc/codecs/rt712-sdca-sdw.c +9 -1
@@ -441,8 +441,16 @@ static int __maybe_unused rt712_sdca_dev_resume(struct device *dev)if (!rt712->first_hw_init)return 0 ; -if (!slave->unattach_request) +if (!slave->unattach_request) { +if (rt712->disable_irq == true) { +mutex_lock (&rt712->disable_irq_lock); +sdw_write_no_pm (slave,SDW_SCP_SDCA_INTMASK1 ,SDW_SCP_SDCA_INTMASK_SDCA_0 ); +sdw_write_no_pm (slave,SDW_SCP_SDCA_INTMASK2 ,SDW_SCP_SDCA_INTMASK_SDCA_8 ); + rt712->disable_irq = false; +mutex_unlock (&rt712->disable_irq_lock); + } goto regmap_sync; + } time =wait_for_completion_timeout (&slave->initialization_complete,msecs_to_jiffies (RT712_PROBE_TIMEOUT ));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 19/737 net: hns3: add tm flush when setting tm
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hao Lan <[email protected]>
[ Upstream commit 6d2336120aa6e1a8a64fa5d6ee5c3f3d0809fe9b ]
When the tm module is configured with traffic, traffic may be abnormal. This patch fixes this problem. Before the tm module is configured, traffic processing should be stopped. After the tm module is configured, traffic processing is enabled.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 4 +++ .../hns3/hns3_common/hclge_comm_cmd.c | 1 + .../hns3/hns3_common/hclge_comm_cmd.h | 2 ++ .../ethernet/hisilicon/hns3/hns3_debugfs.c | 3 ++ .../hisilicon/hns3/hns3pf/hclge_dcb.c | 34 ++++++++++++++++--- .../ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 31 ++++++++++++++++- .../ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 4 +++ 7 files changed, 73 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +4 -0
@@ -102,6 +102,7 @@ enum HNAE3_DEV_CAP_BITS {HNAE3_DEV_SUPPORT_FEC_STATS_B ,HNAE3_DEV_SUPPORT_LANE_NUM_B ,HNAE3_DEV_SUPPORT_WOL_B , + HNAE3_DEV_SUPPORT_TM_FLUSH_B, };#define hnae3_ae_dev_fd_supported (ae_dev) \
@@ -173,6 +174,9 @@ enum HNAE3_DEV_CAP_BITS {#define hnae3_ae_dev_wol_supported (ae_dev) \ test_bit(HNAE3_DEV_SUPPORT_WOL_B, (ae_dev)->caps) +#define hnae3_ae_dev_tm_flush_supported (hdev) \ + test_bit(HNAE3_DEV_SUPPORT_TM_FLUSH_B, (hdev)->ae_dev->caps) +enum HNAE3_PF_CAP_BITS {HNAE3_PF_SUPPORT_VLAN_FLTR_MDF_B =0 , };
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c +1 -0
@@ -156,6 +156,7 @@ static const struct hclge_comm_caps_bit_map hclge_pf_cmd_caps[] = { {HCLGE_COMM_CAP_FEC_STATS_B, HNAE3_DEV_SUPPORT_FEC_STATS_B}, {HCLGE_COMM_CAP_LANE_NUM_B, HNAE3_DEV_SUPPORT_LANE_NUM_B}, {HCLGE_COMM_CAP_WOL_B, HNAE3_DEV_SUPPORT_WOL_B}, + {HCLGE_COMM_CAP_TM_FLUSH_B, HNAE3_DEV_SUPPORT_TM_FLUSH_B}, }; static const struct hclge_comm_caps_bit_map hclge_vf_cmd_caps[] = {
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h +2 -0
@@ -153,6 +153,7 @@ enum hclge_opcode_type {HCLGE_OPC_TM_INTERNAL_STS =0x0850 ,HCLGE_OPC_TM_INTERNAL_CNT =0x0851 ,HCLGE_OPC_TM_INTERNAL_STS_1 =0x0852 , +HCLGE_OPC_TM_FLUSH =0x0872 ,/* Packet buffer allocate commands */ HCLGE_OPC_TX_BUFF_ALLOC = 0x0901,
@@ -349,6 +350,7 @@ enum HCLGE_COMM_CAP_BITS {HCLGE_COMM_CAP_FEC_STATS_B =25 ,HCLGE_COMM_CAP_LANE_NUM_B =27 ,HCLGE_COMM_CAP_WOL_B =28 , + HCLGE_COMM_CAP_TM_FLUSH_B = 31, }; enum HCLGE_COMM_API_CAP_BITS {
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +3 -0
@@ -411,6 +411,9 @@ static struct hns3_dbg_cap_info hns3_dbg_cap[] = { }, { .name = "support wake on lan", .cap_bit = HNAE3_DEV_SUPPORT_WOL_B, + }, { + .name = "support tm flush", + .cap_bit = HNAE3_DEV_SUPPORT_TM_FLUSH_B, } };
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c +29 -5
@@ -227,6 +227,10 @@ static int hclge_notify_down_uinit(struct hclge_dev *hdev)if (ret)return ret; + ret =hclge_tm_flush_cfg (hdev, true); +if (ret) +return ret; +return hclge_notify_client (hdev,HNAE3_UNINIT_CLIENT ); }
@@ -238,6 +242,10 @@ static int hclge_notify_init_up(struct hclge_dev *hdev)if (ret)return ret; + ret =hclge_tm_flush_cfg (hdev, false); +if (ret) +return ret; +return hclge_notify_client (hdev,HNAE3_UP_CLIENT ); }
@@ -324,6 +332,7 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc)struct net_device *netdev = h->kinfo.netdev;struct hclge_dev *hdev = vport->back;u8 i, j, pfc_map, *prio_tc; +int last_bad_ret =0 ;int ret;if (!(hdev->dcbx_cap &DCB_CAP_DCBX_VER_IEEE ))
@@ -361,13 +370,28 @@ static int hclge_ieee_setpfc(struct hnae3_handle *h, struct ieee_pfc *pfc)if (ret)return ret; - ret =hclge_buffer_alloc (hdev); -if (ret) { -hclge_notify_client (hdev,HNAE3_UP_CLIENT ); + ret =hclge_tm_flush_cfg (hdev, true); +if (ret)return ret; - } -return hclge_notify_client (hdev,HNAE3_UP_CLIENT ); +/* No matter whether the following operations are performed +* successfully or not, disabling the tm flush and notify +* the network status to up are necessary. +* Do not return immediately. +*/ + ret =hclge_buffer_alloc (hdev); +if (ret) + last_bad_ret = ret; + + ret =hclge_tm_flush_cfg (hdev, false); +if (ret) + last_bad_ret = ret; + + ret =hclge_notify_client (hdev,HNAE3_UP_CLIENT ); +if (ret) + last_bad_ret = ret; + +return last_bad_ret; }static int hclge_ieee_setapp (struct hnae3_handle *h,struct dcb_app *app)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +30 -1
@@ -1485,7 +1485,11 @@ int hclge_tm_schd_setup_hw(struct hclge_dev *hdev)return ret;/* Cfg schd mode for each level schd */ -return hclge_tm_schd_mode_hw (hdev); + ret =hclge_tm_schd_mode_hw (hdev); +if (ret) +return ret; + +return hclge_tm_flush_cfg (hdev, false); }static int hclge_pause_param_setup_hw (struct hclge_dev *hdev)
@@ -2114,3 +2118,28 @@ int hclge_tm_get_port_shaper(struct hclge_dev *hdev,return 0 ; } + +int hclge_tm_flush_cfg (struct hclge_dev *hdev,bool enable) +{ +struct hclge_desc desc; +int ret; + +if (!hnae3_ae_dev_tm_flush_supported (hdev)) +return 0 ; + +hclge_cmd_setup_basic_desc (&desc,HCLGE_OPC_TM_FLUSH , false); + + desc.data[0 ] =cpu_to_le32 (enable ?HCLGE_TM_FLUSH_EN_MSK :0 ); + + ret =hclge_cmd_send (&hdev->hw, &desc,1 ); +if (ret) { +dev_err (&hdev->pdev->dev, +"failed to config tm flush, ret = %d\n" , ret); +return ret; + } + +if (enable) +msleep (HCLGE_TM_FLUSH_TIME_MS ); + +return ret; +}
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h +4 -0
@@ -33,6 +33,9 @@ enum hclge_opcode_type;#define HCLGE_DSCP_MAP_TC_BD_NUM 2#define HCLGE_DSCP_TC_SHIFT (n) (((n) & 1) * 4) +#define HCLGE_TM_FLUSH_TIME_MS 10 +#define HCLGE_TM_FLUSH_EN_MSK BIT(0) +struct hclge_pg_to_pri_link_cmd {u8 pg_id;u8 rsvd1[3 ];
@@ -272,4 +275,5 @@ int hclge_tm_get_port_shaper(struct hclge_dev *hdev, struct hclge_tm_shaper_para *para);int hclge_up_to_tc_map (struct hclge_dev *hdev);int hclge_dscp_to_tc_map (struct hclge_dev *hdev); +int hclge_tm_flush_cfg (struct hclge_dev *hdev,bool enable);#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 58/737 idmaengine: make FSL_EDMA and INTEL_IDMA64 depends on HAS_IOMEM
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baoquan He <[email protected]>
[ Upstream commit b1e213a9e31c20206f111ec664afcf31cbfe0dbb ]
On s390 systems (aka mainframes), it has classic channel devices for networking and permanent storage that are currently even more common than PCI devices. Hence it could have a fully functional s390 kernel with CONFIG_PCI=n, then the relevant iomem mapping functions [including ioremap(), devm_ioremap(), etc.] are not available.
Here let FSL_EDMA and INTEL_IDMA64 depend on HAS_IOMEM so that it won't be built to cause below compiling error if PCI is unset.
--------
ERROR: modpost: "devm_platform_ioremap_resource" [drivers/dma/fsl-edma.ko] undefined!
ERROR: modpost: "devm_platform_ioremap_resource" [drivers/dma/idma64.ko] undefined!
--------
--- drivers/dma/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/dma/Kconfig +2 -0
@@ -211,6 +211,7 @@ config FSL_DMA config FSL_EDMA tristate "Freescale eDMA engine support" depends on OF + depends on HAS_IOMEM select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help
@@ -280,6 +281,7 @@ config IMX_SDMA config INTEL_IDMA64 tristate "Intel integrated DMA 64-bit support" + depends on HAS_IOMEM select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 67/737 arm64: dts: rockchip: correct wifi interrupt flag in Box Demo
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 2d6f7e3938a7aba154c8e8afaddc8b7f1e0a1b56 ]
GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning: GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE.
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH
--- arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts +1 -1
@@ -416,7 +416,7 @@ compatible = "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpio2>; - interrupts = <RK_PB2 GPIO_ACTIVE_HIGH>; + interrupts = <RK_PB2 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_h>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 68/737 vhost-scsi: Fix alignment handling with windows
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Christie <[email protected]>
[ Upstream commit 5ced58bfa132c8ba0f9c893eb621595a84cfee12 ]
The linux block layer requires bios/requests to have lengths with a 512 byte alignment. Some drivers/layers like dm-crypt and the directi IO code will test for it and just fail. Other drivers like SCSI just assume the requirement is met and will end up in infinte retry loops. The problem for drivers like SCSI is that it uses functions like blk_rq_cur_sectors and blk_rq_sectors which divide the request's length by 512. If there's lefovers then it just gets dropped. But other code in the block/scsi layer may use blk_rq_bytes/blk_rq_cur_bytes and end up thinking there is still data left and try to retry the cmd. We can then end up getting stuck in retry loops where part of the block/scsi thinks there is data left, but other parts think we want to do IOs of zero length.
Linux will always check for alignment, but windows will not. When vhost-scsi then translates the iovec it gets from a windows guest to a scatterlist, we can end up with sg items where the sg->length is not divisible by 512 due to the misaligned offset:
sg[0].offset = 255;
sg[0].length = 3841;
sg...
sg[N].offset = 0;
sg[N].length = 255;
When the lio backends then convert the SG to bios or other iovecs, we end up sending them with the same misaligned values and can hit the issues above.
This just has us drop down to allocating a temp page and copying the data when we detect a misaligned buffer and the IO is large enough that it will get split into multiple bad IOs.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 186 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 161 insertions(+), 25 deletions(-)
drivers/vhost/scsi.c +161 -25
@@ -25,6 +25,8 @@#include <linux/fs.h> #include <linux/vmalloc.h> #include <linux/miscdevice.h> +#include <linux/blk_types.h> +#include <linux/bio.h> #include <asm/unaligned.h> #include <scsi/scsi_common.h> #include <scsi/scsi_proto.h>
@@ -75,6 +77,9 @@ struct vhost_scsi_cmd {u32 tvc_prot_sgl_count;/* Saved unpacked SCSI LUN for vhost_scsi_target_queue_cmd() */ u32 tvc_lun; + u32 copied_iov:1; +const void *saved_iter_addr; +struct iov_iter saved_iter;/* Pointer to the SGL formatted memory from virtio-scsi */ struct scatterlist *tvc_sgl;struct scatterlist *tvc_prot_sgl;
@@ -328,8 +333,13 @@ static void vhost_scsi_release_cmd_res(struct se_cmd *se_cmd)int i;if (tv_cmd->tvc_sgl_count) { -for (i =0 ; i < tv_cmd->tvc_sgl_count; i++) -put_page (sg_page (&tv_cmd->tvc_sgl[i])); +for (i =0 ; i < tv_cmd->tvc_sgl_count; i++) { +if (tv_cmd->copied_iov) +__free_page (sg_page (&tv_cmd->tvc_sgl[i])); +else +put_page (sg_page (&tv_cmd->tvc_sgl[i])); + } +kfree (tv_cmd->saved_iter_addr); }if (tv_cmd->tvc_prot_sgl_count) {for (i =0 ; i < tv_cmd->tvc_prot_sgl_count; i++)
@@ -502,6 +512,28 @@ static void vhost_scsi_evt_work(struct vhost_work *work)mutex_unlock (&vq->mutex); } +static int vhost_scsi_copy_sgl_to_iov (struct vhost_scsi_cmd *cmd) +{ +struct iov_iter *iter = &cmd->saved_iter; +struct scatterlist *sg = cmd->tvc_sgl; +struct page *page; +size_t len; +int i; + +for (i =0 ; i < cmd->tvc_sgl_count; i++) { + page =sg_page (&sg[i]); + len = sg[i].length; + +if (copy_page_to_iter (page,0 , len, iter) != len) { +pr_err ("Could not copy data while handling misaligned cmd. Error %zu\n" , + len); +return -1 ; + } + } + +return 0 ; +} +/* Fill in status and signal that we are done processing this command * * This is scheduled in the vhost work queue so we are called with the owner
@@ -525,15 +557,20 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work)pr_debug ("%s tv_cmd %p resid %u status %#02x\n" , __func__, cmd, se_cmd->residual_count, se_cmd->scsi_status); -memset (&v_rsp,0 ,sizeof (v_rsp)); - v_rsp.resid =cpu_to_vhost32 (cmd->tvc_vq, se_cmd->residual_count); -/* TODO is status_qualifier field needed? */ - v_rsp.status = se_cmd->scsi_status; - v_rsp.sense_len =cpu_to_vhost32 (cmd->tvc_vq, - se_cmd->scsi_sense_length); -memcpy (v_rsp.sense, cmd->tvc_sense_buf, - se_cmd->scsi_sense_length); + +if (cmd->saved_iter_addr &&vhost_scsi_copy_sgl_to_iov (cmd)) { + v_rsp.response =VIRTIO_SCSI_S_BAD_TARGET ; + }else { + v_rsp.resid =cpu_to_vhost32 (cmd->tvc_vq, + se_cmd->residual_count); +/* TODO is status_qualifier field needed? */ + v_rsp.status = se_cmd->scsi_status; + v_rsp.sense_len =cpu_to_vhost32 (cmd->tvc_vq, + se_cmd->scsi_sense_length); +memcpy (v_rsp.sense, cmd->tvc_sense_buf, + se_cmd->scsi_sense_length); + }iov_iter_init (&iov_iter,ITER_DEST , cmd->tvc_resp_iov, cmd->tvc_in_iovs,sizeof (v_rsp));
@@ -615,12 +652,12 @@ static int vhost_scsi_map_to_sgl(struct vhost_scsi_cmd *cmd, struct iov_iter *iter, struct scatterlist *sgl, - bool write) + bool is_prot) { struct page **pages = cmd->tvc_upages;struct scatterlist *sg = sgl; -ssize_t bytes; -size_t offset; +ssize_t bytes, mapped_bytes; +size_t offset, mapped_offset;unsigned int npages =0 ; bytes = iov_iter_get_pages2(iter, pages, LONG_MAX,
@@ -629,13 +666,53 @@ vhost_scsi_map_to_sgl(struct vhost_scsi_cmd *cmd,if (bytes <=0 )return bytes <0 ? bytes : -EFAULT ; + mapped_bytes = bytes; + mapped_offset = offset; +while (bytes) {unsigned n =min_t (unsigned,PAGE_SIZE - offset, bytes); +/* +* The block layer requires bios/requests to be a multiple of +* 512 bytes, but Windows can send us vecs that are misaligned. +* This can result in bios and later requests with misaligned +* sizes if we have to break up a cmd/scatterlist into multiple +* bios. +* +* We currently only break up a command into multiple bios if +* we hit the vec/seg limit, so check if our sgl_count is +* greater than the max and if a vec in the cmd has a +* misaligned offset/size. +*/ +if (!is_prot && + (offset & (SECTOR_SIZE -1 ) || n & (SECTOR_SIZE -1 )) && + cmd->tvc_sgl_count >BIO_MAX_VECS ) { +WARN_ONCE (true, +"vhost-scsi detected misaligned IO. Performance may be degraded." ); + goto revert_iter_get_pages; + } +sg_set_page (sg++, pages[npages++], n, offset); bytes -= n; offset =0 ; } +return npages; + +revert_iter_get_pages: +iov_iter_revert (iter, mapped_bytes); + + npages =0 ; +while (mapped_bytes) { + unsigned int n = min_t(unsigned int, PAGE_SIZE - mapped_offset, + mapped_bytes); + +put_page (pages[npages++]); + + mapped_bytes -= n; + mapped_offset =0 ; + } + +return -EINVAL ; } static int
@@ -659,25 +736,80 @@ vhost_scsi_calc_sgls(struct iov_iter *iter, size_t bytes, int max_sgls) }static int -vhost_scsi_iov_to_sgl (struct vhost_scsi_cmd *cmd,bool write, -struct iov_iter *iter, -struct scatterlist *sg,int sg_count) +vhost_scsi_copy_iov_to_sgl (struct vhost_scsi_cmd *cmd,struct iov_iter *iter, +struct scatterlist *sg,int sg_count) +{ +size_t len =iov_iter_count (iter); +unsigned int nbytes =0 ; +struct page *page; +int i; + +if (cmd->tvc_data_direction ==DMA_FROM_DEVICE ) { + cmd->saved_iter_addr =dup_iter (&cmd->saved_iter, iter, +GFP_KERNEL ); +if (!cmd->saved_iter_addr) +return -ENOMEM ; + } + +for (i =0 ; i < sg_count; i++) { + page =alloc_page (GFP_KERNEL ); +if (!page) { + i--; + goto err; + } + + nbytes = min_t(unsigned int, PAGE_SIZE, len); +sg_set_page (&sg[i], page, nbytes,0 ); + +if (cmd->tvc_data_direction ==DMA_TO_DEVICE && +copy_page_from_iter (page,0 , nbytes, iter) != nbytes) + goto err; + + len -= nbytes; + } + + cmd->copied_iov =1 ; +return 0 ; + +err: +pr_err ("Could not read %u bytes while handling misaligned cmd\n" , + nbytes); + +for (; i >=0 ; i--) +__free_page (sg_page (&sg[i])); +kfree (cmd->saved_iter_addr); +return -ENOMEM ; +} + +static int +vhost_scsi_iov_to_sgl (struct vhost_scsi_cmd *cmd,struct iov_iter *iter, +struct scatterlist *sg,int sg_count,bool is_prot) {struct scatterlist *p = sg; +size_t revert_bytes;int ret;while (iov_iter_count (iter)) { - ret =vhost_scsi_map_to_sgl (cmd, iter, sg, write); + ret =vhost_scsi_map_to_sgl (cmd, iter, sg, is_prot);if (ret <0 ) { + revert_bytes =0 ; +while (p < sg) { -struct page *page =sg_page (p++); -if (page) +struct page *page =sg_page (p); + +if (page) {put_page (page); + revert_bytes += p->length; + } + p++; } + +iov_iter_revert (iter, revert_bytes);return ret; } sg += ret; } +return 0 ; }
@@ -687,7 +819,6 @@ vhost_scsi_mapal(struct vhost_scsi_cmd *cmd, size_t data_bytes, struct iov_iter *data_iter) { int sgl_count, ret; -bool write = (cmd->tvc_data_direction ==DMA_FROM_DEVICE ); if (prot_bytes) { sgl_count = vhost_scsi_calc_sgls(prot_iter, prot_bytes,
@@ -700,9 +831,8 @@ vhost_scsi_mapal(struct vhost_scsi_cmd *cmd,pr_debug ("%s prot_sg %p prot_sgl_count %u\n" , __func__, cmd->tvc_prot_sgl, cmd->tvc_prot_sgl_count); - ret =vhost_scsi_iov_to_sgl (cmd, write, prot_iter, - cmd->tvc_prot_sgl, - cmd->tvc_prot_sgl_count); + ret =vhost_scsi_iov_to_sgl (cmd, prot_iter, cmd->tvc_prot_sgl, + cmd->tvc_prot_sgl_count, true);if (ret <0 ) { cmd->tvc_prot_sgl_count =0 ;return ret;
@@ -718,8 +848,14 @@ vhost_scsi_mapal(struct vhost_scsi_cmd *cmd,pr_debug ("%s data_sg %p data_sgl_count %u\n" , __func__, cmd->tvc_sgl, cmd->tvc_sgl_count); - ret =vhost_scsi_iov_to_sgl (cmd, write, data_iter, - cmd->tvc_sgl, cmd->tvc_sgl_count); + ret =vhost_scsi_iov_to_sgl (cmd, data_iter, cmd->tvc_sgl, + cmd->tvc_sgl_count, false); +if (ret == -EINVAL ) { +sg_init_table (cmd->tvc_sgl, cmd->tvc_sgl_count); + ret =vhost_scsi_copy_iov_to_sgl (cmd, data_iter, cmd->tvc_sgl, + cmd->tvc_sgl_count); + } +if (ret <0 ) { cmd->tvc_sgl_count =0 ;return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 69/737 vdpa/mlx5: Correct default number of queues when MQ is on
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dragos Tatulea <[email protected]>
[ Upstream commit 3fe024193340b225d1fd410d78c495434a9d68e0 ]
The standard specifies that the initial number of queues is the default, which is 1 (1 tx, 1 rx).
Message-Id: <[email protected]>
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +9 -1
@@ -2447,7 +2447,15 @@ static int mlx5_vdpa_set_driver_features(struct vdpa_device *vdev, u64 features)else ndev->rqt_size =1 ; - ndev->cur_num_vqs =2 * ndev->rqt_size; +/* Device must start with 1 queue pair, as per VIRTIO v1.2 spec, section +* 5.1.6.5.5 "Device operation in multiqueue mode": +* +* Multiqueue is disabled by default. +* The driver enables multiqueue by sending a command using class +* VIRTIO_NET_CTRL_MQ. The command selects the mode of multiqueue +* operation, as follows: ... +*/ + ndev->cur_num_vqs =2 ;update_cvq_info (mvdev);return err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 70/737 virtio-mem: remove unsafe unplug in Big Block Mode (BBM)
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit f504e15b94eb4e5b47f8715da59c0207f68dffe1 ]
When "unsafe unplug" is enabled, we don't fake-offline all memory ahead of actual memory offlining using alloc_contig_range(). Instead, we rely on offline_pages() to also perform actual page migration, which might fail or take a very long time.
In that case, it's possible to easily run into endless loops that cannot be aborted anymore (as offlining is triggered by a workqueue then): For example, a single (accidentally) permanently unmovable page in ZONE_MOVABLE results in an endless loop. For ZONE_NORMAL, races between isolating the pageblock (and checking for unmovable pages) and concurrent page allocation are possible and similarly result in endless loops.
The idea of the unsafe unplug mode was to make it possible to more reliably unplug large memory blocks. However, (a) we really should be tackling that differently, by extending the alloc_contig_range()-based mechanism; and (b) this mode is not the default and as far as I know, it's unused either way.
So let's simply get rid of it.
Message-Id: <[email protected]>
--- drivers/virtio/virtio_mem.c | 51 +++++++++++++++---------------------- 1 file changed, 20 insertions(+), 31 deletions(-)
drivers/virtio/virtio_mem.c +20 -31
@@ -38,11 +38,6 @@ module_param(bbm_block_size, ulong, 0444);MODULE_PARM_DESC (bbm_block_size,"Big Block size in bytes. Default is 0 (auto-detection)." ); -static bool bbm_safe_unplug = true; -module_param (bbm_safe_unplug, bool,0444 ); -MODULE_PARM_DESC (bbm_safe_unplug, -"Use a safe unplug mechanism in BBM, avoiding long/endless loops" ); -/* * virtio-mem currently supports the following modes of operation: *
@@ -2111,38 +2106,32 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm, VIRTIO_MEM_BBM_BB_ADDED))return -EINVAL ; -if (bbm_safe_unplug) { -/* -* Start by fake-offlining all memory. Once we marked the device -* block as fake-offline, all newly onlined memory will -* automatically be kept fake-offline. Protect from concurrent -* onlining/offlining until we have a consistent state. -*/ -mutex_lock (&vm->hotplug_mutex); -virtio_mem_bbm_set_bb_state (vm, bb_id, -VIRTIO_MEM_BBM_BB_FAKE_OFFLINE ); +/* +* Start by fake-offlining all memory. Once we marked the device +* block as fake-offline, all newly onlined memory will +* automatically be kept fake-offline. Protect from concurrent +* onlining/offlining until we have a consistent state. +*/ +mutex_lock (&vm->hotplug_mutex); +virtio_mem_bbm_set_bb_state (vm, bb_id,VIRTIO_MEM_BBM_BB_FAKE_OFFLINE ); -for (pfn = start_pfn; pfn < end_pfn; pfn +=PAGES_PER_SECTION ) { - page =pfn_to_online_page (pfn); -if (!page) -continue ; +for (pfn = start_pfn; pfn < end_pfn; pfn +=PAGES_PER_SECTION ) { + page =pfn_to_online_page (pfn); +if (!page) +continue ; - rc =virtio_mem_fake_offline (pfn,PAGES_PER_SECTION ); -if (rc) { - end_pfn = pfn; - goto rollback_safe_unplug; - } + rc =virtio_mem_fake_offline (pfn,PAGES_PER_SECTION ); +if (rc) { + end_pfn = pfn; + goto rollback; } -mutex_unlock (&vm->hotplug_mutex); } +mutex_unlock (&vm->hotplug_mutex); rc =virtio_mem_bbm_offline_and_remove_bb (vm, bb_id);if (rc) { -if (bbm_safe_unplug) { -mutex_lock (&vm->hotplug_mutex); - goto rollback_safe_unplug; - } -return rc; +mutex_lock (&vm->hotplug_mutex); + goto rollback; } rc =virtio_mem_bbm_unplug_bb (vm, bb_id);
@@ -2154,7 +2143,7 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm, VIRTIO_MEM_BBM_BB_UNUSED);return rc; -rollback_safe_unplug: +rollback:for (pfn = start_pfn; pfn < end_pfn; pfn +=PAGES_PER_SECTION ) { page =pfn_to_online_page (pfn);if (!page)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 71/737 virtio-mem: convert most offline_and_remove_memory() errors to -EBUSY
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit ddf409851461f515cc32974714b73efe2e012bde ]
Just like we do with alloc_contig_range(), let's convert all unknown errors to -EBUSY, but WARN so we can look into the issue. For example, offline_pages() could fail with -EINTR, which would be unexpected in our case.
Message-Id: <[email protected]>
--- drivers/virtio/virtio_mem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/virtio/virtio_mem.c +8 -4
@@ -741,11 +741,15 @@ static int virtio_mem_offline_and_remove_memory(struct virtio_mem *vm,* immediately instead of waiting. */ virtio_mem_retry (vm); - }else { -dev_dbg (&vm->vdev->dev, -"offlining and removing memory failed: %d\n" , rc); +return 0 ; } -return rc; +dev_dbg (&vm->vdev->dev,"offlining and removing memory failed: %d\n" , rc); +/* +* We don't really expect this to fail, because we fake-offlined all +* memory already. But it could fail in corner cases. +*/ +WARN_ON_ONCE (rc != -ENOMEM && rc != -EBUSY ); +return rc == -ENOMEM ? -ENOMEM : -EBUSY ; }/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 72/737 virtio-mem: keep retrying on offline_and_remove_memory() errors in Sub Block Mode (SBM)
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit a31648fd4f96fbe0a4d0aeb16b57a2405c6943c0 ]
In case offline_and_remove_memory() fails in SBM, we leave a completely unplugged Linux memory block stick around until we try plugging memory again. We won't try removing that memory block again.
offline_and_remove_memory() may, for example, fail if we're racing with another alloc_contig_range() user, if allocating temporary memory fails, or if some memory notifier rejected the offlining request.
Let's handle that case better, by simple retrying to offline and remove such memory.
Tested using CONFIG_MEMORY_NOTIFIER_ERROR_INJECT.
Message-Id: <[email protected]>
--- drivers/virtio/virtio_mem.c | 92 +++++++++++++++++++++++++++++-------- 1 file changed, 73 insertions(+), 19 deletions(-)
drivers/virtio/virtio_mem.c +73 -19
@@ -168,6 +168,13 @@ struct virtio_mem {/* The number of subblocks per Linux memory block. */ uint32_t sbs_per_mb; +/* +* Some of the Linux memory blocks tracked as "partially +* plugged" are completely unplugged and can be offlined +* and removed -- which previously failed. +*/ +bool have_unplugged_mb; +/* Summary of all memory block states. */ unsigned long mb_count[VIRTIO_MEM_SBM_MB_COUNT ];
@@ -765,6 +772,34 @@ static int virtio_mem_sbm_offline_and_remove_mb(struct virtio_mem *vm,return virtio_mem_offline_and_remove_memory (vm, addr, size); } +/* +* Try (offlining and) removing memory from Linux in case all subblocks are +* unplugged. Can be called on online and offline memory blocks. +* +* May modify the state of memory blocks in virtio-mem. +*/ +static int virtio_mem_sbm_try_remove_unplugged_mb (struct virtio_mem *vm, +unsigned long mb_id) +{ +int rc; + +/* +* Once all subblocks of a memory block were unplugged, offline and +* remove it. +*/ +if (!virtio_mem_sbm_test_sb_unplugged (vm, mb_id,0 , vm->sbm.sbs_per_mb)) +return 0 ; + +/* offline_and_remove_memory() works for online and offline memory. */ +mutex_unlock (&vm->hotplug_mutex); + rc =virtio_mem_sbm_offline_and_remove_mb (vm, mb_id); +mutex_lock (&vm->hotplug_mutex); +if (!rc) +virtio_mem_sbm_set_mb_state (vm, mb_id, +VIRTIO_MEM_SBM_MB_UNUSED ); +return rc; +} +/* * See virtio_mem_offline_and_remove_memory(): Try to offline and remove a * all Linux memory blocks covered by the big block.
@@ -1988,20 +2023,10 @@ static int virtio_mem_sbm_unplug_any_sb_online(struct virtio_mem *vm, } unplugged: -/* -* Once all subblocks of a memory block were unplugged, offline and -* remove it. This will usually not fail, as no memory is in use -* anymore - however some other notifiers might NACK the request. -*/ -if (virtio_mem_sbm_test_sb_unplugged (vm, mb_id,0 , vm->sbm.sbs_per_mb)) { -mutex_unlock (&vm->hotplug_mutex); - rc =virtio_mem_sbm_offline_and_remove_mb (vm, mb_id); -mutex_lock (&vm->hotplug_mutex); -if (!rc) -virtio_mem_sbm_set_mb_state (vm, mb_id, -VIRTIO_MEM_SBM_MB_UNUSED ); - } - + rc =virtio_mem_sbm_try_remove_unplugged_mb (vm, mb_id); +if (rc) + vm->sbm.have_unplugged_mb =1 ; +/* Ignore errors, this is not critical. We'll retry later. */ return 0 ; }
@@ -2253,12 +2278,13 @@ static int virtio_mem_unplug_request(struct virtio_mem *vm, uint64_t diff)/* * Try to unplug all blocks that couldn't be unplugged before, for example, -* because the hypervisor was busy. +* because the hypervisor was busy. Further, offline and remove any memory +* blocks where we previously failed. */ -static int virtio_mem_unplug_pending_mb (struct virtio_mem *vm) +static int virtio_mem_cleanup_pending_mb (struct virtio_mem *vm) {unsigned long id; -int rc; +int rc =0 ;if (!vm->in_sbm) { virtio_mem_bbm_for_each_bb(vm, id,
@@ -2280,6 +2306,27 @@ static int virtio_mem_unplug_pending_mb(struct virtio_mem *vm) VIRTIO_MEM_SBM_MB_UNUSED); } +if (!vm->sbm.have_unplugged_mb) +return 0 ; + +/* +* Let's retry (offlining and) removing completely unplugged Linux +* memory blocks. +*/ + vm->sbm.have_unplugged_mb = false; + +mutex_lock (&vm->hotplug_mutex); +virtio_mem_sbm_for_each_mb (vm, id,VIRTIO_MEM_SBM_MB_MOVABLE_PARTIAL ) + rc |=virtio_mem_sbm_try_remove_unplugged_mb (vm, id); +virtio_mem_sbm_for_each_mb (vm, id,VIRTIO_MEM_SBM_MB_KERNEL_PARTIAL ) + rc |=virtio_mem_sbm_try_remove_unplugged_mb (vm, id); +virtio_mem_sbm_for_each_mb (vm, id,VIRTIO_MEM_SBM_MB_OFFLINE_PARTIAL ) + rc |=virtio_mem_sbm_try_remove_unplugged_mb (vm, id); +mutex_unlock (&vm->hotplug_mutex); + +if (rc) + vm->sbm.have_unplugged_mb = true; +/* Ignore errors, this is not critical. We'll retry later. */ return 0 ; }
@@ -2361,9 +2408,9 @@ static void virtio_mem_run_wq(struct work_struct *work)virtio_mem_refresh_config (vm); } -/* Unplug any leftovers from previous runs */ +/* Cleanup any leftovers from previous runs */ if (!rc) - rc =virtio_mem_unplug_pending_mb (vm); + rc =virtio_mem_cleanup_pending_mb (vm);if (!rc && vm->requested_size != vm->plugged_size) {if (vm->requested_size > vm->plugged_size) {
@@ -2375,6 +2422,13 @@ static void virtio_mem_run_wq(struct work_struct *work) } } +/* +* Keep retrying to offline and remove completely unplugged Linux +* memory blocks. +*/ +if (!rc && vm->in_sbm && vm->sbm.have_unplugged_mb) + rc = -EBUSY ; +switch (rc) {case 0 : vm->retry_timer_ms =VIRTIO_MEM_RETRY_TIMER_MIN_MS ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 73/737 virtio-mem: check if the config changed before fake offlining memory
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
[ Upstream commit f55484fd7be923b740e8e1fc304070ba53675cb4 ]
If we repeatedly fail to fake offline memory to unplug it, we won't be sending any unplug requests to the device. However, we only check if the config changed when sending such (un)plug requests.
We could end up trying for a long time to unplug memory, even though the config changed already and we're not supposed to unplug memory anymore. For example, the hypervisor might detect a low-memory situation while unplugging memory and decide to replug some memory. Continuing trying to unplug memory in that case can be problematic.
So let's check on a more regular basis.
Message-Id: <[email protected]>
--- drivers/virtio/virtio_mem.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/virtio/virtio_mem.c +12 -3
@@ -1189,7 +1189,8 @@ static void virtio_mem_fake_online(unsigned long pfn, unsigned long nr_pages)* Try to allocate a range, marking pages fake-offline, effectively * fake-offlining them. */ -static int virtio_mem_fake_offline (unsigned long pfn,unsigned long nr_pages) +static int virtio_mem_fake_offline (struct virtio_mem *vm,unsigned long pfn, +unsigned long nr_pages) {const bool is_movable =is_zone_movable_page (pfn_to_page (pfn));int rc, retry_count;
@@ -1202,6 +1203,14 @@ static int virtio_mem_fake_offline(unsigned long pfn, unsigned long nr_pages)* some guarantees. */ for (retry_count =0 ; retry_count <5 ; retry_count++) { +/* +* If the config changed, stop immediately and go back to the +* main loop: avoid trying to keep unplugging if the device +* might have decided to not remove any more memory. +*/ +if (atomic_read (&vm->config_changed)) +return -EAGAIN ; + rc =alloc_contig_range (pfn, pfn + nr_pages,MIGRATE_MOVABLE ,GFP_KERNEL );if (rc == -ENOMEM )
@@ -1951,7 +1960,7 @@ static int virtio_mem_sbm_unplug_sb_online(struct virtio_mem *vm, start_pfn =PFN_DOWN (virtio_mem_mb_id_to_phys (mb_id) + sb_id * vm->sbm.sb_size); - rc =virtio_mem_fake_offline (start_pfn, nr_pages); + rc =virtio_mem_fake_offline (vm, start_pfn, nr_pages);if (rc)return rc;
@@ -2149,7 +2158,7 @@ static int virtio_mem_bbm_offline_remove_and_unplug_bb(struct virtio_mem *vm,if (!page)continue ; - rc =virtio_mem_fake_offline (pfn,PAGES_PER_SECTION ); + rc =virtio_mem_fake_offline (vm, pfn,PAGES_PER_SECTION );if (rc) { end_pfn = pfn; goto rollback;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 74/737 ALSA: hda/cs8409: Support new Dell Dolphin Variants
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Binding <[email protected]>
[ Upstream commit 7c761166399bedfc89c928bef8015546d85a9099 ]
Add 4 new Dell Dolphin Systems, same configuration as older systems.
--- sound/pci/hda/patch_cs8409-tables.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/pci/hda/patch_cs8409-tables.c +4 -0
@@ -550,6 +550,10 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0C50 ,"Dolphin" ,CS8409_DOLPHIN ),SND_PCI_QUIRK (0x1028 ,0x0C51 ,"Dolphin" ,CS8409_DOLPHIN ),SND_PCI_QUIRK (0x1028 ,0x0C52 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C73 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C75 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C7D ,"Dolphin" ,CS8409_DOLPHIN ), + SND_PCI_QUIRK(0x1028, 0x0C7F, "Dolphin", CS8409_DOLPHIN), {} /* terminator */ };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 75/737 ARM: dts: integrator: fix PCI bus dtc warnings
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Yujun <[email protected]>
[ Upstream commit 42ff49a1967af71772b264009659ce181f7d2d2a ]
An warning is reported when allmodconfig is used to compile the kernel of the ARM architecture:
arch/arm/boot/dts/arm/integratorap.dts:161.22-206.4: Warning (pci_bridge): /pciv3@62000000: node name is not "pci" or "pcie"
Change the node name to pci to clear the build warning.
--- arch/arm/boot/dts/integratorap.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/integratorap.dts +1 -1
@@ -158,7 +158,7 @@ valid-mask = <0x003fffff>; }; - pci: pciv3@62000000 { + pci: pci@62000000 { compatible = "arm,integrator-ap-pci", "v3,v360epc-pci"; device_type = "pci"; #interrupt-cells = <1>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 76/737 ASoC: rt1308-sdw: fix random louder sound
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuming Fan <[email protected]>
[ Upstream commit 37aba3190891d4de189bd5192ee95220e295f34d ]
This patch uses a vendor register to check whether the system hibernated ever.
The driver will only set the preset when the driver brings up or the system hibernated. It will avoid the unknown issue that makes the speaker output louder and can't control the volume.
--- sound/soc/codecs/rt1308-sdw.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
sound/soc/codecs/rt1308-sdw.c +12 -1
@@ -52,6 +52,7 @@ static bool rt1308_volatile_register(struct device *dev, unsigned int reg)case 0x300a :case 0xc000 :case 0xc710 : +case 0xcf01 : case 0xc860 ... 0xc863: case 0xc870 ... 0xc873:return true;
@@ -213,7 +214,7 @@ static int rt1308_io_init(struct device *dev, struct sdw_slave *slave) {struct rt1308_sdw_priv *rt1308 =dev_get_drvdata (dev);int ret =0 ; -unsigned int tmp; +unsigned int tmp, hibernation_flag;if (rt1308->hw_init)return 0 ;
@@ -242,6 +243,10 @@ static int rt1308_io_init(struct device *dev, struct sdw_slave *slave)pm_runtime_get_noresume (&slave->dev); +regmap_read (rt1308->regmap,0xcf01 , &hibernation_flag); +if ((hibernation_flag !=0x00 ) && rt1308->first_hw_init) + goto _preset_ready_; +/* sw reset */ regmap_write (rt1308->regmap,RT1308_SDW_RESET ,0 );
@@ -282,6 +287,12 @@ static int rt1308_io_init(struct device *dev, struct sdw_slave *slave)regmap_write (rt1308->regmap,0xc100 ,0xd7 );regmap_write (rt1308->regmap,0xc101 ,0xd7 ); +/* apply BQ params */ +rt1308_apply_bq_params (rt1308); + +regmap_write (rt1308->regmap,0xcf01 ,0x01 ); + +_preset_ready_:if (rt1308->first_hw_init) {regcache_cache_bypass (rt1308->regmap, false);regcache_mark_dirty (rt1308->regmap);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 59/737 platform/x86/amd/pmf: Fix unsigned comparison with less than zero
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Li <[email protected]>
[ Upstream commit 785c00993dc4c4bb2f7b0f3a3f29c03a6f7aab2e ]
The return value from the call to amd_pmf_get_pprof_modes() is int. However, the return value is being assigned to an unsigned char variable 'mode', so making 'mode' an int.
silence the warning:
./drivers/platform/x86/amd/pmf/sps.c:183:5-9: WARNING: Unsigned expression compared with zero: mode < 0
--- drivers/platform/x86/amd/pmf/sps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/platform/x86/amd/pmf/sps.c +2 -1
@@ -121,7 +121,8 @@ int amd_pmf_get_pprof_modes(struct amd_pmf_dev *pmf)int amd_pmf_power_slider_update_event (struct amd_pmf_dev *dev) { -u8 mode, flag =0 ; +u8 flag =0 ; +int mode;int src; mode =amd_pmf_get_pprof_modes (dev);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 77/737 i2c: imx-lpi2c: return -EINVAL when i2c peripheral clk doesnt work
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Song <[email protected]>
[ Upstream commit b610c4bbd153c2cde548db48559e170905d7c369 ]
On MX8X platforms, the default clock rate is 0 if without explicit clock setting in dts nodes. I2c can't work when i2c peripheral clk rate is 0.
Add a i2c peripheral clk rate check before configuring the clock register. When i2c peripheral clk rate is 0 and directly return -EINVAL.
--- drivers/i2c/busses/i2c-imx-lpi2c.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-imx-lpi2c.c +3 -0
@@ -209,6 +209,9 @@ static int lpi2c_imx_config(struct lpi2c_imx_struct *lpi2c_imx)lpi2c_imx_set_mode (lpi2c_imx); clk_rate =clk_get_rate (lpi2c_imx->clks[0 ].clk); +if (!clk_rate) +return -EINVAL ; +if (lpi2c_imx->mode ==HS || lpi2c_imx->mode ==ULTRA_FAST ) filt =0 ;else
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 78/737 fbdev: goldfishfb: Do not check 0 for platform_get_irq()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Wang <[email protected]>
[ Upstream commit 0650d5098f8b6b232cd5ea0e15437fc38f7d63ba ]
Since platform_get_irq() never returned zero, so it need not to check whether it returned zero, and we use the return error code of platform_get_irq() to replace the current return error code.
Please refer to the commit a85a6c86c25b ("driver core: platform: Clarify that IRQ 0 is invalid") to get that platform_get_irq() never returned zero.
--- drivers/video/fbdev/goldfishfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/goldfishfb.c +2 -2
@@ -203,8 +203,8 @@ static int goldfish_fb_probe(struct platform_device *pdev) } fb->irq =platform_get_irq (pdev,0 ); -if (fb->irq <=0 ) { - ret = -ENODEV ; +if (fb->irq <0 ) { + ret = fb->irq; goto err_no_irq; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 79/737 broadcom: b44: Use b44_writephy() return value
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Chernyshev <[email protected]>
[ Upstream commit 9944d203fa63721b87eee84a89f7275dc3d25c05 ]
Return result of b44_writephy() instead of zero to deal with possible error.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/ethernet/broadcom/b44.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/b44.c +3 -5
@@ -1793,11 +1793,9 @@ static int b44_nway_reset(struct net_device *dev)b44_readphy (bp,MII_BMCR , &bmcr);b44_readphy (bp,MII_BMCR , &bmcr); r = -EINVAL ; -if (bmcr &BMCR_ANENABLE ) { -b44_writephy (bp,MII_BMCR , - bmcr |BMCR_ANRESTART ); - r =0 ; - } +if (bmcr &BMCR_ANENABLE ) + r =b44_writephy (bp,MII_BMCR , + bmcr |BMCR_ANRESTART );spin_unlock_irq (&bp->lock);return r;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 80/737 gpiolib: fix reference leaks when removing GPIO chips still in use
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
[ Upstream commit 3386fb86ecdef0d39ee3306aea8ec290e61b934f ]
After we remove a GPIO chip that still has some requested descriptors, gpiod_free_commit() will fail and we will never put the references to the GPIO device and the owning module in gpiod_free().
Rework this function to:
- not warn on desc == NULL as this is a use-case on which most free functions silently return
- put the references to desc->gdev and desc->gdev->owner unconditionally so that the release callback actually gets called when the remaining references are dropped by external GPIO users
--- drivers/gpio/gpiolib.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/gpio/gpiolib.c +11 -5
@@ -2175,12 +2175,18 @@ static bool gpiod_free_commit(struct gpio_desc *desc)void gpiod_free (struct gpio_desc *desc) { -if (desc && desc->gdev &&gpiod_free_commit (desc)) { -module_put (desc->gdev->owner); -gpio_device_put (desc->gdev); - }else { +/* +* We must not use VALIDATE_DESC_VOID() as the underlying gdev->chip +* may already be NULL but we still want to put the references. +*/ +if (!desc) +return ; + +if (!gpiod_free_commit (desc))WARN_ON (extra_checks); - } + +module_put (desc->gdev->owner); +gpio_device_put (desc->gdev); }/**
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 81/737 drm/amd/pm: Fix temperature unit of SMU v13.0.6
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit 8d036427f0042a91136e6f19a39542eedec4e96c ]
Temperature needs to be reported in millidegree Celsius.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +6 -3
@@ -697,16 +697,19 @@ static int smu_v13_0_6_get_smu_metrics_data(struct smu_context *smu, *value =SMUQ10_TO_UINT (metrics->SocketPower) <<8 ;break ;case METRICS_TEMPERATURE_HOTSPOT : - *value =SMUQ10_TO_UINT (metrics->MaxSocketTemperature); + *value =SMUQ10_TO_UINT (metrics->MaxSocketTemperature) * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ;break ;case METRICS_TEMPERATURE_MEM : - *value =SMUQ10_TO_UINT (metrics->MaxHbmTemperature); + *value =SMUQ10_TO_UINT (metrics->MaxHbmTemperature) * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ;break ;/* This is the max of all VRs and not just SOC VR. * No need to define another data type for the same. */ case METRICS_TEMPERATURE_VRSOC : - *value =SMUQ10_TO_UINT (metrics->MaxVrTemperature); + *value =SMUQ10_TO_UINT (metrics->MaxVrTemperature) * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ;break ;case METRICS_THROTTLER_STATUS : *value =smu_v13_0_6_get_throttler_status (smu, metrics);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 82/737 ASoC: cs35l56: Add an ACPI match table
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Trimmer <[email protected]>
[ Upstream commit e8500a70270334b9abad72fea504ef38a2952274 ]
An ACPI ID has been allocated for CS35L56 ASoC devices so that they can be instantiated from ACPI Device entries.
--- sound/soc/codecs/cs35l56-i2c.c | 9 +++++++++ sound/soc/codecs/cs35l56-spi.c | 9 +++++++++ 2 files changed, 18 insertions(+)
sound/soc/codecs/cs35l56-i2c.c +9 -0
@@ -62,10 +62,19 @@ static const struct i2c_device_id cs35l56_id_i2c[] = { };MODULE_DEVICE_TABLE (i2c, cs35l56_id_i2c); +#ifdef CONFIG_ACPI +static const struct acpi_device_id cs35l56_asoc_acpi_match[] = { + {"CSC355C" ,0 }, + {}, +}; +MODULE_DEVICE_TABLE (acpi, cs35l56_asoc_acpi_match); +#endif +static struct i2c_driver cs35l56_i2c_driver = { .driver = { .name ="cs35l56" , .pm = &cs35l56_pm_ops_i2c_spi, + .acpi_match_table =ACPI_PTR (cs35l56_asoc_acpi_match), }, .id_table = cs35l56_id_i2c, .probe_new = cs35l56_i2c_probe,
sound/soc/codecs/cs35l56-spi.c +9 -0
@@ -59,10 +59,19 @@ static const struct spi_device_id cs35l56_id_spi[] = { };MODULE_DEVICE_TABLE (spi, cs35l56_id_spi); +#ifdef CONFIG_ACPI +static const struct acpi_device_id cs35l56_asoc_acpi_match[] = { + {"CSC355C" ,0 }, + {}, +}; +MODULE_DEVICE_TABLE (acpi, cs35l56_asoc_acpi_match); +#endif +static struct spi_driver cs35l56_spi_driver = { .driver = { .name ="cs35l56" , .pm = &cs35l56_pm_ops_i2c_spi, + .acpi_match_table =ACPI_PTR (cs35l56_asoc_acpi_match), }, .id_table = cs35l56_id_spi, .probe = cs35l56_spi_probe,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 83/737 net: sfp: handle 100G/25G active optical cables in sfp_parse_support
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josua Mayer <[email protected]>
[ Upstream commit db1a6ad77c180efc7242d7204b9a0c72c8a5a1bb ]
Handle extended compliance code 0x1 (SFF8024_ECC_100G_25GAUI_C2M_AOC) for active optical cables supporting 25G and 100G speeds.
Since the specification makes no statement about transmitter range, and as the specific sfp module that had been tested features only 2m fiber - short-range (SR) modes are selected.
The 100G speed is irrelevant because it would require multiple fibers / multiple SFP28 modules combined under one netdev.sfp-bus.c only handles a single module per netdev, so only 25Gbps modes are selected.
sfp_parse_support already handles SFF8024_ECC_100GBASE_SR4_25GBASE_SR with compatible properties, however that entry is a contradiction in itself since with SFP(28) 100GBASE_SR4 is impossible - that would likely be a mode for qsfp modules only.
Add a case for SFF8024_ECC_100G_25GAUI_C2M_AOC selecting 25gbase-r interface mode and 25000baseSR link mode.
Also enforce SFP28 bitrate limits on the values read from sfp eeprom as requested by Russell King.
Tested with fs.com S28-AO02 AOC SFP28 module.
--- drivers/net/phy/sfp-bus.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/phy/sfp-bus.c +10 -0
@@ -258,6 +258,16 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,switch (id->base.extended_cc) {case SFF8024_ECC_UNSPEC :break ; +case SFF8024_ECC_100G_25GAUI_C2M_AOC : +if (br_min <=28000 && br_max >=25000 ) { +/* 25GBASE-R, possibly with FEC */ +__set_bit (PHY_INTERFACE_MODE_25GBASER , interfaces); +/* There is currently no link mode for 25000base +* with unspecified range, reuse SR. +*/ + phylink_set(modes, 25000baseSR_Full); + } +break ;case SFF8024_ECC_100GBASE_SR4_25GBASE_SR : phylink_set(modes, 100000baseSR4_Full); phylink_set(modes, 25000baseSR_Full);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 84/737 tracing: Introduce pipe_cpumask to avoid race on trace_pipes
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
[ Upstream commit c2489bb7e6be2e8cdced12c16c42fa128403ac03 ]
There is race issue when concurrently splice_read main trace_pipe and per_cpu trace_pipes which will result in data read out being different from what actually writen.
As suggested by Steven:
Quoted 11 lines
I believe we should add a ref count to
trace_pipeand theper_cputrace_pipes, where if they are opened, nothing else can read it.Opening
trace_pipelocks allper_cpuref counts, if any of them are open, then thetrace_pipeopen will fail (and releases any ref counts it had taken).Opening a
per_cputrace_pipewill up the ref count for just that CPU buffer. This will allow multiple tasks to read differentper_cputrace_pipefiles, but will prevent the maintrace_pipefile from being opened.
But because we only need to know whether per_cpu trace_pipe is open or not, using a cpumask instead of using ref count may be easier.
After this patch, users will find that:
- Main trace_pipe can be opened by only one user, and if it is opened, all per_cpu trace_pipes cannot be opened;
- Per_cpu trace_pipes can be opened by multiple users, but each per_cpu trace_pipe can only be opened by one user. And if one of them is opened, main trace_pipe cannot be opened.
--- kernel/trace/trace.c | 55 ++++++++++++++++++++++++++++++++++++++------ kernel/trace/trace.h | 2 ++ 2 files changed, 50 insertions(+), 7 deletions(-)
kernel/trace/trace.c +48 -7
@@ -6690,10 +6690,36 @@ tracing_max_lat_write(struct file *filp, const char __user *ubuf,#endif +static int open_pipe_on_cpu (struct trace_array *tr,int cpu) +{ +if (cpu ==RING_BUFFER_ALL_CPUS ) { +if (cpumask_empty (tr->pipe_cpumask)) { +cpumask_setall (tr->pipe_cpumask); +return 0 ; + } + }else if (!cpumask_test_cpu (cpu, tr->pipe_cpumask)) { +cpumask_set_cpu (cpu, tr->pipe_cpumask); +return 0 ; + } +return -EBUSY ; +} + +static void close_pipe_on_cpu (struct trace_array *tr,int cpu) +{ +if (cpu ==RING_BUFFER_ALL_CPUS ) { +WARN_ON (!cpumask_full (tr->pipe_cpumask)); +cpumask_clear (tr->pipe_cpumask); + }else { +WARN_ON (!cpumask_test_cpu (cpu, tr->pipe_cpumask)); +cpumask_clear_cpu (cpu, tr->pipe_cpumask); + } +} +static int tracing_open_pipe (struct inode *inode,struct file *filp) {struct trace_array *tr = inode->i_private;struct trace_iterator *iter; +int cpu;int ret; ret =tracing_check_open_get_tr (tr);
@@ -6701,13 +6727,16 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)return ret;mutex_lock (&trace_types_lock); + cpu =tracing_get_cpu (inode); + ret =open_pipe_on_cpu (tr, cpu); +if (ret) + goto fail_pipe_on_cpu;/* create a buffer to store the information to pass to userspace */ iter =kzalloc (sizeof (*iter),GFP_KERNEL );if (!iter) { ret = -ENOMEM ; -__trace_array_put (tr); - goto out; + goto fail_alloc_iter; }trace_seq_init (&iter->seq);
@@ -6730,7 +6759,7 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp) iter->tr = tr; iter->array_buffer = &tr->array_buffer; - iter->cpu_file =tracing_get_cpu (inode); + iter->cpu_file = cpu;mutex_init (&iter->mutex); filp->private_data = iter;
@@ -6740,12 +6769,15 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)nonseekable_open (inode, filp); tr->trace_ref++; -out: +mutex_unlock (&trace_types_lock);return ret; fail:kfree (iter); +fail_alloc_iter: +close_pipe_on_cpu (tr, cpu); +fail_pipe_on_cpu:__trace_array_put (tr);mutex_unlock (&trace_types_lock);return ret;
@@ -6762,7 +6794,7 @@ static int tracing_release_pipe(struct inode *inode, struct file *file)if (iter->trace->pipe_close) iter->trace->pipe_close (iter); - +close_pipe_on_cpu (tr, iter->cpu_file);mutex_unlock (&trace_types_lock);free_cpumask_var (iter->started);
@@ -9426,6 +9458,9 @@ static struct trace_array *trace_array_create(const char *name)if (!alloc_cpumask_var (&tr->tracing_cpumask,GFP_KERNEL )) goto out_free_tr; +if (!alloc_cpumask_var (&tr->pipe_cpumask,GFP_KERNEL )) + goto out_free_tr; + tr->trace_flags = global_trace.trace_flags & ~ZEROED_TRACE_FLAGS ;cpumask_copy (tr->tracing_cpumask, cpu_all_mask);
@@ -9467,6 +9502,7 @@ static struct trace_array *trace_array_create(const char *name) out_free_tr:ftrace_free_ftrace_ops (tr);free_trace_buffers (tr); +free_cpumask_var (tr->pipe_cpumask);free_cpumask_var (tr->tracing_cpumask);kfree (tr->name);kfree (tr);
@@ -9569,6 +9605,7 @@ static int __remove_instance(struct trace_array *tr) }kfree (tr->topts); +free_cpumask_var (tr->pipe_cpumask);free_cpumask_var (tr->tracing_cpumask);kfree (tr->name);kfree (tr);
@@ -10366,12 +10403,14 @@ __init static int tracer_alloc_buffers(void)if (trace_create_savedcmd () <0 ) goto out_free_temp_buffer; +if (!alloc_cpumask_var (&global_trace.pipe_cpumask,GFP_KERNEL )) + goto out_free_savedcmd; +/* TODO: make the number of buffers hot pluggable with CPUS */ if (allocate_trace_buffers (&global_trace, ring_buf_size) <0 ) {MEM_FAIL (1 ,"tracer: failed to allocate ring buffer!\n" ); - goto out_free_savedcmd; + goto out_free_pipe_cpumask; } -if (global_trace.buffer_disabled)tracing_off ();
@@ -10424,6 +10463,8 @@ __init static int tracer_alloc_buffers(void)return 0 ; +out_free_pipe_cpumask: +free_cpumask_var (global_trace.pipe_cpumask); out_free_savedcmd:free_saved_cmdlines_buffer (savedcmd); out_free_temp_buffer:
kernel/trace/trace.h +2 -0
@@ -366,6 +366,8 @@ struct trace_array {struct list_head events;struct trace_event_file *trace_marker_file;cpumask_var_t tracing_cpumask;/* only trace on set CPUs */ +/* one per_cpu trace_pipe can be opened by only one user */ +cpumask_var_t pipe_cpumask;int ref;int trace_ref;#ifdef CONFIG_FUNCTION_TRACER
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 85/737 platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shih-Yi Chen <[email protected]>
[ Upstream commit 0848cab765c634597636810bf76d0934003cce28 ]
rshim console does not show all entries of dmesg.
Fixed by setting MLXBF_TM_TX_LWM_IRQ for every CONSOLE notification.
--- drivers/platform/mellanox/mlxbf-tmfifo.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/mellanox/mlxbf-tmfifo.c +1 -0
@@ -887,6 +887,7 @@ static bool mlxbf_tmfifo_virtio_notify(struct virtqueue *vq) tm_vdev = fifo->vdev[VIRTIO_ID_CONSOLE ];mlxbf_tmfifo_console_output (tm_vdev, vring);spin_unlock_irqrestore (&fifo->spin_lock[0 ], flags); +set_bit (MLXBF_TM_TX_LWM_IRQ , &fifo->pend_events); }else if (test_and_set_bit (MLXBF_TM_TX_LWM_IRQ , &fifo->pend_events)) {return true;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 86/737 sbitmap: fix batching wakeup
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
commit 106397376c0369fcc01c58dd189ff925a2724a57 upstream.
Current code supposes that it is enough to provide forward progress by just waking up one wait queue after one completion batch is done.
Unfortunately this way isn't enough, cause waiter can be added to wait queue just after it is woken up.
Follows one example(64 depth, wake_batch is 8)
1) all 64 tags are active
2) in each wait queue, there is only one single waiter
3) each time one completion batch(8 completions) wakes up just one waiter in each wait queue, then immediately one new sleeper is added to this wait queue
4) after 64 completions, 8 waiters are wakeup, and there are still 8 waiters in each wait queue
5) after another 8 active tags are completed, only one waiter can be wakeup, and the other 7 can't be waken up anymore.
Turns out it isn't easy to fix this problem, so simply wakeup enough waiters for single batch.
--- lib/sbitmap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
lib/sbitmap.c +7 -8
@@ -550,7 +550,7 @@ EXPORT_SYMBOL_GPL(sbitmap_queue_min_shalstatic void __sbitmap_queue_wake_up (struct sbitmap_queue *sbq,int nr) { -int i, wake_index; +int i, wake_index, woken;if (!atomic_read (&sbq->ws_active))return ;
@@ -567,13 +567,12 @@ static void __sbitmap_queue_wake_up(stru*/ wake_index =sbq_index_inc (wake_index); -/* -* It is sufficient to wake up at least one waiter to -* guarantee forward progress. -*/ -if (waitqueue_active (&ws->wait) && -wake_up_nr (&ws->wait, nr)) -break ; +if (waitqueue_active (&ws->wait)) { + woken =wake_up_nr (&ws->wait, nr); +if (woken == nr) +break ; + nr -= woken; + } }if (wake_index !=atomic_read (&sbq->wake_index))
Greg Kroah-Hartman
maintainerPATCH 60/737 scsi: lpfc: Remove reftag check in DIF paths
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit 8eebf0e84f0614cebc7347f7bbccba4056d77d42 ]
When preparing protection DIF I/O for DMA, the driver obtains reference tags from scsi_prot_ref_tag(). Previously, there was a wrong assumption that an all 0xffffffff value meant error and thus the driver failed the I/O. This patch removes the evaluation code and accepts whatever the upper layer returns.
--- drivers/scsi/lpfc/lpfc_scsi.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +3 -17
@@ -109,8 +109,6 @@ lpfc_sli4_set_rsp_sgl_last(struct lpfc_hba *phba, } } -#define LPFC_INVALID_REFTAG ((u32)-1) -/** * lpfc_rampdown_queue_depth - Post RAMP_DOWN_QUEUE event to worker thread * @phba: The Hba for which this call is being executed.
@@ -978,8 +976,6 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc, sgpe =scsi_prot_sglist (sc); lba =scsi_prot_ref_tag (sc); -if (lba ==LPFC_INVALID_REFTAG ) -return 0 ;/* First check if we need to match the LBA */ if (phba->lpfc_injerr_lba !=LPFC_INJERR_LBA_OFF ) {
@@ -1560,8 +1556,6 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,/* extract some info from the scsi command for pde*/ reftag =scsi_prot_ref_tag (sc); -if (reftag ==LPFC_INVALID_REFTAG ) - goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -1723,8 +1717,6 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,/* extract some info from the scsi command */ blksize =scsi_prot_interval (sc); reftag =scsi_prot_ref_tag (sc); -if (reftag ==LPFC_INVALID_REFTAG ) - goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -1953,8 +1945,6 @@ lpfc_bg_setup_sgl(struct lpfc_hba *phba, struct scsi_cmnd *sc,/* extract some info from the scsi command for pde*/ reftag =scsi_prot_ref_tag (sc); -if (reftag ==LPFC_INVALID_REFTAG ) - goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -2154,8 +2144,6 @@ lpfc_bg_setup_sgl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,/* extract some info from the scsi command */ blksize =scsi_prot_interval (sc); reftag =scsi_prot_ref_tag (sc); -if (reftag ==LPFC_INVALID_REFTAG ) - goto out;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS rc =lpfc_bg_err_inject (phba, sc, &reftag,NULL ,1 );
@@ -2746,8 +2734,6 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd) src = (struct scsi_dif_tuple *)sg_virt (sgpe); start_ref_tag =scsi_prot_ref_tag (cmd); -if (start_ref_tag ==LPFC_INVALID_REFTAG ) - goto out; start_app_tag = src->app_tag; len = sgpe->length;while (src && protsegcnt) {
@@ -3493,11 +3479,11 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, scsi_cmnd->sc_data_direction);lpfc_printf_log (phba,KERN_ERR ,LOG_TRACE_EVENT , -"9084 Cannot setup S/G List for HBA" -"IO segs %d/%d SGL %d SCSI %d: %d %d\n" , +"9084 Cannot setup S/G List for HBA " +"IO segs %d/%d SGL %d SCSI %d: %d %d %d\n" , lpfc_cmd->seg_cnt, lpfc_cmd->prot_seg_cnt, phba->cfg_total_seg_cnt, phba->cfg_sg_seg_cnt, - prot_group_type, num_sge); + prot_group_type, num_sge, ret); lpfc_cmd->seg_cnt =0 ; lpfc_cmd->prot_seg_cnt =0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 61/737 scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengfeng Ye <[email protected]>
[ Upstream commit dd64f80587190265ca8a0f4be6c64c2fda6d3ac2 ]
As &qedi_percpu->p_work_lock is acquired by hard IRQ qedi_msix_handler(), other acquisitions of the same lock under process context should disable IRQ, otherwise deadlock could happen if the IRQ preempts the execution while the lock is held in process context on the same CPU.
qedi_cpu_offline() is one such function which acquires the lock in process context.
[Deadlock Scenario]qedi_cpu_offline()
->spin_lock(&p->p_work_lock)
<irq>
->qedi_msix_handler()
->edi_process_completions()
->spin_lock_irqsave(&p->p_work_lock, flags); (deadlock here)This flaw was found by an experimental static analysis tool I am developing for IRQ-related deadlocks.
The tentative patch fix the potential deadlock by spin_lock_irqsave() under process context.
--- drivers/scsi/qedi/qedi_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/qedi/qedi_main.c +3 -2
@@ -1977,8 +1977,9 @@ static int qedi_cpu_offline(unsigned int cpu)struct qedi_percpu_s *p =this_cpu_ptr (&qedi_percpu);struct qedi_work *work, *tmp;struct task_struct *thread; +unsigned long flags; -spin_lock_bh (&p->p_work_lock); +spin_lock_irqsave (&p->p_work_lock, flags); thread = p->iothread; p->iothread =NULL ;
@@ -1989,7 +1990,7 @@ static int qedi_cpu_offline(unsigned int cpu)kfree (work); } -spin_unlock_bh (&p->p_work_lock); +spin_unlock_irqrestore (&p->p_work_lock, flags);if (thread)kthread_stop (thread);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 62/737 net: hns3: restore user pause configure when disable autoneg
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Shen <[email protected]>
[ Upstream commit 15159ec0c831b565820c2de05114ea1b4cf07681 ]
Restore the mac pause state to user configuration when autoneg is disabled
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 ++++- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +4 -1
@@ -10936,9 +10936,12 @@ int hclge_cfg_flowctrl(struct hclge_dev *hdev)u32 rx_pause, tx_pause;u8 flowctl; -if (!phydev->link || !phydev->autoneg) +if (!phydev->link)return 0 ; +if (!phydev->autoneg) +return hclge_mac_pause_setup_hw (hdev); + local_advertising =linkmode_adv_to_lcl_adv_t (phydev->advertising);if (phydev->pause)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +1 -1
@@ -1553,7 +1553,7 @@ static int hclge_bp_setup_hw(struct hclge_dev *hdev, u8 tc)return 0 ; } -static int hclge_mac_pause_setup_hw (struct hclge_dev *hdev) +int hclge_mac_pause_setup_hw (struct hclge_dev *hdev) {bool tx_en, rx_en;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h +1 -0
@@ -245,6 +245,7 @@ int hclge_pfc_pause_en_cfg(struct hclge_dev *hdev, u8 tx_rx_bitmap, u8 pfc_bitmap);int hclge_mac_pause_en_cfg (struct hclge_dev *hdev,bool tx,bool rx);int hclge_pause_addr_cfg (struct hclge_dev *hdev,const u8 *mac_addr); +int hclge_mac_pause_setup_hw (struct hclge_dev *hdev);void hclge_pfc_rx_stats_get (struct hclge_dev *hdev,u64 *stats);void hclge_pfc_tx_stats_get (struct hclge_dev *hdev,u64 *stats);int hclge_tm_qs_shaper_cfg (struct hclge_vport *vport,int max_tx_rate);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 63/737 wifi: ath12k: Fix buffer overflow when scanning with extraie
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen Gong <[email protected]>
[ Upstream commit 06f2ab86a5b6ed55f013258de4be9319841853ea ]
If cfg80211 is providing extraie's for a scanning process then ath12k will copy that over to the firmware. The extraie.len is a 32 bit value in struct element_info and describes the amount of bytes for the vendor information elements.
The problem is the allocation of the buffer. It has to align the TLV sections by 4 bytes. But the code was using an u8 to store the newly calculated length of this section (with alignment). And the new calculated length was then used to allocate the skbuff. But the actual code to copy in the data is using the extraie.len and not the calculated "aligned" length.
The length of extraie with IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS enabled was 264 bytes during tests with a wifi card. But it only allocated 8 bytes (264 bytes % 256) for it. As consequence, the code to memcpy the extraie into the skb was then just overwriting data after skb->end. Things like shinfo were therefore corrupted. This could usually be seen by a crash in skb_zcopy_clear which tried to call a ubuf_info callback (using a bogus address).
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
--- drivers/net/wireless/ath/ath12k/wmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +1 -2
@@ -2144,8 +2144,7 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,struct wmi_tlv *tlv;void *ptr;int i, ret, len; -u32 *tmp_ptr; -u8 extraie_len_with_pad =0 ; +u32 *tmp_ptr, extraie_len_with_pad =0 ;struct ath12k_wmi_hint_short_ssid_arg *s_ssid =NULL ;struct ath12k_wmi_hint_bssid_arg *hint_bssid =NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 64/737 drm/amdgpu: Match against exact bootloader status
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit d3de41ee5febe5c2d9989fe9810bce2bb54a3a8e ]
On PSP v13.x ASICs, boot loader will set only the MSB to 1 and clear the least significant bits for any command submission. Hence match against the exact register value, otherwise a register value of all 0xFFs also could falsely indicate that boot loader is ready. Also, from PSP v13.0.6 and newer, bits[7:0] will be used to indicate command error status.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +8 -7
@@ -136,14 +136,15 @@ static int psp_v13_0_wait_for_bootloader(struct psp_context *psp)int ret;int retry_loop; +/* Wait for bootloader to signify that it is ready having bit 31 of +* C2PMSG_35 set to 1. All other bits are expected to be cleared. +* If there is an error in processing command, bits[7:0] will be set. +* This is applicable for PSP v13.0.6 and newer. +*/ for (retry_loop =0 ; retry_loop <10 ; retry_loop++) { -/* Wait for bootloader to signify that is -ready having bit 31 of C2PMSG_35 set to 1 */ - ret =psp_wait_for (psp, -SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_35), -0x80000000 , -0x80000000 , - false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_35), +0x80000000 ,0xffffffff , false);if (ret ==0 )return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 65/737 arm64: dts: rockchip: correct wifi interrupt flag in eaidk-610
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 8183bb7e291b7818f49ea39687c2fafa01a46e27 ]
GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning: GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE.
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH
--- arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts +1 -1
@@ -773,7 +773,7 @@ compatible = "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpio0>; - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_l>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 66/737 arm64: dts: rockchip: correct wifi interrupt flag in Rock Pi 4B
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit cfa12c32b96fd5b12f77d880d6a1ddd2a502756e ]
GPIO_ACTIVE_x flags are not correct in the context of interrupt flags. These are simple defines so they could be used in DTS but they will not have the same meaning: GPIO_ACTIVE_HIGH = 0 = IRQ_TYPE_NONE.
Correct the interrupt flags, assuming the author of the code wanted same logical behavior behind the name "ACTIVE_xxx", this is:
ACTIVE_HIGH => IRQ_TYPE_LEVEL_HIGH
--- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts +1 -1
@@ -31,7 +31,7 @@ compatible = "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpio0>; - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>; + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake"; pinctrl-names = "default"; pinctrl-0 = <&wifi_host_wake_l>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 57/737 x86/hyperv: add noop functions to x86_init mpparse functions
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saurabh Sengar <[email protected]>
[ Upstream commit 9e2d0c336524706fb327e9b87477f5f3337ad7a6 ]
Hyper-V can run VMs at different privilege "levels" known as Virtual Trust Levels (VTL). Sometimes, it chooses to run two different VMs at different levels but they share some of their address space. In such setups VTL2 (higher level VM) has visibility of all of the VTL0 (level 0) memory space.
When the CONFIG_X86_MPPARSE is enabled for VTL2, the VTL2 kernel performs a search within the low memory to locate MP tables. However, in systems where VTL0 manages the low memory and may contain valid tables, this scanning can result in incorrect MP table information being provided to the VTL2 kernel, mistakenly considering VTL0's MP table as its own
Add noop functions to avoid MP parse scan by VTL2.
--- arch/x86/hyperv/hv_vtl.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/hyperv/hv_vtl.c +4 -0
@@ -25,6 +25,10 @@ void __init hv_vtl_init_platform(void) x86_init.irqs.pre_vector_init = x86_init_noop; x86_init.timers.timer_init = x86_init_noop; +/* Avoid searching for BIOS MP tables */ + x86_init.mpparse.find_smp_config = x86_init_noop; + x86_init.mpparse.get_smp_config = x86_init_uint_noop; + x86_platform.get_wallclock = get_rtc_noop; x86_platform.set_wallclock = set_rtc_noop; x86_platform.get_nmi_reason = hv_get_nmi_reason;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 88/737 tpm: Enable hwrng only for Pluton on AMD CPUs
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jarkko Sakkinen <[email protected]>
commit 8f7f35e5aa6f2182eabcfa3abef4d898a48e9aa8 upstream.
The vendor check introduced by commit 554b841d4703 ("tpm: Disable RNG for all AMD fTPMs") doesn't work properly on a number of Intel fTPMs. On the reported systems the TPM doesn't reply at bootup and returns back the command code. This makes the TPM fail probe on Lenovo Legion Y540 laptop.
Since only Microsoft Pluton is the only known combination of AMD CPU and fTPM from other vendor, disable hwrng otherwise. In order to make sysadmin aware of this, print also info message to the klog.
--- drivers/char/tpm/tpm_crb.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-)
drivers/char/tpm/tpm_crb.c +8 -25
@@ -463,28 +463,6 @@ static bool crb_req_canceled(struct tpm_return (cancel &CRB_CANCEL_INVOKE ) ==CRB_CANCEL_INVOKE ; } -static int crb_check_flags (struct tpm_chip *chip) -{ -u32 val; -int ret; - - ret =crb_request_locality (chip,0 ); -if (ret) -return ret; - - ret =tpm2_get_tpm_pt (chip,TPM2_PT_MANUFACTURER , &val,NULL ); -if (ret) - goto release; - -if (val ==0x414D4400U /* AMD */ ) - chip->flags |=TPM_CHIP_FLAG_HWRNG_DISABLED ; - -release: -crb_relinquish_locality (chip,0 ); - -return ret; -} -static const struct tpm_class_ops tpm_crb = { .flags =TPM_OPS_AUTO_STARTUP , .status = crb_status,
@@ -826,9 +804,14 @@ static int crb_acpi_add(struct acpi_deviif (rc) goto out; - rc =crb_check_flags (chip); -if (rc) - goto out; +#ifdef CONFIG_X86 +/* A quirk for https://www.amd.com/en/support/kb/faq/pa-410 */ +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && + priv->sm !=ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON ) { +dev_info (dev,"Disabling hwrng\n" ); + chip->flags |=TPM_CHIP_FLAG_HWRNG_DISABLED ; + } +#endif /* CONFIG_X86 */ rc =tpm_chip_register (chip);
Greg Kroah-Hartman
maintainerPATCH 97/737 reiserfs: Check the return value from __getblk()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox <[email protected]>
[ Upstream commit ba38980add7ffc9e674ada5b4ded4e7d14e76581 ]
__getblk() can return a NULL pointer if we run out of memory or if we try to access beyond the end of the device; check it and handle it appropriately.
--- fs/reiserfs/journal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/reiserfs/journal.c +3 -1
@@ -2326,7 +2326,7 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev,int i, j; bh =__getblk (dev, block, bufsize); -if (buffer_uptodate (bh)) +if (!bh ||buffer_uptodate (bh))return (bh);if (block +BUFNR > max_block) {
@@ -2336,6 +2336,8 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev, j =1 ;for (i =1 ; i < blocks; i++) { bh =__getblk (dev, block + i, bufsize); +if (!bh) +break ;if (buffer_uptodate (bh)) {brelse (bh);break ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 98/737 splice: always fsnotify_access(in), fsnotify_modify(out) on success
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahelenia Ziemiańska <[email protected]>
[ Upstream commit 12ee4b66af34f8e72f3b2fd93a946a955efe7c86 ]
The current behaviour caused an asymmetry where some write APIs (write, sendfile) would notify the written-to/read-from objects, but splice wouldn't.
This affected userspace which uses inotify, most notably coreutils tail -f, to monitor pipes.
If the pipe buffer had been filled by a splice-family function:
* tail wouldn't know and thus wouldn't service the pipe, and
* all writes to the pipe would block because it's full,
thus service was denied.
(For the particular case of tail -f this could be worked around
with ---disable-inotify.)
Message-Id: <604ec704d933e0e0121d9e107ce914512e045fad.1688393619.git.nabijaczleweli@nabijaczleweli.xyz>
--- fs/splice.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)
fs/splice.c +15 -17
@@ -1153,10 +1153,8 @@ long do_splice(struct file *in, loff_t *off_in, struct file *out,if ((in->f_flags | out->f_flags) &O_NONBLOCK ) flags |=SPLICE_F_NONBLOCK ; -return splice_pipe_to_pipe (ipipe, opipe, len, flags); - } - -if (ipipe) { + ret =splice_pipe_to_pipe (ipipe, opipe, len, flags); + }else if (ipipe) {if (off_in)return -ESPIPE ;if (off_out) {
@@ -1181,18 +1179,11 @@ long do_splice(struct file *in, loff_t *off_in, struct file *out, ret =do_splice_from (ipipe, out, &offset, len, flags);file_end_write (out); -if (ret >0 ) -fsnotify_modify (out); -if (!off_out) out->f_pos = offset;else *off_out = offset; - -return ret; - } - -if (opipe) { + }else if (opipe) {if (off_out)return -ESPIPE ;if (off_in) {
@@ -1208,18 +1199,25 @@ long do_splice(struct file *in, loff_t *off_in, struct file *out, ret =splice_file_to_pipe (in, opipe, &offset, len, flags); -if (ret >0 ) -fsnotify_access (in); -if (!off_in) in->f_pos = offset;else *off_in = offset; + }else { + ret = -EINVAL ; + } -return ret; +if (ret >0 ) { +/* +* Generate modify out before access in: +* do_splice_from() may've already sent modify out, +* and this ensures the events get merged. +*/ +fsnotify_modify (out); +fsnotify_access (in); } -return -EINVAL ; +return ret; } static long __do_splice(struct file *in, loff_t __user *off_in,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 99/737 splice: fsnotify_access(fd)/fsnotify_modify(fd) in vmsplice
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahelenia Ziemiańska <[email protected]>
[ Upstream commit 7f0f1ea069e52d5a16921abd59377a7da6c25149 ]
Same logic applies here: this can fill up the pipe and pollers that rely on getting IN_MODIFY notifications never wake up.
Message-Id: <8d9ad5acb9c5c1dd2376a2ff5da6ac3183115389.1688393619.git.nabijaczleweli@nabijaczleweli.xyz>
--- fs/splice.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/splice.c +6 -1
@@ -1346,6 +1346,9 @@ static long vmsplice_to_user(struct file *file, struct iov_iter *iter,pipe_unlock (pipe); } +if (ret >0 ) +fsnotify_access (file); +return ret; }
@@ -1375,8 +1378,10 @@ static long vmsplice_to_pipe(struct file *file, struct iov_iter *iter,if (!ret) ret =iter_to_pipe (iter, pipe, buf_flag);pipe_unlock (pipe); -if (ret >0 ) +if (ret >0 ) {wakeup_pipe_readers (pipe); +fsnotify_modify (file); + }return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 100/737 splice: fsnotify_access(in), fsnotify_modify(out) on success in tee
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahelenia Ziemiańska <[email protected]>
[ Upstream commit 576d498e0ac5caff2d9f6312573ab54d98f12d32 ]
Same logic applies here: this can fill up the pipe, and pollers that rely on getting IN_MODIFY notifications never wake up.
Message-Id: <10d76dd8c85017ae3cd047c9b9a32e26daefdaa2.1688393619.git.nabijaczleweli@nabijaczleweli.xyz>
--- fs/splice.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/splice.c +5 -0
@@ -1815,6 +1815,11 @@ long do_tee(struct file *in, struct file *out, size_t len, unsigned int flags) } } +if (ret >0 ) { +fsnotify_access (in); +fsnotify_modify (out); + } +return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 101/737 eventfd: prevent underflow for eventfd semaphores
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen Yang <[email protected]>
[ Upstream commit 758b492047816a3158d027e9fca660bc5bcf20bf ]
For eventfd with flag EFD_SEMAPHORE, when its ctx->count is 0, calling eventfd_ctx_do_read will cause ctx->count to overflow to ULLONG_MAX.
An underflow can happen with EFD_SEMAPHORE eventfds in at least the following three subsystems:
(1) virt/kvm/eventfd.c
(2) drivers/vfio/virqfd.c
(3) drivers/virt/acrn/irqfd.c
where (2) and (3) are just modeled after (1). An eventfd must be specified for use with the KVM_IRQFD ioctl(). This can also be an EFD_SEMAPHORE eventfd. When the eventfd count is zero or has been decremented to zero an underflow can be triggered when the irqfd is shut down by raising the KVM_IRQFD_FLAG_DEASSIGN flag in the KVM_IRQFD ioctl():
// ctx->count == 0
kvm_vm_ioctl()
-> kvm_irqfd()
-> kvm_irqfd_deassign()
-> irqfd_deactivate()
-> irqfd_shutdown()
-> eventfd_ctx_remove_wait_queue(&cnt)
-> eventfd_ctx_do_read(&cnt)Userspace polling on the eventfd wouldn't notice the underflow because 1 is always returned as the value from eventfd_read() while ctx->count would've underflowed. It's not a huge deal because this should only be happening when the irqfd is shutdown but we should still fix it and avoid the spurious wakeup.
Message-Id: <[email protected]>
--- fs/eventfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/eventfd.c +1 -1
@@ -189,7 +189,7 @@ void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt) {lockdep_assert_held (&ctx->wqh.lock); - *cnt = (ctx->flags &EFD_SEMAPHORE ) ?1 : ctx->count; + *cnt = ((ctx->flags &EFD_SEMAPHORE ) && ctx->count) ?1 : ctx->count; ctx->count -= *cnt; }EXPORT_SYMBOL_GPL (eventfd_ctx_do_read);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 102/737 fs: Fix error checking for d_hash_and_lookup()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Ming <[email protected]>
[ Upstream commit 0d5a4f8f775ff990142cdc810a84eae078589d27 ]
The d_hash_and_lookup() function returns error pointers or NULL. Most incorrect error checks were fixed, but the one in int path_pts() was forgotten.
Message-Id: <[email protected]>
--- fs/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/namei.c +1 -1
@@ -2890,7 +2890,7 @@ int path_pts(struct path *path)dput (path->dentry); path->dentry = parent; child =d_hash_and_lookup (parent, &this); -if (!child) +if (IS_ERR_OR_NULL (child))return -ENOENT ; path->dentry = child;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 103/737 iomap: Remove large folio handling in iomap_invalidate_folio()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit a221ab717c43147f728d93513923ba3528f861bf ]
We do not need to release the iomap_page in iomap_invalidate_folio() to allow the folio to be split. The splitting code will call ->release_folio() if there is still per-fs private data attached to the folio. At that point, we will check if the folio is still dirty and decline to release the iomap_page. It is possible to trigger the warning in perfectly legitimate circumstances (eg if a disk read fails, we do a partial write to the folio, then we truncate the folio), which will cause those writes to be lost.
--- fs/iomap/buffered-io.c | 5 ----- 1 file changed, 5 deletions(-)
fs/iomap/buffered-io.c +0 -5
@@ -508,11 +508,6 @@ void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len)WARN_ON_ONCE (folio_test_writeback (folio));folio_cancel_dirty (folio);iomap_page_release (folio); - }else if (folio_test_large (folio)) { -/* Must release the iop so the page can be split */ -WARN_ON_ONCE (!folio_test_uptodate (folio) && -folio_test_dirty (folio)); -iomap_page_release (folio); } }EXPORT_SYMBOL_GPL (iomap_invalidate_folio);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 104/737 tmpfs: verify {g,u}id mount options correctly
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 0200679fc7953177941e41c2a4241d0b6c2c5de8 ]
A while ago we received the following report:
"The other outstanding issue I noticed comes from the fact that fsconfig syscalls may occur in a different userns than that which called fsopen. That means that resolving the uid/gid via current_user_ns() can save a kuid that isn't mapped in the associated namespace when the filesystem is finally mounted. This means that it is possible for an unprivileged user to create files owned by any group in a tmpfs mount (since we can set the SUID bit on the tmpfs directory), or a tmpfs that is owned by any user, including the root group/user."
The contract for {g,u}id mount options and {g,u}id values in general set from userspace has always been that they are translated according to the caller's idmapping. In so far, tmpfs has been doing the correct thing. But since tmpfs is mountable in unprivileged contexts it is also necessary to verify that the resulting {k,g}uid is representable in the namespace of the superblock to avoid such bugs as above.
The new mount api's cross-namespace delegation abilities are already widely used. After having talked to a bunch of userspace this is the most faithful solution with minimal regression risks. I know of one users - systemd - that makes use of the new mount api in this way and they don't set unresolable {g,u}ids. So the regression risk is minimal.
Message-Id: <[email protected]>
--- mm/shmem.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
mm/shmem.c +24 -4
@@ -3506,6 +3506,8 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)unsigned long long size;char *rest;int opt; +kuid_t kuid; +kgid_t kgid; opt =fs_parse (fc, shmem_fs_parameters, param, &result);if (opt <0 )
@@ -3541,14 +3543,32 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) ctx->mode = result.uint_32 &07777 ;break ;case Opt_uid: - ctx->uid =make_kuid (current_user_ns (), result.uint_32); -if (!uid_valid (ctx->uid)) + kuid =make_kuid (current_user_ns (), result.uint_32); +if (!uid_valid (kuid)) goto bad_value; + +/* +* The requested uid must be representable in the +* filesystem's idmapping. +*/ +if (!kuid_has_mapping (fc->user_ns, kuid)) + goto bad_value; + + ctx->uid = kuid;break ;case Opt_gid: - ctx->gid =make_kgid (current_user_ns (), result.uint_32); -if (!gid_valid (ctx->gid)) + kgid =make_kgid (current_user_ns (), result.uint_32); +if (!gid_valid (kgid)) goto bad_value; + +/* +* The requested gid must be representable in the +* filesystem's idmapping. +*/ +if (!kgid_has_mapping (fc->user_ns, kgid)) + goto bad_value; + + ctx->gid = kgid;break ;case Opt_huge: ctx->huge = result.uint_32;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 105/737 selftests/harness: Actually report SKIP for signal tests
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit b3d46e11fec0c5a8972e5061bb1462119ae5736d ]
Tests that were expecting a signal were not correctly checking for a SKIP condition. Move the check before the signal checking when processing test result.
--- tools/testing/selftests/kselftest_harness.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
tools/testing/selftests/kselftest_harness.h +5 -6
@@ -938,7 +938,11 @@ void __wait_for_test(struct __test_metadata *t)fprintf (TH_LOG_STREAM ,"# %s: Test terminated by timeout\n" , t->name); }else if (WIFEXITED (status)) { -if (t->termsig !=-1 ) { +if (WEXITSTATUS (status) ==255 ) { +/* SKIP */ + t->passed =1 ; + t->skip =1 ; + }else if (t->termsig !=-1 ) { t->passed =0 ; fprintf(TH_LOG_STREAM, "# %s: Test exited normally instead of by signal (code: %d)\n",
@@ -950,11 +954,6 @@ void __wait_for_test(struct __test_metadata *t)case 0 : t->passed =1 ;break ; -/* SKIP */ -case 255 : - t->passed =1 ; - t->skip =1 ; -break ;/* Other failure, assume step report. */ default : t->passed =0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 106/737 vfs, security: Fix automount superblock LSM init problem, preventing NFS sb sharing
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit d80a8f1b58c2bc8d7c6bfb65401ea4f7ec8cddc2 ]
When NFS superblocks are created by automounting, their LSM parameters aren't set in the fs_context struct prior to sget_fc() being called, leading to failure to match existing superblocks.
This bug leads to messages like the following appearing in dmesg when fscache is enabled:
NFS: Cache volume key already in use (nfs,4.2,2,108,106a8c0,1,,,,100000,100000,2ee,3a98,1d4c,3a98,1)
Fix this by adding a new LSM hook to load fc->security for submount creation.
Message-Id: <[email protected]>
--- fs/fs_context.c | 23 +++++++++++++++- include/linux/lsm_hook_defs.h | 1 + include/linux/security.h | 6 +++++ security/security.c | 14 ++++++++++ security/selinux/hooks.c | 22 +++++++++++++++ security/smack/smack_lsm.c | 51 +++++++++++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 1 deletion(-)
fs/fs_context.c +22 -1
@@ -315,10 +315,31 @@ struct fs_context *fs_context_for_reconfigure(struct dentry *dentry, }EXPORT_SYMBOL (fs_context_for_reconfigure); +/** +* fs_context_for_submount: allocate a new fs_context for a submount +* @type: file_system_type of the new context +* @reference: reference dentry from which to copy relevant info +* +* Allocate a new fs_context suitable for a submount. This also ensures that +* the fc->security object is inherited from @reference (if needed). +*/ struct fs_context *fs_context_for_submount (struct file_system_type *type,struct dentry *reference) { -return alloc_fs_context (type, reference,0 ,0 ,FS_CONTEXT_FOR_SUBMOUNT ); +struct fs_context *fc; +int ret; + + fc =alloc_fs_context (type, reference,0 ,0 ,FS_CONTEXT_FOR_SUBMOUNT ); +if (IS_ERR (fc)) +return fc; + + ret =security_fs_context_submount (fc, reference->d_sb); +if (ret) { +put_fs_context (fc); +return ERR_PTR (ret); + } + +return fc; }EXPORT_SYMBOL (fs_context_for_submount);
include/linux/lsm_hook_defs.h +1 -0
@@ -54,6 +54,7 @@ LSM_HOOK(int, 0, bprm_creds_from_file, struct linux_binprm *bprm, struct file *f LSM_HOOK(int, 0, bprm_check_security, struct linux_binprm *bprm) LSM_HOOK(void, LSM_RET_VOID, bprm_committing_creds, struct linux_binprm *bprm) LSM_HOOK(void, LSM_RET_VOID, bprm_committed_creds, struct linux_binprm *bprm) +LSM_HOOK(int, 0, fs_context_submount, struct fs_context *fc, struct super_block *reference) LSM_HOOK(int, 0, fs_context_dup, struct fs_context *fc, struct fs_context *src_sc) LSM_HOOK(int, -ENOPARAM, fs_context_parse_param, struct fs_context *fc,
include/linux/security.h +6 -0
@@ -293,6 +293,7 @@ int security_bprm_creds_from_file(struct linux_binprm *bprm, struct file *file);int security_bprm_check (struct linux_binprm *bprm);void security_bprm_committing_creds (struct linux_binprm *bprm);void security_bprm_committed_creds (struct linux_binprm *bprm); +int security_fs_context_submount (struct fs_context *fc,struct super_block *reference);int security_fs_context_dup (struct fs_context *fc,struct fs_context *src_fc);int security_fs_context_parse_param (struct fs_context *fc,struct fs_parameter *param);int security_sb_alloc (struct super_block *sb);
@@ -629,6 +630,11 @@ static inline void security_bprm_committed_creds(struct linux_binprm *bprm) { } +static inline int security_fs_context_submount (struct fs_context *fc, +struct super_block *reference) +{ +return 0 ; +}static inline int security_fs_context_dup (struct fs_context *fc,struct fs_context *src_fc) {
security/security.c +14 -0
@@ -1138,6 +1138,20 @@ void security_bprm_committed_creds(struct linux_binprm *bprm)call_void_hook (bprm_committed_creds, bprm); } +/** +* security_fs_context_submount() - Initialise fc->security +* @fc: new filesystem context +* @reference: dentry reference for submount/remount +* +* Fill out the ->security field for a new fs_context. +* +* Return: Returns 0 on success or negative error code on failure. +*/ +int security_fs_context_submount (struct fs_context *fc,struct super_block *reference) +{ +return call_int_hook (fs_context_submount,0 , fc, reference); +} +/** * security_fs_context_dup() - Duplicate a fs_context LSM blob * @fc: destination filesystem context
security/selinux/hooks.c +22 -0
@@ -2721,6 +2721,27 @@ static int selinux_umount(struct vfsmount *mnt, int flags) FILESYSTEM__UNMOUNT, NULL); } +static int selinux_fs_context_submount (struct fs_context *fc, +struct super_block *reference) +{ +const struct superblock_security_struct *sbsec; +struct selinux_mnt_opts *opts; + + opts =kzalloc (sizeof (*opts),GFP_KERNEL ); +if (!opts) +return -ENOMEM ; + + sbsec =selinux_superblock (reference); +if (sbsec->flags &FSCONTEXT_MNT ) + opts->fscontext_sid = sbsec->sid; +if (sbsec->flags &CONTEXT_MNT ) + opts->context_sid = sbsec->mntpoint_sid; +if (sbsec->flags &DEFCONTEXT_MNT ) + opts->defcontext_sid = sbsec->def_sid; + fc->security = opts; +return 0 ; +} +static int selinux_fs_context_dup (struct fs_context *fc,struct fs_context *src_fc) {
@@ -7142,6 +7163,7 @@ static struct security_hook_list selinux_hooks[] __ro_after_init = {/* * PUT "CLONING" (ACCESSING + ALLOCATING) HOOKS HERE */ +LSM_HOOK_INIT (fs_context_submount, selinux_fs_context_submount),LSM_HOOK_INIT (fs_context_dup, selinux_fs_context_dup),LSM_HOOK_INIT (fs_context_parse_param, selinux_fs_context_parse_param), LSM_HOOK_INIT(sb_eat_lsm_opts, selinux_sb_eat_lsm_opts),
security/smack/smack_lsm.c +51 -0
63 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 89/737 KVM: x86/mmu: Add "never" option to allow sticky disabling of nx_huge_pages
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 0b210faf337314e4bc88e796218bc70c72a51209 upstream.
Add a "never" option to the nx_huge_pages module param to allow userspace to do a one-way hard disabling of the mitigation, and don't create the per-VM recovery threads when the mitigation is hard disabled. Letting userspace pinky swear that userspace doesn't want to enable NX mitigation (without reloading KVM) allows certain use cases to avoid the latency problems associated with spawning a kthread for each VM.
E.g. in FaaS use cases, the guest kernel is trusted and the host may create 100+ VMs per logical CPU, which can result in 100ms+ latencies when a burst of VMs is created.
--- arch/x86/kvm/mmu/mmu.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-)
arch/x86/kvm/mmu/mmu.c +36 -5
@@ -58,6 +58,8 @@extern bool itlb_multihit_kvm_mitigation; +static bool nx_hugepage_mitigation_hard_disabled; +int __read_mostly nx_huge_pages =-1 ;static uint __read_mostly nx_huge_pages_recovery_period_ms;#ifdef CONFIG_PREEMPT_RT
@@ -67,12 +69,13 @@ static uint __read_mostly nx_huge_pages_static uint __read_mostly nx_huge_pages_recovery_ratio =60 ;#endif +static int get_nx_huge_pages (char *buffer,const struct kernel_param *kp);static int set_nx_huge_pages (const char *val,const struct kernel_param *kp);static int set_nx_huge_pages_recovery_param (const char *val,const struct kernel_param *kp);static const struct kernel_param_ops nx_huge_pages_ops = { .set = set_nx_huge_pages, - .get = param_get_bool, + .get = get_nx_huge_pages, };static const struct kernel_param_ops nx_huge_pages_recovery_param_ops = {
@@ -6844,6 +6847,14 @@ static void mmu_destroy_caches(void)kmem_cache_destroy (mmu_page_header_cache); } +static int get_nx_huge_pages (char *buffer,const struct kernel_param *kp) +{ +if (nx_hugepage_mitigation_hard_disabled) +return sprintf (buffer,"never\n" ); + +return param_get_bool (buffer, kp); +} +static bool get_nx_auto_mode (void ) {/* Return true when CPU has the bug, and mitigations are ON */
@@ -6860,15 +6871,29 @@ static int set_nx_huge_pages(const charbool old_val = nx_huge_pages;bool new_val; +if (nx_hugepage_mitigation_hard_disabled) +return -EPERM ; +/* In "auto" mode deploy workaround only if CPU has the bug. */ -if (sysfs_streq (val,"off" )) +if (sysfs_streq (val,"off" )) { new_val =0 ; -else if (sysfs_streq (val,"force" )) + }else if (sysfs_streq (val,"force" )) { new_val =1 ; -else if (sysfs_streq (val,"auto" )) + }else if (sysfs_streq (val,"auto" )) { new_val =get_nx_auto_mode (); -else if (kstrtobool (val, &new_val) <0 ) + }else if (sysfs_streq (val,"never" )) { + new_val =0 ; + +mutex_lock (&kvm_lock); +if (!list_empty (&vm_list)) { +mutex_unlock (&kvm_lock); +return -EBUSY ; + } + nx_hugepage_mitigation_hard_disabled = true; +mutex_unlock (&kvm_lock); + }else if (kstrtobool (val, &new_val) <0 ) {return -EINVAL ; + }__set_nx_huge_pages (new_val);
@@ -7006,6 +7031,9 @@ static int set_nx_huge_pages_recovery_pauint old_period, new_period;int err; +if (nx_hugepage_mitigation_hard_disabled) +return -EPERM ; + was_recovery_enabled =calc_nx_huge_pages_recovery_period (&old_period); err =param_set_uint (val, kp);
@@ -7164,6 +7192,9 @@ int kvm_mmu_post_init_vm(struct kvm *kvm {int err; +if (nx_hugepage_mitigation_hard_disabled) +return 0 ; + err =kvm_vm_create_worker_thread (kvm, kvm_nx_huge_page_recovery_worker,0 ,"kvm-nx-lpage-recovery" , &kvm->arch.nx_huge_page_recovery_thread);
Greg Kroah-Hartman
maintainerPATCH 107/737 ARM: ptrace: Restore syscall restart tracing
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit cf007647475b5090819c5fe8da771073145c7334 ]
Since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall: always store thread_info->abi_syscall"), the seccomp selftests "syscall_restart" has been broken. This was caused by the restart syscall not being stored to "abi_syscall" during restart setup before branching to the "local_restart" label. Tracers would see the wrong syscall, and scno would get overwritten while returning from the TIF_WORK path. Add the missing store.
--- arch/arm/kernel/entry-common.S | 1 + 1 file changed, 1 insertion(+)
arch/arm/kernel/entry-common.S +1 -0
@@ -90,6 +90,7 @@ slow_work_pending: cmp r0, #0 beq no_work_pending movlt scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE) + str scno, [tsk, #TI_ABI_SYSCALL] @ make sure tracers see update ldmia sp, {r0 - r6} @ have to reload r0 - r6 b local_restart @ ... and off we go ENDPROC(ret_fast_syscall)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 108/737 ARM: ptrace: Restore syscall skipping for tracers
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 4697b5848bd933f68ebd04836362c8de0cacaf71 ]
Since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall: always store thread_info->abi_syscall"), the seccomp selftests "syscall_errno" and "syscall_faked" have been broken. Both seccomp and PTRACE depend on using the special value of "-1" for skipping syscalls. This value wasn't working because it was getting masked by __NR_SYSCALL_MASK in both PTRACE_SET_SYSCALL and get_syscall_nr().
Explicitly test for -1 in PTRACE_SET_SYSCALL and get_syscall_nr(), leaving it exposed when present, allowing tracers to skip syscalls again.
--- arch/arm/include/asm/syscall.h | 3 +++ arch/arm/kernel/ptrace.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/include/asm/syscall.h +3 -0
@@ -25,6 +25,9 @@ static inline int syscall_get_nr(struct task_struct *task,if (IS_ENABLED (CONFIG_AEABI ) && !IS_ENABLED (CONFIG_OABI_COMPAT ))return task_thread_info (task)->abi_syscall; +if (task_thread_info (task)->abi_syscall ==-1 ) +return -1 ; +return task_thread_info (task)->abi_syscall & __NR_SYSCALL_MASK; }
arch/arm/kernel/ptrace.c +3 -2
@@ -783,8 +783,9 @@ long arch_ptrace(struct task_struct *child, long request,break ;case PTRACE_SET_SYSCALL : -task_thread_info (child)->abi_syscall = data & - __NR_SYSCALL_MASK; +if (data !=-1 ) + data &= __NR_SYSCALL_MASK; +task_thread_info (child)->abi_syscall = data; ret =0 ;break ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 109/737 locking/arch: Avoid variable shadowing in local_try_cmpxchg()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uros Bizjak <[email protected]>
[ Upstream commit d6b45484c130f4095313ae3edeb4aae662c12fb1 ]
Several architectures define arch_try_local_cmpxchg macro using internal temporary variables named ___old, __old or _old. Remove temporary varible in local_try_cmpxchg to avoid variable shadowing.
No functional change intended.
--- arch/loongarch/include/asm/local.h | 4 ++-- arch/mips/include/asm/local.h | 4 ++-- arch/x86/include/asm/local.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/loongarch/include/asm/local.h +2 -2
@@ -63,8 +63,8 @@ static inline long local_cmpxchg(local_t *l, long old, long new)static inline bool local_try_cmpxchg (local_t *l,long *old,long new) { - typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; -return try_cmpxchg_local (&l->a.counter, __old, new); +return try_cmpxchg_local (&l->a.counter, + (typeof(l->a.counter) *) old, new); }#define local_xchg (l, n) (atomic_long_xchg((&(l)->a), (n)))
arch/mips/include/asm/local.h +2 -2
@@ -101,8 +101,8 @@ static __inline__ long local_cmpxchg(local_t *l, long old, long new)static __inline__bool local_try_cmpxchg (local_t *l,long *old,long new) { - typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; -return try_cmpxchg_local (&l->a.counter, __old, new); +return try_cmpxchg_local (&l->a.counter, + (typeof(l->a.counter) *) old, new); }#define local_xchg (l, n) (atomic_long_xchg((&(l)->a), (n)))
arch/x86/include/asm/local.h +2 -2
@@ -127,8 +127,8 @@ static inline long local_cmpxchg(local_t *l, long old, long new)static inline bool local_try_cmpxchg (local_t *l,long *old,long new) { - typeof(l->a.counter) *__old = (typeof(l->a.counter) *) old; -return try_cmpxchg_local (&l->a.counter, __old, new); +return try_cmpxchg_local (&l->a.counter, + (typeof(l->a.counter) *) old, new); }/* Always has a lock prefix */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 110/737 refscale: Fix uninitalized use of wait_queue_head_t
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Waiman Long <[email protected]>
[ Upstream commit f5063e8948dad7f31adb007284a5d5038ae31bb8 ]
Running the refscale test occasionally crashes the kernel with the following error:
[ 8569.952896] BUG: unable to handle page fault for address: ffffffffffffffe8 [ 8569.952900] #PF: supervisor read access in kernel mode [ 8569.952902] #PF: error_code(0x0000) - not-present page [ 8569.952904] PGD c4b048067 P4D c4b049067 PUD c4b04b067 PMD 0 [ 8569.952910] Oops: 0000 [#1] PREEMPT_RT SMP NOPTI [ 8569.952916] Hardware name: Dell Inc. PowerEdge R750/0WMWCR, BIOS 1.2.4 05/28/2021 [ 8569.952917] RIP: 0010:prepare_to_wait_event+0x101/0x190 : [ 8569.952940] Call Trace: [ 8569.952941] <TASK> [ 8569.952944] ref_scale_reader+0x380/0x4a0 [refscale] [ 8569.952959] kthread+0x10e/0x130 [ 8569.952966] ret_from_fork+0x1f/0x30 [ 8569.952973] </TASK>
The likely cause is that init_waitqueue_head() is called after the call to the torture_create_kthread() function that creates the ref_scale_reader kthread. Although this init_waitqueue_head() call will very likely complete before this kthread is created and starts running, it is possible that the calling kthread will be delayed between the calls to torture_create_kthread() and init_waitqueue_head(). In this case, the new kthread will use the waitqueue head before it is properly initialized, which is not good for the kernel's health and well-being.
The above crash happened here:
static inline void __add_wait_queue(...)
{
:
if (!(wq->flags & WQ_FLAG_PRIORITY)) <=== Crash hereThe offset of flags from list_head entry in wait_queue_entry is -0x18. If reader_tasks[i].wq.head.next is NULL as allocated reader_task structure is zero initialized, the instruction will try to access address 0xffffffffffffffe8, which is exactly the fault address listed above.
This commit therefore invokes init_waitqueue_head() before creating the kthread.
--- kernel/rcu/refscale.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/rcu/refscale.c +1 -2
@@ -1107,12 +1107,11 @@ ref_scale_init(void)VERBOSE_SCALEOUT ("Starting %d reader threads" , nreaders);for (i =0 ; i < nreaders; i++) { +init_waitqueue_head (&reader_tasks[i].wq); firsterr =torture_create_kthread (ref_scale_reader, (void *)i, reader_tasks[i].task);if (torture_init_error (firsterr)) goto unwind; - -init_waitqueue_head (&(reader_tasks[i].wq)); }// Main Task
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 111/737 clocksource: Handle negative skews in "skew is too large" messages
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul E. McKenney <[email protected]>
[ Upstream commit e40806e9bcf8aaa86dbf0d484e7cf3cfa09cb86c ]
The nanosecond-to-millisecond skew computation uses unsigned arithmetic, which produces user-unfriendly large positive numbers for negative skews. Therefore, use signed arithmetic for this computation in order to preserve the negativity.
--- kernel/time/clocksource.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/time/clocksource.c +4 -4
@@ -473,8 +473,8 @@ static void clocksource_watchdog(struct timer_list *unused)/* Check the deviation from the watchdog clocksource. */ md = cs->uncertainty_margin + watchdog->uncertainty_margin;if (abs (cs_nsec - wd_nsec) > md) { -u64 cs_wd_msec; -u64 wd_msec; +s64 cs_wd_msec; +s64 wd_msec;u32 wd_rem; pr_warn("timekeeping watchdog on CPU%d: Marking clocksource '%s' as unstable because the skew is too large:\n",
@@ -483,8 +483,8 @@ static void clocksource_watchdog(struct timer_list *unused) watchdog->name, wd_nsec, wdnow, wdlast, watchdog->mask);pr_warn (" '%s' cs_nsec: %lld cs_now: %llx cs_last: %llx mask: %llx\n" , cs->name, cs_nsec, csnow, cslast, cs->mask); - cs_wd_msec =div_u64_rem (cs_nsec - wd_nsec,1000U *1000U , &wd_rem); - wd_msec =div_u64_rem (wd_nsec,1000U *1000U , &wd_rem); + cs_wd_msec =div_s64_rem (cs_nsec - wd_nsec,1000 *1000 , &wd_rem); + wd_msec =div_s64_rem (wd_nsec,1000 *1000 , &wd_rem);pr_warn (" Clocksource '%s' skewed %lld ns (%lld ms) over watchdog '%s' interval of %lld ns (%lld ms)\n" , cs->name, cs_nsec - wd_nsec, cs_wd_msec, watchdog->name, wd_nsec, wd_msec);if (curr_clocksource == cs)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 112/737 powercap: arm_scmi: Remove recursion while parsing zones
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Marussi <[email protected]>
[ Upstream commit 3e767d6850f867cc33ac16ca097350a1d2417982 ]
Powercap zones can be defined as arranged in a hierarchy of trees and when registering a zone with powercap_register_zone(), the kernel powercap subsystem expects this to happen starting from the root zones down to the leaves; on the other side, de-registration by powercap_deregister_zone() must begin from the leaf zones.
Available SCMI powercap zones are retrieved dynamically from the platform at probe time and, while any defined hierarchy between the zones is described properly in the zones descriptor, the platform returns the availables zones with no particular well-defined order: as a consequence, the trees possibly composing the hierarchy of zones have to be somehow walked properly to register the retrieved zones from the root.
Currently the ARM SCMI Powercap driver walks the zones using a recursive algorithm; this approach, even though correct and tested can lead to kernel stack overflow when processing a returned hierarchy of zones composed by particularly high trees.
Avoid possible kernel stack overflow by substituting the recursive approach with an iterative one supported by a dynamically allocated stack-like data structure.
--- drivers/powercap/arm_scmi_powercap.c | 159 ++++++++++++++++----------- 1 file changed, 92 insertions(+), 67 deletions(-)
drivers/powercap/arm_scmi_powercap.c +92 -67
@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/powercap.h> #include <linux/scmi_protocol.h> +#include <linux/slab.h> #define to_scmi_powercap_zone (z) \ container_of(z, struct scmi_powercap_zone, zone)
@@ -19,6 +20,8 @@static const struct scmi_powercap_proto_ops *powercap_ops;struct scmi_powercap_zone { +bool registered; +bool invalid;unsigned int height;struct device *dev;struct scmi_protocol_handle *ph;
@@ -32,6 +35,7 @@ struct scmi_powercap_root {unsigned int num_zones;struct scmi_powercap_zone *spzones;struct list_head *registered_zones; +struct list_head scmi_zones; };static struct powercap_control_type *scmi_top_pcntrl;
@@ -255,12 +259,6 @@ static void scmi_powercap_unregister_all_zones(struct scmi_powercap_root *pr) } } -static inline bool -scmi_powercap_is_zone_registered (struct scmi_powercap_zone *spz) -{ -return !list_empty (&spz->node); -} -static inline unsigned int scmi_powercap_get_zone_height (struct scmi_powercap_zone *spz) {
@@ -279,11 +277,46 @@ scmi_powercap_get_parent_zone(struct scmi_powercap_zone *spz)return &spz->spzones[spz->info->parent_id]; } +static int scmi_powercap_register_zone (struct scmi_powercap_root *pr, +struct scmi_powercap_zone *spz, +struct scmi_powercap_zone *parent) +{ +int ret =0 ; +struct powercap_zone *z; + +if (spz->invalid) { +list_del (&spz->node); +return -EINVAL ; + } + + z =powercap_register_zone (&spz->zone, scmi_top_pcntrl, spz->info->name, + parent ? &parent->zone :NULL , + &zone_ops,1 , &constraint_ops); +if (!IS_ERR (z)) { + spz->height =scmi_powercap_get_zone_height (spz); + spz->registered = true; +list_move (&spz->node, &pr->registered_zones[spz->height]); +dev_dbg (spz->dev,"Registered node %s - parent %s - height:%d\n" , + spz->info->name, parent ? parent->info->name :"ROOT" , + spz->height); + }else { +list_del (&spz->node); + ret =PTR_ERR (z); +dev_err (spz->dev, +"Error registering node:%s - parent:%s - h:%d - ret:%d\n" , + spz->info->name, + parent ? parent->info->name :"ROOT" , + spz->height, ret); + } + +return ret; +} +/** -* scmi_powercap_register_zone - Register an SCMI powercap zone recursively +* scmi_zones_register- Register SCMI powercap zones starting from parent zones * +* @dev: A reference to the SCMI device * @pr: A reference to the root powercap zones descriptors -* @spz: A reference to the SCMI powercap zone to register * * When registering SCMI powercap zones with the powercap framework we should * take care to always register zones starting from the root ones and to
@@ -293,10 +326,10 @@ scmi_powercap_get_parent_zone(struct scmi_powercap_zone *spz)* zones provided by the SCMI platform firmware is built to comply with such * requirement. * -* This function, given an SCMI powercap zone to register, takes care to walk -* the SCMI powercap zones tree up to the root looking recursively for -* unregistered parent zones before registering the provided zone; at the same -* time each registered zone height in such a tree is accounted for and each +* This function, given the set of SCMI powercap zones to register, takes care +* to walk the SCMI powercap zones trees up to the root registering any +* unregistered parent zone before registering the child zones; at the same +* time each registered-zone height in such a tree is accounted for and each * zone, once registered, is stored in the @registered_zones array that is * indexed by zone height: this way will be trivial, at unregister time, to walk * the @registered_zones array backward and unregister all the zones starting
@@ -314,57 +347,55 @@ scmi_powercap_get_parent_zone(struct scmi_powercap_zone *spz)* * Return: 0 on Success */ -static int scmi_powercap_register_zone (struct scmi_powercap_root *pr, -struct scmi_powercap_zone *spz) +static int scmi_zones_register (struct device *dev, +struct scmi_powercap_root *pr) {int ret =0 ; -struct scmi_powercap_zone *parent; - -if (!spz->info) -return ret; +unsigned int sp =0 , reg_zones =0 ; +struct scmi_powercap_zone *spz, **zones_stack; - parent =scmi_powercap_get_parent_zone (spz); -if (parent && !scmi_powercap_is_zone_registered (parent)) { -/* -* Bail out if a parent domain was marked as unsupported: -* only domains participating as leaves can be skipped. -*/ -if (!parent->info) -return -ENODEV ; + zones_stack =kcalloc (pr->num_zones,sizeof (spz),GFP_KERNEL ); +if (!zones_stack) +return -ENOMEM ; - ret =scmi_powercap_register_zone (pr, parent); -if (ret) -return ret; - } + spz =list_first_entry_or_null (&pr->scmi_zones, + struct scmi_powercap_zone, node); +while (spz) { +struct scmi_powercap_zone *parent; -if (!scmi_powercap_is_zone_registered (spz)) { -struct powercap_zone *z; - - z =powercap_register_zone (&spz->zone, - scmi_top_pcntrl, - spz->info->name, - parent ? &parent->zone :NULL , - &zone_ops,1 , &constraint_ops); -if (!IS_ERR (z)) { - spz->height =scmi_powercap_get_zone_height (spz); -list_add (&spz->node, - &pr->registered_zones[spz->height]); -dev_dbg (spz->dev, -"Registered node %s - parent %s - height:%d\n" , - spz->info->name, - parent ? parent->info->name :"ROOT" , - spz->height); - ret =0 ; + parent =scmi_powercap_get_parent_zone (spz); +if (parent && !parent->registered) { + zones_stack[sp++] = spz; + spz = parent; }else { - ret =PTR_ERR (z); -dev_err (spz->dev, -"Error registering node:%s - parent:%s - h:%d - ret:%d\n" , - spz->info->name, - parent ? parent->info->name :"ROOT" , - spz->height, ret); + ret =scmi_powercap_register_zone (pr, spz, parent); +if (!ret) { + reg_zones++; + }else if (sp) { +/* Failed to register a non-leaf zone. +* Bail-out. +*/ +dev_err (dev, +"Failed to register non-leaf zone - ret:%d\n" , + ret); +scmi_powercap_unregister_all_zones (pr); + reg_zones =0 ; + goto out; + } +/* Pick next zone to process */ +if (sp) + spz = zones_stack[--sp]; +else + spz =list_first_entry_or_null (&pr->scmi_zones, + struct scmi_powercap_zone, + node); } } +out: +kfree (zones_stack); +dev_info (dev,"Registered %d SCMI Powercap domains !\n" , reg_zones); +return ret; }
@@ -408,6 +439,8 @@ static int scmi_powercap_probe(struct scmi_device *sdev)if (!pr->registered_zones)return -ENOMEM ; +INIT_LIST_HEAD (&pr->scmi_zones); +for (i =0 , spz = pr->spzones; i < pr->num_zones; i++, spz++) {/* * Powercap domains are validate by the protocol layer, i.e.
@@ -422,6 +455,7 @@ static int scmi_powercap_probe(struct scmi_device *sdev)INIT_LIST_HEAD (&spz->node);INIT_LIST_HEAD (&pr->registered_zones[i]); +list_add_tail (&spz->node, &pr->scmi_zones);/* * Forcibly skip powercap domains using an abstract scale. * Note that only leaves domains can be skipped, so this could
@@ -432,7 +466,7 @@ static int scmi_powercap_probe(struct scmi_device *sdev)dev_warn (dev,"Abstract power scale not supported. Skip %s.\n" , spz->info->name); - spz->info =NULL ; + spz->invalid = true;continue ; } }
@@ -441,21 +475,12 @@ static int scmi_powercap_probe(struct scmi_device *sdev)* Scan array of retrieved SCMI powercap domains and register them * recursively starting from the root domains. */ -for (i =0 , spz = pr->spzones; i < pr->num_zones; i++, spz++) { - ret =scmi_powercap_register_zone (pr, spz); -if (ret) { -dev_err (dev, -"Failed to register powercap zone %s - ret:%d\n" , - spz->info->name, ret); -scmi_powercap_unregister_all_zones (pr); -return ret; - } - } + ret =scmi_zones_register (dev, pr); +if (ret) +return ret;dev_set_drvdata (dev, pr); -dev_info (dev,"Registered %d SCMI Powercap domains !\n" , pr->num_zones); -return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 113/737 OPP: Fix passing 0 to PTR_ERR in _opp_attach_genpd()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit d920920f85a82c1c806a4143871a0e8f534732f2 ]
If dev_pm_domain_attach_by_name() returns NULL, then 0 will be passed to PTR_ERR() as reported by the smatch warning below:
drivers/opp/core.c:2456 _opp_attach_genpd() warn: passing zero to 'PTR_ERR'
Fix it by checking for the non-NULL virt_dev pointer before passing it to PTR_ERR. Otherwise return -ENODEV.
--- drivers/opp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/opp/core.c +1 -1
@@ -2382,7 +2382,7 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev, virt_dev =dev_pm_domain_attach_by_name (dev, *name);if (IS_ERR_OR_NULL (virt_dev)) { - ret =PTR_ERR (virt_dev) ? : -ENODEV ; + ret = virt_dev ?PTR_ERR (virt_dev) : -ENODEV ;dev_err (dev,"Couldn't attach to pm_domain: %d\n" , ret); goto err; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 114/737 selftests/resctrl: Add resctrl.h into build deps
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 8e289f4542890168705219e54f0231dccfabddbe ]
Makefile only lists *.c as build dependencies for the resctrl_tests executable which excludes resctrl.h.
Add *.h to wildcard() to include resctrl.h.
--- tools/testing/selftests/resctrl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/resctrl/Makefile +1 -1
@@ -7,4 +7,4 @@ TEST_GEN_PROGS := resctrl_tests include ../lib.mk -$(OUTPUT)/resctrl_tests: $(wildcard *.c) +$(OUTPUT)/resctrl_tests: $(wildcard *.[ch])
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 115/737 selftests/resctrl: Dont leak buffer in fill_cache()
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 2d320b1029ee7329ee0638181be967789775b962 ]
The error path in fill_cache() does return before the allocated buffer is freed leaking the buffer.
The leak was introduced when fill_cache_read() started to return errors in commit c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on open failed"), before that both fill functions always returned 0.
Move free() earlier to prevent the mem leak.
--- tools/testing/selftests/resctrl/fill_buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/resctrl/fill_buf.c +2 -1
@@ -177,12 +177,13 @@ fill_cache(unsigned long long buf_size, int malloc_and_init, int memflush,else ret =fill_cache_write (start_ptr, end_ptr, resctrl_val); +free (startptr); +if (ret) {printf ("\n Error in fill cache read/write...\n" );return -1 ; } -free (startptr);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 90/737 net: Avoid address overwrite in kernel_connect
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jordan Rife <[email protected]>
commit 0bdf399342c5acbd817c9098b6c7ed21f1974312 upstream.
BPF programs that run on connect can rewrite the connect address. For the connect system call this isn't a problem, because a copy of the address is made when it is moved into kernel space. However, kernel_connect simply passes through the address it is given, so the caller may observe its address value unexpectedly change.
A practical example where this is problematic is where NFS is combined with a system such as Cilium which implements BPF-based load balancing. A common pattern in software-defined storage systems is to have an NFS mount that connects to a persistent virtual IP which in turn maps to an ephemeral server IP. This is usually done to achieve high availability:
if your server goes down you can quickly spin up a replacement and remap the virtual IP to that endpoint. With BPF-based load balancing, mounts will forget the virtual IP address when the address rewrite occurs because a pointer to the only copy of that address is passed down the stack. Server failover then breaks, because clients have forgotten the virtual IP address. Reconnects fail and mounts remain broken. This patch was tested by setting up a scenario like this and ensuring that NFS reconnects worked after applying the patch.
--- net/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/socket.c +5 -1
@@ -3528,7 +3528,11 @@ EXPORT_SYMBOL(kernel_accept);int kernel_connect (struct socket *sock,struct sockaddr *addr,int addrlen,int flags) { -return sock->ops->connect (sock, addr, addrlen, flags); +struct sockaddr_storage address; + +memcpy (&address, addr, addrlen); + +return sock->ops->connect (sock, (struct sockaddr *)&address, addrlen, flags); }EXPORT_SYMBOL (kernel_connect);
Greg Kroah-Hartman
maintainerPATCH 91/737 Bluetooth: btrtl: Load FW v2 otherwise FW v1 for RTL8852C
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Chou <[email protected]>
commit bd003fb338afee97c76f13c3e9144a7e4ad37179 upstream.
In this commit, prefer to load FW v2 if available. Fallback to FW v1 otherwise. This behavior is only for RTL8852C.
--- drivers/bluetooth/btrtl.c | 70 +++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 25 deletions(-)
drivers/bluetooth/btrtl.c +45 -25
@@ -101,21 +101,21 @@ static const struct id_table ic_id_table { IC_INFO(RTL_ROM_LMP_8723A, 0xb, 0x6, HCI_USB), .config_needed = false, .has_rom_version = false, - .fw_name = "rtl_bt/rtl8723a_fw.bin", + .fw_name = "rtl_bt/rtl8723a_fw", .cfg_name = NULL }, /* 8723BS */ { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_UART), .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723bs_fw.bin", + .fw_name = "rtl_bt/rtl8723bs_fw", .cfg_name = "rtl_bt/rtl8723bs_config" }, /* 8723B */ { IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723b_fw.bin", + .fw_name = "rtl_bt/rtl8723b_fw", .cfg_name = "rtl_bt/rtl8723b_config" },/* 8723CS-CG */
@@ -126,7 +126,7 @@ static const struct id_table ic_id_table .hci_bus = HCI_UART, .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723cs_cg_fw.bin", + .fw_name = "rtl_bt/rtl8723cs_cg_fw", .cfg_name = "rtl_bt/rtl8723cs_cg_config" },/* 8723CS-VF */
@@ -137,7 +137,7 @@ static const struct id_table ic_id_table .hci_bus = HCI_UART, .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723cs_vf_fw.bin", + .fw_name = "rtl_bt/rtl8723cs_vf_fw", .cfg_name = "rtl_bt/rtl8723cs_vf_config" },/* 8723CS-XX */
@@ -148,28 +148,28 @@ static const struct id_table ic_id_table .hci_bus = HCI_UART, .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723cs_xx_fw.bin", + .fw_name = "rtl_bt/rtl8723cs_xx_fw", .cfg_name = "rtl_bt/rtl8723cs_xx_config" },/* 8723D */ { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB), .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723d_fw.bin", + .fw_name = "rtl_bt/rtl8723d_fw", .cfg_name = "rtl_bt/rtl8723d_config" }, /* 8723DS */ { IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_UART), .config_needed = true, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8723ds_fw.bin", + .fw_name = "rtl_bt/rtl8723ds_fw", .cfg_name = "rtl_bt/rtl8723ds_config" }, /* 8821A */ { IC_INFO(RTL_ROM_LMP_8821A, 0xa, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8821a_fw.bin", + .fw_name = "rtl_bt/rtl8821a_fw", .cfg_name = "rtl_bt/rtl8821a_config" },/* 8821C */
@@ -177,7 +177,7 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8821c_fw.bin", + .fw_name = "rtl_bt/rtl8821c_fw", .cfg_name = "rtl_bt/rtl8821c_config" },/* 8821CS */
@@ -185,14 +185,14 @@ static const struct id_table ic_id_table .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8821cs_fw.bin", + .fw_name = "rtl_bt/rtl8821cs_fw", .cfg_name = "rtl_bt/rtl8821cs_config" },/* 8761A */ { IC_INFO(RTL_ROM_LMP_8761A, 0xa, 0x6, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8761a_fw.bin", + .fw_name = "rtl_bt/rtl8761a_fw", .cfg_name = "rtl_bt/rtl8761a_config" },/* 8761B */
@@ -200,14 +200,14 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8761b_fw.bin", + .fw_name = "rtl_bt/rtl8761b_fw", .cfg_name = "rtl_bt/rtl8761b_config" },/* 8761BU */ { IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_USB), .config_needed = false, .has_rom_version = true, - .fw_name = "rtl_bt/rtl8761bu_fw.bin", + .fw_name = "rtl_bt/rtl8761bu_fw", .cfg_name = "rtl_bt/rtl8761bu_config" },/* 8822C with UART interface */
@@ -215,7 +215,7 @@ static const struct id_table ic_id_table .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822cs_fw.bin", + .fw_name = "rtl_bt/rtl8822cs_fw", .cfg_name = "rtl_bt/rtl8822cs_config" },/* 8822C with UART interface */
@@ -223,7 +223,7 @@ static const struct id_table ic_id_table .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822cs_fw.bin", + .fw_name = "rtl_bt/rtl8822cs_fw", .cfg_name = "rtl_bt/rtl8822cs_config" },/* 8822C with USB interface */
@@ -231,7 +231,7 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822cu_fw.bin", + .fw_name = "rtl_bt/rtl8822cu_fw", .cfg_name = "rtl_bt/rtl8822cu_config" },/* 8822B */
@@ -239,7 +239,7 @@ static const struct id_table ic_id_table .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8822b_fw.bin", + .fw_name = "rtl_bt/rtl8822b_fw", .cfg_name = "rtl_bt/rtl8822b_config" },/* 8852A */
@@ -247,7 +247,7 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852au_fw.bin", + .fw_name = "rtl_bt/rtl8852au_fw", .cfg_name = "rtl_bt/rtl8852au_config" },/* 8852B with UART interface */
@@ -255,7 +255,7 @@ static const struct id_table ic_id_table .config_needed = true, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852bs_fw.bin", + .fw_name = "rtl_bt/rtl8852bs_fw", .cfg_name = "rtl_bt/rtl8852bs_config" },/* 8852B */
@@ -263,7 +263,7 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852bu_fw.bin", + .fw_name = "rtl_bt/rtl8852bu_fw", .cfg_name = "rtl_bt/rtl8852bu_config" },/* 8852C */
@@ -271,7 +271,7 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = true, - .fw_name = "rtl_bt/rtl8852cu_fw.bin", + .fw_name = "rtl_bt/rtl8852cu_fw", .cfg_name = "rtl_bt/rtl8852cu_config" },/* 8851B */
@@ -279,7 +279,7 @@ static const struct id_table ic_id_table .config_needed = false, .has_rom_version = true, .has_msft_ext = false, - .fw_name = "rtl_bt/rtl8851bu_fw.bin", + .fw_name = "rtl_bt/rtl8851bu_fw", .cfg_name = "rtl_bt/rtl8851bu_config" }, };
@@ -967,6 +967,7 @@ struct btrtl_device_info *btrtl_initialistruct btrtl_device_info *btrtl_dev;struct sk_buff *skb;struct hci_rp_read_local_version *resp; +char fw_name[40 ];char cfg_name[40 ];u16 hci_rev, lmp_subver;u8 hci_ver, lmp_ver, chip_type =0 ;
@@ -1079,8 +1080,26 @@ next: goto err_free; } - btrtl_dev->fw_len =rtl_load_file (hdev, btrtl_dev->ic_info->fw_name, - &btrtl_dev->fw_data); +if (!btrtl_dev->ic_info->fw_name) { + ret = -ENOMEM ; + goto err_free; + } + + btrtl_dev->fw_len = -EIO ; +if (lmp_subver ==RTL_ROM_LMP_8852A && hci_rev ==0x000c ) { +snprintf (fw_name,sizeof (fw_name),"%s_v2.bin" , + btrtl_dev->ic_info->fw_name); + btrtl_dev->fw_len =rtl_load_file (hdev, fw_name, + &btrtl_dev->fw_data); + } + +if (btrtl_dev->fw_len <0 ) { +snprintf (fw_name,sizeof (fw_name),"%s.bin" , + btrtl_dev->ic_info->fw_name); + btrtl_dev->fw_len =rtl_load_file (hdev, fw_name, + &btrtl_dev->fw_data); + } +if (btrtl_dev->fw_len <0 ) {rtl_dev_err (hdev,"firmware file %s not found" , btrtl_dev->ic_info->fw_name);
@@ -1382,6 +1401,7 @@ MODULE_FIRMWARE("rtl_bt/rtl8852bs_configMODULE_FIRMWARE ("rtl_bt/rtl8852bu_fw.bin" );MODULE_FIRMWARE ("rtl_bt/rtl8852bu_config.bin" );MODULE_FIRMWARE ("rtl_bt/rtl8852cu_fw.bin" ); +MODULE_FIRMWARE ("rtl_bt/rtl8852cu_fw_v2.bin" );MODULE_FIRMWARE ("rtl_bt/rtl8852cu_config.bin" );MODULE_FIRMWARE ("rtl_bt/rtl8851bu_fw.bin" );MODULE_FIRMWARE ("rtl_bt/rtl8851bu_config.bin" );
Greg Kroah-Hartman
maintainerPATCH 92/737 drm/amd/display: ensure async flips are only accepted for fast updates
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hamza Mahfooz <[email protected]>
commit a7c0cad0dc060bb77e9c9d235d68441b0fc69507 upstream.
We should be checking to see if async flips are supported in amdgpu_dm_atomic_check() (i.e. not dm_crtc_helper_atomic_check()). Also, async flipping isn't supported if a plane's framebuffer changes memory domains during an atomic commit. So, move the check from dm_crtc_helper_atomic_check() to amdgpu_dm_atomic_check() and check if the memory domain has changed in amdgpu_dm_atomic_check().
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 ++++++++++++++--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 12 -------- 2 files changed, 21 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21 -3
@@ -7993,10 +7993,12 @@ static void amdgpu_dm_commit_planes(stru* fast updates. */ if (crtc->state->async_flip && - acrtc_state->update_type !=UPDATE_TYPE_FAST ) + (acrtc_state->update_type !=UPDATE_TYPE_FAST || +get_mem_type (old_plane_state->fb) !=get_mem_type (fb)))drm_warn_once (state->dev,"[PLANE:%d:%s] async flip with non-fast update\n" , plane->base.id, plane->name); + bundle->flip_addrs[planes_count].flip_immediate = crtc->state->async_flip && acrtc_state->update_type == UPDATE_TYPE_FAST &&
@@ -9953,6 +9955,11 @@ static int amdgpu_dm_atomic_check(struct/* Remove exiting planes if they are modified */ for_each_oldnew_plane_in_state_reverse (state, plane, old_plane_state, new_plane_state, i) { +if (old_plane_state->fb && new_plane_state->fb && +get_mem_type (old_plane_state->fb) != +get_mem_type (new_plane_state->fb)) + lock_and_validation_needed = true; + ret = dm_update_plane_state(dc, state, plane, old_plane_state, new_plane_state,
@@ -10200,9 +10207,20 @@ static int amdgpu_dm_atomic_check(structstruct dm_crtc_state *dm_new_crtc_state =to_dm_crtc_state (new_crtc_state); +/* +* Only allow async flips for fast updates that don't change +* the FB pitch, the DCC state, rotation, etc. +*/ +if (new_crtc_state->async_flip && lock_and_validation_needed) { +drm_dbg_atomic (crtc->dev, +"[CRTC:%d:%s] async flips are only supported for fast updates\n" , + crtc->base.id, crtc->name); + ret = -EINVAL ; + goto fail; + } + dm_new_crtc_state->update_type = lock_and_validation_needed ? -UPDATE_TYPE_FULL : -UPDATE_TYPE_FAST ; +UPDATE_TYPE_FULL :UPDATE_TYPE_FAST ; }/* Must be success */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +0 -12
@@ -398,18 +398,6 @@ static int dm_crtc_helper_atomic_check(sreturn -EINVAL ; } -/* -* Only allow async flips for fast updates that don't change the FB -* pitch, the DCC state, rotation, etc. -*/ -if (crtc_state->async_flip && - dm_crtc_state->update_type !=UPDATE_TYPE_FAST ) { -drm_dbg_atomic (crtc->dev, -"[CRTC:%d:%s] async flips are only supported for fast updates\n" , - crtc->base.id, crtc->name); -return -EINVAL ; - } -/* In some use cases, like reset, no stream is attached */ if (!dm_crtc_state->stream)return 0 ;
Greg Kroah-Hartman
maintainerPATCH 93/737 Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Werner Sembach <[email protected]>
commit eb09074bdb05ffd6bfe77f8b4a41b76ef78c997b upstream.
The touchpad of this device is both connected via PS/2 and i2c. This causes strange behavior when both driver fight for control. The easy fix is to prevent the PS/2 driver from accessing the mouse port as the full feature set of the touchpad is only supported in the i2c interface anyway.
The strange behavior in this case is, that when an external screen is connected and the notebook is closed, the pointer on the external screen is moving to the lower right corner. When the notebook is opened again, this movement stops, but the touchpad clicks are unresponsive afterwards until reboot.
--- drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-acpipnpio.h +7 -0
@@ -1281,6 +1281,13 @@ static const struct dmi_system_id i8042_ .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, +/* See comment on TUXEDO InfinityBook S17 Gen6 / Clevo NS70MU above */ + { + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "PD5x_7xPNP_PNR_PNN_PNT"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOAUX ) + }, { .matches = { DMI_MATCH(DMI_BOARD_NAME, "X170SM"),
Greg Kroah-Hartman
maintainerPATCH 94/737 Revert "fuse: in fuse_flush only wait if someone wants the return code"
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
commit 91ec6c85599b60c00caf4e9a9d6c4d6e5dd5e93c upstream.
This reverts commit 5a8bee63b10f6f2f52f6d22e109a4a147409842a.
Jürg Billeter reports the following regression:
Since v6.3-rc1 commit 5a8bee63b1 ("fuse: in fuse_flush only wait if someone wants the return code") fput() is called asynchronously if a file is closed as part of a process exiting, i.e., if there was no explicit close() before exit.
If the file was open for writing, also put_write_access() is called asynchronously as part of the async fput().
If that newly written file is an executable, attempting to execve() the new file can fail with ETXTBSY if it's called after the writer process exited but before the async fput() has run.
--- fs/fuse/file.c | 89 +++++++++++++++----------------------------------- 1 file changed, 26 insertions(+), 63 deletions(-)
fs/fuse/file.c +26 -63
@@ -19,7 +19,6 @@#include <linux/uio.h> #include <linux/fs.h> #include <linux/filelock.h> -#include <linux/file.h> static int fuse_send_open(struct fuse_mount *fm, u64 nodeid, unsigned int open_flags, int opcode,
@@ -479,36 +478,48 @@ static void fuse_sync_writes(struct inode *inode)fuse_release_nowrite (inode); } -struct fuse_flush_args { -struct fuse_args args; -struct fuse_flush_in inarg; -struct work_struct work; -struct file *file; -}; - -static int fuse_do_flush (struct fuse_flush_args *fa) +static int fuse_flush (struct file *file,fl_owner_t id) { -int err; -struct inode *inode =file_inode (fa->file); +struct inode *inode =file_inode (file);struct fuse_mount *fm =get_fuse_mount (inode); +struct fuse_file *ff = file->private_data; +struct fuse_flush_in inarg; +FUSE_ARGS (args); +int err; + +if (fuse_is_bad (inode)) +return -EIO ; + +if (ff->open_flags &FOPEN_NOFLUSH && !fm->fc->writeback_cache) +return 0 ; err =write_inode_now (inode,1 );if (err) - goto out; +return err;inode_lock (inode);fuse_sync_writes (inode);inode_unlock (inode); - err =filemap_check_errors (fa->file->f_mapping); + err =filemap_check_errors (file->f_mapping);if (err) - goto out; +return err; err =0 ;if (fm->fc->no_flush) goto inval_attr_out; - err =fuse_simple_request (fm, &fa->args); +memset (&inarg,0 ,sizeof (inarg)); + inarg.fh = ff->fh; + inarg.lock_owner =fuse_lock_owner_id (fm->fc, id); + args.opcode =FUSE_FLUSH ; + args.nodeid =get_node_id (inode); + args.in_numargs =1 ; + args.in_args[0 ].size =sizeof (inarg); + args.in_args[0 ].value = &inarg; + args.force = true; + + err =fuse_simple_request (fm, &args);if (err == -ENOSYS ) { fm->fc->no_flush =1 ; err =0 ;
@@ -521,57 +532,9 @@ static int fuse_do_flush(struct fuse_flush_args *fa)*/ if (!err && fm->fc->writeback_cache)fuse_invalidate_attr_mask (inode,STATX_BLOCKS ); - -out: -fput (fa->file); -kfree (fa);return err; } -static void fuse_flush_async (struct work_struct *work) -{ -struct fuse_flush_args *fa =container_of (work,typeof (*fa), work); - -fuse_do_flush (fa); -} - -static int fuse_flush (struct file *file,fl_owner_t id) -{ -struct fuse_flush_args *fa; -struct inode *inode =file_inode (file); -struct fuse_mount *fm =get_fuse_mount (inode); -struct fuse_file *ff = file->private_data; - -if (fuse_is_bad (inode)) -return -EIO ; - -if (ff->open_flags &FOPEN_NOFLUSH && !fm->fc->writeback_cache) -return 0 ; - - fa =kzalloc (sizeof (*fa),GFP_KERNEL ); -if (!fa) -return -ENOMEM ; - - fa->inarg.fh = ff->fh; - fa->inarg.lock_owner =fuse_lock_owner_id (fm->fc, id); - fa->args.opcode =FUSE_FLUSH ; - fa->args.nodeid =get_node_id (inode); - fa->args.in_numargs =1 ; - fa->args.in_args[0 ].size =sizeof (fa->inarg); - fa->args.in_args[0 ].value = &fa->inarg; - fa->args.force = true; - fa->file =get_file (file); - -/* Don't wait if the task is exiting */ -if (current->flags &PF_EXITING ) { -INIT_WORK (&fa->work, fuse_flush_async); -schedule_work (&fa->work); -return 0 ; - } - -return fuse_do_flush (fa); -} -int fuse_fsync_common (struct file *file,loff_t start,loff_t end,int datasync,int opcode) {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 95/737 Revert "PCI: tegra194: Enable support for 256 Byte payload"
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vidya Sagar <[email protected]>
commit ebfde1584d9f037b6309fc682c96e22dac7bcb7a upstream.
After commit 4fb8e46c1bc4 ("PCI: tegra194: Enable support for 256 Byte payload"), we initialize MPS=256 for tegra194 Root Ports before enumerating the hierarchy.
Consider an Endpoint that supports only MPS=128. In the default situation (CONFIG_PCIE_BUS_DEFAULT set and no "pci=pcie_bus_*" parameter), Linux tries to configure the MPS of every device to match the upstream bridge. If the Endpoint is directly below the Root Port, Linux can reduce the Root Port MPS to 128 to match the Endpoint. But if there's a switch in the middle, Linux doesn't reduce the Root Port MPS because other devices below the switch may already be configured with MPS larger than 128.
This scenario results in uncorrectable Malformed TLP errors if the Root Port sends TLPs with payloads larger than 128 bytes. These errors can be avoided by using the "pci=pcie_bus_safe" parameter, but it doesn't seem to be a good idea to always have this parameter even for basic functionality to work.
Revert commit 4fb8e46c1bc4 ("PCI: tegra194: Enable support for 256 Byte payload") so the Root Ports default to MPS=128, which all devices support.
If peer-to-peer DMA is not required, one can use "pci=pcie_bus_perf" to get the benefit of larger MPS settings.
[bhelgaas: commit log; kwilczynski: retain "u16 val_16" declaration at the top, add missing acked by tag]
--- drivers/pci/controller/dwc/pcie-tegra194.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/pci/controller/dwc/pcie-tegra194.c +0 -10
@@ -883,11 +883,6 @@ static int tegra_pcie_dw_host_init(struc pcie->pcie_cap_base =dw_pcie_find_capability (&pcie->pci,PCI_CAP_ID_EXP ); - val_16 =dw_pcie_readw_dbi (pci, pcie->pcie_cap_base +PCI_EXP_DEVCTL ); - val_16 &= ~PCI_EXP_DEVCTL_PAYLOAD ; - val_16 |=PCI_EXP_DEVCTL_PAYLOAD_256B ; -dw_pcie_writew_dbi (pci, pcie->pcie_cap_base +PCI_EXP_DEVCTL , val_16); - val =dw_pcie_readl_dbi (pci,PCI_IO_BASE ); val &= ~(IO_BASE_IO_DECODE |IO_BASE_IO_DECODE_BIT8 );dw_pcie_writel_dbi (pci,PCI_IO_BASE , val);
@@ -1876,11 +1871,6 @@ static void pex_ep_event_pex_rst_deasser pcie->pcie_cap_base =dw_pcie_find_capability (&pcie->pci,PCI_CAP_ID_EXP ); - val_16 =dw_pcie_readw_dbi (pci, pcie->pcie_cap_base +PCI_EXP_DEVCTL ); - val_16 &= ~PCI_EXP_DEVCTL_PAYLOAD ; - val_16 |=PCI_EXP_DEVCTL_PAYLOAD_256B ; -dw_pcie_writew_dbi (pci, pcie->pcie_cap_base +PCI_EXP_DEVCTL , val_16); -/* Clear Slot Clock Configuration bit if SRNS configuration */ if (pcie->enable_srns) { val_16 = dw_pcie_readw_dbi(pci, pcie->pcie_cap_base +
Greg Kroah-Hartman
maintainerPATCH 96/737 Revert "net: macsec: preserve ingress frame ordering"
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sabrina Dubroca <[email protected]>
commit d3287e4038ca4f81e02067ab72d087af7224c68b upstream.
This reverts commit ab046a5d4be4c90a3952a0eae75617b49c0cb01b.
It was trying to work around an issue at the crypto layer by excluding ASYNC implementations of gcm(aes), because a bug in the AESNI version caused reordering when some requests bypassed the cryptd queue while older requests were still pending on the queue.
This was fixed by commit 38b2f68b4264 ("crypto: aesni - Fix cryptd reordering problem on gcm"), which pre-dates ab046a5d4be4.
Herbert Xu confirmed that all ASYNC implementations are expected to maintain the ordering of completions wrt requests, so we can use them in MACsec.
On my test machine, this restores the performance of a single netperf instance, from 1.4Gbps to 4.4Gbps.
--- drivers/net/macsec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/macsec.c +1 -2
@@ -1341,8 +1341,7 @@ static struct crypto_aead *macsec_alloc_struct crypto_aead *tfm;int ret; -/* Pick a sync gcm(aes) cipher to ensure order is preserved. */ - tfm =crypto_alloc_aead ("gcm(aes)" ,0 ,CRYPTO_ALG_ASYNC ); + tfm =crypto_alloc_aead ("gcm(aes)" ,0 ,0 );if (IS_ERR (tfm))return tfm;
Greg Kroah-Hartman
maintainerPATCH 87/737 cpufreq: intel_pstate: set stale CPU frequency to minimum
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doug Smythies <[email protected]>
commit d51847acb018d83186e4af67bc93f9a00a8644f7 upstream.
The intel_pstate CPU frequency scaling driver does not use policy->cur and it is 0.
When the CPU frequency is outdated arch_freq_get_on_cpu() will default to the nominal clock frequency when its call to cpufreq_quick_getpolicy_cur returns the never updated 0. Thus, the listed frequency might be outside of currently set limits. Some users are complaining about the high reported frequency, albeit stale, when their system is idle and/or it is above the reduced maximum they have set.
This patch will maintain policy_cur for the intel_pstate driver at the current minimum CPU frequency.
--- drivers/cpufreq/intel_pstate.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/cpufreq/intel_pstate.c +5 -0
@@ -2570,6 +2570,11 @@ static int intel_pstate_set_policy(strucintel_pstate_clear_update_util_hook (policy->cpu);intel_pstate_hwp_set (policy->cpu); } +/* +* policy->cur is never updated with the intel_pstate driver, but it +* is used as a stale frequency value. So, keep it within limits. +*/ + policy->cur = policy->min;mutex_unlock (&intel_pstate_limits_lock);
Greg Kroah-Hartman
maintainerPATCH 117/737 selftests/resctrl: Close perf value read fd on errors
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 51a0c3b7f028169e40db930575dd01fe81c3e765 ]
Perf event fd (fd_lm) is not closed when run_fill_buf() returns error.
Close fd_lm only in cat_val() to make it easier to track it is always closed.
--- tools/testing/selftests/resctrl/cache.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
tools/testing/selftests/resctrl/cache.c +11 -7
@@ -87,21 +87,19 @@ static int reset_enable_llc_perf(pid_t pid, int cpu_no)static int get_llc_perf (unsigned long *llc_perf_miss) {__u64 total_misses; +int ret;/* Stop counters after one span to get miss rate */ ioctl (fd_lm,PERF_EVENT_IOC_DISABLE ,0 ); -if (read (fd_lm, &rf_cqm,sizeof (struct read_format )) ==-1 ) { + ret =read (fd_lm, &rf_cqm,sizeof (struct read_format )); +if (ret ==-1 ) {perror ("Could not get llc misses through perf" ); -return -1 ; } total_misses = rf_cqm.values[0 ].value; - -close (fd_lm); - *llc_perf_miss = total_misses;return 0 ;
@@ -253,19 +251,25 @@ int cat_val(struct resctrl_val_param *param) memflush, operation, resctrl_val)) {fprintf (stderr,"Error-running fill buffer\n" ); ret =-1 ; -break ; + goto pe_close; }sleep (1 ); ret =measure_cache_vals (param, bm_pid);if (ret) -break ; + goto pe_close; + +close (fd_lm); }else {break ; } }return ret; + +pe_close: +close (fd_lm); +return ret; }/*
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 126/737 s390/pkey: fix/harmonize internal keyblob headers
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Holger Dengler <[email protected]>
[ Upstream commit 37a08f010b7c423b5e4c9ed3b187d21166553007 ]
Commit 'fa6999e326fe ("s390/pkey: support CCA and EP11 secure ECC private keys")' introduced PKEY_TYPE_EP11_AES as a supplement to PKEY_TYPE_EP11. All pkeys have an internal header/payload structure, which is opaque to the userspace. The header structures for PKEY_TYPE_EP11 and PKEY_TYPE_EP11_AES are nearly identical and there is no reason, why different structures are used. In preparation to fix the keyversion handling in the broken PKEY IOCTLs, the same header structure is used for PKEY_TYPE_EP11 and PKEY_TYPE_EP11_AES. This reduces the number of different code paths and increases the readability.
--- drivers/s390/crypto/pkey_api.c | 2 +- drivers/s390/crypto/zcrypt_ep11misc.c | 4 ++-- drivers/s390/crypto/zcrypt_ep11misc.h | 9 +-------- 3 files changed, 4 insertions(+), 11 deletions(-)
drivers/s390/crypto/pkey_api.c +1 -1
@@ -747,7 +747,7 @@ static int pkey_verifykey2(const u8 *key, size_t keylen,if (ktype) *ktype =PKEY_TYPE_EP11 ;if (ksize) - *ksize = kb->head.keybitlen; + *ksize = kb->head.bitlen; rc =ep11_findcard2 (&_apqns, &_nr_apqns, *cardnr, *domain,ZCRYPT_CEX7 ,EP11_API_V , kb->wkvp);
drivers/s390/crypto/zcrypt_ep11misc.c +2 -2
@@ -787,7 +787,7 @@ int ep11_genaeskey(u16 card, u16 domain, u32 keybitsize, u32 keygenflags, kb->head.type =TOKTYPE_NON_CCA ; kb->head.len = rep_pl->data_len; kb->head.version =TOKVER_EP11_AES ; - kb->head.keybitlen = keybitsize; + kb->head.bitlen = keybitsize; out:kfree (req);
@@ -1055,7 +1055,7 @@ static int ep11_unwrapkey(u16 card, u16 domain, kb->head.type =TOKTYPE_NON_CCA ; kb->head.len = rep_pl->data_len; kb->head.version =TOKVER_EP11_AES ; - kb->head.keybitlen = keybitsize; + kb->head.bitlen = keybitsize; out:kfree (req);
drivers/s390/crypto/zcrypt_ep11misc.h +1 -8
@@ -29,14 +29,7 @@ struct ep11keyblob {union {u8 session[32 ];/* only used for PKEY_TYPE_EP11: */ -struct { -u8 type;/* 0x00 (TOKTYPE_NON_CCA) */ -u8 res0;/* unused */ -u16 len;/* total length in bytes of this blob */ -u8 version;/* 0x03 (TOKVER_EP11_AES) */ -u8 res1;/* unused */ -u16 keybitlen;/* clear key bit len, 0 for unknown */ - } head; +struct ep11kblob_header head; };u8 wkvp[16 ];/* wrapping key verification pattern */ u64 attr;/* boolean key attributes */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 127/737 s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_GENSECK2 IOCTL
In reply to Greg Kroah-Hartman6.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Holger Dengler <[email protected]>
[ Upstream commit fb249ce7f7bfd8621a38e4ad401ba74b680786d4 ]
Commit 'fa6999e326fe ("s390/pkey: support CCA and EP11 secure ECC private keys")' introduced PKEY_TYPE_EP11_AES for the PKEY_GENSECK2 IOCTL, to enable userspace to generate securekey blobs of this type. Unfortunately, all PKEY_GENSECK2 IOCTL requests for PKEY_TYPE_EP11_AES return with an error (-EINVAL). Fix the handling for PKEY_TYPE_EP11_AES in PKEY_GENSECK2 IOCTL, so that userspace can generate securekey blobs of this type.
The start of the header and the keyblob, as well as the length need special handling, depending on the internal keyversion. Add a helper function that splits an uninitialized buffer into start and size of the header as well as start and size of the payload, depending on the requested keyversion.
Do the header-related calculations and the raw genkey request handling in separate functions. Use the raw genkey request function for internal purposes.
--- drivers/s390/crypto/pkey_api.c | 18 +++-- drivers/s390/crypto/zcrypt_ep11misc.c | 103 ++++++++++++++++++++++---- drivers/s390/crypto/zcrypt_ep11misc.h | 2 +- 3 files changed, 102 insertions(+), 21 deletions(-)
drivers/s390/crypto/pkey_api.c +13 -5
@@ -565,6 +565,11 @@ static int pkey_genseckey2(const struct pkey_apqn *apqns, size_t nr_apqns,if (*keybufsize <MINEP11AESKEYBLOBSIZE )return -EINVAL ;break ; +case PKEY_TYPE_EP11_AES : +if (*keybufsize < (sizeof (struct ep11kblob_header ) + +MINEP11AESKEYBLOBSIZE )) +return -EINVAL ; +break ;default :return -EINVAL ; }
@@ -581,9 +586,10 @@ static int pkey_genseckey2(const struct pkey_apqn *apqns, size_t nr_apqns,for (i =0 , rc = -ENODEV ; i < nr_apqns; i++) { card = apqns[i].card; dom = apqns[i].domain; -if (ktype ==PKEY_TYPE_EP11 ) { +if (ktype ==PKEY_TYPE_EP11 || + ktype ==PKEY_TYPE_EP11_AES ) { rc =ep11_genaeskey (card, dom, ksize, kflags, - keybuf, keybufsize); + keybuf, keybufsize, ktype); }else if (ktype ==PKEY_TYPE_CCA_DATA ) { rc =cca_genseckey (card, dom, ksize, keybuf); *keybufsize = (rc ?0 :SECKEYBLOBSIZE );
@@ -1313,7 +1319,7 @@ static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd, apqns =_copy_apqns_from_user (kgs.apqns, kgs.apqn_entries);if (IS_ERR (apqns))return PTR_ERR (apqns); - kkey =kmalloc (klen,GFP_KERNEL ); + kkey =kzalloc (klen,GFP_KERNEL );if (!kkey) {kfree (apqns);return -ENOMEM ;
@@ -1969,7 +1975,8 @@ static ssize_t pkey_ep11_aes_attr_read(enum pkey_key_size keybits,for (i =0 , rc = -ENODEV ; i < nr_apqns; i++) { card = apqns[i] >>16 ; dom = apqns[i] &0xFFFF ; - rc =ep11_genaeskey (card, dom, keybits,0 , buf, &keysize); + rc =ep11_genaeskey (card, dom, keybits,0 , buf, &keysize, +PKEY_TYPE_EP11 );if (rc ==0 )break ; }
@@ -1979,7 +1986,8 @@ static ssize_t pkey_ep11_aes_attr_read(enum pkey_key_size keybits,if (is_xts) { keysize =MAXEP11AESKEYBLOBSIZE ; buf +=MAXEP11AESKEYBLOBSIZE ; - rc =ep11_genaeskey (card, dom, keybits,0 , buf, &keysize); + rc =ep11_genaeskey (card, dom, keybits,0 , buf, &keysize, +PKEY_TYPE_EP11 );if (rc ==0 )return 2 *MAXEP11AESKEYBLOBSIZE ; }
drivers/s390/crypto/zcrypt_ep11misc.c +88 -15
153 lines not on this page · raw message
drivers/s390/crypto/zcrypt_ep11misc.h +1 -1
@@ -107,7 +107,7 @@ int ep11_get_domain_info(u16 card, u16 domain, struct ep11_domain_info *info);* Generate (random) EP11 AES secure key. */ int ep11_genaeskey (u16 card,u16 domain,u32 keybitsize,u32 keygenflags, -u8 *keybuf,size_t *keybufsize); +u8 *keybuf,size_t *keybufsize,u32 keybufver);/* * Generate EP11 AES secure key with given clear key value.
Signature · 1 line
2.40.1