5.17.2-rc1 review
Subsystems (11)
Greg Kroah-Hartman
maintainerPATCH 822/1126 qlcnic: dcb: default to returning -EOPNOTSUPP
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 1521db37f0d42334a88e8ff28198a27d1ed5cd7b ]
Clang static analysis reports this issue
qlcnic_dcb.c:382:10: warning: Assigned value is
garbage or undefined
mbx_out = *val;
^ ~~~~val is set in the qlcnic_dcb_query_hw_capability() wrapper. If there is no query_hw_capability op in dcp, success is returned without setting the val.
For this and similar wrappers, return -EOPNOTSUPP.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h +5 -5
@@ -51,7 +51,7 @@ static inline int qlcnic_dcb_get_hw_capability(struct qlcnic_dcb *dcb)if (dcb && dcb->ops->get_hw_capability)return dcb->ops->get_hw_capability (dcb); -return 0 ; +return -EOPNOTSUPP ; }static inline void qlcnic_dcb_free (struct qlcnic_dcb *dcb)
@@ -65,7 +65,7 @@ static inline int qlcnic_dcb_attach(struct qlcnic_dcb *dcb)if (dcb && dcb->ops->attach)return dcb->ops->attach (dcb); -return 0 ; +return -EOPNOTSUPP ; } static inline int
@@ -74,7 +74,7 @@ qlcnic_dcb_query_hw_capability(struct qlcnic_dcb *dcb, char *buf)if (dcb && dcb->ops->query_hw_capability)return dcb->ops->query_hw_capability (dcb, buf); -return 0 ; +return -EOPNOTSUPP ; }static inline void qlcnic_dcb_get_info (struct qlcnic_dcb *dcb)
@@ -89,7 +89,7 @@ qlcnic_dcb_query_cee_param(struct qlcnic_dcb *dcb, char *buf, u8 type)if (dcb && dcb->ops->query_cee_param)return dcb->ops->query_cee_param (dcb, buf, type); -return 0 ; +return -EOPNOTSUPP ; }static inline int qlcnic_dcb_get_cee_cfg (struct qlcnic_dcb *dcb)
@@ -97,7 +97,7 @@ static inline int qlcnic_dcb_get_cee_cfg(struct qlcnic_dcb *dcb)if (dcb && dcb->ops->get_cee_cfg)return dcb->ops->get_cee_cfg (dcb); -return 0 ; +return -EOPNOTSUPP ; }static inline void qlcnic_dcb_aen_handler (struct qlcnic_dcb *dcb,void *msg)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 823/1126 net/x25: Fix null-ptr-deref caused by x25_disconnect
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 7781607938c8371d4c2b243527430241c62e39c2 ]
When the link layer is terminating, x25->neighbour will be set to NULL in x25_disconnect(). As a result, it could cause null-ptr-deref bugs in x25_sendmsg(),x25_recvmsg() and x25_connect(). One of the bugs is shown below.
(Thread 1) | (Thread 2) x25_link_terminated() | x25_recvmsg() x25_kill_by_neigh() | ... x25_disconnect() | lock_sock(sk) ... | ... x25->neighbour = NULL //(1) | ... | x25->neighbour->extended //(2)
The code sets NULL to x25->neighbour in position (1) and dereferences x25->neighbour in position (2), which could cause null-ptr-deref bug.
This patch adds lock_sock() in x25_kill_by_neigh() in order to synchronize with x25_sendmsg(), x25_recvmsg() and x25_connect(). What`s more, the sock held by lock_sock() is not NULL, because it is extracted from x25_list and uses x25_list_lock to synchronize.
--- net/x25/af_x25.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
net/x25/af_x25.c +8 -3
@@ -1765,10 +1765,15 @@ void x25_kill_by_neigh(struct x25_neigh *nb)write_lock_bh (&x25_list_lock); -sk_for_each (s, &x25_list) -if (x25_sk (s)->neighbour == nb) +sk_for_each (s, &x25_list) { +if (x25_sk (s)->neighbour == nb) { +write_unlock_bh (&x25_list_lock); +lock_sock (s);x25_disconnect (s,ENETUNREACH ,0 ,0 ); - +release_sock (s); +write_lock_bh (&x25_list_lock); + } + }write_unlock_bh (&x25_list_lock);/* Remove any related forwards */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 824/1126 net: sparx5: switchdev: fix possible NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: Zheng Yongjun <[email protected]>
[ Upstream commit 0906f3a3df07835e37077d8971aac65347f2ed57 ]
As the possible failure of the allocation, devm_kzalloc() may return NULL pointer.
Therefore, it should be better to check the 'db' in order to prevent the dereference of NULL pointer.
--- drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c +2 -0
@@ -420,6 +420,8 @@ static int sparx5_fdma_tx_alloc(struct sparx5 *sparx5) db_hw->dataptr = phys; db_hw->status =0 ; db =devm_kzalloc (sparx5->dev,sizeof (*db),GFP_KERNEL ); +if (!db) +return -ENOMEM ; db->cpu_addr = cpu_addr;list_add_tail (&db->list, &tx->db_list); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 825/1126 octeontx2-af: initialize action variable
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 33b5bc9e703383e396f275d51fc4bafa48dbae5a ]
Clang static analysis reports this representative issue rvu_npc.c:898:15: warning: Assigned value is garbage
or undefined
req.match_id = action.match_id;
^ ~~~~~~~~~~~~~~~The initial setting of action is conditional on
if (is_mcam_entry_enabled(...))
The later check of action.op will sometimes be garbage. So initialize action.
Reduce setting of
*(u64 *)&action = 0x00;
to
*(u64 *)&action = 0;
--- .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +7 -8
@@ -605,7 +605,7 @@ void rvu_npc_install_ucast_entry(struct rvu *rvu, u16 pcifunc,struct npc_install_flow_req req = {0 };struct npc_install_flow_rsp rsp = {0 };struct npc_mcam *mcam = &rvu->hw->mcam; -struct nix_rx_action action; +struct nix_rx_action action = {0 };int blkaddr, index;/* AF's and SDP VFs work in promiscuous mode */
@@ -626,7 +626,6 @@ void rvu_npc_install_ucast_entry(struct rvu *rvu, u16 pcifunc, *(u64 *)&action =npc_get_mcam_action (rvu, mcam, blkaddr, index); }else { - *(u64 *)&action =0x00 ; action.op =NIX_RX_ACTIONOP_UCAST ; action.pf_func = pcifunc; }
@@ -657,7 +656,7 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc,struct npc_mcam *mcam = &rvu->hw->mcam;struct rvu_hwinfo *hw = rvu->hw;int blkaddr, ucast_idx, index; -struct nix_rx_action action; +struct nix_rx_action action = {0 };u64 relaxed_mask;if (!hw->cap.nix_rx_multicast &&is_cgx_vf (rvu, pcifunc))
@@ -685,14 +684,14 @@ void rvu_npc_install_promisc_entry(struct rvu *rvu, u16 pcifunc, blkaddr, ucast_idx);if (action.op !=NIX_RX_ACTIONOP_RSS ) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_UCAST ; }/* RX_ACTION set to MCAST for CGX PF's */ if (hw->cap.nix_rx_multicast && pfvf->use_mce_list &&is_pf_cgxmapped (rvu,rvu_get_pf (pcifunc))) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_MCAST ; pfvf =rvu_get_pfvf (rvu, pcifunc & ~RVU_PFVF_FUNC_MASK ); action.index = pfvf->promisc_mce_idx;
@@ -832,7 +831,7 @@ void rvu_npc_install_allmulti_entry(struct rvu *rvu, u16 pcifunc, int nixlf,struct rvu_hwinfo *hw = rvu->hw;int blkaddr, ucast_idx, index;u8 mac_addr[ETH_ALEN ] = {0 }; -struct nix_rx_action action; +struct nix_rx_action action = {0 };struct rvu_pfvf *pfvf;u16 vf_func;
@@ -861,14 +860,14 @@ void rvu_npc_install_allmulti_entry(struct rvu *rvu, u16 pcifunc, int nixlf, blkaddr, ucast_idx);if (action.op !=NIX_RX_ACTIONOP_RSS ) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_UCAST ; action.pf_func = pcifunc; }/* RX_ACTION set to MCAST for CGX PF's */ if (hw->cap.nix_rx_multicast && pfvf->use_mce_list) { - *(u64 *)&action =0x00 ; + *(u64 *)&action =0 ; action.op =NIX_RX_ACTIONOP_MCAST ; action.index = pfvf->mcast_mce_idx; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 826/1126 selftests: tls: skip cmsg_to_pipe tests with TLS=n
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 5c7e49be96ea24776a5b5a07c732c477294add00 ]
These are negative tests, testing TLS code rejects certain operations. They won't pass without TLS enabled, pure TCP accepts those operations.
--- tools/testing/selftests/net/tls.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/testing/selftests/net/tls.c +6 -0
@@ -683,6 +683,9 @@ TEST_F(tls, splice_cmsg_to_pipe)char buf[10 ];int p[2 ]; +if (self->notls) +SKIP (return,"no TLS support" ); +ASSERT_GE (pipe (p),0 );EXPECT_EQ (tls_send_cmsg (self->fd,100 , test_str, send_len,0 ),10 );EXPECT_EQ (splice (self->cfd,NULL , p[1 ],NULL , send_len,0 ),-1 );
@@ -703,6 +706,9 @@ TEST_F(tls, splice_dec_cmsg_to_pipe)char buf[10 ];int p[2 ]; +if (self->notls) +SKIP (return,"no TLS support" ); +ASSERT_GE (pipe (p),0 );EXPECT_EQ (tls_send_cmsg (self->fd,100 , test_str, send_len,0 ),10 );EXPECT_EQ (recv (self->cfd, buf, send_len,0 ),-1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 827/1126 net/sched: act_ct: fix ref leak when switching zones
In reply to Greg Kroah-HartmanFrom: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit bcb74e132a76ce0502bb33d5b65533a4ed72d159 ]
When switching zones or network namespaces without doing a ct clear in between, it is now leaking a reference to the old ct entry. That's because tcf_ct_skb_nfct_cached() returns false and tcf_ct_flow_table_lookup() may simply overwrite it.
The fix is to, as the ct entry is not reusable, free it already at tcf_ct_skb_nfct_cached().
--- net/sched/act_ct.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
net/sched/act_ct.c +9 -6
@@ -605,22 +605,25 @@ static bool tcf_ct_skb_nfct_cached(struct net *net, struct sk_buff *skb,if (!ct)return false;if (!net_eq (net,read_pnet (&ct->ct_net))) -return false; + goto drop_ct;if (nf_ct_zone (ct)->id != zone_id) -return false; + goto drop_ct;/* Force conntrack entry direction. */ if (force &&CTINFO2DIR (ctinfo) !=IP_CT_DIR_ORIGINAL ) {if (nf_ct_is_confirmed (ct))nf_ct_kill (ct); -nf_ct_put (ct); -nf_ct_set (skb,NULL ,IP_CT_UNTRACKED ); - -return false; + goto drop_ct; }return true; + +drop_ct: +nf_ct_put (ct); +nf_ct_set (skb,NULL ,IP_CT_UNTRACKED ); + +return false; }/* Trim the skb to the length specified by the IP/IPv6 header,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 828/1126 NFSv4/pNFS: Fix another issue with a list iterator pointing to the head
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 7c9d845f0612e5bcd23456a2ec43be8ac43458f1 ]
In nfs4_callback_devicenotify(), if we don't find a matching entry for the deviceid, we're left with a pointer to 'struct nfs_server' that actually points to the list of super blocks associated with our struct nfs_client.
Furthermore, even if we have a valid pointer, nothing pins the super block, and so the struct nfs_server could end up getting freed while we're using it.
Since all we want is a pointer to the struct pnfs_layoutdriver_type, let's skip all the iteration over super blocks, and just use APIs to find the layout driver directly.
--- fs/nfs/callback_proc.c | 27 +++++++++------------------ fs/nfs/pnfs.c | 11 +++++++++++ fs/nfs/pnfs.h | 2 ++ 3 files changed, 22 insertions(+), 18 deletions(-)
fs/nfs/callback_proc.c +9 -18
@@ -358,12 +358,11 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp, struct cb_process_state *cps) {struct cb_devicenotifyargs *args = argp; +const struct pnfs_layoutdriver_type *ld =NULL ;uint32_t i;__be32 res =0 ; -struct nfs_client *clp = cps->clp; -struct nfs_server *server =NULL ; -if (!clp) { +if (!cps->clp) { res =cpu_to_be32 (NFS4ERR_OP_NOT_IN_SESSION ); goto out; }
@@ -371,23 +370,15 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp,for (i =0 ; i < args->ndevs; i++) {struct cb_devicenotifyitem *dev = &args->devs[i]; -if (!server || - server->pnfs_curr_ld->id != dev->cbd_layout_type) { -rcu_read_lock (); -list_for_each_entry_rcu (server, &clp->cl_superblocks, client_link) -if (server->pnfs_curr_ld && - server->pnfs_curr_ld->id == dev->cbd_layout_type) { -rcu_read_unlock (); - goto found; - } -rcu_read_unlock (); -continue ; +if (!ld || ld->id != dev->cbd_layout_type) { +pnfs_put_layoutdriver (ld); + ld =pnfs_find_layoutdriver (dev->cbd_layout_type); +if (!ld) +continue ; } - - found: -nfs4_delete_deviceid (server->pnfs_curr_ld, clp, &dev->cbd_dev_id); +nfs4_delete_deviceid (ld, cps->clp, &dev->cbd_dev_id); } - +pnfs_put_layoutdriver (ld); out:kfree (args->devs);return res;
fs/nfs/pnfs.c +11 -0
@@ -92,6 +92,17 @@ find_pnfs_driver(u32 id)return local; } +const struct pnfs_layoutdriver_type *pnfs_find_layoutdriver (u32 id) +{ +return find_pnfs_driver (id); +} + +void pnfs_put_layoutdriver (const struct pnfs_layoutdriver_type *ld) +{ +if (ld) +module_put (ld->owner); +} +void unset_pnfs_layoutdriver (struct nfs_server *nfss) {
fs/nfs/pnfs.h +2 -0
@@ -234,6 +234,8 @@ struct pnfs_devicelist {extern int pnfs_register_layoutdriver (struct pnfs_layoutdriver_type *);extern void pnfs_unregister_layoutdriver (struct pnfs_layoutdriver_type *); +extern const struct pnfs_layoutdriver_type *pnfs_find_layoutdriver (u32 id); +extern void pnfs_put_layoutdriver (const struct pnfs_layoutdriver_type *ld);/* nfs4proc.c */ extern size_t max_response_pages (struct nfs_server *server);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 829/1126 net: dsa: bcm_sf2_cfp: fix an incorrect NULL check on list iterator
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
[ Upstream commit 6da69b1da130e7d96766042750cd9f902e890eba ]
The bug is here:
return rule;
The list iterator value 'rule' will *always* be set and non-NULL by list_for_each_entry(), so it is incorrect to assume that the iterator value will be NULL if the list is empty or no element is found.
To fix the bug, return 'rule' when found, otherwise return NULL.
--- drivers/net/dsa/bcm_sf2_cfp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/bcm_sf2_cfp.c +3 -3
@@ -567,14 +567,14 @@ static void bcm_sf2_cfp_slice_ipv6(struct bcm_sf2_priv *priv,static struct cfp_rule *bcm_sf2_cfp_rule_find (struct bcm_sf2_priv *priv,int port,u32 location) { -struct cfp_rule *rule =NULL ; +struct cfp_rule *rule;list_for_each_entry (rule, &priv->cfp.rules_list, next) {if (rule->port == port && rule->fs.location == location) -break ; +return rule; } -return rule; +return NULL ; } static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 830/1126 fs: fd tables have to be multiples of BITS_PER_LONG
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
[ Upstream commit 1c24a186398f59c80adb9a967486b65c1423a59d ]
This has always been the rule: fdtables have several bitmaps in them, and as a result they have to be sized properly for bitmaps. We walk those bitmaps in chunks of 'unsigned long' in serveral cases, but even when we don't, we use the regular kernel bitops that are defined to work on arrays of 'unsigned long', not on some byte array.
Now, the distinction between arrays of bytes and 'unsigned long' normally only really ends up being noticeable on big-endian systems, but Fedor Pchelkin and Alexey Khoroshilov reported that copy_fd_bitmaps() could be called with an argument that wasn't even a multiple of BITS_PER_BYTE. And then it fails to do the proper copy even on little-endian machines.
The bug wasn't in copy_fd_bitmap(), but in sane_fdtable_size(), which didn't actually sanitize the fdtable size sufficiently, and never made sure it had the proper BITS_PER_LONG alignment.
That's partly because the alignment historically came not from having to explicitly align things, but simply from previous fdtable sizes, and from count_open_files(), which counts the file descriptors by walking them one 'unsigned long' word at a time and thus naturally ends up doing sizing in the proper 'chunks of unsigned long'.
But with the introduction of close_range(), we now have an external source of "this is how many files we want to have", and so sane_fdtable_size() needs to do a better job.
This also adds that explicit alignment to alloc_fdtable(), although there it is mainly just for documentation at a source code level. The arithmetic we do there to pick a reasonable fdtable size already aligns the result sufficiently.
In fact,clang notices that the added ALIGN() in that function doesn't actually do anything, and does not generate any extra code for it.
It turns out that gcc ends up confusing itself by combining a previous constant-sized shift operation with the variable-sized shift operations in roundup_pow_of_two(). And probably due to that doesn't notice that the ALIGN() is a no-op. But that's a (tiny) gcc misfeature that doesn't matter. Having the explicit alignment makes sense, and would actually matter on a 128-bit architecture if we ever go there.
This also adds big comments above both functions about how fdtable sizes have to have that BITS_PER_LONG alignment.
--- fs/file.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
fs/file.c +30 -0
@@ -87,6 +87,21 @@ static void copy_fdtable(struct fdtable *nfdt, struct fdtable *ofdt)copy_fd_bitmaps (nfdt, ofdt, ofdt->max_fds); } +/* +* Note how the fdtable bitmap allocations very much have to be a multiple of +* BITS_PER_LONG. This is not only because we walk those things in chunks of +* 'unsigned long' in some places, but simply because that is how the Linux +* kernel bitmaps are defined to work: they are not "bits in an array of bytes", +* they are very much "bits in an array of unsigned long". +* +* The ALIGN(nr, BITS_PER_LONG) here is for clarity: since we just multiplied +* by that "1024/sizeof(ptr)" before, we already know there are sufficient +* clear low bits. Clang seems to realize that, gcc ends up being confused. +* +* On a 128-bit machine, the ALIGN() would actually matter. In the meantime, +* let's consider it documentation (and maybe a test-case for gcc to improve +* its code generation ;) +*/ static struct fdtable *alloc_fdtable (unsigned int nr) {struct fdtable *fdt;
@@ -102,6 +117,7 @@ static struct fdtable * alloc_fdtable(unsigned int nr) nr /= (1024 /sizeof (struct file *)); nr =roundup_pow_of_two (nr +1 ); nr *= (1024 /sizeof (struct file *)); + nr =ALIGN (nr,BITS_PER_LONG );/* * Note that this can drive nr *below* what we had passed if sysctl_nr_open * had been set lower between the check in expand_files() and here. Deal
@@ -269,11 +285,25 @@ static unsigned int count_open_files(struct fdtable *fdt)return i; } +/* +* Note that a sane fdtable size always has to be a multiple of +* BITS_PER_LONG, since we have bitmaps that are sized by this. +* +* 'max_fds' will normally already be properly aligned, but it +* turns out that in the close_range() -> __close_range() -> +* unshare_fd() -> dup_fd() -> sane_fdtable_size() we can end +* up having a 'max_fds' value that isn't already aligned. +* +* Rather than make close_range() have to worry about this, +* just make that BITS_PER_LONG alignment be part of a sane +* fdtable size. Becuase that's really what it is. +*/ static unsigned int sane_fdtable_size (struct fdtable *fdt,unsigned int max_fds) {unsigned int count; count =count_open_files (fdt); + max_fds =ALIGN (max_fds,BITS_PER_LONG );if (max_fds <NR_OPEN_DEFAULT ) max_fds =NR_OPEN_DEFAULT ;return min (count, max_fds);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 831/1126 lib/test: use after free in register_test_dev_kmod()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit dc0ce6cc4b133f5f2beb8b47dacae13a7d283c2c ]
The "test_dev" pointer is freed but then returned to the caller.
--- lib/test_kmod.c | 1 + 1 file changed, 1 insertion(+)
lib/test_kmod.c +1 -0
@@ -1149,6 +1149,7 @@ static struct kmod_test_device *register_test_dev_kmod(void)if (ret) {pr_err ("could not register misc device: %d\n" , ret);free_test_dev_kmod (test_dev); + test_dev =NULL ; goto out; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 832/1126 fs: fix fd table size alignment properly
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
[ Upstream commit d888c83fcec75194a8a48ccd283953bdba7b2550 ]
Jason Donenfeld reports that my commit 1c24a186398f ("fs: fd tables have to be multiples of BITS_PER_LONG") doesn't work, and the reason is an embarrassing brown-paper-bag bug.
Yes, we want to align the number of fds to BITS_PER_LONG, and yes, the reason they might not be aligned is because the incoming 'max_fd' argument might not be aligned.
But aligining the argument - while simple - will cause a "infinitely big" maxfd (eg NR_OPEN_MAX) to just overflow to zero. Which most definitely isn't what we want either.
The obvious fix was always just to do the alignment last, but I had moved it earlier just to make the patch smaller and the code look simpler. Duh. It certainly made _me_ look simple.
--- fs/file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/file.c +1 -2
@@ -303,10 +303,9 @@ static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds)unsigned int count; count =count_open_files (fdt); - max_fds =ALIGN (max_fds,BITS_PER_LONG );if (max_fds <NR_OPEN_DEFAULT ) max_fds =NR_OPEN_DEFAULT ; -return min (count, max_fds); +return ALIGN (min (count, max_fds),BITS_PER_LONG ); }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 833/1126 LSM: general protection fault in legacy_parse_param
In reply to Greg Kroah-HartmanFrom: Casey Schaufler <[email protected]>
[ Upstream commit ecff30575b5ad0eda149aadad247b7f75411fd47 ]
The usual LSM hook "bail on fail" scheme doesn't work for cases where a security module may return an error code indicating that it does not recognize an input. In this particular case Smack sees a mount option that it recognizes, and returns 0. A call to a BPF hook follows, which returns -ENOPARAM, which confuses the caller because Smack has processed its data.
The SELinux hook incorrectly returns 1 on success. There was a time when this was correct, however the current expectation is that it return 0 on success. This is repaired.
--- security/security.c | 17 +++++++++++++++-- security/selinux/hooks.c | 5 ++--- 2 files changed, 17 insertions(+), 5 deletions(-)
security/security.c +15 -2
@@ -884,9 +884,22 @@ int security_fs_context_dup(struct fs_context *fc, struct fs_context *src_fc)return call_int_hook (fs_context_dup,0 , fc, src_fc); } -int security_fs_context_parse_param (struct fs_context *fc,struct fs_parameter *param) +int security_fs_context_parse_param (struct fs_context *fc, +struct fs_parameter *param) { -return call_int_hook (fs_context_parse_param, -ENOPARAM , fc, param); +struct security_hook_list *hp; +int trc; +int rc = -ENOPARAM ; + +hlist_for_each_entry (hp, &security_hook_heads.fs_context_parse_param, + list) { + trc = hp->hook.fs_context_parse_param (fc, param); +if (trc ==0 ) + rc =0 ; +else if (trc != -ENOPARAM ) +return trc; + } +return rc; }int security_sb_alloc (struct super_block *sb)
security/selinux/hooks.c +2 -3
@@ -2867,10 +2867,9 @@ static int selinux_fs_context_parse_param(struct fs_context *fc,return opt; rc =selinux_add_opt (opt, param->string, &fc->security); -if (!rc) { +if (!rc) param->string =NULL ; - rc =1 ; - } +return rc; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 834/1126 regulator: rpi-panel: Handle I2C errors/timing to the Atmel
In reply to Greg Kroah-HartmanFrom: Dave Stevenson <[email protected]>
[ Upstream commit 5665eee7a3800430e7dc3ef6f25722476b603186 ]
The Atmel is doing some things in the I2C ISR, during which period it will not respond to further commands. This is particularly true of the POWERON command.
Increase delays appropriately, and retry should I2C errors be reported.
--- .../regulator/rpi-panel-attiny-regulator.c | 56 +++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-)
drivers/regulator/rpi-panel-attiny-regulator.c +46 -10
@@ -37,11 +37,24 @@ static const struct regmap_config attiny_regmap_config = {static int attiny_lcd_power_enable (struct regulator_dev *rdev) {unsigned int data; +int ret, i;regmap_write (rdev->regmap,REG_POWERON ,1 ); +msleep (80 ); +/* Wait for nPWRDWN to go low to indicate poweron is done. */ -regmap_read_poll_timeout (rdev->regmap,REG_PORTB , data, - data &BIT (0 ),10 ,1000000 ); +for (i =0 ; i <20 ; i++) { + ret =regmap_read (rdev->regmap,REG_PORTB , &data); +if (!ret) { +if (data &BIT (0 )) +break ; + } +usleep_range (10000 ,12000 ); + } +usleep_range (10000 ,12000 ); + +if (ret) +pr_err ("%s: regmap_read_poll_timeout failed %d\n" , __func__, ret);/* Default to the same orientation as the closed source * firmware used for the panel. Runtime rotation
@@ -57,23 +70,34 @@ static int attiny_lcd_power_disable(struct regulator_dev *rdev) {regmap_write (rdev->regmap,REG_PWM ,0 );regmap_write (rdev->regmap,REG_POWERON ,0 ); -udelay (1 ); +msleep (30 );return 0 ; }static int attiny_lcd_power_is_enabled (struct regulator_dev *rdev) {unsigned int data; -int ret; +int ret, i; - ret =regmap_read (rdev->regmap,REG_POWERON , &data); +for (i =0 ; i <10 ; i++) { + ret =regmap_read (rdev->regmap,REG_POWERON , &data); +if (!ret) +break ; +usleep_range (10000 ,12000 ); + }if (ret <0 )return ret;if (!(data &BIT (0 )))return 0 ; - ret =regmap_read (rdev->regmap,REG_PORTB , &data); +for (i =0 ; i <10 ; i++) { + ret =regmap_read (rdev->regmap,REG_PORTB , &data); +if (!ret) +break ; +usleep_range (10000 ,12000 ); + } +if (ret <0 )return ret;
@@ -103,20 +127,32 @@ static int attiny_update_status(struct backlight_device *bl) {struct regmap *regmap =bl_get_data (bl);int brightness = bl->props.brightness; +int ret, i;if (bl->props.power !=FB_BLANK_UNBLANK || bl->props.fb_blank !=FB_BLANK_UNBLANK ) brightness =0 ; -return regmap_write (regmap,REG_PWM , brightness); +for (i =0 ; i <10 ; i++) { + ret =regmap_write (regmap,REG_PWM , brightness); +if (!ret) +break ; + } + +return ret; }static int attiny_get_brightness (struct backlight_device *bl) {struct regmap *regmap =bl_get_data (bl); -int ret, brightness; +int ret, brightness, i; + +for (i =0 ; i <10 ; i++) { + ret =regmap_read (regmap,REG_PWM , &brightness); +if (!ret) +break ; + } - ret =regmap_read (regmap,REG_PWM , &brightness);if (ret)return ret;
@@ -166,7 +202,7 @@ static int attiny_i2c_probe(struct i2c_client *i2c, }regmap_write (regmap,REG_POWERON ,0 ); -mdelay (1 ); +msleep (30 ); config.dev = &i2c->dev; config.regmap = regmap;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 835/1126 crypto: hisilicon/qm - cleanup warning in qm_vf_read_qos
In reply to Greg Kroah-HartmanFrom: Kai Ye <[email protected]>
[ Upstream commit 05b3bade290d6c940701f97f3233c07cfe27205d ]
The kernel test rebot report this warning: Uninitialized variable: ret. The code flow may return value of ret directly. This value is an uninitialized variable, here is fix it.
--- drivers/crypto/hisilicon/qm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/hisilicon/qm.c +1 -1
@@ -4295,7 +4295,7 @@ static void qm_vf_get_qos(struct hisi_qm *qm, u32 fun_num)static int qm_vf_read_qos (struct hisi_qm *qm) {int cnt =0 ; -int ret; +int ret = -EINVAL ;/* reset mailbox qos val */ qm->mb_qos =0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 836/1126 crypto: octeontx2 - CN10K CPT to RNM workaround
In reply to Greg Kroah-HartmanFrom: Srujana Challa <[email protected]>
[ Upstream commit bd9305b0cb69bfe98885a63a9e6231ae92e822e2 ]
When software sets CPT_AF_CTL[RNM_REQ_EN]=1 and RNM in not producing entropy(i.e., RNM_ENTROPY_STATUS[NORMAL_CNT] < 0x40), the first cycle of the response may be lost due to a conditional clocking issue. Due to this, the subsequent random number stream will be corrupted. So, this patch adds support to ensure RNM_ENTROPY_STATUS[NORMAL_CNT] = 0x40 before writing CPT_AF_CTL[RNM_REQ_EN] = 1, as a workaround.
--- .../marvell/octeontx2/otx2_cptpf_ucode.c | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +42 -1
@@ -1076,6 +1076,39 @@ static void delete_engine_grps(struct pci_dev *pdev,delete_engine_group (&pdev->dev, &eng_grps->grp[i]); } +#define PCI_DEVID_CN10K_RNM 0xA098 +#define RNM_ENTROPY_STATUS 0x8 + +static void rnm_to_cpt_errata_fixup (struct device *dev) +{ +struct pci_dev *pdev; +void __iomem *base; +int timeout =5000 ; + + pdev =pci_get_device (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10K_RNM ,NULL ); +if (!pdev) +return ; + + base =pci_ioremap_bar (pdev,0 ); +if (!base) + goto put_pdev; + +while ((readq (base +RNM_ENTROPY_STATUS ) &0x7F ) !=0x40 ) { +cpu_relax (); +udelay (1 ); + timeout--; +if (!timeout) { +dev_warn (dev,"RNM is not producing entropy\n" ); +break ; + } + } + +iounmap (base); + +put_pdev: +pci_dev_put (pdev); +} +int otx2_cpt_get_eng_grp (struct otx2_cpt_eng_grps *eng_grps,int eng_type) {
@@ -1189,9 +1222,17 @@ int otx2_cpt_create_eng_grps(struct otx2_cptpf_dev *cptpf,if (is_dev_otx2 (pdev)) goto unlock; + +/* +* Ensure RNM_ENTROPY_STATUS[NORMAL_CNT] = 0x40 before writing +* CPT_AF_CTL[RNM_REQ_EN] = 1 as a workaround for HW errata. +*/ +rnm_to_cpt_errata_fixup (&pdev->dev); +/* * Configure engine group mask to allow context prefetching -* for the groups. +* for the groups and enable random number request, to enable +* CPT to request random numbers from RNM. */ otx2_cpt_write_af_reg(&cptpf->afpf_mbox, pdev, CPT_AF_CTL, OTX2_CPT_ALL_ENG_GRPS_MASK << 3 | BIT_ULL(16),
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 837/1126 gcc-plugins/stackleak: Exactly match strings instead of prefixes
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 27e9faf415dbf94af19b9c827842435edbc1fbbc ]
Since STRING_CST may not be NUL terminated, strncmp() was used for check for equality. However, this may lead to mismatches for longer section names where the start matches the tested-for string. Test for exact equality by checking for the presences of NUL termination.
--- scripts/gcc-plugins/stackleak_plugin.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
scripts/gcc-plugins/stackleak_plugin.c +21 -4
@@ -429,6 +429,23 @@ static unsigned int stackleak_cleanup_execute(void)return 0 ; } +/* +* STRING_CST may or may not be NUL terminated: +* https://gcc.gnu.org/onlinedocs/gccint/Constant-expressions.html +*/ +static inline bool string_equal (tree node,const char *string,int length) +{ +if (TREE_STRING_LENGTH (node) < length) +return false; +if (TREE_STRING_LENGTH (node) > length +1 ) +return false; +if (TREE_STRING_LENGTH (node) == length +1 && +TREE_STRING_POINTER (node)[length] !='\0' ) +return false; +return !memcmp (TREE_STRING_POINTER (node), string, length); +} +#define STRING_EQUAL (node, str) string_equal(node, str, strlen(str)) +static bool stackleak_gate (void ) {tree section;
@@ -438,13 +455,13 @@ static bool stackleak_gate(void)if (section &&TREE_VALUE (section)) { section =TREE_VALUE (TREE_VALUE (section)); -if (!strncmp (TREE_STRING_POINTER (section),".init.text" ,10 )) +if (STRING_EQUAL (section,".init.text" ))return false; -if (!strncmp (TREE_STRING_POINTER (section),".devinit.text" ,13 )) +if (STRING_EQUAL (section,".devinit.text" ))return false; -if (!strncmp (TREE_STRING_POINTER (section),".cpuinit.text" ,13 )) +if (STRING_EQUAL (section,".cpuinit.text" ))return false; -if (!strncmp (TREE_STRING_POINTER (section),".meminit.text" ,13 )) +if (STRING_EQUAL (section,".meminit.text" ))return false; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 838/1126 rcu: Kill rnp->ofl_seq and use only rcu_state.ofl_lock for exclusion
In reply to Greg Kroah-HartmanFrom: David Woodhouse <[email protected]>
[ Upstream commit 82980b1622d97017053c6792382469d7dc26a486 ]
If we allow architectures to bring APs online in parallel, then we end up requiring rcu_cpu_starting() to be reentrant. But currently, the manipulation of rnp->ofl_seq is not thread-safe.
However, rnp->ofl_seq is also fairly much pointless anyway since both rcu_cpu_starting() and rcu_report_dead() hold rcu_state.ofl_lock for fairly much the whole time that rnp->ofl_seq is set to an odd number to indicate that an operation is in progress.
So drop rnp->ofl_seq completely, and use only rcu_state.ofl_lock.
This has a couple of minor complexities: lockdep will complain when we take rcu_state.ofl_lock, and currently accepts the 'excuse' of having an odd value in rnp->ofl_seq. So switch it to an arch_spinlock_t to avoid that false positive complaint. Since we're killing rnp->ofl_seq of course that 'excuse' has to be changed too, so make it check for arch_spin_is_locked(rcu_state.ofl_lock).
There's no arch_spin_lock_irqsave() so we have to manually save and restore local interrupts around the locking.
At Paul's request based on Neeraj's analysis, make rcu_gp_init not just wait but *exclude* any CPU online/offline activity, which was fairly much true already by virtue of it holding rcu_state.ofl_lock.
--- kernel/rcu/tree.c | 71 ++++++++++++++++++++++++----------------------- kernel/rcu/tree.h | 4 +-- 2 files changed, 37 insertions(+), 38 deletions(-)
kernel/rcu/tree.c +36 -35
@@ -91,7 +91,7 @@ static struct rcu_state rcu_state = { .abbr = RCU_ABBR, .exp_mutex = __MUTEX_INITIALIZER(rcu_state.exp_mutex), .exp_wake_mutex = __MUTEX_INITIALIZER(rcu_state.exp_wake_mutex), - .ofl_lock = __RAW_SPIN_LOCK_UNLOCKED(rcu_state.ofl_lock), + .ofl_lock = __ARCH_SPIN_LOCK_UNLOCKED, };/* Dump rcu_node combining tree at boot to verify correct setup. */
@@ -1175,7 +1175,15 @@ bool rcu_lockdep_current_cpu_online(void)preempt_disable_notrace (); rdp =this_cpu_ptr (&rcu_data); rnp = rdp->mynode; -if (rdp->grpmask &rcu_rnp_online_cpus (rnp) ||READ_ONCE (rnp->ofl_seq) &0x1 ) +/* +* Strictly, we care here about the case where the current CPU is +* in rcu_cpu_starting() and thus has an excuse for rdp->grpmask +* not being up to date. So arch_spin_is_locked() might have a +* false positive if it's held by some *other* CPU, but that's +* OK because that just means a false *negative* on the warning. +*/ +if (rdp->grpmask &rcu_rnp_online_cpus (rnp) || +arch_spin_is_locked (&rcu_state.ofl_lock)) ret = true;preempt_enable_notrace ();return ret;
@@ -1739,7 +1747,6 @@ static void rcu_strict_gp_boundary(void *unused)*/ static noinline_for_stack bool rcu_gp_init(void) { -unsigned long firstseq;unsigned long flags;unsigned long oldmask;unsigned long mask;
@@ -1782,22 +1789,17 @@ static noinline_for_stack bool rcu_gp_init(void)* of RCU's Requirements documentation. */ WRITE_ONCE (rcu_state.gp_state,RCU_GP_ONOFF ); +/* Exclude CPU hotplug operations. */ rcu_for_each_leaf_node (rnp) { -// Wait for CPU-hotplug operations that might have -// started before this grace period did. -smp_mb ();// Pair with barriers used when updating ->ofl_seq to odd values. - firstseq =READ_ONCE (rnp->ofl_seq); -if (firstseq &0x1 ) -while (firstseq ==READ_ONCE (rnp->ofl_seq)) -schedule_timeout_idle (1 );// Can't wake unless RCU is watching. -smp_mb ();// Pair with barriers used when updating ->ofl_seq to even values. -raw_spin_lock (&rcu_state.ofl_lock); -raw_spin_lock_irq_rcu_node (rnp); +local_irq_save (flags); +arch_spin_lock (&rcu_state.ofl_lock); +raw_spin_lock_rcu_node (rnp);if (rnp->qsmaskinit == rnp->qsmaskinitnext && !rnp->wait_blkd_tasks) {/* Nothing to do on this leaf rcu_node structure. */ -raw_spin_unlock_irq_rcu_node (rnp); -raw_spin_unlock (&rcu_state.ofl_lock); +raw_spin_unlock_rcu_node (rnp); +arch_spin_unlock (&rcu_state.ofl_lock); +local_irq_restore (flags);continue ; }
@@ -1832,8 +1834,9 @@ static noinline_for_stack bool rcu_gp_init(void)rcu_cleanup_dead_rnp (rnp); } -raw_spin_unlock_irq_rcu_node (rnp); -raw_spin_unlock (&rcu_state.ofl_lock); +raw_spin_unlock_rcu_node (rnp); +arch_spin_unlock (&rcu_state.ofl_lock); +local_irq_restore (flags); }rcu_gp_slow (gp_preinit_delay);/* Races with CPU hotplug. */
@@ -4287,11 +4290,10 @@ void rcu_cpu_starting(unsigned int cpu) rnp = rdp->mynode; mask = rdp->grpmask; -WRITE_ONCE (rnp->ofl_seq, rnp->ofl_seq +1 ); -WARN_ON_ONCE (!(rnp->ofl_seq &0x1 )); +local_irq_save (flags); +arch_spin_lock (&rcu_state.ofl_lock);rcu_dynticks_eqs_online (); -smp_mb ();// Pair with rcu_gp_cleanup()'s ->ofl_seq barrier(). -raw_spin_lock_irqsave_rcu_node (rnp, flags); +raw_spin_lock_rcu_node (rnp);WRITE_ONCE (rnp->qsmaskinitnext, rnp->qsmaskinitnext | mask); newcpu = !(rnp->expmaskinitnext & mask); rnp->expmaskinitnext |= mask;
@@ -4304,15 +4306,18 @@ void rcu_cpu_starting(unsigned int cpu)/* An incoming CPU should never be blocking a grace period. */ if (WARN_ON_ONCE (rnp->qsmask & mask)) {/* RCU waiting on incoming CPU? */ +/* rcu_report_qs_rnp() *really* wants some flags to restore */ +unsigned long flags2; + +local_irq_save (flags2);rcu_disable_urgency_upon_qs (rdp);/* Report QS -after- changing ->qsmaskinitnext! */ -rcu_report_qs_rnp (mask, rnp, rnp->gp_seq, flags); +rcu_report_qs_rnp (mask, rnp, rnp->gp_seq, flags2); }else { -raw_spin_unlock_irqrestore_rcu_node (rnp, flags); +raw_spin_unlock_rcu_node (rnp); } -smp_mb ();// Pair with rcu_gp_cleanup()'s ->ofl_seq barrier(). -WRITE_ONCE (rnp->ofl_seq, rnp->ofl_seq +1 ); -WARN_ON_ONCE (rnp->ofl_seq &0x1 ); +arch_spin_unlock (&rcu_state.ofl_lock); +local_irq_restore (flags);smp_mb ();/* Ensure RCU read-side usage follows above initialization. */ }
@@ -4326,7 +4331,7 @@ void rcu_cpu_starting(unsigned int cpu)*/ void rcu_report_dead (unsigned int cpu) { -unsigned long flags; +unsigned long flags, seq_flags;unsigned long mask;struct rcu_data *rdp =per_cpu_ptr (&rcu_data, cpu);struct rcu_node *rnp = rdp->mynode;/* Outgoing CPU's rdp & rnp. */
@@ -4340,10 +4345,8 @@ void rcu_report_dead(unsigned int cpu)/* Remove outgoing CPU from mask in the leaf rcu_node structure. */ mask = rdp->grpmask; -WRITE_ONCE (rnp->ofl_seq, rnp->ofl_seq +1 ); -WARN_ON_ONCE (!(rnp->ofl_seq &0x1 )); -smp_mb ();// Pair with rcu_gp_cleanup()'s ->ofl_seq barrier(). -raw_spin_lock (&rcu_state.ofl_lock); +local_irq_save (seq_flags); +arch_spin_lock (&rcu_state.ofl_lock);raw_spin_lock_irqsave_rcu_node (rnp, flags);/* Enforce GP memory-order guarantee. */ rdp->rcu_ofl_gp_seq =READ_ONCE (rcu_state.gp_seq); rdp->rcu_ofl_gp_flags =READ_ONCE (rcu_state.gp_flags);
@@ -4354,10 +4357,8 @@ void rcu_report_dead(unsigned int cpu) }WRITE_ONCE (rnp->qsmaskinitnext, rnp->qsmaskinitnext & ~mask);raw_spin_unlock_irqrestore_rcu_node (rnp, flags); -raw_spin_unlock (&rcu_state.ofl_lock); -smp_mb ();// Pair with rcu_gp_cleanup()'s ->ofl_seq barrier(). -WRITE_ONCE (rnp->ofl_seq, rnp->ofl_seq +1 ); -WARN_ON_ONCE (rnp->ofl_seq &0x1 ); +arch_spin_unlock (&rcu_state.ofl_lock); +local_irq_restore (seq_flags); rdp->cpu_started = false; }
kernel/rcu/tree.h +1 -3
@@ -56,8 +56,6 @@ struct rcu_node {/* Initialized from ->qsmaskinitnext at the */ /* beginning of each grace period. */ unsigned long qsmaskinitnext; -unsigned long ofl_seq;/* CPU-hotplug operation sequence count. */ -/* Online CPUs for next grace period. */ unsigned long expmask;/* CPUs or groups that need to check in */ /* to allow the current expedited GP */ /* to complete. */
@@ -355,7 +353,7 @@ struct rcu_state {const char *name;/* Name of structure. */ char abbr;/* Abbreviated name. */ -raw_spinlock_t ofl_lock____cacheline_internodealigned_in_smp ; +arch_spinlock_t ofl_lock____cacheline_internodealigned_in_smp ;/* Synchronize offline with */ /* GP pre-initialization. */ };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 839/1126 pinctrl: npcm: Fix broken references to chip->parent_device
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit f7e53e2255808ca3abcc8f38d18ad0823425e771 ]
The npcm driver has a bunch of references to the irq_chip parent_device field, but never sets it.
Fix it by fishing that reference from somewhere else, but it is obvious that these debug statements were never used. Also remove an unused field in a local data structure.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +12 -13
@@ -78,7 +78,6 @@ struct npcm7xx_gpio {struct gpio_chip gc;int irqbase;int irq; -void *priv;struct irq_chip irq_chip;u32 pinctrl_id;int (*direction_input)(struct gpio_chip *chip,unsigned offset);
@@ -226,7 +225,7 @@ static void npcmgpio_irq_handler(struct irq_desc *desc)chained_irq_enter (chip, desc); sts =ioread32 (bank->base +NPCM7XX_GP_N_EVST ); en =ioread32 (bank->base +NPCM7XX_GP_N_EVEN ); -dev_dbg (chip->parent_device,"==> got irq sts %.8x %.8x\n" , sts, +dev_dbg (bank->gc.parent,"==> got irq sts %.8x %.8x\n" , sts, en); sts &= en;
@@ -241,33 +240,33 @@ static int npcmgpio_set_irq_type(struct irq_data *d, unsigned int type)gpiochip_get_data (irq_data_get_irq_chip_data (d));unsigned int gpio =BIT (d->hwirq); -dev_dbg (d->chip->parent_device,"setirqtype: %u.%u = %u\n" , gpio, +dev_dbg (bank->gc.parent,"setirqtype: %u.%u = %u\n" , gpio, d->irq, type);switch (type) {case IRQ_TYPE_EDGE_RISING : -dev_dbg (d->chip->parent_device,"edge.rising\n" ); +dev_dbg (bank->gc.parent,"edge.rising\n" );npcm_gpio_clr (&bank->gc, bank->base +NPCM7XX_GP_N_EVBE , gpio);npcm_gpio_clr (&bank->gc, bank->base +NPCM7XX_GP_N_POL , gpio);break ;case IRQ_TYPE_EDGE_FALLING : -dev_dbg (d->chip->parent_device,"edge.falling\n" ); +dev_dbg (bank->gc.parent,"edge.falling\n" );npcm_gpio_clr (&bank->gc, bank->base +NPCM7XX_GP_N_EVBE , gpio);npcm_gpio_set (&bank->gc, bank->base +NPCM7XX_GP_N_POL , gpio);break ;case IRQ_TYPE_EDGE_BOTH : -dev_dbg (d->chip->parent_device,"edge.both\n" ); +dev_dbg (bank->gc.parent,"edge.both\n" );npcm_gpio_set (&bank->gc, bank->base +NPCM7XX_GP_N_EVBE , gpio);break ;case IRQ_TYPE_LEVEL_LOW : -dev_dbg (d->chip->parent_device,"level.low\n" ); +dev_dbg (bank->gc.parent,"level.low\n" );npcm_gpio_set (&bank->gc, bank->base +NPCM7XX_GP_N_POL , gpio);break ;case IRQ_TYPE_LEVEL_HIGH : -dev_dbg (d->chip->parent_device,"level.high\n" ); +dev_dbg (bank->gc.parent,"level.high\n" );npcm_gpio_clr (&bank->gc, bank->base +NPCM7XX_GP_N_POL , gpio);break ;default : -dev_dbg (d->chip->parent_device,"invalid irq type\n" ); +dev_dbg (bank->gc.parent,"invalid irq type\n" );return -EINVAL ; }
@@ -289,7 +288,7 @@ static void npcmgpio_irq_ack(struct irq_data *d)gpiochip_get_data (irq_data_get_irq_chip_data (d));unsigned int gpio = d->hwirq; -dev_dbg (d->chip->parent_device,"irq_ack: %u.%u\n" , gpio, d->irq); +dev_dbg (bank->gc.parent,"irq_ack: %u.%u\n" , gpio, d->irq);iowrite32 (BIT (gpio), bank->base +NPCM7XX_GP_N_EVST ); }
@@ -301,7 +300,7 @@ static void npcmgpio_irq_mask(struct irq_data *d)unsigned int gpio = d->hwirq;/* Clear events */ -dev_dbg (d->chip->parent_device,"irq_mask: %u.%u\n" , gpio, d->irq); +dev_dbg (bank->gc.parent,"irq_mask: %u.%u\n" , gpio, d->irq);iowrite32 (BIT (gpio), bank->base +NPCM7XX_GP_N_EVENC ); }
@@ -313,7 +312,7 @@ static void npcmgpio_irq_unmask(struct irq_data *d)unsigned int gpio = d->hwirq;/* Enable events */ -dev_dbg (d->chip->parent_device,"irq_unmask: %u.%u\n" , gpio, d->irq); +dev_dbg (bank->gc.parent,"irq_unmask: %u.%u\n" , gpio, d->irq);iowrite32 (BIT (gpio), bank->base +NPCM7XX_GP_N_EVENS ); }
@@ -323,7 +322,7 @@ static unsigned int npcmgpio_irq_startup(struct irq_data *d)unsigned int gpio = d->hwirq;/* active-high, input, clear interrupt, enable interrupt */ -dev_dbg (d->chip->parent_device,"startup: %u.%u\n" , gpio, d->irq); +dev_dbg (gc->parent,"startup: %u.%u\n" , gpio, d->irq);npcmgpio_direction_input (gc, gpio);npcmgpio_irq_ack (d);npcmgpio_irq_unmask (d);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 840/1126 rcu: Mark writes to the rcu_segcblist structures ->flags field
In reply to Greg Kroah-HartmanFrom: Paul E. McKenney <[email protected]>
[ Upstream commit c09929031018913b5783872a8b8cdddef4a543c7 ]
KCSAN reports data races between the rcu_segcblist_clear_flags() and rcu_segcblist_set_flags() functions, though misreporting the latter as a call to rcu_segcblist_is_enabled() from call_rcu(). This commit converts the updates of this field to WRITE_ONCE(), relying on the resulting unmarked reads to continue to detect buggy concurrent writes to this field.
--- kernel/rcu/rcu_segcblist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/rcu/rcu_segcblist.h +2 -2
@@ -56,13 +56,13 @@ static inline long rcu_segcblist_n_cbs(struct rcu_segcblist *rsclp)static inline void rcu_segcblist_set_flags (struct rcu_segcblist *rsclp,int flags) { - rsclp->flags |= flags; +WRITE_ONCE (rsclp->flags, rsclp->flags | flags); }static inline void rcu_segcblist_clear_flags (struct rcu_segcblist *rsclp,int flags) { - rsclp->flags &= ~flags; +WRITE_ONCE (rsclp->flags, rsclp->flags & ~flags); } static inline bool rcu_segcblist_test_flags(struct rcu_segcblist *rsclp,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 841/1126 block: throttle split bio in case of iops limit
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 9f5ede3c01f9951b0ae7d68b28762ad51d9bacc8 ]
Commit 111be8839817 ("block-throttle: avoid double charge") marks bio as BIO_THROTTLED unconditionally if __blk_throtl_bio() is called on this bio, then this bio won't be called into __blk_throtl_bio() any more. This way is to avoid double charge in case of bio splitting. It is reasonable for read/write throughput limit, but not reasonable for IOPS limit because block layer provides io accounting against split bio.
Chunguang Xu has already observed this issue and fixed it in commit 4f1e9630afe6 ("blk-throtl: optimize IOPS throttle for large IO scenarios"). However, that patch only covers bio splitting in __blk_queue_split(), and we have other kind of bio splitting, such as bio_split() & submit_bio_noacct() and other ways.
This patch tries to fix the issue in one generic way by always charging the bio for iops limit in blk_throtl_bio(). This way is reasonable:
re-submission & fast-cloned bio is charged if it is submitted to same disk/queue, and BIO_THROTTLED will be cleared if bio->bi_bdev is changed.
This new approach can get much more smooth/stable iops limit compared with commit 4f1e9630afe6 ("blk-throtl: optimize IOPS throttle for large IO scenarios") since that commit can't throttle current split bios actually.
Also this way won't cause new double bio iops charge in blk_throtl_dispatch_work_fn() in which blk_throtl_bio() won't be called any more.
--- block/blk-merge.c | 2 -- block/blk-throttle.c | 10 +++++++--- block/blk-throttle.h | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-)
block/blk-merge.c +0 -2
@@ -369,8 +369,6 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio,trace_block_split (split, (*bio)->bi_iter.bi_sector);submit_bio_noacct (*bio); *bio = split; - -blk_throtl_charge_bio_split (*bio); } }
block/blk-throttle.c +7 -3
@@ -808,7 +808,8 @@ static bool tg_with_in_bps_limit(struct throtl_grp *tg, struct bio *bio,unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd;unsigned int bio_size =throtl_bio_data_size (bio); -if (bps_limit ==U64_MAX ) { +/* no need to throttle if this bio's bytes have been accounted */ +if (bps_limit ==U64_MAX ||bio_flagged (bio,BIO_THROTTLED )) {if (wait) *wait =0 ;return true;
@@ -920,9 +921,12 @@ static void throtl_charge_bio(struct throtl_grp *tg, struct bio *bio)unsigned int bio_size =throtl_bio_data_size (bio);/* Charge the bio to the group */ - tg->bytes_disp[rw] += bio_size; +if (!bio_flagged (bio,BIO_THROTTLED )) { + tg->bytes_disp[rw] += bio_size; + tg->last_bytes_disp[rw] += bio_size; + } + tg->io_disp[rw]++; - tg->last_bytes_disp[rw] += bio_size; tg->last_io_disp[rw]++;/*
block/blk-throttle.h +0 -2
@@ -170,8 +170,6 @@ static inline bool blk_throtl_bio(struct bio *bio) {struct throtl_grp *tg =blkg_to_tg (bio->bi_blkg); -if (bio_flagged (bio,BIO_THROTTLED )) -return false;if (!tg->has_rules[bio_data_dir (bio)])return false;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 842/1126 memstick/mspro_block: fix handling of read-only devices
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 6dab421bfe06a59bf8f212a72e34673e8acf2018 ]
Use set_disk_ro to propagate the read-only state to the block layer instead of checking for it in ->open and leaking a reference in case of a read-only device.
--- drivers/memstick/core/mspro_block.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/memstick/core/mspro_block.c +4 -6
@@ -186,13 +186,8 @@ static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)mutex_lock (&mspro_block_disk_lock); -if (msb && msb->card) { +if (msb && msb->card) msb->usage_count++; -if ((mode &FMODE_WRITE ) && msb->read_only) - rc = -EROFS ; -else - rc =0 ; - }mutex_unlock (&mspro_block_disk_lock);
@@ -1239,6 +1234,9 @@ static int mspro_block_init_disk(struct memstick_dev *card)set_capacity (msb->disk, capacity);dev_dbg (&card->dev,"capacity set %ld\n" , capacity); +if (msb->read_only) +set_disk_ro (msb->disk, true); + rc =device_add_disk (&card->dev, msb->disk,NULL );if (rc) goto out_cleanup_disk;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 843/1126 block/bfq_wf2q: correct weight to ioprio
In reply to Greg Kroah-HartmanFrom: Yahu Gao <[email protected]>
[ Upstream commit bcd2be763252f3a4d5fc4d6008d4d96c601ee74b ]
The return value is ioprio * BFQ_WEIGHT_CONVERSION_COEFF or 0. What we want is ioprio or 0.
Correct this by changing the calculation.
--- block/bfq-wf2q.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bfq-wf2q.c +1 -1
@@ -519,7 +519,7 @@ unsigned short bfq_ioprio_to_weight(int ioprio)static unsigned short bfq_weight_to_ioprio (int weight) {return max_t (int,0 , -IOPRIO_NR_LEVELS *BFQ_WEIGHT_CONVERSION_COEFF - weight); +IOPRIO_NR_LEVELS - weight /BFQ_WEIGHT_CONVERSION_COEFF ); }static void bfq_get_entity (struct bfq_entity *entity)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 844/1126 crypto: xts - Add softdep on ecb
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit dfe085d8dcd0bb1fe20cc2327e81c8064cead441 ]
The xts module needs ecb to be present as it's meant to work on top of ecb. This patch adds a softdep so ecb can be included automatically into the initramfs.
--- crypto/xts.c | 1 + 1 file changed, 1 insertion(+)
crypto/xts.c +1 -0
@@ -466,3 +466,4 @@ MODULE_LICENSE("GPL");MODULE_DESCRIPTION ("XTS block cipher mode" );MODULE_ALIAS_CRYPTO ("xts" );MODULE_IMPORT_NS (CRYPTO_INTERNAL ); +MODULE_SOFTDEP ("pre: ecb" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 845/1126 crypto: hisilicon/sec - not need to enable sm4 extra mode at HW V3
In reply to Greg Kroah-HartmanFrom: Kai Ye <[email protected]>
[ Upstream commit f8a2652826444d13181061840b96a5d975d5b6c6 ]
It is not need to enable sm4 extra mode in at HW V3. Here is fix it.
--- drivers/crypto/hisilicon/sec2/sec_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/crypto/hisilicon/sec2/sec_main.c +5 -3
@@ -443,9 +443,11 @@ static int sec_engine_init(struct hisi_qm *qm)writel (SEC_SAA_ENABLE , qm->io_base +SEC_SAA_EN_REG ); -/* Enable sm4 extra mode, as ctr/ecb */ -writel_relaxed (SEC_BD_ERR_CHK_EN0 , - qm->io_base +SEC_BD_ERR_CHK_EN_REG0 ); +/* HW V2 enable sm4 extra mode, as ctr/ecb */ +if (qm->ver <QM_HW_V3 ) +writel_relaxed (SEC_BD_ERR_CHK_EN0 , + qm->io_base +SEC_BD_ERR_CHK_EN_REG0 ); +/* Enable sm4 xts mode multiple iv */ writel_relaxed (SEC_BD_ERR_CHK_EN1 , qm->io_base +SEC_BD_ERR_CHK_EN_REG1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 846/1126 block, bfq: dont move oom_bfqq
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 8410f70977734f21b8ed45c37e925d311dfda2e7 ]
Our test report a UAF:
[ 2073.019181] ================================================================== [ 2073.019188] BUG: KASAN: use-after-free in __bfq_put_async_bfqq+0xa0/0x168 [ 2073.019191] Write of size 8 at addr ffff8000ccf64128 by task rmmod/72584 [ 2073.019192] [ 2073.019196] CPU: 0 PID: 72584 Comm: rmmod Kdump: loaded Not tainted 4.19.90-yk #5 [ 2073.019198] Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 [ 2073.019200] Call trace: [ 2073.019203] dump_backtrace+0x0/0x310 [ 2073.019206] show_stack+0x28/0x38 [ 2073.019210] dump_stack+0xec/0x15c [ 2073.019216] print_address_description+0x68/0x2d0 [ 2073.019220] kasan_report+0x238/0x2f0 [ 2073.019224] __asan_store8+0x88/0xb0 [ 2073.019229] __bfq_put_async_bfqq+0xa0/0x168 [ 2073.019233] bfq_put_async_queues+0xbc/0x208 [ 2073.019236] bfq_pd_offline+0x178/0x238 [ 2073.019240] blkcg_deactivate_policy+0x1f0/0x420 [ 2073.019244] bfq_exit_queue+0x128/0x178 [ 2073.019249] blk_mq_exit_sched+0x12c/0x160 [ 2073.019252] elevator_exit+0xc8/0xd0 [ 2073.019256] blk_exit_queue+0x50/0x88 [ 2073.019259] blk_cleanup_queue+0x228/0x3d8 [ 2073.019267] null_del_dev+0xfc/0x1e0 [null_blk] [ 2073.019274] null_exit+0x90/0x114 [null_blk] [ 2073.019278] __arm64_sys_delete_module+0x358/0x5a0 [ 2073.019282] el0_svc_common+0xc8/0x320 [ 2073.019287] el0_svc_handler+0xf8/0x160 [ 2073.019290] el0_svc+0x10/0x218 [ 2073.019291] [ 2073.019294] Allocated by task 14163: [ 2073.019301] kasan_kmalloc+0xe0/0x190 [ 2073.019305] kmem_cache_alloc_node_trace+0x1cc/0x418 [ 2073.019308] bfq_pd_alloc+0x54/0x118 [ 2073.019313] blkcg_activate_policy+0x250/0x460 [ 2073.019317] bfq_create_group_hierarchy+0x38/0x110 [ 2073.019321] bfq_init_queue+0x6d0/0x948 [ 2073.019325] blk_mq_init_sched+0x1d8/0x390 [ 2073.019330] elevator_switch_mq+0x88/0x170 [ 2073.019334] elevator_switch+0x140/0x270 [ 2073.019338] elv_iosched_store+0x1a4/0x2a0 [ 2073.019342] queue_attr_store+0x90/0xe0 [ 2073.019348] sysfs_kf_write+0xa8/0xe8 [ 2073.019351] kernfs_fop_write+0x1f8/0x378 [ 2073.019359] __vfs_write+0xe0/0x360 [ 2073.019363] vfs_write+0xf0/0x270 [ 2073.019367] ksys_write+0xdc/0x1b8 [ 2073.019371] __arm64_sys_write+0x50/0x60 [ 2073.019375] el0_svc_common+0xc8/0x320 [ 2073.019380] el0_svc_handler+0xf8/0x160 [ 2073.019383] el0_svc+0x10/0x218 [ 2073.019385] [ 2073.019387] Freed by task 72584: [ 2073.019391] __kasan_slab_free+0x120/0x228 [ 2073.019394] kasan_slab_free+0x10/0x18 [ 2073.019397] kfree+0x94/0x368 [ 2073.019400] bfqg_put+0x64/0xb0 [ 2073.019404] bfqg_and_blkg_put+0x90/0xb0 [ 2073.019408] bfq_put_queue+0x220/0x228 [ 2073.019413] __bfq_put_async_bfqq+0x98/0x168 [ 2073.019416] bfq_put_async_queues+0xbc/0x208 [ 2073.019420] bfq_pd_offline+0x178/0x238 [ 2073.019424] blkcg_deactivate_policy+0x1f0/0x420 [ 2073.019429] bfq_exit_queue+0x128/0x178 [ 2073.019433] blk_mq_exit_sched+0x12c/0x160 [ 2073.019437] elevator_exit+0xc8/0xd0 [ 2073.019440] blk_exit_queue+0x50/0x88 [ 2073.019443] blk_cleanup_queue+0x228/0x3d8 [ 2073.019451] null_del_dev+0xfc/0x1e0 [null_blk] [ 2073.019459] null_exit+0x90/0x114 [null_blk] [ 2073.019462] __arm64_sys_delete_module+0x358/0x5a0 [ 2073.019467] el0_svc_common+0xc8/0x320 [ 2073.019471] el0_svc_handler+0xf8/0x160 [ 2073.019474] el0_svc+0x10/0x218 [ 2073.019475] [ 2073.019479] The buggy address belongs to the object at ffff8000ccf63f00 which belongs to the cache kmalloc-1024 of size 1024 [ 2073.019484] The buggy address is located 552 bytes inside of 1024-byte region [ffff8000ccf63f00, ffff8000ccf64300) [ 2073.019486] The buggy address belongs to the page: [ 2073.019492] page:ffff7e000333d800 count:1 mapcount:0 mapping:ffff8000c0003a00 index:0x0 compound_mapcount: 0 [ 2073.020123] flags: 0x7ffff0000008100(slab|head) [ 2073.020403] raw: 07ffff0000008100 ffff7e0003334c08 ffff7e00001f5a08 ffff8000c0003a00 [ 2073.020409] raw: 0000000000000000 00000000001c001c 00000001ffffffff 0000000000000000 [ 2073.020411] page dumped because: kasan: bad access detected [ 2073.020412] [ 2073.020414] Memory state around the buggy address: [ 2073.020420] ffff8000ccf64000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 2073.020424] ffff8000ccf64080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 2073.020428] >ffff8000ccf64100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 2073.020430] ^ [ 2073.020434] ffff8000ccf64180: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 2073.020438] ffff8000ccf64200: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 2073.020439] ==================================================================
The same problem exist in mainline as well.
This is because oom_bfqq is moved to a non-root group, thus root_group is freed earlier.
Thus fix the problem by don't move oom_bfqq.
--- block/bfq-cgroup.c | 6 ++++++ 1 file changed, 6 insertions(+)
block/bfq-cgroup.c +6 -0
@@ -646,6 +646,12 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq, {struct bfq_entity *entity = &bfqq->entity; +/* +* oom_bfqq is not allowed to move, oom_bfqq will hold ref to root_group +* until elevator exit. +*/ +if (bfqq == &bfqd->oom_bfqq) +return ;/* * Get extra reference to prevent bfqq from being freed in * next possible expire or deactivate.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 847/1126 selinux: use correct type for context length
In reply to Greg Kroah-HartmanFrom: Christian Göttsche <[email protected]>
[ Upstream commit b97df7c098c531010e445da88d02b7bf7bf59ef6 ]
security_sid_to_context() expects a pointer to an u32 as the address where to store the length of the computed context.
Reported by sparse:
security/selinux/xfrm.c:359:39: warning: incorrect type in arg 4
(different signedness)
security/selinux/xfrm.c:359:39: expected unsigned int
[usertype] *scontext_len
security/selinux/xfrm.c:359:39: got int *
--- security/selinux/xfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/xfrm.c +1 -1
@@ -347,7 +347,7 @@ int selinux_xfrm_state_alloc_acquire(struct xfrm_state *x,int rc;struct xfrm_sec_ctx *ctx;char *ctx_str =NULL ; -int str_len; +u32 str_len;if (!polsec)return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 848/1126 powercap/dtpm_cpu: Reset per_cpu variable in the release function
In reply to Greg Kroah-HartmanFrom: Daniel Lezcano <[email protected]>
[ Upstream commit 0aea2e4ec2a2bfa2d7e8820e37ba5b5ce04f20a5 ]
The release function does not reset the per cpu variable when it is called. That will prevent creation again as the variable will be already from the previous creation.
Fix it by resetting them.
--- drivers/powercap/dtpm_cpu.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/powercap/dtpm_cpu.c +7 -0
@@ -150,10 +150,17 @@ static int update_pd_power_uw(struct dtpm *dtpm)static void pd_release (struct dtpm *dtpm) {struct dtpm_cpu *dtpm_cpu =to_dtpm_cpu (dtpm); +struct cpufreq_policy *policy;if (freq_qos_request_active (&dtpm_cpu->qos_req))freq_qos_remove_request (&dtpm_cpu->qos_req); + policy =cpufreq_cpu_get (dtpm_cpu->cpu); +if (policy) { +for_each_cpu (dtpm_cpu->cpu, policy->related_cpus) +per_cpu (dtpm_per_cpu, dtpm_cpu->cpu) =NULL ; + } +kfree (dtpm_cpu); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 849/1126 arm64: module: remove (NOLOAD) from linker script
In reply to Greg Kroah-HartmanFrom: Fangrui Song <[email protected]>
[ Upstream commit 4013e26670c590944abdab56c4fa797527b74325 ]
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always SHT_PROGBITS.
In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report a section type mismatch error. Just remove (NOLOAD) to fix the error.
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/module.lds.h +3 -3
@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 850/1126 selinux: allow FIOCLEX and FIONCLEX with policy capability
In reply to Greg Kroah-HartmanFrom: Richard Haines <[email protected]>
[ Upstream commit 65881e1db4e948614d9eb195b8e1197339822949 ]
These ioctls are equivalent to fcntl(fd, F_SETFD, flags), which SELinux always allows too. Furthermore, a failed FIOCLEX could result in a file descriptor being leaked to a process that should not have access to it.
As this patch removes access controls, a policy capability needs to be enabled in policy to always allow these ioctls.
--- security/selinux/hooks.c | 6 ++++++ security/selinux/include/policycap.h | 1 + security/selinux/include/policycap_names.h | 3 ++- security/selinux/include/security.h | 7 +++++++ 4 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/hooks.c +6 -0
@@ -3751,6 +3751,12 @@ static int selinux_file_ioctl(struct file *file, unsigned int cmd, CAP_OPT_NONE, true);break ; +case FIOCLEX : +case FIONCLEX : +if (!selinux_policycap_ioctl_skip_cloexec ()) + error =ioctl_has_perm (cred, file,FILE__IOCTL , (u16 ) cmd); +break ; +/* default case assumes that the command will go * to the file's ioctl() function. */
security/selinux/include/policycap.h +1 -0
@@ -11,6 +11,7 @@ enum {POLICYDB_CAPABILITY_CGROUPSECLABEL ,POLICYDB_CAPABILITY_NNP_NOSUID_TRANSITION ,POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS , +POLICYDB_CAPABILITY_IOCTL_SKIP_CLOEXEC , __POLICYDB_CAPABILITY_MAX };#define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1)
security/selinux/include/policycap_names.h +2 -1
@@ -12,7 +12,8 @@ const char *selinux_policycap_names[__POLICYDB_CAPABILITY_MAX] = {"always_check_network" ,"cgroup_seclabel" ,"nnp_nosuid_transition" , -"genfs_seclabel_symlinks" +"genfs_seclabel_symlinks" , +"ioctl_skip_cloexec" };#endif /* _SELINUX_POLICYCAP_NAMES_H_ */
security/selinux/include/security.h +7 -0
@@ -219,6 +219,13 @@ static inline bool selinux_policycap_genfs_seclabel_symlinks(void)return READ_ONCE (state->policycap[POLICYDB_CAPABILITY_GENFS_SECLABEL_SYMLINKS ]); } +static inline bool selinux_policycap_ioctl_skip_cloexec (void ) +{ +struct selinux_state *state = &selinux_state; + +return READ_ONCE (state->policycap[POLICYDB_CAPABILITY_IOCTL_SKIP_CLOEXEC ]); +} +struct selinux_policy_convert_data ;struct selinux_load_state {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 851/1126 loop: use sysfs_emit() in the sysfs xxx show()
In reply to Greg Kroah-HartmanFrom: Chaitanya Kulkarni <[email protected]>
[ Upstream commit b27824d31f09ea7b4a6ba2c1b18bd328df3e8bed ]
sprintf does not know the PAGE_SIZE maximum of the temporary buffer used for outputting sysfs content and it's possible to overrun the PAGE_SIZE buffer length.
Use a generic sysfs_emit function that knows the size of the temporary buffer and ensures that no overrun is done for offset attribute in loop_attr_[offset|sizelimit|autoclear|partscan|dio]_show() callbacks.
--- drivers/block/loop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/block/loop.c +5 -5
@@ -681,33 +681,33 @@ static ssize_t loop_attr_backing_file_show(struct loop_device *lo, char *buf)static ssize_t loop_attr_offset_show (struct loop_device *lo,char *buf) { -return sprintf (buf,"%llu\n" , (unsigned long long )lo->lo_offset); +return sysfs_emit (buf,"%llu\n" , (unsigned long long )lo->lo_offset); }static ssize_t loop_attr_sizelimit_show (struct loop_device *lo,char *buf) { -return sprintf (buf,"%llu\n" , (unsigned long long )lo->lo_sizelimit); +return sysfs_emit (buf,"%llu\n" , (unsigned long long )lo->lo_sizelimit); }static ssize_t loop_attr_autoclear_show (struct loop_device *lo,char *buf) {int autoclear = (lo->lo_flags &LO_FLAGS_AUTOCLEAR ); -return sprintf (buf,"%s\n" , autoclear ?"1" :"0" ); +return sysfs_emit (buf,"%s\n" , autoclear ?"1" :"0" ); }static ssize_t loop_attr_partscan_show (struct loop_device *lo,char *buf) {int partscan = (lo->lo_flags &LO_FLAGS_PARTSCAN ); -return sprintf (buf,"%s\n" , partscan ?"1" :"0" ); +return sysfs_emit (buf,"%s\n" , partscan ?"1" :"0" ); }static ssize_t loop_attr_dio_show (struct loop_device *lo,char *buf) {int dio = (lo->lo_flags &LO_FLAGS_DIRECT_IO ); -return sprintf (buf,"%s\n" , dio ?"1" :"0" ); +return sysfs_emit (buf,"%s\n" , dio ?"1" :"0" ); }LOOP_ATTR_RO (backing_file);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 852/1126 Fix incorrect type in assignment of ipv6 port for audit
In reply to Greg Kroah-HartmanFrom: Casey Schaufler <[email protected]>
[ Upstream commit a5cd1ab7ab679d252a6d2f483eee7d45ebf2040c ]
Remove inappropriate use of ntohs() and assign the port value directly.
--- security/smack/smack_lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/smack/smack_lsm.c +1 -1
@@ -2510,7 +2510,7 @@ static int smk_ipv6_check(struct smack_known *subject,#ifdef CONFIG_AUDIT smk_ad_init_net (&ad, __func__,LSM_AUDIT_DATA_NET , &net); ad.a.u.net->family =PF_INET6 ; - ad.a.u.net->dport =ntohs (address->sin6_port); + ad.a.u.net->dport = address->sin6_port;if (act ==SMK_RECEIVING ) ad.a.u.net->v6info.saddr = address->sin6_addr;else
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 853/1126 irqchip/qcom-pdc: Fix broken locking
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit a6aca2f460e203781dc41391913cc5b54f4bc0ce ]
pdc_enable_intr() serves as a primitive to qcom_pdc_gic_{en,dis}able, and has a raw spinlock for mutual exclusion, which is uses with interruptible primitives.
This means that this critical section can itself be interrupted. Should the interrupt also be a PDC interrupt, and the endpoint driver perform an irq_disable() on that interrupt, we end-up in a deadlock.
Fix this by using the irqsave/irqrestore variants of the locking primitives.
--- drivers/irqchip/qcom-pdc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/irqchip/qcom-pdc.c +3 -2
@@ -56,17 +56,18 @@ static u32 pdc_reg_read(int reg, u32 i)static void pdc_enable_intr (struct irq_data *d,bool on) {int pin_out = d->hwirq; +unsigned long flags;u32 index, mask;u32 enable; index = pin_out /32 ; mask = pin_out %32 ; -raw_spin_lock (&pdc_lock); +raw_spin_lock_irqsave (&pdc_lock, flags); enable =pdc_reg_read (IRQ_ENABLE_BANK , index); enable = on ?ENABLE_INTR (enable, mask) :CLEAR_INTR (enable, mask);pdc_reg_write (IRQ_ENABLE_BANK , index, enable); -raw_spin_unlock (&pdc_lock); +raw_spin_unlock_irqrestore (&pdc_lock, flags); }static void qcom_pdc_gic_disable (struct irq_data *d)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 854/1126 irqchip/nvic: Release nvic_base upon failure
In reply to Greg Kroah-HartmanFrom: Souptick Joarder (HPE) <[email protected]>
[ Upstream commit e414c25e3399b2b3d7337dc47abccab5c71b7c8f ]
smatch warning was reported as below ->
smatch warnings:drivers/irqchip/irq-nvic.c:131 nvic_of_init()
warn: 'nvic_base' not released on lines: 97.
Release nvic_base upon failure.
--- drivers/irqchip/irq-nvic.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/irqchip/irq-nvic.c +2 -0
@@ -107,6 +107,7 @@ static int __init nvic_of_init(struct device_node *node,if (!nvic_irq_domain) {pr_warn ("Failed to allocate irq domain\n" ); +iounmap (nvic_base);return -ENOMEM ; }
@@ -116,6 +117,7 @@ static int __init nvic_of_init(struct device_node *node,if (ret) {pr_warn ("Failed to allocate irq chips\n" );irq_domain_remove (nvic_irq_domain); +iounmap (nvic_base);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 855/1126 fs/binfmt_elf: Fix AT_PHDR for unusual ELF files
In reply to Greg Kroah-HartmanFrom: Akira Kawata <[email protected]>
[ Upstream commit 0da1d5002745cdc721bc018b582a8a9704d56c42 ]
As pointed out in the discussion of buglink, we cannot calculate AT_PHDR as the sum of load_addr and exec->e_phoff.
: The AT_PHDR of ELF auxiliary vectors should point to the memory address : of program header. But binfmt_elf.c calculates this address as follows:
:
: NEW_AUX_ENT(AT_PHDR, load_addr + exec->e_phoff);
:
: which is wrong since e_phoff is the file offset of program header and : load_addr is the memory base address from PT_LOAD entry.
:
: The ld.so uses AT_PHDR as the memory address of program header. In normal : case, since the e_phoff is usually 64 and in the first PT_LOAD region, it : is the correct program header address.
:
: But if the address of program header isn't equal to the first PT_LOAD : address + e_phoff (e.g. Put the program header in other non-consecutive : PT_LOAD region), ld.so will try to read program header from wrong address : then crash or use incorrect program header.
This is because exec->e_phoff
is the offset of PHDRs in the file and the address of PHDRs in the memory may differ from it. This patch fixes the bug by calculating the address of program headers from PT_LOADs directly.
--- fs/binfmt_elf.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
fs/binfmt_elf.c +18 -6
@@ -170,8 +170,8 @@ static int padzero(unsigned long elf_bss)static int create_elf_tables (struct linux_binprm *bprm,const struct elfhdr *exec, -unsigned long load_addr,unsigned long interp_load_addr, -unsigned long e_entry) +unsigned long interp_load_addr, +unsigned long e_entry,unsigned long phdr_addr) {struct mm_struct *mm = current->mm;unsigned long p = bprm->p;
@@ -257,7 +257,7 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,NEW_AUX_ENT (AT_HWCAP ,ELF_HWCAP );NEW_AUX_ENT (AT_PAGESZ ,ELF_EXEC_PAGESIZE );NEW_AUX_ENT (AT_CLKTCK ,CLOCKS_PER_SEC ); -NEW_AUX_ENT (AT_PHDR , load_addr + exec->e_phoff); +NEW_AUX_ENT (AT_PHDR , phdr_addr);NEW_AUX_ENT (AT_PHENT ,sizeof (struct elf_phdr ));NEW_AUX_ENT (AT_PHNUM , exec->e_phnum);NEW_AUX_ENT (AT_BASE , interp_load_addr);
@@ -823,7 +823,7 @@ static int parse_elf_properties(struct file *f, const struct elf_phdr *phdr,static int load_elf_binary (struct linux_binprm *bprm) {struct file *interpreter =NULL ;/* to shut gcc up */ -unsigned long load_addr =0 , load_bias =0 ; +unsigned long load_addr, load_bias =0 , phdr_addr =0 ;int load_addr_set =0 ;unsigned long error;struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata =NULL ;
@@ -1180,6 +1180,17 @@ static int load_elf_binary(struct linux_binprm *bprm) reloc_func_desc = load_bias; } } + +/* +* Figure out which segment in the file contains the Program +* Header table, and map to the associated memory address. +*/ +if (elf_ppnt->p_offset <= elf_ex->e_phoff && + elf_ex->e_phoff < elf_ppnt->p_offset + elf_ppnt->p_filesz) { + phdr_addr = elf_ex->e_phoff - elf_ppnt->p_offset + + elf_ppnt->p_vaddr; + } + k = elf_ppnt->p_vaddr;if ((elf_ppnt->p_flags &PF_X ) && k < start_code) start_code = k;
@@ -1215,6 +1226,7 @@ static int load_elf_binary(struct linux_binprm *bprm) } e_entry = elf_ex->e_entry + load_bias; + phdr_addr += load_bias; elf_bss += load_bias; elf_brk += load_bias; start_code += load_bias;
@@ -1278,8 +1290,8 @@ static int load_elf_binary(struct linux_binprm *bprm) goto out;#endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ - retval =create_elf_tables (bprm, elf_ex, - load_addr, interp_load_addr, e_entry); + retval =create_elf_tables (bprm, elf_ex, interp_load_addr, + e_entry, phdr_addr);if (retval <0 ) goto out;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 856/1126 hwrng: cavium - fix NULL but dereferenced coccicheck error
In reply to Greg Kroah-HartmanFrom: Wan Jiabing <[email protected]>
[ Upstream commit e6205ad58a7ac194abfb33897585b38687d797fa ]
Fix following coccicheck warning:
./drivers/char/hw_random/cavium-rng-vf.c:182:17-20: ERROR:
pdev is NULL but dereferenced.
--- drivers/char/hw_random/cavium-rng-vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hw_random/cavium-rng-vf.c +1 -1
@@ -179,7 +179,7 @@ static int cavium_map_pf_regs(struct cavium_rng *rng) pdev =pci_get_device (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CAVIUM_RNG_PF ,NULL );if (!pdev) { -dev_err (&pdev->dev,"Cannot find RNG PF device\n" ); +pr_err ("Cannot find RNG PF device\n" );return -EIO ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 857/1126 bfq: fix use-after-free in bfq_dispatch_request
In reply to Greg Kroah-HartmanFrom: Zhang Wensheng <[email protected]>
[ Upstream commit ab552fcb17cc9e4afe0e4ac4df95fc7b30e8490a ]
KASAN reports a use-after-free report when doing normal scsi-mq test
[69832.239032] ================================================================== [69832.241810] BUG: KASAN: use-after-free in bfq_dispatch_request+0x1045/0x44b0 [69832.243267] Read of size 8 at addr ffff88802622ba88 by task kworker/3:1H/155 [69832.244656] [69832.245007] CPU: 3 PID: 155 Comm: kworker/3:1H Not tainted 5.10.0-10295-g576c6382529e #8 [69832.246626] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [69832.249069] Workqueue: kblockd blk_mq_run_work_fn [69832.250022] Call Trace: [69832.250541] dump_stack+0x9b/0xce [69832.251232] ? bfq_dispatch_request+0x1045/0x44b0 [69832.252243] print_address_description.constprop.6+0x3e/0x60 [69832.253381] ? __cpuidle_text_end+0x5/0x5 [69832.254211] ? vprintk_func+0x6b/0x120 [69832.254994] ? bfq_dispatch_request+0x1045/0x44b0 [69832.255952] ? bfq_dispatch_request+0x1045/0x44b0 [69832.256914] kasan_report.cold.9+0x22/0x3a [69832.257753] ? bfq_dispatch_request+0x1045/0x44b0 [69832.258755] check_memory_region+0x1c1/0x1e0 [69832.260248] bfq_dispatch_request+0x1045/0x44b0 [69832.261181] ? bfq_bfqq_expire+0x2440/0x2440 [69832.262032] ? blk_mq_delay_run_hw_queues+0xf9/0x170 [69832.263022] __blk_mq_do_dispatch_sched+0x52f/0x830 [69832.264011] ? blk_mq_sched_request_inserted+0x100/0x100 [69832.265101] __blk_mq_sched_dispatch_requests+0x398/0x4f0 [69832.266206] ? blk_mq_do_dispatch_ctx+0x570/0x570 [69832.267147] ? __switch_to+0x5f4/0xee0 [69832.267898] blk_mq_sched_dispatch_requests+0xdf/0x140 [69832.268946] __blk_mq_run_hw_queue+0xc0/0x270 [69832.269840] blk_mq_run_work_fn+0x51/0x60 [69832.278170] process_one_work+0x6d4/0xfe0 [69832.278984] worker_thread+0x91/0xc80 [69832.279726] ? __kthread_parkme+0xb0/0x110 [69832.280554] ? process_one_work+0xfe0/0xfe0 [69832.281414] kthread+0x32d/0x3f0 [69832.282082] ? kthread_park+0x170/0x170 [69832.282849] ret_from_fork+0x1f/0x30 [69832.283573] [69832.283886] Allocated by task 7725: [69832.284599] kasan_save_stack+0x19/0x40 [69832.285385] __kasan_kmalloc.constprop.2+0xc1/0xd0 [69832.286350] kmem_cache_alloc_node+0x13f/0x460 [69832.287237] bfq_get_queue+0x3d4/0x1140 [69832.287993] bfq_get_bfqq_handle_split+0x103/0x510 [69832.289015] bfq_init_rq+0x337/0x2d50 [69832.289749] bfq_insert_requests+0x304/0x4e10 [69832.290634] blk_mq_sched_insert_requests+0x13e/0x390 [69832.291629] blk_mq_flush_plug_list+0x4b4/0x760 [69832.292538] blk_flush_plug_list+0x2c5/0x480 [69832.293392] io_schedule_prepare+0xb2/0xd0 [69832.294209] io_schedule_timeout+0x13/0x80 [69832.295014] wait_for_common_io.constprop.1+0x13c/0x270 [69832.296137] submit_bio_wait+0x103/0x1a0 [69832.296932] blkdev_issue_discard+0xe6/0x160 [69832.297794] blk_ioctl_discard+0x219/0x290 [69832.298614] blkdev_common_ioctl+0x50a/0x1750 [69832.304715] blkdev_ioctl+0x470/0x600 [69832.305474] block_ioctl+0xde/0x120 [69832.306232] vfs_ioctl+0x6c/0xc0 [69832.306877] __se_sys_ioctl+0x90/0xa0 [69832.307629] do_syscall_64+0x2d/0x40 [69832.308362] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [69832.309382] [69832.309701] Freed by task 155: [69832.310328] kasan_save_stack+0x19/0x40 [69832.311121] kasan_set_track+0x1c/0x30 [69832.311868] kasan_set_free_info+0x1b/0x30 [69832.312699] __kasan_slab_free+0x111/0x160 [69832.313524] kmem_cache_free+0x94/0x460 [69832.314367] bfq_put_queue+0x582/0x940 [69832.315112] __bfq_bfqd_reset_in_service+0x166/0x1d0 [69832.317275] bfq_bfqq_expire+0xb27/0x2440 [69832.318084] bfq_dispatch_request+0x697/0x44b0 [69832.318991] __blk_mq_do_dispatch_sched+0x52f/0x830 [69832.319984] __blk_mq_sched_dispatch_requests+0x398/0x4f0 [69832.321087] blk_mq_sched_dispatch_requests+0xdf/0x140 [69832.322225] __blk_mq_run_hw_queue+0xc0/0x270 [69832.323114] blk_mq_run_work_fn+0x51/0x60 [69832.323942] process_one_work+0x6d4/0xfe0 [69832.324772] worker_thread+0x91/0xc80 [69832.325518] kthread+0x32d/0x3f0 [69832.326205] ret_from_fork+0x1f/0x30 [69832.326932] [69832.338297] The buggy address belongs to the object at ffff88802622b968 [69832.338297] which belongs to the cache bfq_queue of size 512 [69832.340766] The buggy address is located 288 bytes inside of [69832.340766] 512-byte region [ffff88802622b968, ffff88802622bb68) [69832.343091] The buggy address belongs to the page: [69832.344097] page:ffffea0000988a00 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88802622a528 pfn:0x26228 [69832.346214] head:ffffea0000988a00 order:2 compound_mapcount:0 compound_pincount:0 [69832.347719] flags: 0x1fffff80010200(slab|head) [69832.348625] raw: 001fffff80010200 ffffea0000dbac08 ffff888017a57650 ffff8880179fe840 [69832.354972] raw: ffff88802622a528 0000000000120008 00000001ffffffff 0000000000000000 [69832.356547] page dumped because: kasan: bad access detected [69832.357652] [69832.357970] Memory state around the buggy address: [69832.358926] ffff88802622b980: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [69832.360358] ffff88802622ba00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [69832.361810] >ffff88802622ba80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [69832.363273] ^ [69832.363975] ffff88802622bb00: fb fb fb fb fb fb fb fb fb fb fb fb fb fc fc fc [69832.375960] ffff88802622bb80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [69832.377405] ==================================================================
In bfq_dispatch_requestfunction, it may have function call:
bfq_dispatch_request
__bfq_dispatch_request
bfq_select_queue
bfq_bfqq_expire
__bfq_bfqd_reset_in_service
bfq_put_queue
kmem_cache_free
In this function call, in_serv_queue has beed expired and meet the conditions to free. In the function bfq_dispatch_request, the address of in_serv_queue pointing to has been released. For getting the value of idle_timer_disabled, it will get flags value from the address which in_serv_queue pointing to, then the problem of use-after-free happens;
Fix the problem by check in_serv_queue == bfqd->in_service_queue, to get the value of idle_timer_disabled if in_serve_queue is equel to bfqd->in_service_queue. If the space of in_serv_queue pointing has been released, this judge will aviod use-after-free problem. And if in_serv_queue may be expired or finished, the idle_timer_disabled will be false which would not give effects to bfq_update_dispatch_stats.
--- block/bfq-iosched.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
block/bfq-iosched.c +8 -7
@@ -5181,7 +5181,7 @@ static struct request *bfq_dispatch_request(struct blk_mq_hw_ctx *hctx)struct bfq_data *bfqd = hctx->queue->elevator->elevator_data;struct request *rq;struct bfq_queue *in_serv_queue; -bool waiting_rq, idle_timer_disabled; +bool waiting_rq, idle_timer_disabled = false;spin_lock_irq (&bfqd->lock);
@@ -5189,14 +5189,15 @@ static struct request *bfq_dispatch_request(struct blk_mq_hw_ctx *hctx) waiting_rq = in_serv_queue &&bfq_bfqq_wait_request (in_serv_queue); rq =__bfq_dispatch_request (hctx); - - idle_timer_disabled = - waiting_rq && !bfq_bfqq_wait_request (in_serv_queue); +if (in_serv_queue == bfqd->in_service_queue) { + idle_timer_disabled = + waiting_rq && !bfq_bfqq_wait_request (in_serv_queue); + }spin_unlock_irq (&bfqd->lock); - -bfq_update_dispatch_stats (hctx->queue, rq, in_serv_queue, - idle_timer_disabled); +bfq_update_dispatch_stats (hctx->queue, rq, + idle_timer_disabled ? in_serv_queue :NULL , + idle_timer_disabled);return rq; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 858/1126 ACPICA: Avoid walking the ACPI Namespace if it is not there
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 0c9992315e738e7d6e927ef36839a466b080dba6 ]
ACPICA commit b1c3656ef4950098e530be68d4b589584f06cddc
Prevent acpi_ns_walk_namespace() from crashing when called with start_node equal to ACPI_ROOT_OBJECT if the Namespace has not been instantiated yet and acpi_gbl_root_node is NULL.
For instance, this can happen if the kernel is run with "acpi=off" in the command line.
--- drivers/acpi/acpica/nswalk.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/acpi/acpica/nswalk.c +3 -0
@@ -169,6 +169,9 @@ acpi_ns_walk_namespace(acpi_object_type type,if (start_node ==ACPI_ROOT_OBJECT ) { start_node = acpi_gbl_root_node; +if (!start_node) { +return_ACPI_STATUS (AE_NO_NAMESPACE ); + } }/* Null child means "get first node" */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 859/1126 ACPI / x86: Add skip i2c clients quirk for Nextbook Ares 8
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit f38312c9b569322edf4baae467568206fe46d57b ]
The Nextbook Ares 8 is a x86 ACPI tablet which ships with Android x86 as factory OS. Its DSDT contains a bunch of I2C devices which are not actually there, causing various resource conflicts (the Android x86 kernel fork ignores I2C devices described in the DSDT).
Add a ACPI_QUIRK_SKIP_I2C_CLIENTS for the Nextbook Ares 8 to the acpi_quirk_skip_dmi_ids table to woraround this.
--- drivers/acpi/x86/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/acpi/x86/utils.c +9 -0
@@ -284,6 +284,15 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS | ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY), }, + { +/* Nextbook Ares 8 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Insyde" ), + DMI_MATCH(DMI_PRODUCT_NAME, "M890BAP"), + }, + .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS | + ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY), + }, {/* Whitelabel (sold as various brands) TM800A550L */ .matches = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 860/1126 ACPI / x86: Add skip i2c clients quirk for Lenovo Yoga Tablet 1050F/L
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 4fecb1e93e4914fc0bc1fb467ca79741f9f94abb ]
The Yoga Tablet 1050F/L is a x86 ACPI tablet which ships with Android x86 as factory OS. Its DSDT contains a bunch of I2C devices which are not actually there, causing various resource conflicts (the Android x86 kernel fork ignores I2C devices described in the DSDT).
Add a ACPI_QUIRK_SKIP_I2C_CLIENTS for the Nextbook Ares 8 to the acpi_quirk_skip_dmi_ids table to woraround this.
--- drivers/acpi/x86/utils.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/acpi/x86/utils.c +12 -0
@@ -284,6 +284,18 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS | ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY), }, + { +/* Lenovo Yoga Tablet 1050F/L */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Intel Corp." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"VALLEYVIEW C0 PLATFORM" ), +DMI_MATCH (DMI_BOARD_NAME ,"BYT-T FFD8" ), +/* Partial match on beginning of BIOS version */ + DMI_MATCH(DMI_BIOS_VERSION, "BLADE_21"), + }, + .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS | + ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY), + }, {/* Nextbook Ares 8 */ .matches = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 861/1126 lib/raid6/test/Makefile: Use $(pound) instead of \# for Make 4.3
In reply to Greg Kroah-HartmanFrom: Paul Menzel <[email protected]>
[ Upstream commit 633174a7046ec3b4572bec24ef98e6ee89bce14b ]
Buidling raid6test on Ubuntu 21.10 (ppc64le) with GNU Make 4.3 shows the errors below:
$ cd lib/raid6/test/
$ make
<stdin>:1:1: error: stray ‘\’ in program
<stdin>:1:2: error: stray ‘#’ in program
<stdin>:1:11: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ \
before ‘<’ token[...]
The errors come from the HAS_ALTIVEC test, which fails, and the POWER optimized versions are not built. That’s also reason nobody noticed on the other architectures.
GNU Make 4.3 does not remove the backslash anymore. From the 4.3 release announcment:
Quoted 11 lines
* WARNING: Backward-incompatibility!
Number signs (#) appearing inside a macro reference or function invocation no longer introduce comments and should not be escaped with backslashes:
thus a call such as:foo := $(shell echo '#') is legal. Previously the number sign needed to be escaped, for example: foo := $(shell echo '\#') Now this latter will resolve to "\#". If you want to write makefiles portable to both versions, assign the number sign to a variable: H := \# foo := $(shell echo '$H')
Quoted 2 lines
This was claimed to be fixed in 3.81, but wasn't, for some reason. To detect this change search for 'nocomment' in the .FEATURES variable.
So, do the same as commit 9564a8cf422d ("Kbuild: fix # escaping in .cmd files for future Make") and commit 929bef467771 ("bpf: Use $(pound) instead of \# in Makefiles") and define and use a $(pound) variable.
Reference for the change in make:
https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b57
--- lib/raid6/test/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/raid6/test/Makefile +3 -1
@@ -4,6 +4,8 @@ # from userspace. # +pound := \# + CC = gcc OPTFLAGS = -O2 # Adjust as desired CFLAGS = -I.. -I ../../../include -g $(OPTFLAGS)
@@ -42,7 +44,7 @@ else ifeq ($(HAS_NEON),yes) OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1 else - HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\ + HAS_ALTIVEC := $(shell printf '$(pound)include <altivec.h>\nvector int a;\n' |\ gcc -c -x c - >/dev/null && rm ./-.o && echo yes) ifeq ($(HAS_ALTIVEC),yes) CFLAGS += -I../../../arch/powerpc/include
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 862/1126 Revert "Revert "block, bfq: honor already-setup queue merges""
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit 15729ff8143f8135b03988a100a19e66d7cb7ecd ]
A crash [1] happened to be triggered in conjunction with commit 2d52c58b9c9b ("block, bfq: honor already-setup queue merges"). The latter was then reverted by commit ebc69e897e17 ("Revert "block, bfq:
honor already-setup queue merges""). Yet, the reverted commit was not the one introducing the bug. In fact, it actually triggered a UAF introduced by a different commit, and now fixed by commit d29bd41428cf ("block, bfq: reset last_bfqq_created on group change").
So, there is no point in keeping commit 2d52c58b9c9b ("block, bfq:
honor already-setup queue merges") out. This commit restores it.
[1] https://bugzilla.kernel.org/show_bug.cgi?id=214503
--- block/bfq-iosched.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
block/bfq-iosched.c +13 -3
@@ -2782,6 +2782,15 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)* are likely to increase the throughput. */ bfqq->new_bfqq = new_bfqq; +/* +* The above assignment schedules the following redirections: +* each time some I/O for bfqq arrives, the process that +* generated that I/O is disassociated from bfqq and +* associated with new_bfqq. Here we increases new_bfqq->ref +* in advance, adding the number of processes that are +* expected to be associated with new_bfqq as they happen to +* issue I/O. +*/ new_bfqq->ref += process_refs;return new_bfqq; }
@@ -2844,6 +2853,10 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, {struct bfq_queue *in_service_bfqq, *new_bfqq; +/* if a merge has already been setup, then proceed with that first */ +if (bfqq->new_bfqq) +return bfqq->new_bfqq; +/* * Check delayed stable merge for rotational or non-queueing * devs. For this branch to be executed, bfqq must not be
@@ -2945,9 +2958,6 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,if (bfq_too_late_for_merging (bfqq))return NULL ; -if (bfqq->new_bfqq) -return bfqq->new_bfqq; -if (!io_struct ||unlikely (bfqq == &bfqd->oom_bfqq))return NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 863/1126 ACPI/APEI: Limit printable size of BERT table data
In reply to Greg Kroah-HartmanFrom: Darren Hart <[email protected]>
[ Upstream commit 3f8dec116210ca649163574ed5f8df1e3b837d07 ]
Platforms with large BERT table data can trigger soft lockup errors while attempting to print the entire BERT table data to the console at boot:
watchdog: BUG: soft lockup - CPU#160 stuck for 23s! [swapper/0:1]
Observed on Ampere Altra systems with a single BERT record of ~250KB.
The original bert driver appears to have assumed relatively small table data. Since it is impractical to reassemble large table data from interwoven console messages, and the table data is available in
/sys/firmware/acpi/tables/data/BERT
limit the size for tables printed to the console to 1024 (for no reason other than it seemed like a good place to kick off the discussion, would appreciate feedback from existing users in terms of what size would maintain their current usage model).
Alternatively, we could make printing a CONFIG option, use the bert_disable boot arg (or something similar), or use a debug log level. However, all those solutions require extra steps or change the existing behavior for small table data. Limiting the size preserves existing behavior on existing platforms with small table data, and eliminates the soft lockups for platforms with large table data, while still making it available.
--- drivers/acpi/apei/bert.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/acpi/apei/bert.c +6 -2
@@ -29,6 +29,7 @@#undef pr_fmt#define pr_fmt (fmt) "BERT: " fmt +#define ACPI_BERT_PRINT_MAX_LEN 1024static int bert_disable;
@@ -58,8 +59,11 @@ static void __init bert_print_all(struct acpi_bert_region *region, }pr_info_once ("Error records from previous boot:\n" ); - - cper_estatus_print(KERN_INFO HW_ERR, estatus); +if (region_len <ACPI_BERT_PRINT_MAX_LEN ) + cper_estatus_print(KERN_INFO HW_ERR, estatus); +else +pr_info_once ("Max print length exceeded, table data is available at:\n" +"/sys/firmware/acpi/tables/data/BERT" );/* * Because the boot error source is "one-time polled" type,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 864/1126 PM: core: keep irq flags in device_pm_check_callbacks()
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 524bb1da785a7ae43dd413cd392b5071c6c367f8 ]
The function device_pm_check_callbacks() can be called under the spin lock (in the reported case it happens from genpd_add_device() -> dev_pm_domain_set(), when the genpd uses spinlocks rather than mutexes.
However this function uncoditionally uses spin_lock_irq() / spin_unlock_irq(), thus not preserving the CPU flags. Use the irqsave/irqrestore instead.
The backtrace for the reference:
[ 2.752010] ------------[ cut here ]------------ [ 2.756769] raw_local_irq_restore() called with IRQs enabled [ 2.762596] WARNING: CPU: 4 PID: 1 at kernel/locking/irqflag-debug.c:10 warn_bogus_irq_restore+0x34/0x50 [ 2.772338] Modules linked in: [ 2.775487] CPU: 4 PID: 1 Comm: swapper/0 Tainted: G S 5.17.0-rc6-00384-ge330d0d82eff-dirty #684 [ 2.781384] Freeing initrd memory: 46024K [ 2.785839] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 2.785841] pc : warn_bogus_irq_restore+0x34/0x50 [ 2.785844] lr : warn_bogus_irq_restore+0x34/0x50 [ 2.785846] sp : ffff80000805b7d0 [ 2.785847] x29: ffff80000805b7d0 x28: 0000000000000000 x27: 0000000000000002 [ 2.785850] x26: ffffd40e80930b18 x25: ffff7ee2329192b8 x24: ffff7edfc9f60800 [ 2.785853] x23: ffffd40e80930b18 x22: ffffd40e80930d30 x21: ffff7edfc0dffa00 [ 2.785856] x20: ffff7edfc09e3768 x19: 0000000000000000 x18: ffffffffffffffff [ 2.845775] x17: 6572206f74206465 x16: 6c696166203a3030 x15: ffff80008805b4f7 [ 2.853108] x14: 0000000000000000 x13: ffffd40e809550b0 x12: 00000000000003d8 [ 2.860441] x11: 0000000000000148 x10: ffffd40e809550b0 x9 : ffffd40e809550b0 [ 2.867774] x8 : 00000000ffffefff x7 : ffffd40e809ad0b0 x6 : ffffd40e809ad0b0 [ 2.875107] x5 : 000000000000bff4 x4 : 0000000000000000 x3 : 0000000000000000 [ 2.882440] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff7edfc03a8000 [ 2.889774] Call trace: [ 2.892290] warn_bogus_irq_restore+0x34/0x50 [ 2.896770] _raw_spin_unlock_irqrestore+0x94/0xa0 [ 2.901690] genpd_unlock_spin+0x20/0x30 [ 2.905724] genpd_add_device+0x100/0x2d0 [ 2.909850] __genpd_dev_pm_attach+0xa8/0x23c [ 2.914329] genpd_dev_pm_attach_by_id+0xc4/0x190 [ 2.919167] genpd_dev_pm_attach_by_name+0x3c/0xd0 [ 2.924086] dev_pm_domain_attach_by_name+0x24/0x30 [ 2.929102] psci_dt_attach_cpu+0x24/0x90 [ 2.933230] psci_cpuidle_probe+0x2d4/0x46c [ 2.937534] platform_probe+0x68/0xe0 [ 2.941304] really_probe.part.0+0x9c/0x2fc [ 2.945605] __driver_probe_device+0x98/0x144 [ 2.950085] driver_probe_device+0x44/0x15c [ 2.954385] __device_attach_driver+0xb8/0x120 [ 2.958950] bus_for_each_drv+0x78/0xd0 [ 2.962896] __device_attach+0xd8/0x180 [ 2.966843] device_initial_probe+0x14/0x20 [ 2.971144] bus_probe_device+0x9c/0xa4 [ 2.975092] device_add+0x380/0x88c [ 2.978679] platform_device_add+0x114/0x234 [ 2.983067] platform_device_register_full+0x100/0x190 [ 2.988344] psci_idle_init+0x6c/0xb0 [ 2.992113] do_one_initcall+0x74/0x3a0 [ 2.996060] kernel_init_freeable+0x2fc/0x384 [ 3.000543] kernel_init+0x28/0x130 [ 3.004132] ret_from_fork+0x10/0x20 [ 3.007817] irq event stamp: 319826 [ 3.011404] hardirqs last enabled at (319825): [<ffffd40e7eda0268>] __up_console_sem+0x78/0x84 [ 3.020332] hardirqs last disabled at (319826): [<ffffd40e7fd6d9d8>] el1_dbg+0x24/0x8c [ 3.028458] softirqs last enabled at (318312): [<ffffd40e7ec90410>] _stext+0x410/0x588 [ 3.036678] softirqs last disabled at (318299): [<ffffd40e7ed1bf68>] __irq_exit_rcu+0x158/0x174 [ 3.045607] ---[ end trace 0000000000000000 ]---
--- drivers/base/power/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/base/power/main.c +4 -2
@@ -2018,7 +2018,9 @@ static bool pm_ops_is_empty(const struct dev_pm_ops *ops)void device_pm_check_callbacks (struct device *dev) { -spin_lock_irq (&dev->power.lock); +unsigned long flags; + +spin_lock_irqsave (&dev->power.lock, flags); dev->power.no_pm_callbacks = (!dev->bus || (pm_ops_is_empty (dev->bus->pm) && !dev->bus->suspend && !dev->bus->resume)) &&
@@ -2027,7 +2029,7 @@ void device_pm_check_callbacks(struct device *dev) (!dev->pm_domain ||pm_ops_is_empty (&dev->pm_domain->ops)) && (!dev->driver || (pm_ops_is_empty (dev->driver->pm) && !dev->driver->suspend && !dev->driver->resume)); -spin_unlock_irq (&dev->power.lock); +spin_unlock_irqrestore (&dev->power.lock, flags); }bool dev_pm_skip_suspend (struct device *dev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 865/1126 parisc: Fix non-access data TLB cache flush faults
In reply to Greg Kroah-HartmanFrom: John David Anglin <[email protected]>
[ Upstream commit f839e5f1cef36ce268950c387129b1bfefdaebc9 ]
When a page is not present, we get non-access data TLB faults from the fdc and fic instructions in flush_user_dcache_range_asm and flush_user_icache_range_asm. When these occur, the cache line is not invalidated and potentially we get memory corruption. The problem was hidden by the nullification of the flush instructions.
These faults also affect performance. With pa8800/pa8900 processors, there will be 32 faults per 4 KB page since the cache line is 128 bytes. There will be more faults with earlier processors.
The problem is fixed by using flush_cache_pages(). It does the flush using a tmp alias mapping.
The flush_cache_pages() call in flush_cache_range() flushed too large a range.
V2: Remove unnecessary preempt_disable() and preempt_enable() calls.
--- arch/parisc/kernel/cache.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-)
arch/parisc/kernel/cache.c +1 -27
@@ -558,15 +558,6 @@ static void flush_cache_pages(struct vm_area_struct *vma, struct mm_struct *mm, } } -static void flush_user_cache_tlb (struct vm_area_struct *vma, -unsigned long start,unsigned long end) -{ -flush_user_dcache_range_asm (start, end); -if (vma->vm_flags &VM_EXEC ) -flush_user_icache_range_asm (start, end); -flush_tlb_range (vma, start, end); -} -void flush_cache_mm (struct mm_struct *mm) {struct vm_area_struct *vma;
@@ -581,17 +572,8 @@ void flush_cache_mm(struct mm_struct *mm)return ; } -preempt_disable (); -if (mm->context ==mfsp (3 )) { -for (vma = mm->mmap; vma; vma = vma->vm_next) -flush_user_cache_tlb (vma, vma->vm_start, vma->vm_end); -preempt_enable (); -return ; - } -for (vma = mm->mmap; vma; vma = vma->vm_next)flush_cache_pages (vma, mm, vma->vm_start, vma->vm_end); -preempt_enable (); } void flush_cache_range(struct vm_area_struct *vma,
@@ -605,15 +587,7 @@ void flush_cache_range(struct vm_area_struct *vma,return ; } -preempt_disable (); -if (vma->vm_mm->context ==mfsp (3 )) { -flush_user_cache_tlb (vma, start, end); -preempt_enable (); -return ; - } - -flush_cache_pages (vma, vma->vm_mm, vma->vm_start, vma->vm_end); -preempt_enable (); +flush_cache_pages (vma, vma->vm_mm, start, end); }void
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 866/1126 parisc: Fix handling off probe non-access faults
In reply to Greg Kroah-HartmanFrom: John David Anglin <[email protected]>
[ Upstream commit e00b0a2ab8ec019c344e53bfc76e31c18bb587b7 ]
Currently, the parisc kernel does not fully support non-access TLB fault handling for probe instructions. In the fast path, we set the target register to zero if it is not a shadowed register. The slow path is not implemented, so we call do_page_fault. The architecture indicates that non-access faults should not cause a page fault from disk.
This change adds to code to provide non-access fault support for probe instructions. It also modifies the handling of faults on userspace so that if the address lies in a valid VMA and the access type matches that for the VMA, the probe target register is set to one. Otherwise, the target register is set to zero.
This was done to make probe instructions more useful for userspace. Probe instructions are not very useful if they set the target register to zero whenever a page is not present in memory. Nominally, the purpose of the probe instruction is determine whether read or write access to a given address is allowed.
This fixes a problem in function pointer comparison noticed in the glibc testsuite (stdio-common/tst-vfprintf-user-type). The same problem is likely in glibc (_dl_lookup_address).
V2 adds flush and lpa instruction support to handle_nadtlb_fault.
--- arch/parisc/include/asm/traps.h | 1 + arch/parisc/kernel/traps.c | 2 + arch/parisc/mm/fault.c | 89 +++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+)
arch/parisc/include/asm/traps.h +1 -0
@@ -18,6 +18,7 @@ unsigned long parisc_acctyp(unsigned long code, unsigned int inst);const char *trap_name (unsigned long code);void do_page_fault (struct pt_regs *regs,unsigned long code,unsigned long address); +int handle_nadtlb_fault (struct pt_regs *regs);#endif #endif
arch/parisc/kernel/traps.c +2 -0
@@ -662,6 +662,8 @@ void notrace handle_interruption(int code, struct pt_regs *regs)by hand. Technically we need to emulate: fdc,fdce,pdc,"fic,4f",prober,probeir,probew, probeiw */ +if (code ==17 &&handle_nadtlb_fault (regs)) +return ; fault_address = regs->ior; fault_space = regs->isr;break ;
arch/parisc/mm/fault.c +89 -0
92 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 867/1126 nvme-tcp: lockdep: annotate in-kernel sockets
In reply to Greg Kroah-HartmanFrom: Chris Leech <[email protected]>
[ Upstream commit 841aee4d75f18fdfb53935080b03de0c65e9b92c ]
Put NVMe/TCP sockets in their own class to avoid some lockdep warnings. Sockets created by nvme-tcp are not exposed to user-space, and will not trigger certain code paths that the general socket API exposes.
Lockdep complains about a circular dependency between the socket and filesystem locks, because setsockopt can trigger a page fault with a socket lock held, but nvme-tcp sends requests on the socket while file system locks are held.
======================================================
WARNING: possible circular locking dependency detected 5.15.0-rc3 #1 Not tainted
------------------------------------------------------
fio/1496 is trying to acquire lock:
(sk_lock-AF_INET){+.+.}-{0:0}, at: tcp_sendpage+0x23/0x80
but task is already holding lock:
(&xfs_dir_ilock_class/5){+.+.}-{3:3}, at: xfs_ilock+0xcf/0x290 [xfs]
which lock already depends on the new lock.
other info that might help us debug this:
chain exists of:
sk_lock-AF_INET --> sb_internal --> &xfs_dir_ilock_class/5
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&xfs_dir_ilock_class/5);
lock(sb_internal);
lock(&xfs_dir_ilock_class/5); lock(sk_lock-AF_INET);
*** DEADLOCK ***
6 locks held by fio/1496:
#0: (sb_writers#13){.+.+}-{0:0}, at: path_openat+0x9fc/0xa20
#1: (&inode->i_sb->s_type->i_mutex_dir_key){++++}-{3:3}, at: path_openat+0x296/0xa20 #2: (sb_internal){.+.+}-{0:0}, at: xfs_trans_alloc_icreate+0x41/0xd0 [xfs] #3: (&xfs_dir_ilock_class/5){+.+.}-{3:3}, at: xfs_ilock+0xcf/0x290 [xfs] #4: (hctx->srcu){....}-{0:0}, at: hctx_lock+0x51/0xd0
#5: (&queue->send_mutex){+.+.}-{3:3}, at: nvme_tcp_queue_rq+0x33e/0x380 [nvme_tcp]
This annotation lets lockdep analyze nvme-tcp controlled sockets independently of what the user-space sockets API does.
--- drivers/nvme/host/tcp.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/nvme/host/tcp.c +40 -0
@@ -30,6 +30,44 @@ static int so_priority;module_param (so_priority, int,0644 );MODULE_PARM_DESC (so_priority,"nvme tcp socket optimize priority" ); +#ifdef CONFIG_DEBUG_LOCK_ALLOC +/* lockdep can detect a circular dependency of the form +* sk_lock -> mmap_lock (page fault) -> fs locks -> sk_lock +* because dependencies are tracked for both nvme-tcp and user contexts. Using +* a separate class prevents lockdep from conflating nvme-tcp socket use with +* user-space socket API use. +*/ +static struct lock_class_key nvme_tcp_sk_key[2 ]; +static struct lock_class_key nvme_tcp_slock_key[2 ]; + +static void nvme_tcp_reclassify_socket (struct socket *sock) +{ +struct sock *sk = sock->sk; + +if (WARN_ON_ONCE (!sock_allow_reclassification (sk))) +return ; + +switch (sk->sk_family) { +case AF_INET : +sock_lock_init_class_and_name (sk,"slock-AF_INET-NVME" , + &nvme_tcp_slock_key[0 ], +"sk_lock-AF_INET-NVME" , + &nvme_tcp_sk_key[0 ]); +break ; +case AF_INET6 : +sock_lock_init_class_and_name (sk,"slock-AF_INET6-NVME" , + &nvme_tcp_slock_key[1 ], +"sk_lock-AF_INET6-NVME" , + &nvme_tcp_sk_key[1 ]); +break ; +default : +WARN_ON_ONCE (1 ); + } +} +#else +static void nvme_tcp_reclassify_socket (struct socket *sock) { } +#endif +enum nvme_tcp_send_state {NVME_TCP_SEND_CMD_PDU =0 ,NVME_TCP_SEND_H2C_PDU ,
@@ -1469,6 +1507,8 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, goto err_destroy_mutex; } +nvme_tcp_reclassify_socket (queue->sock); +/* Single syn retry */ tcp_sock_set_syncnt (queue->sock->sk,1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 868/1126 spi: tegra20: Use of_device_get_match_data()
In reply to Greg Kroah-HartmanFrom: Minghao Chi <[email protected]>
[ Upstream commit c9839acfcbe20ce43d363c2a9d0772472d9921c0 ]
Use of_device_get_match_data() to simplify the code.
--- drivers/spi/spi-tegra20-slink.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/spi/spi-tegra20-slink.c +1 -7
@@ -1006,14 +1006,8 @@ static int tegra_slink_probe(struct platform_device *pdev)struct resource *r;int ret, spi_irq;const struct tegra_slink_chip_data *cdata =NULL ; -const struct of_device_id *match; - match =of_match_device (tegra_slink_of_match, &pdev->dev); -if (!match) { -dev_err (&pdev->dev,"Error: No device match found\n" ); -return -ENODEV ; - } - cdata = match->data; + cdata =of_device_get_match_data (&pdev->dev); master =spi_alloc_master (&pdev->dev,sizeof (*tspi));if (!master) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 869/1126 spi: fsi: Implement a timeout for polling status
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
[ Upstream commit 89b35e3f28514087d3f1e28e8f5634fbfd07c554 ]
The data transfer routines must poll the status register to determine when more data can be shifted in or out. If the hardware gets into a bad state, these polling loops may never exit. Prevent this by returning an error if a timeout is exceeded.
--- drivers/spi/spi-fsi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/spi/spi-fsi.c +10 -0
@@ -25,6 +25,7 @@#define SPI_FSI_BASE 0x70000#define SPI_FSI_INIT_TIMEOUT_MS 1000 +#define SPI_FSI_STATUS_TIMEOUT_MS 100#define SPI_FSI_MAX_RX_SIZE 8#define SPI_FSI_MAX_TX_SIZE 40
@@ -299,6 +300,7 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx, struct spi_transfer *transfer) {int rc =0 ; +unsigned long end;u64 status =0ULL ;if (transfer->tx_buf) {
@@ -315,10 +317,14 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,if (rc)return rc; + end = jiffies +msecs_to_jiffies (SPI_FSI_STATUS_TIMEOUT_MS );do { rc =fsi_spi_status (ctx, &status,"TX" );if (rc)return rc; + +if (time_after (jiffies, end)) +return -ETIMEDOUT ; }while (status &SPI_FSI_STATUS_TDR_FULL ); sent += nb;
@@ -329,10 +335,14 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,u8 *rx = transfer->rx_buf;while (transfer->len > recv) { + end = jiffies +msecs_to_jiffies (SPI_FSI_STATUS_TIMEOUT_MS );do { rc =fsi_spi_status (ctx, &status,"RX" );if (rc)return rc; + +if (time_after (jiffies, end)) +return -ETIMEDOUT ; }while (!(status &SPI_FSI_STATUS_RDR_FULL )); rc =fsi_spi_read_reg (ctx,SPI_FSI_DATA_RX , &in);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 870/1126 atomics: Fix atomic64_{read_acquire,set_release} fallbacks
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit dc1b4df09acdca7a89806b28f235cd6d8dcd3d24 ]
Arnd reports that on 32-bit architectures, the fallbacks for atomic64_read_acquire() and atomic64_set_release() are broken as they use smp_load_acquire() and smp_store_release() respectively, which do not work on types larger than the native word size.
Since those contain compiletime_assert_atomic_type(), any attempt to use those fallbacks will result in a build-time error. e.g. with the following added to arch/arm/kernel/setup.c:
| void test_atomic64(atomic64_t *v)
| {
| atomic64_set_release(v, 5);
| atomic64_read_acquire(v);
| }The compiler will complain as follows:
| In file included from <command-line>:
| In function 'arch_atomic64_set_release',
| inlined from 'test_atomic64' at ./include/linux/atomic/atomic-instrumented.h:669:2:
| ././include/linux/compiler_types.h:346:38: error: call to '__compiletime_assert_9' declared with attribute error: Need native word sized stores/loads for atomicity.
| 346 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| | ^
| ././include/linux/compiler_types.h:327:4: note: in definition of macro '__compiletime_assert'
| 327 | prefix ## suffix(); \
| | ^~~~~~
| ././include/linux/compiler_types.h:346:2: note: in expansion of macro '_compiletime_assert'
| 346 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| | ^~~~~~~~~~~~~~~~~~~
| ././include/linux/compiler_types.h:349:2: note: in expansion of macro 'compiletime_assert'
| 349 | compiletime_assert(__native_word(t), \
| | ^~~~~~~~~~~~~~~~~~
| ./include/asm-generic/barrier.h:133:2: note: in expansion of macro 'compiletime_assert_atomic_type'
| 133 | compiletime_assert_atomic_type(*p); \
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| ./include/asm-generic/barrier.h:164:55: note: in expansion of macro '__smp_store_release'
| 164 | #define smp_store_release(p, v) do { kcsan_release(); __smp_store_release(p, v); } while (0)
| | ^~~~~~~~~~~~~~~~~~~
| ./include/linux/atomic/atomic-arch-fallback.h:1270:2: note: in expansion of macro 'smp_store_release'
| 1270 | smp_store_release(&(v)->counter, i);
| | ^~~~~~~~~~~~~~~~~
| make[2]: *** [scripts/Makefile.build:288: arch/arm/kernel/setup.o] Error 1
| make[1]: *** [scripts/Makefile.build:550: arch/arm/kernel] Error 2
| make: *** [Makefile:1831: arch/arm] Error 2Fix this by only using smp_load_acquire() and smp_store_release() for native atomic types, and otherwise falling back to the regular barriers necessary for acquire/release semantics, as we do in the more generic acquire and release fallbacks.
Since the fallback templates are used to generate the atomic64_*() and atomic_*() operations, the __native_word() check is added to both. For the atomic_*() operations, which are always 32-bit, the __native_word() check is redundant but not harmful, as it is always true.
For the example above this works as expected on 32-bit, e.g. for arm multi_v7_defconfig:
| <test_atomic64>:
| push {r4, r5}
| dmb ish
| pldw [r0]
| mov r2, #5
| mov r3, #0
| ldrexd r4, [r0]
| strexd r4, r2, [r0]
| teq r4, #0
| bne 484 <test_atomic64+0x14>
| ldrexd r2, [r0]
| dmb ish
| pop {r4, r5}
| bx lr... and also on 64-bit, e.g. for arm64 defconfig:
| <test_atomic64>: | bti c | paciasp | mov x1, #0x5 | stlr x1, [x0] | ldar x0, [x0] | autiasp | ret
--- include/linux/atomic/atomic-arch-fallback.h | 38 ++++++++++++++++++--- scripts/atomic/fallbacks/read_acquire | 11 +++++- scripts/atomic/fallbacks/set_release | 7 +++- 3 files changed, 49 insertions(+), 7 deletions(-)
include/linux/atomic/atomic-arch-fallback.h +33 -5
@@ -151,7 +151,16 @@ static __always_inline intarch_atomic_read_acquire (const atomic_t *v) { -return smp_load_acquire (&(v)->counter); +int ret; + +if (__native_word (atomic_t)) { + ret =smp_load_acquire (&(v)->counter); + }else { + ret =arch_atomic_read (v); +__atomic_acquire_fence (); + } + +return ret; }#define arch_atomic_read_acquire arch_atomic_read_acquire#endif
@@ -160,7 +169,12 @@ arch_atomic_read_acquire(const atomic_t *v) static __always_inline voidarch_atomic_set_release (atomic_t *v,int i) { -smp_store_release (&(v)->counter, i); +if (__native_word (atomic_t)) { +smp_store_release (&(v)->counter, i); + }else { +__atomic_release_fence (); +arch_atomic_set (v, i); + } }#define arch_atomic_set_release arch_atomic_set_release#endif
@@ -1258,7 +1272,16 @@ arch_atomic_dec_if_positive(atomic_t *v) static __always_inline s64arch_atomic64_read_acquire (const atomic64_t *v) { -return smp_load_acquire (&(v)->counter); +s64 ret; + +if (__native_word (atomic64_t)) { + ret =smp_load_acquire (&(v)->counter); + }else { + ret =arch_atomic64_read (v); +__atomic_acquire_fence (); + } + +return ret; }#define arch_atomic64_read_acquire arch_atomic64_read_acquire#endif
@@ -1267,7 +1290,12 @@ arch_atomic64_read_acquire(const atomic64_t *v) static __always_inline voidarch_atomic64_set_release (atomic64_t *v,s64 i) { -smp_store_release (&(v)->counter, i); +if (__native_word (atomic64_t)) { +smp_store_release (&(v)->counter, i); + }else { +__atomic_release_fence (); +arch_atomic64_set (v, i); + } }#define arch_atomic64_set_release arch_atomic64_set_release#endif
@@ -2358,4 +2386,4 @@ arch_atomic64_dec_if_positive(atomic64_t *v)#endif #endif /* _LINUX_ATOMIC_FALLBACK_H */ -// cca554917d7ea73d5e3e7397dd70c484cad9b2c4 +// 8e2cc06bc0d2c0967d2f8424762bd48555ee40ae
scripts/atomic/fallbacks/read_acquire +10 -1
@@ -2,6 +2,15 @@ cat <<EOF static __always_inline ${ret} arch_${atomic}_read_acquire(const ${atomic}_t *v) { - return smp_load_acquire(&(v)->counter); + ${int} ret; + + if (__native_word(${atomic}_t)) { + ret = smp_load_acquire(&(v)->counter); + } else { + ret = arch_${atomic}_read(v); + __atomic_acquire_fence(); + } + + return ret; } EOF
scripts/atomic/fallbacks/set_release +6 -1
@@ -2,6 +2,11 @@ cat <<EOF static __always_inline void arch_${atomic}_set_release(${atomic}_t *v, ${int} i) { - smp_store_release(&(v)->counter, i); + if (__native_word(${atomic}_t)) { + smp_store_release(&(v)->counter, i); + } else { + __atomic_release_fence(); + arch_${atomic}_set(v, i); + } } EOF
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 871/1126 locking/lockdep: Iterate lock_classes directly when reading lockdep files
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit fb7275acd6fb988313dddd8d3d19efa70d9015ad ]
When dumping lock_classes information via /proc/lockdep, we can't take the lockdep lock as the lock hold time is indeterminate. Iterating over all_lock_classes without holding lock can be dangerous as there is a slight chance that it may branch off to other lists leading to infinite loop or even access invalid memory if changes are made to all_lock_classes list in parallel.
To avoid this problem, iteration of lock classes is now done directly on the lock_classes array itself. The lock_classes_in_use bitmap is checked to see if the lock class is being used. To avoid iterating the full array all the times, a new max_lock_class_idx value is added to track the maximum lock_class index that is currently being used.
We can theoretically take the lockdep lock for iterating all_lock_classes when other lockdep files (lockdep_stats and lock_stat) are accessed as the lock hold time will be shorter for them. For consistency, they are also modified to iterate the lock_classes array directly.
--- kernel/locking/lockdep.c | 14 +++++--- kernel/locking/lockdep_internals.h | 6 ++-- kernel/locking/lockdep_proc.c | 51 +++++++++++++++++++++++++----- 3 files changed, 56 insertions(+), 15 deletions(-)
kernel/locking/lockdep.c +9 -5
@@ -183,11 +183,9 @@ static DECLARE_BITMAP(list_entries_in_use, MAX_LOCKDEP_ENTRIES);static struct hlist_head lock_keys_hash[KEYHASH_SIZE ];unsigned long nr_lock_classes;unsigned long nr_zapped_classes; -#ifndef CONFIG_DEBUG_LOCKDEP -static -#endif +unsigned long max_lock_class_idx;struct lock_class lock_classes[MAX_LOCKDEP_KEYS ]; -static DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); +DECLARE_BITMAP (lock_classes_in_use,MAX_LOCKDEP_KEYS );static inline struct lock_class *hlock_class (struct held_lock *hlock) {
@@ -338,7 +336,7 @@ static inline void lock_release_holdtime(struct held_lock *hlock)* elements. These elements are linked together by the lock_entry member in * struct lock_class. */ -LIST_HEAD (all_lock_classes); +static LIST_HEAD (all_lock_classes);static LIST_HEAD (free_lock_classes);/**
@@ -1252,6 +1250,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)struct lockdep_subclass_key *key;struct hlist_head *hash_head;struct lock_class *class; +int idx;DEBUG_LOCKS_WARN_ON (!irqs_disabled ());
@@ -1317,6 +1316,9 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)* of classes. */ list_move_tail (&class->lock_entry, &all_lock_classes); + idx = class - lock_classes; +if (idx > max_lock_class_idx) + max_lock_class_idx = idx;if (verbose (class)) {graph_unlock ();
@@ -6000,6 +6002,8 @@ static void zap_class(struct pending_free *pf, struct lock_class *class)WRITE_ONCE (class->name,NULL ); nr_lock_classes--;__clear_bit (class - lock_classes, lock_classes_in_use); +if (class - lock_classes == max_lock_class_idx) + max_lock_class_idx--; }else {WARN_ONCE (true,"%s() failed for class %s\n" , __func__, class->name);
kernel/locking/lockdep_internals.h +4 -2
@@ -121,7 +121,6 @@ static const unsigned long LOCKF_USED_IN_IRQ_READ =#define MAX_LOCKDEP_CHAIN_HLOCKS (MAX_LOCKDEP_CHAINS*5) -extern struct list_head all_lock_classes;extern struct lock_chain lock_chains[];#define LOCK_USAGE_CHARS (2*XXX_LOCK_USAGE_STATES + 1)
@@ -151,6 +150,10 @@ extern unsigned int nr_large_chain_blocks;extern unsigned int max_lockdep_depth;extern unsigned int max_bfs_queue_depth; +extern unsigned long max_lock_class_idx; + +extern struct lock_class lock_classes[MAX_LOCKDEP_KEYS ]; +extern unsigned long lock_classes_in_use[];#ifdef CONFIG_PROVE_LOCKING extern unsigned long lockdep_count_forward_deps (struct lock_class *);
@@ -205,7 +208,6 @@ struct lockdep_stats { }; DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats); -extern struct lock_class lock_classes[MAX_LOCKDEP_KEYS ];#define __debug_atomic_inc (ptr) \ this_cpu_inc(lockdep_stats.ptr);
kernel/locking/lockdep_proc.c +43 -8
117 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 872/1126 ext4: correct cluster len and clusters changed accounting in ext4_mb_mark_bb
In reply to Greg Kroah-HartmanFrom: Ritesh Harjani <[email protected]>
[ Upstream commit a5c0e2fdf7cea535ba03259894dc184e5a4c2800 ]
ext4_mb_mark_bb() currently wrongly calculates cluster len (clen) and flex_group->free_clusters. This patch fixes that.
Identified based on code review of ext4_mb_mark_bb() function.
--- fs/ext4/mballoc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
fs/ext4/mballoc.c +12 -7
@@ -3899,10 +3899,11 @@ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block,struct ext4_sb_info *sbi =EXT4_SB (sb);ext4_group_t group;ext4_grpblk_t blkoff; -int i, clen, err; +int i, err;int already; +unsigned int clen, clen_changed; - clen =EXT4_B2C (sbi, len); + clen =EXT4_NUM_B2C (sbi, len);ext4_get_group_no_and_offset (sb, block, &group, &blkoff); bitmap_bh =ext4_read_block_bitmap (sb, group);
@@ -3923,6 +3924,7 @@ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block,if (!mb_test_bit (blkoff + i, bitmap_bh->b_data) == !state) already++; + clen_changed = clen - already;if (state)ext4_set_bits (bitmap_bh->b_data, blkoff, clen);else
@@ -3935,9 +3937,9 @@ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block, group, gdp)); }if (state) - clen =ext4_free_group_clusters (sb, gdp) - clen + already; + clen =ext4_free_group_clusters (sb, gdp) - clen_changed;else - clen =ext4_free_group_clusters (sb, gdp) + clen - already; + clen =ext4_free_group_clusters (sb, gdp) + clen_changed;ext4_free_group_clusters_set (sb, gdp, clen);ext4_block_bitmap_csum_set (sb, group, gdp, bitmap_bh);
@@ -3947,10 +3949,13 @@ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block,if (sbi->s_log_groups_per_flex) {ext4_group_t flex_group =ext4_flex_group (sbi, group); +struct flex_groups *fg =sbi_array_rcu_deref (sbi, + s_flex_groups, flex_group); -atomic64_sub (len, - &sbi_array_rcu_deref (sbi, s_flex_groups, - flex_group)->free_clusters); +if (state) +atomic64_sub (clen_changed, &fg->free_clusters); +else +atomic64_add (clen_changed, &fg->free_clusters); } err =ext4_handle_dirty_metadata (NULL ,NULL , bitmap_bh);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 873/1126 ext4: fix ext4_mb_mark_bb() with flex_bg with fast_commit
In reply to Greg Kroah-HartmanFrom: Ritesh Harjani <[email protected]>
[ Upstream commit bfdc502a4a4c058bf4cbb1df0c297761d528f54d ]
In case of flex_bg feature (which is by default enabled), extents for any given inode might span across blocks from two different block group. ext4_mb_mark_bb() only reads the buffer_head of block bitmap once for the starting block group, but it fails to read it again when the extent length boundary overflows to another block group. Then in this below loop it accesses memory beyond the block group bitmap buffer_head and results into a data abort.
for (i = 0; i < clen; i++) if (!mb_test_bit(blkoff + i, bitmap_bh->b_data) == !state) already++;
This patch adds this functionality for checking block group boundary in ext4_mb_mark_bb() and update the buffer_head(bitmap_bh) for every different block group.
w/o this patch, I was easily able to hit a data access abort using Power platform.
<...>
[ 74.327662] EXT4-fs error (device loop3): ext4_mb_generate_buddy:1141: group 11, block bitmap and bg descriptor inconsistent: 21248 vs 23294 free clusters
[ 74.533214] EXT4-fs (loop3): shut down requested (2)
[ 74.536705] Aborting journal on device loop3-8.
[ 74.702705] BUG: Unable to handle kernel data access on read at 0xc00000005e980000
[ 74.703727] Faulting instruction address: 0xc0000000007bffb8
cpu 0xd: Vector: 300 (Data Access) at [c000000015db7060]
pc: c0000000007bffb8: ext4_mb_mark_bb+0x198/0x5a0
lr: c0000000007bfeec: ext4_mb_mark_bb+0xcc/0x5a0
sp: c000000015db7300
msr: 800000000280b033
dar: c00000005e980000
dsisr: 40000000
current = 0xc000000027af6880
paca = 0xc00000003ffd5200 irqmask: 0x03 irq_happened: 0x01
pid = 5167, comm = mount<...>
enter ? for help
[c000000015db7380] c000000000782708 ext4_ext_clear_bb+0x378/0x410 [c000000015db7400] c000000000813f14 ext4_fc_replay+0x1794/0x2000 [c000000015db7580] c000000000833f7c do_one_pass+0xe9c/0x12a0 [c000000015db7710] c000000000834504 jbd2_journal_recover+0x184/0x2d0 [c000000015db77c0] c000000000841398 jbd2_journal_load+0x188/0x4a0 [c000000015db7880] c000000000804de8 ext4_fill_super+0x2638/0x3e10 [c000000015db7a40] c0000000005f8404 get_tree_bdev+0x2b4/0x350 [c000000015db7ae0] c0000000007ef058 ext4_get_tree+0x28/0x40 [c000000015db7b00] c0000000005f6344 vfs_get_tree+0x44/0x100 [c000000015db7b70] c00000000063c408 path_mount+0xdd8/0xe70 [c000000015db7c40] c00000000063c8f0 sys_mount+0x450/0x550 [c000000015db7d50] c000000000035770 system_call_exception+0x4a0/0x4e0 [c000000015db7e10] c00000000000c74c system_call_common+0xec/0x250
--- fs/ext4/mballoc.c | 131 +++++++++++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 55 deletions(-)
fs/ext4/mballoc.c +76 -55
@@ -3901,72 +3901,93 @@ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block,ext4_grpblk_t blkoff;int i, err;int already; -unsigned int clen, clen_changed; +unsigned int clen, clen_changed, thisgrp_len; - clen =EXT4_NUM_B2C (sbi, len); - -ext4_get_group_no_and_offset (sb, block, &group, &blkoff); - bitmap_bh =ext4_read_block_bitmap (sb, group); -if (IS_ERR (bitmap_bh)) { - err =PTR_ERR (bitmap_bh); - bitmap_bh =NULL ; - goto out_err; - } - - err = -EIO ; - gdp =ext4_get_group_desc (sb, group, &gdp_bh); -if (!gdp) - goto out_err; +while (len >0 ) { +ext4_get_group_no_and_offset (sb, block, &group, &blkoff); -ext4_lock_group (sb, group); - already =0 ; -for (i =0 ; i < clen; i++) -if (!mb_test_bit (blkoff + i, bitmap_bh->b_data) == !state) - already++; - - clen_changed = clen - already; -if (state) -ext4_set_bits (bitmap_bh->b_data, blkoff, clen); -else -mb_test_and_clear_bits (bitmap_bh->b_data, blkoff, clen); -if (ext4_has_group_desc_csum (sb) && - (gdp->bg_flags &cpu_to_le16 (EXT4_BG_BLOCK_UNINIT ))) { - gdp->bg_flags &=cpu_to_le16 (~EXT4_BG_BLOCK_UNINIT ); -ext4_free_group_clusters_set (sb, gdp, -ext4_free_clusters_after_init (sb, - group, gdp)); - } -if (state) - clen =ext4_free_group_clusters (sb, gdp) - clen_changed; -else - clen =ext4_free_group_clusters (sb, gdp) + clen_changed; +/* +* Check to see if we are freeing blocks across a group +* boundary. +* In case of flex_bg, this can happen that (block, len) may +* span across more than one group. In that case we need to +* get the corresponding group metadata to work with. +* For this we have goto again loop. +*/ + thisgrp_len = min_t(unsigned int, (unsigned int)len, +EXT4_BLOCKS_PER_GROUP (sb) -EXT4_C2B (sbi, blkoff)); + clen =EXT4_NUM_B2C (sbi, thisgrp_len); -ext4_free_group_clusters_set (sb, gdp, clen); -ext4_block_bitmap_csum_set (sb, group, gdp, bitmap_bh); -ext4_group_desc_csum_set (sb, group, gdp); + bitmap_bh =ext4_read_block_bitmap (sb, group); +if (IS_ERR (bitmap_bh)) { + err =PTR_ERR (bitmap_bh); + bitmap_bh =NULL ; +break ; + } -ext4_unlock_group (sb, group); + err = -EIO ; + gdp =ext4_get_group_desc (sb, group, &gdp_bh); +if (!gdp) +break ; -if (sbi->s_log_groups_per_flex) { -ext4_group_t flex_group =ext4_flex_group (sbi, group); -struct flex_groups *fg =sbi_array_rcu_deref (sbi, - s_flex_groups, flex_group); +ext4_lock_group (sb, group); + already =0 ; +for (i =0 ; i < clen; i++) +if (!mb_test_bit (blkoff + i, bitmap_bh->b_data) == + !state) + already++; + clen_changed = clen - already;if (state) -atomic64_sub (clen_changed, &fg->free_clusters); +ext4_set_bits (bitmap_bh->b_data, blkoff, clen);else -atomic64_add (clen_changed, &fg->free_clusters); +mb_test_and_clear_bits (bitmap_bh->b_data, blkoff, clen); +if (ext4_has_group_desc_csum (sb) && + (gdp->bg_flags &cpu_to_le16 (EXT4_BG_BLOCK_UNINIT ))) { + gdp->bg_flags &=cpu_to_le16 (~EXT4_BG_BLOCK_UNINIT ); +ext4_free_group_clusters_set (sb, gdp, +ext4_free_clusters_after_init (sb, group, gdp)); + } +if (state) + clen =ext4_free_group_clusters (sb, gdp) - clen_changed; +else + clen =ext4_free_group_clusters (sb, gdp) + clen_changed; + +ext4_free_group_clusters_set (sb, gdp, clen); +ext4_block_bitmap_csum_set (sb, group, gdp, bitmap_bh); +ext4_group_desc_csum_set (sb, group, gdp); + +ext4_unlock_group (sb, group); + +if (sbi->s_log_groups_per_flex) { +ext4_group_t flex_group =ext4_flex_group (sbi, group); +struct flex_groups *fg =sbi_array_rcu_deref (sbi, + s_flex_groups, flex_group); + +if (state) +atomic64_sub (clen_changed, &fg->free_clusters); +else +atomic64_add (clen_changed, &fg->free_clusters); + + } + + err =ext4_handle_dirty_metadata (NULL ,NULL , bitmap_bh); +if (err) +break ; +sync_dirty_buffer (bitmap_bh); + err =ext4_handle_dirty_metadata (NULL ,NULL , gdp_bh); +sync_dirty_buffer (gdp_bh); +if (err) +break ; + + block += thisgrp_len; + len -= thisgrp_len; +brelse (bitmap_bh); +BUG_ON (len <0 ); } - err =ext4_handle_dirty_metadata (NULL ,NULL , bitmap_bh);if (err) - goto out_err; -sync_dirty_buffer (bitmap_bh); - err =ext4_handle_dirty_metadata (NULL ,NULL , gdp_bh); -sync_dirty_buffer (gdp_bh); - -out_err: -brelse (bitmap_bh); +brelse (bitmap_bh); }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 874/1126 sched/tracing: Dont re-read p->state when emitting sched_switch event
In reply to Greg Kroah-HartmanFrom: Valentin Schneider <[email protected]>
[ Upstream commit fa2c3254d7cfff5f7a916ab928a562d1165f17bb ]
As of commit
c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu")
the following sequence becomes possible:
p->__state = TASK_INTERRUPTIBLE;
__schedule()
deactivate_task(p);
ttwu()
READ !p->on_rq
p->__state=TASK_WAKING
trace_sched_switch()
__trace_sched_switch_state()
task_state_index()
return 0;TASK_WAKING isn't in TASK_REPORT, so the task appears as TASK_RUNNING in the trace event.
Prevent this by pushing the value read from __schedule() down the trace event.
--- include/linux/sched.h | 11 ++++++++--- include/trace/events/sched.h | 11 +++++++---- kernel/sched/core.c | 4 ++-- kernel/trace/fgraph.c | 4 +++- kernel/trace/ftrace.c | 4 +++- kernel/trace/trace_events.c | 8 ++++++-- kernel/trace/trace_osnoise.c | 4 +++- kernel/trace/trace_sched_switch.c | 1 + kernel/trace/trace_sched_wakeup.c | 1 + 9 files changed, 34 insertions(+), 14 deletions(-)
include/linux/sched.h +8 -3
@@ -1620,10 +1620,10 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)#define TASK_REPORT_IDLE (TASK_REPORT + 1)#define TASK_REPORT_MAX (TASK_REPORT_IDLE << 1) -static inline unsigned int task_state_index (struct task_struct *tsk) +static inline unsigned int __task_state_index (unsigned int tsk_state, +unsigned int tsk_exit_state) { -unsigned int tsk_state =READ_ONCE (tsk->__state); -unsigned int state = (tsk_state | tsk->exit_state) &TASK_REPORT ; +unsigned int state = (tsk_state | tsk_exit_state) &TASK_REPORT ;BUILD_BUG_ON_NOT_POWER_OF_2 (TASK_REPORT_MAX );
@@ -1633,6 +1633,11 @@ static inline unsigned int task_state_index(struct task_struct *tsk)return fls (state); } +static inline unsigned int task_state_index (struct task_struct *tsk) +{ +return __task_state_index (READ_ONCE (tsk->__state), tsk->exit_state); +} +static inline char task_index_to_char (unsigned int state) {static const char state_char[] ="RSDTtXZPI" ;
include/trace/events/sched.h +7 -4
@@ -187,7 +187,9 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new, TP_ARGS(p));#ifdef CREATE_TRACE_POINTS -static inline long __trace_sched_switch_state (bool preempt,struct task_struct *p) +static inline long __trace_sched_switch_state (bool preempt, +unsigned int prev_state, +struct task_struct *p) {unsigned int state;
@@ -208,7 +210,7 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct ** it for left shift operation to get the correct task->state * mapping. */ - state =task_state_index (p); + state =__task_state_index (prev_state, p->exit_state);return state ? (1 << (state -1 )) : state; }
@@ -220,10 +222,11 @@ static inline long __trace_sched_switch_state(bool preempt, struct task_struct * TRACE_EVENT(sched_switch, TP_PROTO(bool preempt, + unsigned int prev_state, struct task_struct *prev, struct task_struct *next), - TP_ARGS(preempt, prev, next), + TP_ARGS(preempt, prev_state, prev, next), TP_STRUCT__entry( __array( char, prev_comm, TASK_COMM_LEN )
@@ -239,7 +242,7 @@ TRACE_EVENT(sched_switch,memcpy (__entry->next_comm, next->comm,TASK_COMM_LEN ); __entry->prev_pid = prev->pid; __entry->prev_prio = prev->prio; - __entry->prev_state =__trace_sched_switch_state (preempt, prev); + __entry->prev_state =__trace_sched_switch_state (preempt, prev_state, prev);memcpy (__entry->prev_comm, prev->comm,TASK_COMM_LEN ); __entry->next_pid = next->pid; __entry->next_prio = next->prio;
kernel/sched/core.c +2 -2
@@ -4835,7 +4835,7 @@ static struct rq *finish_task_switch(struct task_struct *prev) {struct rq *rq =this_rq ();struct mm_struct *mm = rq->prev_mm; -long prev_state; +unsigned int prev_state;/* * The previous task will have left us with a preempt_count of 2
@@ -6299,7 +6299,7 @@ static void __sched notrace __schedule(unsigned int sched_mode)migrate_disable_switch (rq, prev);psi_sched_switch (prev, next, !task_on_rq_queued (prev)); -trace_sched_switch (sched_mode &SM_MASK_PREEMPT , prev, next); +trace_sched_switch (sched_mode &SM_MASK_PREEMPT , prev_state, prev, next);/* Also unlocks the rq: */ rq =context_switch (rq, prev, next, &rf);
kernel/trace/fgraph.c +3 -1
@@ -415,7 +415,9 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)static void ftrace_graph_probe_sched_switch (void *ignore,bool preempt, -struct task_struct *prev,struct task_struct *next) +unsigned int prev_state, +struct task_struct *prev, +struct task_struct *next) {unsigned long long timestamp;int index;
kernel/trace/ftrace.c +3 -1
@@ -7346,7 +7346,9 @@ ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops)static void ftrace_filter_pid_sched_switch_probe (void *data,bool preempt, -struct task_struct *prev,struct task_struct *next) +unsigned int prev_state, +struct task_struct *prev, +struct task_struct *next) {struct trace_array *tr = data;struct trace_pid_list *pid_list;
kernel/trace/trace_events.c +6 -2
@@ -759,7 +759,9 @@ void trace_event_follow_fork(struct trace_array *tr, bool enable)static void event_filter_pid_sched_switch_probe_pre (void *data,bool preempt, -struct task_struct *prev,struct task_struct *next) +unsigned int prev_state, +struct task_struct *prev, +struct task_struct *next) {struct trace_array *tr = data;struct trace_pid_list *no_pid_list;
@@ -783,7 +785,9 @@ event_filter_pid_sched_switch_probe_pre(void *data, bool preempt,static void event_filter_pid_sched_switch_probe_post (void *data,bool preempt, -struct task_struct *prev,struct task_struct *next) +unsigned int prev_state, +struct task_struct *prev, +struct task_struct *next) {struct trace_array *tr = data;struct trace_pid_list *no_pid_list;
kernel/trace/trace_osnoise.c +3 -1
@@ -1167,7 +1167,9 @@ thread_exit(struct osnoise_variables *osn_var, struct task_struct *t)* used to record the beginning and to report the end of a thread noise window. */ static void -trace_sched_switch_callback (void *data,bool preempt,struct task_struct *p, +trace_sched_switch_callback (void *data,bool preempt, +unsigned int prev_state, +struct task_struct *p,struct task_struct *n) {struct osnoise_variables *osn_var =this_cpu_osn_var ();
kernel/trace/trace_sched_switch.c +1 -0
@@ -22,6 +22,7 @@ static DEFINE_MUTEX(sched_register_mutex);static void probe_sched_switch (void *ignore,bool preempt, +unsigned int prev_state,struct task_struct *prev,struct task_struct *next) {int flags;
kernel/trace/trace_sched_wakeup.c +1 -0
@@ -426,6 +426,7 @@ tracing_sched_wakeup_trace(struct trace_array *tr, static void notraceprobe_wakeup_sched_switch (void *ignore,bool preempt, +unsigned int prev_state,struct task_struct *prev,struct task_struct *next) {struct trace_array_cpu *data;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 875/1126 sched/tracing: Report TASK_RTLOCK_WAIT tasks as TASK_UNINTERRUPTIBLE
In reply to Greg Kroah-HartmanFrom: Valentin Schneider <[email protected]>
[ Upstream commit 25795ef6299f07ce3838f3253a9cb34f64efcfae ]
TASK_RTLOCK_WAIT currently isn't part of TASK_REPORT, thus a task blocking on an rtlock will appear as having a task state == 0, IOW TASK_RUNNING.
The actual state is saved in p->saved_state, but reading it after reading p->__state has a few issues:
o that could still be TASK_RUNNING in the case of e.g. rt_spin_lock
o ttwu_state_match() might have changed that to TASK_RUNNING
As pointed out by Eric, adding TASK_RTLOCK_WAIT to TASK_REPORT implies exposing a new state to userspace tools which way not know what to do with them. The only information that needs to be conveyed here is that a task is waiting on an rt_mutex, which matches TASK_UNINTERRUPTIBLE - there's no need for a new state.
--- include/linux/sched.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/sched.h +8 -0
@@ -1630,6 +1630,14 @@ static inline unsigned int __task_state_index(unsigned int tsk_state,if (tsk_state ==TASK_IDLE ) state =TASK_REPORT_IDLE ; +/* +* We're lying here, but rather than expose a completely new task state +* to userspace, we can make this appear as if the task has gone through +* a regular rt_mutex_lock() call. +*/ +if (tsk_state ==TASK_RTLOCK_WAIT ) + state =TASK_UNINTERRUPTIBLE ; +return fls (state); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 876/1126 ext4: dont BUG if someone dirty pages without asking ext4 first
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
[ Upstream commit cc5095747edfb054ca2068d01af20be3fcc3634f ]
[un]pin_user_pages_remote is dirtying pages without properly warning the file system in advance. A related race was noted by Jan Kara in 2018[1]; however, more recently instead of it being a very hard-to-hit race, it could be reliably triggered by process_vm_writev(2) which was discovered by Syzbot[2].
This is technically a bug in mm/gup.c, but arguably ext4 is fragile in that if some other kernel subsystem dirty pages without properly notifying the file system using page_mkwrite(), ext4 will BUG, while other file systems will not BUG (although data will still be lost).
So instead of crashing with a BUG, issue a warning (since there may be potential data loss) and just mark the page as clean to avoid unprivileged denial of service attacks until the problem can be properly fixed. More discussion and background can be found in the thread starting at [2].
[1] https://lore.kernel.org/linux-mm/[email protected]
[2] https://lore.kernel.org/r/[email protected]
--- fs/ext4/inode.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
fs/ext4/inode.c +25 -0
@@ -1993,6 +1993,15 @@ static int ext4_writepage(struct page *page,else len =PAGE_SIZE ; +/* Should never happen but for bugs in other kernel subsystems */ +if (!page_has_buffers (page)) { +ext4_warning_inode (inode, +"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +return 0 ; + } + page_bufs =page_buffers (page);/* * We cannot do block allocation or other extent handling in this
@@ -2594,6 +2603,22 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)wait_on_page_writeback (page);BUG_ON (PageWriteback (page)); +/* +* Should never happen but for buggy code in +* other subsystems that call +* set_page_dirty() without properly warning +* the file system first. See [1] for more +* information. +* +* [1] https://lore.kernel.org/linux-mm/[email protected] +*/ +if (!page_has_buffers (page)) { +ext4_warning_inode (mpd->inode,"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +continue ; + } +if (mpd->map.m_len ==0 ) mpd->first_page = page->index; mpd->next_page = page->index +1 ;
Signature · 1 line
2.34.1
syzbot
syzbotRe: [PATCH 5.17 0876/1126] ext4: dont BUG if someone dirty pages without asking ext4 first
I see the command but can't find the corresponding bug. The email is sent to [email protected] address but the HASH does not correspond to any known bug. Please double check the…
Quoted 81 lines
From: Theodore Ts'o <[email protected]>
[ Upstream commit
cc5095747edfb054ca2068d01af20be3fcc3634f][un]pin_user_pages_remote is dirtying pages without properly warning the file system in advance. A related race was noted by Jan Kara in 2018[1]; however, more recently instead of it being a very hard-to-hit race, it could be reliably triggered by
process_vm_writev(2)which was discovered by Syzbot[2].This is technically a bug in
mm/gup.c, but arguably ext4 is fragile in that if some other kernel subsystem dirty pages without properly notifying the file system usingpage_mkwrite(), ext4 will BUG, while other file systems will not BUG (although data will still be lost).So instead of crashing with a BUG, issue a warning (since there may be potential data loss) and just mark the page as clean to avoid unprivileged denial of service attacks until the problem can be properly fixed. More discussion and background can be found in the thread starting at [2].
[1] https://lore.kernel.org/linux-mm/[email protected]
[2] https://lore.kernel.org/r/[email protected]Reported-by Lee Jones <[email protected]>Signed-off-by Theodore Ts'o <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/ext4/inode.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)fs/ext4/inode.c +25
-0@@ -1993,6 +1993,15 @@ static int ext4_writepage(struct page *page,else len =PAGE_SIZE ; +/* Should never happen but for bugs in other kernel subsystems */ +if (!page_has_buffers (page)) { +ext4_warning_inode (inode, +"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +return 0 ; + } + page_bufs =page_buffers (page);/* * We cannot do block allocation or other extent handling in this @@ -2594,6 +2603,22 @@ static int mpage_prepare_extent_to_map(struct mpage_da_data *mpd)wait_on_page_writeback (page);BUG_ON (PageWriteback (page)); +/* +* Should never happen but for buggy code in +* other subsystems that call +* set_page_dirty() without properly warning +* the file system first. See [1] for more +* information. +* +* [1] https://lore.kernel.org/linux-mm/[email protected] +*/ +if (!page_has_buffers (page)) { +ext4_warning_inode (mpd->inode,"page %lu does not have buffers attached" , page->index); +ClearPageDirty (page); +unlock_page (page); +continue ; + } +if (mpd->map.m_len ==0 ) mpd->first_page = page->index; mpd->next_page = page->index +1 ;Signature · 1 line
2.34.1
I see the command but can't find the corresponding bug. The email is sent to [email protected] address but the HASH does not correspond to any known bug. Please double check the address.
Greg Kroah-Hartman
maintainerPATCH 877/1126 f2fs: fix to do sanity check on curseg->alloc_type
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit f41ee8b91c00770d718be2ff4852a80017ae9ab3 ]
As Wenqing Liu reported in bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=215657
- Overview
UBSAN: array-index-out-of-bounds in fs/f2fs/segment.c:3460:2 when mount and operate a corrupted image
- Reproduce
tested on kernel 5.17-rc4, 5.17-rc6
1. mkdir test_crash
2. cd test_crash
3. unzip tmp2.zip
4. mkdir mnt
5. ./single_test.sh f2fs 2
- Kernel dump
[ 46.434454] loop0: detected capacity change from 0 to 131072 [ 46.529839] F2FS-fs (loop0): Mounted with checkpoint version = 7548c2d9 [ 46.738319] ================================================================================ [ 46.738412] UBSAN: array-index-out-of-bounds in fs/f2fs/segment.c:3460:2 [ 46.738475] index 231 is out of range for type 'unsigned int [2]' [ 46.738539] CPU: 2 PID: 939 Comm: umount Not tainted 5.17.0-rc6 #1 [ 46.738547] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014 [ 46.738551] Call Trace: [ 46.738556] <TASK> [ 46.738563] dump_stack_lvl+0x47/0x5c [ 46.738581] ubsan_epilogue+0x5/0x50 [ 46.738592] __ubsan_handle_out_of_bounds+0x68/0x80 [ 46.738604] f2fs_allocate_data_block+0xdff/0xe60 [f2fs] [ 46.738819] do_write_page+0xef/0x210 [f2fs] [ 46.738934] f2fs_do_write_node_page+0x3f/0x80 [f2fs] [ 46.739038] __write_node_page+0x2b7/0x920 [f2fs] [ 46.739162] f2fs_sync_node_pages+0x943/0xb00 [f2fs] [ 46.739293] f2fs_write_checkpoint+0x7bb/0x1030 [f2fs] [ 46.739405] kill_f2fs_super+0x125/0x150 [f2fs] [ 46.739507] deactivate_locked_super+0x60/0xc0 [ 46.739517] deactivate_super+0x70/0xb0 [ 46.739524] cleanup_mnt+0x11a/0x200 [ 46.739532] __cleanup_mnt+0x16/0x20 [ 46.739538] task_work_run+0x67/0xa0 [ 46.739547] exit_to_user_mode_prepare+0x18c/0x1a0 [ 46.739559] syscall_exit_to_user_mode+0x26/0x40 [ 46.739568] do_syscall_64+0x46/0xb0 [ 46.739584] entry_SYSCALL_64_after_hwframe+0x44/0xae
The root cause is we missed to do sanity check on curseg->alloc_type, result in out-of-bound accessing on sbi->block_count[] array, fix it.
--- fs/f2fs/segment.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/f2fs/segment.c +7 -0
@@ -4789,6 +4789,13 @@ static int sanity_check_curseg(struct f2fs_sb_info *sbi)sanity_check_seg_type (sbi, curseg->seg_type); +if (curseg->alloc_type !=LFS && curseg->alloc_type !=SSR ) { +f2fs_err (sbi, +"Current segment has invalid alloc_type:%d" , + curseg->alloc_type); +return -EFSCORRUPTED ; + } +if (f2fs_test_bit (blkofs, se->cur_valid_map)) goto out;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 878/1126 NFSD: Fix nfsd_breaker_owns_lease() return values
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 50719bf3442dd6cd05159e9c98d020b3919ce978 ]
These have been incorrect since the function was introduced.
A proper kerneldoc comment is added since this function, though static, is part of an external interface.
--- fs/nfsd/nfs4state.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +10 -2
@@ -4711,6 +4711,14 @@ nfsd_break_deleg_cb(struct file_lock *fl)return ret; } +/** +* nfsd_breaker_owns_lease - Check if lease conflict was resolved +* @fl: Lock state to check +* +* Return values: +* %true: Lease conflict was resolved +* %false: Lease conflict was not resolved. +*/ static bool nfsd_breaker_owns_lease (struct file_lock *fl) {struct nfs4_delegation *dl = fl->fl_owner;
@@ -4718,11 +4726,11 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl)struct nfs4_client *clp;if (!i_am_nfsd ()) -return NULL ; +return false; rqst =kthread_data (current);/* Note rq_prog == NFS_ACL_PROGRAM is also possible: */ if (rqst->rq_prog !=NFS_PROGRAM || rqst->rq_vers <4 ) -return NULL ; +return false; clp = *(rqst->rq_lease_breaker);return dl->dl_stid.sc_client == clp; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 879/1126 f2fs: dont get FREEZE lock in f2fs_evict_inode in frozen fs
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit ba900534f807f0b327c92d5141c85d2313e2d55c ]
Let's purge inode cache in order to avoid the below deadlock.
[freeze test] shrinkderfreeze_super
- pwercpu_down_write(SB_FREEZE_FS)
- super_cache_scan
- down_read(&sb->s_umount)
- prune_icache_sb
- dispose_list
- evict
- f2fs_evict_inodethaw_super
- down_write(&sb->s_umount);
- __percpu_down_read(SB_FREEZE_FS)
--- Documentation/ABI/testing/sysfs-fs-f2fs | 1 + fs/f2fs/debug.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/inode.c | 6 ++++-- fs/f2fs/super.c | 4 ++++ 5 files changed, 11 insertions(+), 2 deletions(-)
Documentation/ABI/testing/sysfs-fs-f2fs +1 -0
@@ -430,6 +430,7 @@ Description: Show status of f2fs superblock in real time. 0x800 SBI_QUOTA_SKIP_FLUSH skip flushing quota in current CP 0x1000 SBI_QUOTA_NEED_REPAIR quota file may be corrupted 0x2000 SBI_IS_RESIZEFS resizefs is in process + 0x4000 SBI_IS_FREEZING freefs is in process ====== ===================== ================================= What: /sys/fs/f2fs/<disk>/ckpt_thread_ioprio
fs/f2fs/debug.c +1 -0
@@ -338,6 +338,7 @@ static char *s_flag[] = { [SBI_QUOTA_SKIP_FLUSH] = " quota_skip_flush", [SBI_QUOTA_NEED_REPAIR] = " quota_need_repair", [SBI_IS_RESIZEFS] = " resizefs", + [SBI_IS_FREEZING] = " freezefs", };static int stat_show (struct seq_file *s,void *v)
fs/f2fs/f2fs.h +1 -0
@@ -1267,6 +1267,7 @@ enum {SBI_QUOTA_SKIP_FLUSH ,/* skip flushing quota in current CP */ SBI_QUOTA_NEED_REPAIR ,/* quota file may be corrupted */ SBI_IS_RESIZEFS ,/* resizefs is in process */ + SBI_IS_FREEZING, /* freezefs is in process */ }; enum {
fs/f2fs/inode.c +4 -2
@@ -778,7 +778,8 @@ void f2fs_evict_inode(struct inode *inode)f2fs_remove_ino_entry (sbi, inode->i_ino,UPDATE_INO );f2fs_remove_ino_entry (sbi, inode->i_ino,FLUSH_INO ); -sb_start_intwrite (inode->i_sb); +if (!is_sbi_flag_set (sbi,SBI_IS_FREEZING )) +sb_start_intwrite (inode->i_sb);set_inode_flag (inode,FI_NO_ALLOC );i_size_write (inode,0 ); retry:
@@ -809,7 +810,8 @@ void f2fs_evict_inode(struct inode *inode)if (dquot_initialize_needed (inode))set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); } -sb_end_intwrite (inode->i_sb); +if (!is_sbi_flag_set (sbi,SBI_IS_FREEZING )) +sb_end_intwrite (inode->i_sb); no_delete:dquot_drop (inode);
fs/f2fs/super.c +4 -0
@@ -1662,11 +1662,15 @@ static int f2fs_freeze(struct super_block *sb)/* ensure no checkpoint required */ if (!llist_empty (&F2FS_SB (sb)->cprc_info.issue_list))return -EINVAL ; + +/* to avoid deadlock on f2fs_evict_inode->SB_FREEZE_FS */ +set_sbi_flag (F2FS_SB (sb),SBI_IS_FREEZING );return 0 ; }static int f2fs_unfreeze (struct super_block *sb) { +clear_sbi_flag (F2FS_SB (sb),SBI_IS_FREEZING );return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 880/1126 btrfs: harden identification of a stale device
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
[ Upstream commit 770c79fb65506fc7c16459855c3839429f46cb32 ]
Identifying and removing the stale device from the fs_uuids list is done by btrfs_free_stale_devices(). btrfs_free_stale_devices() in turn depends on device_path_matched() to check if the device appears in more than one btrfs_device structure.
The matching of the device happens by its path, the device path. However, when device mapper is in use, the dm device paths are nothing but a link to the actual block device, which leads to the device_path_matched() failing to match.
Fix this by matching the dev_t as provided by lookup_bdev() instead of plain string compare of the device paths.
--- fs/btrfs/volumes.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-)
fs/btrfs/volumes.c +38 -7
@@ -534,15 +534,48 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder,return ret; } -static bool device_path_matched (const char *path,struct btrfs_device *device) +/* +* Check if the device in the path matches the device in the given struct device. +* +* Returns: +* true If it is the same device. +* false If it is not the same device or on error. +*/ +static bool device_matched (const struct btrfs_device *device,const char *path) { -int found; +char *device_name; +dev_t dev_old; +dev_t dev_new; +int ret; + +/* +* If we are looking for a device with the matching dev_t, then skip +* device without a name (a missing device). +*/ +if (!device->name) +return false; + + device_name =kzalloc (BTRFS_PATH_NAME_MAX ,GFP_KERNEL ); +if (!device_name) +return false;rcu_read_lock (); - found =strcmp (rcu_str_deref (device->name), path); +scnprintf (device_name,BTRFS_PATH_NAME_MAX ,"%s" ,rcu_str_deref (device->name));rcu_read_unlock (); -return found ==0 ; + ret =lookup_bdev (device_name, &dev_old); +kfree (device_name); +if (ret) +return false; + + ret =lookup_bdev (path, &dev_new); +if (ret) +return false; + +if (dev_old == dev_new) +return true; + +return false; }/*
@@ -575,9 +608,7 @@ static int btrfs_free_stale_devices(const char *path, &fs_devices->devices, dev_list) {if (skip_device && skip_device == device)continue ; -if (path && !device->name) -continue ; -if (path && !device_path_matched (path, device)) +if (path && !device_matched (device, path))continue ;if (fs_devices->opened) {/* for an already deleted device return 0 */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 881/1126 btrfs: make search_csum_tree return 0 if we get -EFBIG
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 03ddb19d2ea745228879b9334f3b550c88acb10a ]
We can either fail to find a csum entry at all and return -ENOENT, or we can find a range that is close, but return -EFBIG. In essence these both mean the same thing when we are doing a lookup for a csum in an existing range, we didn't find a csum. We want to treat both of these errors the same way, complain loudly that there wasn't a csum. This currently happens anyway because we do
count = search_csum_tree();
if (count <= 0) {
// reloc and error handling
}However it forces us to incorrectly treat EIO or ENOMEM errors as on disk corruption. Fix this by returning 0 if we get either -ENOENT or -EFBIG from btrfs_lookup_csum() so we can do proper error handling.
--- fs/btrfs/file-item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/file-item.c +1 -1
@@ -305,7 +305,7 @@ static int search_csum_tree(struct btrfs_fs_info *fs_info,read_extent_buffer (path->nodes[0 ], dst, (unsigned long )item, ret * csum_size); out: -if (ret == -ENOENT ) +if (ret == -ENOENT || ret == -EFBIG ) ret =0 ;return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 882/1126 btrfs: handle csum lookup errors properly on reads
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 1784b7d502a94b561eae58249adde5f72c26eb3c ]
Currently any error we get while trying to lookup csums during reads shows up as a missing csum, and then on the read completion side we print an error saying there was a csum mismatch and we increase the device corruption count.
However we could have gotten an EIO from the lookup. We could also be inside of a memory constrained container and gotten a ENOMEM while trying to do the read. In either case we don't want to make this look like a file system corruption problem, we want to make it look like the actual error it is. Capture any negative value, convert it to the appropriate blk_status_t, free the csum array if we have one and bail.
Note: a possible improvement would be to make the relocation code look up the owning inode and see if it's marked as NODATASUM and set EXTENT_NODATASUM there, that way if there's corruption and there isn't a checksum when we want it we can fail here rather than later.
--- fs/btrfs/file-item.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
fs/btrfs/file-item.c +22 -14
@@ -368,6 +368,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dst {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct extent_io_tree *io_tree = &BTRFS_I (inode)->io_tree; +struct btrfs_bio *bbio =NULL ;struct btrfs_path *path;const u32 sectorsize = fs_info->sectorsize;const u32 csum_size = fs_info->csum_size;
@@ -377,6 +378,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dstu8 *csum;const unsigned int nblocks = orig_len >> fs_info->sectorsize_bits;int count =0 ; +blk_status_t ret =BLK_STS_OK ;if ((BTRFS_I (inode)->flags &BTRFS_INODE_NODATASUM ) ||test_bit (BTRFS_FS_STATE_NO_CSUMS , &fs_info->fs_state))
@@ -400,7 +402,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dstreturn BLK_STS_RESOURCE ;if (!dst) { -struct btrfs_bio *bbio =btrfs_bio (bio); + bbio =btrfs_bio (bio);if (nblocks * csum_size >BTRFS_BIO_INLINE_CSUM_SIZE ) { bbio->csum =kmalloc_array (nblocks, csum_size,GFP_NOFS );
@@ -456,21 +458,27 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dst count =search_csum_tree (fs_info, path, cur_disk_bytenr, search_len, csum_dst); -if (count <=0 ) { -/* -* Either we hit a critical error or we didn't find -* the csum. -* Either way, we put zero into the csums dst, and skip -* to the next sector. -*/ +if (count <0 ) { + ret =errno_to_blk_status (count); +if (bbio) +btrfs_bio_free_csum (bbio); +break ; + } + +/* +* We didn't find a csum for this range. We need to make sure +* we complain loudly about this, because we are not NODATASUM. +* +* However for the DATA_RELOC inode we could potentially be +* relocating data extents for a NODATASUM inode, so the inode +* itself won't be marked with NODATASUM, but the extent we're +* copying is in fact NODATASUM. If we don't find a csum we +* assume this is the case. +*/ +if (count ==0 ) {memset (csum_dst,0 , csum_size); count =1 ; -/* -* For data reloc inode, we need to mark the range -* NODATASUM so that balance won't report false csum -* error. -*/ if (BTRFS_I (inode)->root->root_key.objectid ==BTRFS_DATA_RELOC_TREE_OBJECTID ) {u64 file_offset;
@@ -491,7 +499,7 @@ blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dst }btrfs_free_path (path); -return BLK_STS_OK ; +return ret; } int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 883/1126 btrfs: do not double complete bio on errors during compressed reads
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit f9f15de85d74e7eef021af059ca53a15f041cdd8 ]
I hit some weird panics while fixing up the error handling from btrfs_lookup_bio_sums(). Turns out the compression path will complete the bio we use if we set up any of the compression bios and then return an error, and then btrfs_submit_data_bio() will also call bio_endio() on the bio.
Fix this by making btrfs_submit_compressed_read() responsible for calling bio_endio() on the bio if there are any errors. Currently it was only doing it if we created the compression bios, otherwise it was depending on btrfs_submit_data_bio() to do the right thing. This creates the above problem, so fix up btrfs_submit_compressed_read() to always call bio_endio() in case of an error, and then simply return from btrfs_submit_data_bio() if we had to call btrfs_submit_compressed_read().
--- fs/btrfs/compression.c | 20 ++++++++++++++------ fs/btrfs/inode.c | 8 +++++++- 2 files changed, 21 insertions(+), 7 deletions(-)
fs/btrfs/compression.c +14 -6
@@ -808,7 +808,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,u64 em_len;u64 em_start;struct extent_map *em; -blk_status_t ret =BLK_STS_RESOURCE ; +blk_status_t ret;int faili =0 ;u8 *sums;
@@ -821,14 +821,18 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,read_lock (&em_tree->lock); em =lookup_extent_mapping (em_tree, file_offset, fs_info->sectorsize);read_unlock (&em_tree->lock); -if (!em) -return BLK_STS_IOERR ; +if (!em) { + ret =BLK_STS_IOERR ; + goto out; + }ASSERT (em->compress_type !=BTRFS_COMPRESS_NONE ); compressed_len = em->block_len; cb =kmalloc (compressed_bio_size (fs_info, compressed_len),GFP_NOFS ); -if (!cb) +if (!cb) { + ret =BLK_STS_RESOURCE ; goto out; + }refcount_set (&cb->pending_sectors, compressed_len >> fs_info->sectorsize_bits); cb->errors =0 ;
@@ -851,8 +855,10 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, nr_pages =DIV_ROUND_UP (compressed_len,PAGE_SIZE ); cb->compressed_pages =kcalloc (nr_pages,sizeof (struct page *),GFP_NOFS ); -if (!cb->compressed_pages) +if (!cb->compressed_pages) { + ret =BLK_STS_RESOURCE ; goto fail1; + }for (pg_index =0 ; pg_index < nr_pages; pg_index++) { cb->compressed_pages[pg_index] =alloc_page (GFP_NOFS );
@@ -938,7 +944,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, comp_bio =NULL ; } } -return 0 ; +return BLK_STS_OK ; fail2:while (faili >=0 ) {
@@ -951,6 +957,8 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,kfree (cb); out:free_extent_map (em); + bio->bi_status = ret; +bio_endio (bio);return ret; finish_cb:if (comp_bio) {
fs/btrfs/inode.c +7 -1
@@ -2538,10 +2538,15 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio, goto out;if (bio_flags &EXTENT_BIO_COMPRESSED ) { +/* +* btrfs_submit_compressed_read will handle completing +* the bio if there were any errors, so just return +* here. +*/ ret =btrfs_submit_compressed_read (inode, bio, mirror_num, bio_flags); - goto out; + goto out_no_endio; }else {/* * Lookup bio sums does extra checks around whether we
@@ -2575,6 +2580,7 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio, bio->bi_status = ret;bio_endio (bio); } +out_no_endio:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 884/1126 btrfs: do not clean up repair bio if submit fails
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 8cbc3001a3264d998d6b6db3e23f935c158abd4d ]
The submit helper will always run bio_endio() on the bio if it fails to submit, so cleaning up the bio just leads to a variety of use-after-free and NULL pointer dereference bugs because we race with the endio function that is cleaning up the bio. Instead just return BLK_STS_OK as the repair function has to continue to process the rest of the pages, and the endio for the repair bio will do the appropriate cleanup for the page that it was given.
--- fs/btrfs/extent_io.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
fs/btrfs/extent_io.c +7 -8
@@ -2639,7 +2639,6 @@ int btrfs_repair_one_sector(struct inode *inode,const int icsum = bio_offset >> fs_info->sectorsize_bits;struct bio *repair_bio;struct btrfs_bio *repair_bbio; -blk_status_t status;btrfs_debug (fs_info,"repair read error: read error at %llu" , start);
@@ -2678,13 +2677,13 @@ int btrfs_repair_one_sector(struct inode *inode,"repair read error: submitting new read to mirror %d" , failrec->this_mirror); - status =submit_bio_hook (inode, repair_bio, failrec->this_mirror, - failrec->bio_flags); -if (status) { -free_io_failure (failure_tree, tree, failrec); -bio_put (repair_bio); - } -return blk_status_to_errno (status); +/* +* At this point we have a bio, so any errors from submit_bio_hook() +* will be handled by the endio on the repair_bio, so we can't return an +* error here. +*/ +submit_bio_hook (inode, repair_bio, failrec->this_mirror, failrec->bio_flags); +return BLK_STS_OK ; }static void end_page_read (struct page *page,bool uptodate,u64 start,u32 len)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 885/1126 f2fs: use spin_lock to avoid hang
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 98237fcda4a24e67b0a4498c17d5aa4ad4537bc7 ]
[14696.634553] task:cat state:D stack: 0 pid:1613738 ppid:1613735 flags:0x00000004 [14696.638285] Call Trace: [14696.639038] <TASK> [14696.640032] __schedule+0x302/0x930 [14696.640969] schedule+0x58/0xd0 [14696.641799] schedule_preempt_disabled+0x18/0x30 [14696.642890] __mutex_lock.constprop.0+0x2fb/0x4f0 [14696.644035] ? mod_objcg_state+0x10c/0x310 [14696.645040] ? obj_cgroup_charge+0xe1/0x170 [14696.646067] __mutex_lock_slowpath+0x13/0x20 [14696.647126] mutex_lock+0x34/0x40 [14696.648070] stat_show+0x25/0x17c0 [f2fs] [14696.649218] seq_read_iter+0x120/0x4b0 [14696.650289] ? aa_file_perm+0x12a/0x500 [14696.651357] ? lru_cache_add+0x1c/0x20 [14696.652470] seq_read+0xfd/0x140 [14696.653445] full_proxy_read+0x5c/0x80 [14696.654535] vfs_read+0xa0/0x1a0 [14696.655497] ksys_read+0x67/0xe0 [14696.656502] __x64_sys_read+0x1a/0x20 [14696.657580] do_syscall_64+0x3b/0xc0 [14696.658671] entry_SYSCALL_64_after_hwframe+0x44/0xae [14696.660068] RIP: 0033:0x7efe39df1cb2 [14696.661133] RSP: 002b:00007ffc8badd948 EFLAGS: 00000246 ORIG_RAX: 0000000000000000 [14696.662958] RAX: ffffffffffffffda RBX: 0000000000020000 RCX: 00007efe39df1cb2 [14696.664757] RDX: 0000000000020000 RSI: 00007efe399df000 RDI: 0000000000000003 [14696.666542] RBP: 00007efe399df000 R08: 00007efe399de010 R09: 00007efe399de010 [14696.668363] R10: 0000000000000022 R11: 0000000000000246 R12: 0000000000000000 [14696.670155] R13: 0000000000000003 R14: 0000000000020000 R15: 0000000000020000 [14696.671965] </TASK> [14696.672826] task:umount state:D stack: 0 pid:1614985 ppid:1614984 flags:0x00004000 [14696.674930] Call Trace: [14696.675903] <TASK> [14696.676780] __schedule+0x302/0x930 [14696.677927] schedule+0x58/0xd0 [14696.679019] schedule_preempt_disabled+0x18/0x30 [14696.680412] __mutex_lock.constprop.0+0x2fb/0x4f0 [14696.681783] ? destroy_inode+0x65/0x80 [14696.683006] __mutex_lock_slowpath+0x13/0x20 [14696.684305] mutex_lock+0x34/0x40 [14696.685442] f2fs_destroy_stats+0x1e/0x60 [f2fs] [14696.686803] f2fs_put_super+0x158/0x390 [f2fs] [14696.688238] generic_shutdown_super+0x7a/0x120 [14696.689621] kill_block_super+0x27/0x50 [14696.690894] kill_f2fs_super+0x7f/0x100 [f2fs] [14696.692311] deactivate_locked_super+0x35/0xa0 [14696.693698] deactivate_super+0x40/0x50 [14696.694985] cleanup_mnt+0x139/0x190 [14696.696209] __cleanup_mnt+0x12/0x20 [14696.697390] task_work_run+0x64/0xa0 [14696.698587] exit_to_user_mode_prepare+0x1b7/0x1c0 [14696.700053] syscall_exit_to_user_mode+0x27/0x50 [14696.701418] do_syscall_64+0x48/0xc0 [14696.702630] entry_SYSCALL_64_after_hwframe+0x44/0xae
--- fs/f2fs/debug.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
fs/f2fs/debug.c +10 -7
@@ -21,7 +21,7 @@#include "gc.h" static LIST_HEAD (f2fs_stat_list); -static DEFINE_MUTEX (f2fs_stat_mutex); +static DEFINE_RAW_SPINLOCK (f2fs_stat_lock);#ifdef CONFIG_DEBUG_FS static struct dentry *f2fs_debugfs_root;#endif
@@ -345,8 +345,9 @@ static int stat_show(struct seq_file *s, void *v) {struct f2fs_stat_info *si;int i =0 , j =0 ; +unsigned long flags; -mutex_lock (&f2fs_stat_mutex); +raw_spin_lock_irqsave (&f2fs_stat_lock, flags);list_for_each_entry (si, &f2fs_stat_list, stat_list) {update_general_status (si->sbi);
@@ -574,7 +575,7 @@ static int stat_show(struct seq_file *s, void *v)seq_printf (s," - paged : %llu KB\n" , si->page_mem >>10 ); } -mutex_unlock (&f2fs_stat_mutex); +raw_spin_unlock_irqrestore (&f2fs_stat_lock, flags);return 0 ; }
@@ -585,6 +586,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi) {struct f2fs_super_block *raw_super =F2FS_RAW_SUPER (sbi);struct f2fs_stat_info *si; +unsigned long flags;int i; si =f2fs_kzalloc (sbi,sizeof (struct f2fs_stat_info ),GFP_KERNEL );
@@ -620,9 +622,9 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)atomic_set (&sbi->max_aw_cnt,0 );atomic_set (&sbi->max_vw_cnt,0 ); -mutex_lock (&f2fs_stat_mutex); +raw_spin_lock_irqsave (&f2fs_stat_lock, flags);list_add_tail (&si->stat_list, &f2fs_stat_list); -mutex_unlock (&f2fs_stat_mutex); +raw_spin_unlock_irqrestore (&f2fs_stat_lock, flags);return 0 ; }
@@ -630,10 +632,11 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)void f2fs_destroy_stats (struct f2fs_sb_info *sbi) {struct f2fs_stat_info *si =F2FS_STAT (sbi); +unsigned long flags; -mutex_lock (&f2fs_stat_mutex); +raw_spin_lock_irqsave (&f2fs_stat_lock, flags);list_del (&si->stat_list); -mutex_unlock (&f2fs_stat_mutex); +raw_spin_unlock_irqrestore (&f2fs_stat_lock, flags);kfree (si); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 886/1126 f2fs: compress: fix to print raw data size in error path of lz4 decompression
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit d284af43f703760e261b1601378a0c13a19d5f1f ]
In lz4_decompress_pages(), if size of decompressed data is not equal to expected one, we should print the size rather than size of target buffer for decompressed data, fix it.
--- fs/f2fs/compress.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/f2fs/compress.c +2 -3
@@ -314,10 +314,9 @@ static int lz4_decompress_pages(struct decompress_io_ctx *dic) }if (ret !=PAGE_SIZE << dic->log_cluster_size) { -printk_ratelimited ("%sF2FS-fs (%s): lz4 invalid rlen:%zu, " +printk_ratelimited ("%sF2FS-fs (%s): lz4 invalid ret:%d, " "expected:%lu\n" ,KERN_ERR , -F2FS_I_SB (dic->inode)->sb->s_id, - dic->rlen, +F2FS_I_SB (dic->inode)->sb->s_id, ret,PAGE_SIZE << dic->log_cluster_size);return -EIO ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 887/1126 Adjust cifssb maximum read size
In reply to Greg Kroah-HartmanFrom: Rohith Surabattula <[email protected]>
[ Upstream commit 06a466565d54a1a42168f9033a062a3f5c40e73b ]
When session gets reconnected during mount then read size in super block fs context gets set to zero and after negotiate, rsize is not modified which results in incorrect read with requested bytes as zero. Fixes intermittent failure of xfstest generic/240
Note that stable requires a different version of this patch which will be sent to the stable mailing list.
--- fs/cifs/cifsfs.c | 3 +++ fs/cifs/file.c | 10 ++++++++++ 2 files changed, 13 insertions(+)
fs/cifs/cifsfs.c +3 -0
@@ -210,6 +210,9 @@ cifs_read_super(struct super_block *sb)if (rc) goto out_no_root;/* tune readahead according to rsize if readahead size not set on mount */ +if (cifs_sb->ctx->rsize ==0 ) + cifs_sb->ctx->rsize = + tcon->ses->server->ops->negotiate_rsize (tcon, cifs_sb->ctx);if (cifs_sb->ctx->rasize) sb->s_bdi->ra_pages = cifs_sb->ctx->rasize /PAGE_SIZE ;else
fs/cifs/file.c +10 -0
@@ -3740,6 +3740,11 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file,break ; } +if (cifs_sb->ctx->rsize ==0 ) + cifs_sb->ctx->rsize = + server->ops->negotiate_rsize (tlink_tcon (open_file->tlink), + cifs_sb->ctx); + rc = server->ops->wait_mtu_credits (server, cifs_sb->ctx->rsize, &rsize, credits);if (rc)
@@ -4474,6 +4479,11 @@ static void cifs_readahead(struct readahead_control *ractl) } } +if (cifs_sb->ctx->rsize ==0 ) + cifs_sb->ctx->rsize = + server->ops->negotiate_rsize (tlink_tcon (open_file->tlink), + cifs_sb->ctx); + rc = server->ops->wait_mtu_credits (server, cifs_sb->ctx->rsize, &rsize, credits);if (rc)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 888/1126 ntfs: add sanity check on allocation size
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 714fbf2647b1a33d914edd695d4da92029c7e7c0 ]
ntfs_read_inode_mount invokes ntfs_malloc_nofs with zero allocation size. It triggers one BUG in the __ntfs_malloc function.
Fix this by adding sanity check on ni->attr_list_size.
--- fs/ntfs/inode.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ntfs/inode.c +4 -0
@@ -1881,6 +1881,10 @@ int ntfs_read_inode_mount(struct inode *vi) }/* Now allocate memory for the attribute list. */ ni->attr_list_size = (u32 )ntfs_attr_size (a); +if (!ni->attr_list_size) { +ntfs_error (sb,"Attr_list_size is zero" ); + goto put_err_out; + } ni->attr_list =ntfs_malloc_nofs (ni->attr_list_size);if (!ni->attr_list) { ntfs_error(sb, "Not enough memory to allocate buffer "
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 889/1126 media: staging: media: zoran: move videodev alloc
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit 82e3a496eb56da0b9f29fdc5b63cedb3289e91de ]
Move some code out of zr36057_init() and create new functions for handling zr->video_dev. This permit to ease code reading and fix a zr->video_dev memory leak.
--- drivers/staging/media/zoran/zoran.h | 2 +- drivers/staging/media/zoran/zoran_card.c | 80 ++++++++++++++-------- drivers/staging/media/zoran/zoran_driver.c | 5 +- 3 files changed, 54 insertions(+), 33 deletions(-)
drivers/staging/media/zoran/zoran.h +1 -1
@@ -313,6 +313,6 @@ static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)#endif -int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq); +int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq,int dir);void zoran_queue_exit (struct zoran *zr);int zr_set_buf (struct zoran *zr);
drivers/staging/media/zoran/zoran_card.c +50 -30
115 lines not on this page · raw message
drivers/staging/media/zoran/zoran_driver.c +3 -2
@@ -1008,7 +1008,7 @@ static const struct vb2_ops zr_video_qops = { .wait_finish = vb2_ops_wait_finish, }; -int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq) +int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq,int dir) {int err;
@@ -1016,7 +1016,8 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq)INIT_LIST_HEAD (&zr->queued_bufs); vq->dev = &zr->pci_dev->dev; - vq->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; + vq->type = dir; + vq->io_modes =VB2_USERPTR |VB2_DMABUF |VB2_MMAP |VB2_READ |VB2_WRITE ; vq->drv_priv = zr; vq->buf_struct_size =sizeof (struct zr_buffer );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 890/1126 media: staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
[ Upstream commit e3b86f4e558cea9eed71d894df2f19b10d60a207 ]
On the case tmp_dcim=1, the index of buffer is miscalculated. This generate a NULL pointer dereference later.
So let's fix the calcul and add a check to prevent this to reappear.
--- drivers/staging/media/zoran/zoran_device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/zoran/zoran_device.c +6 -1
@@ -814,7 +814,7 @@ static void zoran_reap_stat_com(struct zoran *zr)if (zr->jpg_settings.tmp_dcm ==1 ) i = (zr->jpg_dma_tail - zr->jpg_err_shift) &BUZ_MASK_STAT_COM ;else - i = ((zr->jpg_dma_tail - zr->jpg_err_shift) &1 ) *2 +1 ; + i = ((zr->jpg_dma_tail - zr->jpg_err_shift) &1 ) *2 ; stat_com =le32_to_cpu (zr->stat_com[i]);if ((stat_com &1 ) ==0 ) {
@@ -826,6 +826,11 @@ static void zoran_reap_stat_com(struct zoran *zr) size = (stat_com &GENMASK (22 ,1 )) >>1 ; buf = zr->inuse[i]; +if (!buf) { +spin_unlock_irqrestore (&zr->queued_bufs_lock, flags); +pci_err (zr->pci_dev,"No buffer at slot %d\n" , i); +return ; + } buf->vbuf.vb2_buf.timestamp =ktime_get_ns ();if (zr->codec_mode ==BUZ_MODE_MOTION_COMPRESS ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 891/1126 media: staging: media: zoran: fix various V4L2 compliance errors
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 914941827aad5ecddf9bf3a6dee67fbec1af1fff ]
This fixes several issues found with 'v4l2-compliance -s':
1) read()/write() is supported, but not reported in the capabilities
2) S_STD(G_STD()) failed: setting the same standard should just return 0.
3) G_PARM failed to set readbuffers.
4) different field values in the format vs. what v4l2_buffer reported.
5) zero the sequence number when starting streaming.
6) drop VB_USERPTR: makes no sense with dma_contig streaming.
--- drivers/staging/media/zoran/zoran_card.c | 2 +- drivers/staging/media/zoran/zoran_driver.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/staging/media/zoran/zoran_card.c +1 -1
@@ -811,7 +811,7 @@ static int zoran_init_video_device(struct zoran *zr, struct video_device *video_ *video_dev = zoran_template; video_dev->v4l2_dev = &zr->v4l2_dev; video_dev->lock = &zr->lock; - video_dev->device_caps =V4L2_CAP_STREAMING | dir; + video_dev->device_caps =V4L2_CAP_STREAMING |V4L2_CAP_READWRITE | dir;strscpy (video_dev->name,ZR_DEVNAME (zr),sizeof (video_dev->name));/*
drivers/staging/media/zoran/zoran_driver.c +10 -3
@@ -255,8 +255,6 @@ static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capabilitystrscpy (cap->card,ZR_DEVNAME (zr),sizeof (cap->card));strscpy (cap->driver,"zoran" ,sizeof (cap->driver));snprintf (cap->bus_info,sizeof (cap->bus_info),"PCI:%s" ,pci_name (zr->pci_dev)); - cap->device_caps = zr->video_dev->device_caps; - cap->capabilities = cap->device_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }
@@ -582,6 +580,9 @@ static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std)struct zoran *zr =video_drvdata (file);int res =0 ; +if (zr->norm == std) +return 0 ; +if (zr->running !=ZORAN_MAP_MODE_NONE )return -EBUSY ;
@@ -739,6 +740,7 @@ static int zoran_g_parm(struct file *file, void *priv, struct v4l2_streamparm *pif (parm->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )return -EINVAL ; + parm->parm.capture.readbuffers =9 ;return 0 ; }
@@ -869,6 +871,10 @@ int zr_set_buf(struct zoran *zr) vbuf = &buf->vbuf; buf->vbuf.field =V4L2_FIELD_INTERLACED ; +if (BUZ_MAX_HEIGHT < (zr->v4l_settings.height *2 )) + buf->vbuf.field =V4L2_FIELD_INTERLACED ; +else + buf->vbuf.field =V4L2_FIELD_TOP ;vb2_set_plane_payload (&buf->vbuf.vb2_buf,0 , zr->buffer_size);vb2_buffer_done (&buf->vbuf.vb2_buf,VB2_BUF_STATE_DONE ); zr->inuse[0 ] =NULL ;
@@ -928,6 +934,7 @@ static int zr_vb2_start_streaming(struct vb2_queue *vq, unsigned int count) zr->stat_com[j] =cpu_to_le32 (1 ); zr->inuse[j] =NULL ; } + zr->vbseq =0 ;if (zr->map_mode !=ZORAN_MAP_MODE_RAW ) {pci_info (zr->pci_dev,"START JPG\n" );
@@ -1018,7 +1025,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq, int dir) vq->dev = &zr->pci_dev->dev; vq->type = dir; - vq->io_modes =VB2_USERPTR |VB2_DMABUF |VB2_MMAP |VB2_READ |VB2_WRITE ; + vq->io_modes =VB2_DMABUF |VB2_MMAP |VB2_READ |VB2_WRITE ; vq->drv_priv = zr; vq->buf_struct_size =sizeof (struct zr_buffer ); vq->ops = &zr_video_qops;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 892/1126 media: atmel: atmel-isc-base: report frame sizes as full supported range
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 72802a86e11c34e819fbfb38f58c5aef668f833d ]
The ISC supports a full broad range of frame sizes.
Until now, the subdevice was queried for possible frame sizes and these were reported to the user space.
However, the ISC should not care about which frame sizes the subdev supports, as long as this frame size is supported.
Thus, report a continuous range from smallest frame size up to the max resolution.
--- drivers/media/platform/atmel/atmel-isc-base.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/media/platform/atmel/atmel-isc-base.c +10 -12
@@ -1369,14 +1369,12 @@ static int isc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) {struct isc_device *isc =video_drvdata (file); -struct v4l2_subdev_frame_size_enum fse = { - .code = isc->config.sd_format->mbus_code, - .index = fsize->index, - .which =V4L2_SUBDEV_FORMAT_ACTIVE , - };int ret = -EINVAL ;int i; +if (fsize->index) +return -EINVAL ; +for (i =0 ; i < isc->num_user_formats; i++)if (isc->user_formats[i]->fourcc == fsize->pixel_format) ret =0 ;
@@ -1388,14 +1386,14 @@ static int isc_enum_framesizes(struct file *file, void *fh,if (ret)return ret; - ret =v4l2_subdev_call (isc->current_subdev->sd, pad, enum_frame_size, -NULL , &fse); -if (ret) -return ret; + fsize->type =V4L2_FRMSIZE_TYPE_CONTINUOUS ; - fsize->type =V4L2_FRMSIZE_TYPE_DISCRETE ; - fsize->discrete.width = fse.max_width; - fsize->discrete.height = fse.max_height; + fsize->stepwise.min_width =16 ; + fsize->stepwise.max_width = isc->max_width; + fsize->stepwise.min_height =16 ; + fsize->stepwise.max_height = isc->max_height; + fsize->stepwise.step_width =1 ; + fsize->stepwise.step_height =1 ;return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 893/1126 media: ir_toy: free before error exiting
In reply to Greg Kroah-HartmanFrom: Peiwei Hu <[email protected]>
[ Upstream commit 52cdb013036391d9d87aba5b4fc49cdfc6ea4b23 ]
Fix leak in error path.
--- drivers/media/rc/ir_toy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ir_toy.c +1 -1
@@ -458,7 +458,7 @@ static int irtoy_probe(struct usb_interface *intf, err =usb_submit_urb (irtoy->urb_in,GFP_KERNEL );if (err !=0 ) {dev_err (irtoy->dev,"fail to submit in urb: %d\n" , err); -return err; + goto free_rcdev; } err =irtoy_setup (irtoy);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 894/1126 ASoC: sh: rz-ssi: Make the data structures available before registering the handlers
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 0788785c78342d422f93b1c9831c2b2b7f137937 ]
Initialize the spinlock and make the data structures available before registering the interrupt handlers.
--- sound/soc/sh/rz-ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/sh/rz-ssi.c +3 -2
@@ -977,6 +977,9 @@ static int rz_ssi_probe(struct platform_device *pdev) ssi->playback.priv = ssi; ssi->capture.priv = ssi; +spin_lock_init (&ssi->lock); +dev_set_drvdata (&pdev->dev, ssi); +/* Error Interrupt */ ssi->irq_int =platform_get_irq_byname (pdev,"int_req" );if (ssi->irq_int <0 )
@@ -1029,8 +1032,6 @@ static int rz_ssi_probe(struct platform_device *pdev)return dev_err_probe (ssi->dev, ret,"pm_runtime_resume_and_get failed\n" ); } -spin_lock_init (&ssi->lock); -dev_set_drvdata (&pdev->dev, ssi); ret =devm_snd_soc_register_component (&pdev->dev, &rz_ssi_soc_component, rz_ssi_soc_dai,ARRAY_SIZE (rz_ssi_soc_dai));
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 895/1126 ASoC: cs42l42: Report full jack status when plug is detected
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit 8d06f797f844d04a961f201f886f7f9985edc9bf ]
When a plug event is detect report the full state of all status bits, don't assume that there will have been a previous unplug event to clear all the bits. Report the state of both HEADPHONE and MICROPHONE bits according to detected type, and clear all the button status bits. The current button status is already checked and reported at the end of the function.
During a system suspend the jack could be unplugged and plugged, possibly changing the jack type. On resume the interrupt status will indicate a plug event - there will not be an unplug event to clear the bits.
--- sound/soc/codecs/cs42l42.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
sound/soc/codecs/cs42l42.c +11 -3
@@ -1637,7 +1637,11 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data)mutex_lock (&cs42l42->jack_detect_mutex); -/* Check auto-detect status */ +/* +* Check auto-detect status. Don't assume a previous unplug event has +* cleared the flags. If the jack is unplugged and plugged during +* system suspend there won't have been an unplug event. +*/ if ((~masks[5 ]) & irq_params_table[5 ].mask) {if (stickies[5 ] &CS42L42_HSDET_AUTO_DONE_MASK ) {cs42l42_process_hs_type_detect (cs42l42);
@@ -1645,11 +1649,15 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data)case CS42L42_PLUG_CTIA :case CS42L42_PLUG_OMTP :snd_soc_jack_report (cs42l42->jack,SND_JACK_HEADSET , -SND_JACK_HEADSET ); +SND_JACK_HEADSET | +SND_JACK_BTN_0 |SND_JACK_BTN_1 | +SND_JACK_BTN_2 |SND_JACK_BTN_3 );break ;case CS42L42_PLUG_HEADPHONE :snd_soc_jack_report (cs42l42->jack,SND_JACK_HEADPHONE , -SND_JACK_HEADPHONE ); +SND_JACK_HEADSET | +SND_JACK_BTN_0 |SND_JACK_BTN_1 | +SND_JACK_BTN_2 |SND_JACK_BTN_3 );break ;default :break ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 896/1126 ASoC: SOF: Intel: match sdw version on link_slaves_found
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
[ Upstream commit f67c0c0d3b9048d86ea6ae52e36a2b78c48f265d ]
Codecs with the same part id, manufacturer id and part id, but different sdw version should be treated as different codecs. For example, rt711 and rt711-sdca are different. So, we should match sdw version as well.
--- sound/soc/sof/intel/hda.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/sof/intel/hda.c +10 -5
@@ -1188,7 +1188,7 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,struct hdac_bus *bus =sof_to_bus (sdev);struct sdw_intel_slave_id *ids = sdw->ids;int num_slaves = sdw->num_slaves; -unsigned int part_id, link_id, unique_id, mfg_id; +unsigned int part_id, link_id, unique_id, mfg_id, version;int i, j, k;for (i =0 ; i < link->num_adr; i++) {
@@ -1198,12 +1198,14 @@ static bool link_slaves_found(struct snd_sof_dev *sdev, mfg_id =SDW_MFG_ID (adr); part_id =SDW_PART_ID (adr); link_id =SDW_DISCO_LINK_ID (adr); + version =SDW_VERSION (adr);for (j =0 ; j < num_slaves; j++) {/* find out how many identical parts were reported on that link */ if (ids[j].link_id == link_id && ids[j].id.part_id == part_id && - ids[j].id.mfg_id == mfg_id) + ids[j].id.mfg_id == mfg_id && + ids[j].id.sdw_version == version) reported_part_count++; }
@@ -1212,21 +1214,24 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,if (ids[j].link_id != link_id || ids[j].id.part_id != part_id || - ids[j].id.mfg_id != mfg_id) + ids[j].id.mfg_id != mfg_id || + ids[j].id.sdw_version != version)continue ;/* find out how many identical parts are expected */ for (k =0 ; k < link->num_adr; k++) {u64 adr2 = link->adr_d[k].adr; -unsigned int part_id2, link_id2, mfg_id2; +unsigned int part_id2, link_id2, mfg_id2, version2; mfg_id2 =SDW_MFG_ID (adr2); part_id2 =SDW_PART_ID (adr2); link_id2 =SDW_DISCO_LINK_ID (adr2); + version2 =SDW_VERSION (adr2);if (link_id2 == link_id && part_id2 == part_id && - mfg_id2 == mfg_id) + mfg_id2 == mfg_id && + version2 == version) expected_part_count++; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 897/1126 media: imx-jpeg: Prevent decoding NV12M jpegs into single-planar buffers
In reply to Greg Kroah-HartmanFrom: Mirela Rabulea <[email protected]>
[ Upstream commit 417591a766b3c040c346044541ff949c0b2bb7b2 ]
If the application queues an NV12M jpeg as output buffer, but then queues a single planar capture buffer, the kernel will crash with "Unable to handle kernel NULL pointer dereference" in mxc_jpeg_addrs, prevent this by finishing the job with error.
--- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/imx-jpeg/mxc-jpeg.c +6 -0
@@ -947,6 +947,12 @@ static void mxc_jpeg_device_run(void *priv)v4l2_m2m_buf_copy_metadata (src_buf, dst_buf, true); jpeg_src_buf =vb2_to_mxc_buf (&src_buf->vb2_buf); +if (q_data_cap->fmt->colplanes != dst_buf->vb2_buf.num_planes) { +dev_err (dev,"Capture format %s has %d planes, but capture buffer has %d planes\n" , + q_data_cap->fmt->name, q_data_cap->fmt->colplanes, + dst_buf->vb2_buf.num_planes); + jpeg_src_buf->jpeg_parse_error = true; + }if (jpeg_src_buf->jpeg_parse_error) { jpeg->slot_data[ctx->slot].used = false;v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 898/1126 ASoC: SOF: Intel: hda: Remove link assignment limitation
In reply to Greg Kroah-HartmanFrom: Ranjani Sridharan <[email protected]>
[ Upstream commit 2ce0d008dcc59f9c01f43277b9f9743af7b01dad ]
The limitation to assign a link DMA channel for a BE iff the corresponding host DMA channel is assigned to a connected FE is only applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms that do not enable the quirk.
Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")
--- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/soc/sof/intel/hda-dai.c +13 -0
@@ -59,6 +59,8 @@ static struct hdac_ext_stream * {struct snd_soc_pcm_runtime *rtd =asoc_substream_to_rtd (substream);struct sof_intel_hda_stream *hda_stream; +const struct sof_intel_dsp_desc *chip; +struct snd_sof_dev *sdev;struct hdac_ext_stream *res =NULL ;struct hdac_stream *stream =NULL ;
@@ -77,9 +79,20 @@ static struct hdac_ext_stream *continue ; hda_stream =hstream_to_sof_hda_stream (hstream); + sdev = hda_stream->sdev; + chip =get_chip_info (sdev->pdata);/* check if link is available */ if (!hstream->link_locked) { +/* +* choose the first available link for platforms that do not have the +* PROCEN_FMT_QUIRK set. +*/ +if (!(chip->quirks &SOF_INTEL_PROCEN_FMT_QUIRK )) { + res = hstream; +break ; + } +if (stream->opened) {/* * check if the stream tag matches the stream
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 899/1126 media: iommu/mediatek-v1: Free the existed fwspec if the master dev already has
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit 822a2ed8c606caf6a11b1a180b8e46292bd77d71 ]
When the iommu master device enters of_iommu_xlate, the ops may be NULL(iommu dev is defered), then it will initialize the fwspec here:
[<c0c9c5bc>] (dev_iommu_fwspec_set) from [<c06bda80>] (iommu_fwspec_init+0xbc/0xd4)
[<c06bd9c4>] (iommu_fwspec_init) from [<c06c0db4>] (of_iommu_xlate+0x7c/0x12c)
[<c06c0d38>] (of_iommu_xlate) from [<c06c10e8>] (of_iommu_configure+0x144/0x1e8)
BUT the mtk_iommu_v1.c only supports arm32, the probing flow still is a bit weird. We always expect create the fwspec internally. otherwise it will enter here and return fail.
static int mtk_iommu_create_mapping(struct device *dev,
struct of_phandle_args *args)
{
...
if (!fwspec) {
....
} else if (dev_iommu_fwspec_get(dev)->ops != &mtk_iommu_ops) {
>>>>>>>>>>Enter here. return fail.<<<<<<<<<<<<
return -EINVAL;
}
...
}Thus, Free the existed fwspec if the master device already has fwspec.
This issue is reported at:
https://lore.kernel.org/linux-mediatek/trinity-7d9ebdc9-4849-4d93-bfb5-429dcb4ee449-1626253158870@3c-app-gmx-bs01/
--- drivers/iommu/mtk_iommu_v1.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/iommu/mtk_iommu_v1.c +9 -0
@@ -425,6 +425,15 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)struct mtk_iommu_data *data;int err, idx =0 ; +/* +* In the deferred case, free the existed fwspec. +* Always initialize the fwspec internally. +*/ +if (fwspec) { +iommu_fwspec_free (dev); + fwspec =dev_iommu_fwspec_get (dev); + } +while (!of_parse_phandle_with_args (dev->of_node,"iommus" ,"#iommu-cells" , idx, &iommu_spec)) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 900/1126 media: iommu/mediatek: Return ENODEV if the device is NULL
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit 2fb0feed51085db77606de9b9477c96894328809 ]
The platform device is created at:of_platform_default_populate_init: arch_initcall_sync
->of_platform_populate
->of_platform_device_create_pdata
When entering our probe, all the devices should be already created. if it is null, means NODEV. Currently we don't get the fail case. It's a minor fix, no need add fixes tags.
--- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/mtk_iommu_v1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +1 -1
@@ -848,7 +848,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) plarbdev =of_find_device_by_node (larbnode);if (!plarbdev) {of_node_put (larbnode); -return -EPROBE_DEFER ; +return -ENODEV ; } data->larb_imu[id].dev = &plarbdev->dev;
drivers/iommu/mtk_iommu_v1.c +1 -1
@@ -604,7 +604,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) plarbdev =of_find_device_by_node (larbnode);if (!plarbdev) {of_node_put (larbnode); -return -EPROBE_DEFER ; +return -ENODEV ; } data->larb_imu[i].dev = &plarbdev->dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 901/1126 media: iommu/mediatek: Add device_link between the consumer and the larb devices
In reply to Greg Kroah-HartmanFrom: Yong Wu <[email protected]>
[ Upstream commit 635319a4a7444ca97124d781cd96deb277ff4d40 ]
MediaTek IOMMU-SMI diagram is like below. all the consumer connect with smi-larb, then connect with smi-common.
M4U
|
smi-common
|
-------------
| | ...
| |
larb1 larb2
| |
vdec vencWhen the consumer works, it should enable the smi-larb's power which also need enable the smi-common's power firstly.
Thus, First of all, use the device link connect the consumer and the smi-larbs. then add device link between the smi-larb and smi-common.
This patch adds device_link between the consumer and the larbs.
When device_link_add, I add the flag DL_FLAG_STATELESS to avoid calling pm_runtime_xx to keep the original status of clocks. It can avoid two issues:
1) Display HW show fastlogo abnormally reported in [1]. At the beggining, all the clocks are enabled before entering kernel, but the clocks for display HW(always in larb0) will be gated after clk_enable and clk_disable called from device_link_add(->pm_runtime_resume) and rpm_idle. The clock operation happened before display driver probe. At that time, the display HW will be abnormal.
2) A deadlock issue reported in [2]. Use DL_FLAG_STATELESS to skip pm_runtime_xx to avoid the deadlock.
Corresponding, DL_FLAG_AUTOREMOVE_CONSUMER can't be added, then device_link_removed should be added explicitly.
Meanwhile, Currently we don't have a device connect with 2 larbs at the same time. Disallow this case, print the error log.
[1] https://lore.kernel.org/linux-mediatek/1564213888.22908.4.camel@mhfsdcap03/
[2] https://lore.kernel.org/patchwork/patch/1086569/
--- drivers/iommu/mtk_iommu.c | 30 ++++++++++++++++++++++++++++++ drivers/iommu/mtk_iommu_v1.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +30 -0
@@ -562,22 +562,52 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev);struct mtk_iommu_data *data; +struct device_link *link; +struct device *larbdev; +unsigned int larbid, larbidx, i;if (!fwspec || fwspec->ops != &mtk_iommu_ops)return ERR_PTR (-ENODEV );/* Not a iommu client device */ data =dev_iommu_priv_get (dev); +/* +* Link the consumer device with the smi-larb device(supplier). +* The device that connects with each a larb is a independent HW. +* All the ports in each a device should be in the same larbs. +*/ + larbid =MTK_M4U_TO_LARB (fwspec->ids[0 ]); +for (i =1 ; i < fwspec->num_ids; i++) { + larbidx =MTK_M4U_TO_LARB (fwspec->ids[i]); +if (larbid != larbidx) { +dev_err (dev,"Can only use one larb. Fail@larb%d-%d.\n" , + larbid, larbidx); +return ERR_PTR (-EINVAL ); + } + } + larbdev = data->larb_imu[larbid].dev; + link =device_link_add (dev, larbdev, +DL_FLAG_PM_RUNTIME |DL_FLAG_STATELESS ); +if (!link) +dev_err (dev,"Unable to link %s\n" ,dev_name (larbdev));return &data->iommu; }static void mtk_iommu_release_device (struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); +struct mtk_iommu_data *data; +struct device *larbdev; +unsigned int larbid;if (!fwspec || fwspec->ops != &mtk_iommu_ops)return ; + data =dev_iommu_priv_get (dev); + larbid =MTK_M4U_TO_LARB (fwspec->ids[0 ]); + larbdev = data->larb_imu[larbid].dev; +device_link_remove (dev, larbdev); +iommu_fwspec_free (dev); }
drivers/iommu/mtk_iommu_v1.c +28 -1
@@ -423,7 +423,9 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev);struct of_phandle_args iommu_spec;struct mtk_iommu_data *data; -int err, idx =0 ; +int err, idx =0 , larbid, larbidx; +struct device_link *link; +struct device *larbdev;/* * In the deferred case, free the existed fwspec.
@@ -453,6 +455,23 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) data =dev_iommu_priv_get (dev); +/* Link the consumer device with the smi-larb device(supplier) */ + larbid =mt2701_m4u_to_larb (fwspec->ids[0 ]); +for (idx =1 ; idx < fwspec->num_ids; idx++) { + larbidx =mt2701_m4u_to_larb (fwspec->ids[idx]); +if (larbid != larbidx) { +dev_err (dev,"Can only use one larb. Fail@larb%d-%d.\n" , + larbid, larbidx); +return ERR_PTR (-EINVAL ); + } + } + + larbdev = data->larb_imu[larbid].dev; + link =device_link_add (dev, larbdev, +DL_FLAG_PM_RUNTIME |DL_FLAG_STATELESS ); +if (!link) +dev_err (dev,"Unable to link %s\n" ,dev_name (larbdev)); +return &data->iommu; }
@@ -473,10 +492,18 @@ static void mtk_iommu_probe_finalize(struct device *dev)static void mtk_iommu_release_device (struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); +struct mtk_iommu_data *data; +struct device *larbdev; +unsigned int larbid;if (!fwspec || fwspec->ops != &mtk_iommu_ops)return ; + data =dev_iommu_priv_get (dev); + larbid =mt2701_m4u_to_larb (fwspec->ids[0 ]); + larbdev = data->larb_imu[larbid].dev; +device_link_remove (dev, larbdev); +iommu_fwspec_free (dev); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 902/1126 video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
In reply to Greg Kroah-HartmanFrom: Tim Gardner <[email protected]>
[ Upstream commit 37a1a2e6eeeb101285cd34e12e48a881524701aa ]
Coverity complains of a possible buffer overflow. However, given the 'static' scope of nvidia_setup_i2c_bus() it looks like that can't happen after examiniing the call sites.
CID 19036 (#1 of 1): Copy into fixed size buffer (STRING_OVERFLOW)
1. fixed_size_dest: You might overrun the 48-character fixed-size string chan->adapter.name by copying name without checking the length.
2. parameter_as_source: Note: This defect has an elevated risk because the source argument is a parameter of the current function.
89 strcpy(chan->adapter.name, name);
Fix this warning by using strscpy() which will silence the warning and prevent any future buffer overflows should the names used to identify the channel become much longer.
--- drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/nvidia/nv_i2c.c +1 -1
@@ -86,7 +86,7 @@ static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name, {int rc; -strcpy (chan->adapter.name, name); +strscpy (chan->adapter.name, name,sizeof (chan->adapter.name)); chan->adapter.owner =THIS_MODULE ; chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 903/1126 video: fbdev: w100fb: Reset global state
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 8738ddcac644964ae128ccd3d80d48773c8d528e ]
w100fb_probe() did not reset the global state to its initial state. This can result in invocation of iounmap() even when there was not the appropriate successful call of ioremap(). For instance, this may be the case if first probe fails after two successful ioremap() while second probe fails when first ioremap() fails. The similar issue is with w100fb_remove(). The patch fixes both bugs.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/video/fbdev/w100fb.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/video/fbdev/w100fb.c +12 -3
@@ -770,12 +770,18 @@ static int w100fb_probe(struct platform_device *pdev)fb_dealloc_cmap (&info->cmap);kfree (info->pseudo_palette); } -if (remapped_fbuf !=NULL ) +if (remapped_fbuf !=NULL ) {iounmap (remapped_fbuf); -if (remapped_regs !=NULL ) + remapped_fbuf =NULL ; + } +if (remapped_regs !=NULL ) {iounmap (remapped_regs); -if (remapped_base !=NULL ) + remapped_regs =NULL ; + } +if (remapped_base !=NULL ) {iounmap (remapped_base); + remapped_base =NULL ; + }if (info)framebuffer_release (info);return err;
@@ -795,8 +801,11 @@ static int w100fb_remove(struct platform_device *pdev)fb_dealloc_cmap (&info->cmap);iounmap (remapped_base); + remapped_base =NULL ;iounmap (remapped_regs); + remapped_regs =NULL ;iounmap (remapped_fbuf); + remapped_fbuf =NULL ;framebuffer_release (info);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 904/1126 video: fbdev: cirrusfb: check pixclock to avoid divide by zero
In reply to Greg Kroah-HartmanFrom: George Kennedy <[email protected]>
[ Upstream commit 5c6f402bdcf9e7239c6bc7087eda71ac99b31379 ]
Do a sanity check on pixclock value to avoid divide by zero.
If the pixclock value is zero, the cirrusfb driver will round up pixclock to get the derived frequency as close to maxclock as possible.
Syzkaller reported a divide error in cirrusfb_check_pixclock.
divide error: 0000 [#1] SMP KASAN PTI
CPU: 0 PID: 14938 Comm: cirrusfb_test Not tainted 5.15.0-rc6 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2 RIP: 0010:cirrusfb_check_var+0x6f1/0x1260 Call Trace: fb_set_var+0x398/0xf90 do_fb_ioctl+0x4b8/0x6f0 fb_ioctl+0xeb/0x130 __x64_sys_ioctl+0x19d/0x220 do_syscall_64+0x3a/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- drivers/video/fbdev/cirrusfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/video/fbdev/cirrusfb.c +8 -8
@@ -469,7 +469,7 @@ static int cirrusfb_check_mclk(struct fb_info *info, long freq)return 0 ; } -static int cirrusfb_check_pixclock (const struct fb_var_screeninfo *var, +static int cirrusfb_check_pixclock (struct fb_var_screeninfo *var,struct fb_info *info) {long freq;
@@ -478,9 +478,7 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,unsigned maxclockidx = var->bits_per_pixel >>3 ;/* convert from ps to kHz */ - freq =PICOS2KHZ (var->pixclock); - -dev_dbg (info->device,"desired pixclock: %ld kHz\n" , freq); + freq =PICOS2KHZ (var->pixclock ? :1 ); maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx]; cinfo->multiplexing =0 ;
@@ -488,11 +486,13 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,/* If the frequency is greater than we can support, we might be able * to use multiplexing for the video mode */ if (freq > maxclock) { -dev_err (info->device, -"Frequency greater than maxclock (%ld kHz)\n" , - maxclock); -return -EINVAL ; + var->pixclock =KHZ2PICOS (maxclock); + +while ((freq =PICOS2KHZ (var->pixclock)) > maxclock) + var->pixclock++; } +dev_dbg (info->device,"desired pixclock: %ld kHz\n" , freq); +/* * Additional constraint: 8bpp uses DAC clock doubling to allow maximum * pixel clock
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 905/1126 video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
In reply to Greg Kroah-HartmanFrom: Yang Guang <[email protected]>
[ Upstream commit 24565bc4115961db7ee64fcc7ad2a7437c0d0a49 ]
coccinelle report:./drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c:
479:9-17: WARNING: use scnprintf or sprintf
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
--- .../video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c +1 -1
@@ -476,7 +476,7 @@ static ssize_t show_cabc_available_modes(struct device *dev,int i;if (!ddata->has_cabc) -return snprintf (buf,PAGE_SIZE ,"%s\n" , cabc_modes[0 ]); +return sysfs_emit (buf,"%s\n" , cabc_modes[0 ]);for (i =0 , len =0 ; len <PAGE_SIZE && i <ARRAY_SIZE (cabc_modes); i++)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 906/1126 ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
[ Upstream commit 6f7e221e7a5cfc3299616543fce42b36e631497b ]
IRQ types blindly copied from very similar APQ8064.
Fixes warnings as:
WARNING: CPU: 0 PID: 1 at drivers/irqchip/irq-gic.c:1080 gic_irq_domain_translate+0x118/0x120
...
--- arch/arm/boot/dts/qcom-msm8960.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/qcom-msm8960.dtsi +5 -3
@@ -146,7 +146,9 @@ reg = <0x108000 0x1000>; qcom,ipc = <&l2cc 0x8 2>; - interrupts = <0 19 0>, <0 21 0>, <0 22 0>; + interrupts = <GIC_SPI 19 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ack", "err", "wakeup"; regulators {
@@ -192,7 +194,7 @@ compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; - interrupts = <0 154 0x0>; + interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; status = "disabled";
@@ -318,7 +320,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x16080000 0x1000>; - interrupts = <0 147 0>; + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; spi-max-frequency = <24000000>; cs-gpios = <&msmgpio 8 0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 907/1126 ARM: dts: bcm2837: Add the missing L1/L2 cache information
In reply to Greg Kroah-HartmanFrom: Richard Schleich <[email protected]>
[ Upstream commit bdf8762da268d2a34abf517c36528413906e9cd5 ]
This patch fixes the kernel warning "cacheinfo: Unable to detect cache hierarchy for CPU 0" for the bcm2837 on newer kernel versions.
--- arch/arm/boot/dts/bcm2837.dtsi | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
arch/arm/boot/dts/bcm2837.dtsi +49 -0
@@ -40,12 +40,26 @@ #size-cells = <0>; enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/ddi0500/e/level-1-memory-system + * /about-the-l1-memory-system?lang=en + * + * Source for d/i-cache-size + * https://magpi.raspberrypi.com/articles/raspberry-pi-3-specs-benchmarks + */ cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a53"; reg = <0>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000d8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu1: cpu@1 {
@@ -54,6 +68,13 @@ reg = <1>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu2: cpu@2 {
@@ -62,6 +83,13 @@ reg = <2>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu3: cpu@3 {
@@ -70,6 +98,27 @@ reg = <3>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000f0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; + }; + + /* Source for cache-line-size + cache-sets + * https://developer.arm.com/documentation/ddi0500 + * /e/level-2-memory-system/about-the-l2-memory-system?lang=en + * Source for cache-size + * https://datasheets.raspberrypi.com/cm/cm1-and-cm3-datasheet.pdf + */ + l2: l2-cache0 { + compatible = "cache"; + cache-size = <0x80000>; + cache-line-size = <64>; + cache-sets = <512>; // 512KiB(size)/64(line-size)=8192ways/16-way set + cache-level = <2>; }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 908/1126 ASoC: madera: Add dependencies on MFD
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit ec29170c724ca30305fc3a19ba2ee73ecac65509 ]
The Madera CODECs use regmap_irq functions but nothing ensures that regmap_irq is built into the kernel. Add dependencies on the ASoC symbols for the relevant MFD component. There is no point in building the ASoC driver if the MFD doesn't support it and the MFD part contains the necessary dependencies to ensure everything is built into the kernel.
--- sound/soc/codecs/Kconfig | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/Kconfig +5 -0
@@ -733,6 +733,7 @@ config SND_SOC_CS4349 config SND_SOC_CS47L15 tristate + depends on MFD_CS47L15 config SND_SOC_CS47L24 tristate
@@ -740,15 +741,19 @@ config SND_SOC_CS47L24 config SND_SOC_CS47L35 tristate + depends on MFD_CS47L35 config SND_SOC_CS47L85 tristate + depends on MFD_CS47L85 config SND_SOC_CS47L90 tristate + depends on MFD_CS47L90 config SND_SOC_CS47L92 tristate + depends on MFD_CS47L92 # Cirrus Logic Quad-Channel ADC config SND_SOC_CS53L30
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 909/1126 media: atomisp_gmin_platform: Add DMI quirk to not turn AXP ELDO2 regulator off on some boards
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 2c39a01154ea57d596470afa1d278e3be3b37f6a ]
The TrekStor SurfTab duo W1 10.1 has a hw bug where turning eldo2 back on after having turned it off causes the CPLM3218 ambient-light-sensor on the front camera sensor's I2C bus to crash, hanging the bus.
Add a DMI quirk table for systems on which to leave eldo2 on.
Note an alternative fix is to turn off the CPLM3218 ambient-light-sensor as long as the camera sensor is being used, this is what Windows seems to do as a workaround (based on analyzing the DSDT). But that is not easy to do cleanly under Linux.
--- .../media/atomisp/pci/atomisp_gmin_platform.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c +18 -0
@@ -748,6 +748,21 @@ static int axp_regulator_set(struct device *dev, struct gmin_subdev *gs,return 0 ; } +/* +* Some boards contain a hw-bug where turning eldo2 back on after having turned +* it off causes the CPLM3218 ambient-light-sensor on the image-sensor's I2C bus +* to crash, hanging the bus. Do not turn eldo2 off on these systems. +*/ +static const struct dmi_system_id axp_leave_eldo2_on_ids[] = { + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TrekStor" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"SurfTab duo W1 10.1 (VT4)" ), + }, + }, + { } +}; +static int axp_v1p8_on (struct device *dev,struct gmin_subdev *gs) {int ret;
@@ -782,6 +797,9 @@ static int axp_v1p8_off(struct device *dev, struct gmin_subdev *gs)if (ret)return ret; +if (dmi_check_system (axp_leave_eldo2_on_ids)) +return 0 ; + ret =axp_regulator_set (dev, gs, gs->eldo2_sel_reg, gs->eldo2_1p8v,ELDO_CTRL_REG , gs->eldo2_ctrl_shift, false);return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 910/1126 media: atomisp: fix dummy_ptr check to avoid duplicate active_bo
In reply to Greg Kroah-HartmanFrom: Tsuchiya Yuto <[email protected]>
[ Upstream commit 127efdbc51fe6064336c0452ce9c910b3e107cf0 ]
The dummy_ptr check in hmm_init() [1] results in the following "hmm_init Failed to create sysfs" error exactly once every two times on atomisp reload by rmmod/insmod (although atomisp module loads and works fine regardless of this error):
[ 140.230662] sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:03.0/active_bo' [ 140.230668] CPU: 1 PID: 2502 Comm: insmod Tainted: G C OE 5.15.0-rc4-1-surface-mainline #1 b8acf6eb64994414b2e20bad312a7a2c45f748f9 [ 140.230675] Hardware name: OEMB OEMB/OEMB, BIOS 1.51116.238 03/09/2015 [ 140.230678] Call Trace: [ 140.230687] dump_stack_lvl+0x46/0x5a [ 140.230702] sysfs_warn_dup.cold+0x17/0x24 [ 140.230710] sysfs_add_file_mode_ns+0x160/0x170 [ 140.230717] internal_create_group+0x126/0x390 [ 140.230723] hmm_init+0x5c/0x70 [atomisp 7a6a680bf400629363d2a6f58fd10e7299678b99] [ 140.230811] atomisp_pci_probe.cold+0x1136/0x148e [atomisp 7a6a680bf400629363d2a6f58fd10e7299678b99] [ 140.230875] local_pci_probe+0x45/0x80 [ 140.230882] ? pci_match_device+0xd7/0x130 [ 140.230887] pci_device_probe+0xfa/0x1b0 [ 140.230892] really_probe+0x1f5/0x3f0 [ 140.230899] __driver_probe_device+0xfe/0x180 [ 140.230903] driver_probe_device+0x1e/0x90 [ 140.230908] __driver_attach+0xc0/0x1c0 [ 140.230912] ? __device_attach_driver+0xe0/0xe0 [ 140.230915] ? __device_attach_driver+0xe0/0xe0 [ 140.230919] bus_for_each_dev+0x89/0xd0 [ 140.230924] bus_add_driver+0x12b/0x1e0 [ 140.230929] driver_register+0x8f/0xe0 [ 140.230933] ? 0xffffffffc153f000 [ 140.230937] do_one_initcall+0x57/0x220 [ 140.230945] do_init_module+0x5c/0x260 [ 140.230952] load_module+0x24bd/0x26a0 [ 140.230962] ? __do_sys_finit_module+0xae/0x110 [ 140.230966] __do_sys_finit_module+0xae/0x110 [ 140.230972] do_syscall_64+0x5c/0x80 [ 140.230979] ? syscall_exit_to_user_mode+0x23/0x40 [ 140.230983] ? do_syscall_64+0x69/0x80 [ 140.230988] ? exc_page_fault+0x72/0x170 [ 140.230991] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 140.230997] RIP: 0033:0x7f7fd5d8718d [ 140.231003] Code: b4 0c 00 0f 05 eb a9 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d b3 6c 0c 00 f7 d8 64 89 01 48 [ 140.231006] RSP: 002b:00007ffefc25f0e8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 140.231012] RAX: ffffffffffffffda RBX: 000055ac3edcd7f0 RCX: 00007f7fd5d8718d [ 140.231015] RDX: 0000000000000000 RSI: 000055ac3d723270 RDI: 0000000000000003 [ 140.231017] RBP: 0000000000000000 R08: 0000000000000000 R09: 00007f7fd5e52380 [ 140.231019] R10: 0000000000000003 R11: 0000000000000246 R12: 000055ac3d723270 [ 140.231021] R13: 0000000000000000 R14: 000055ac3edd06e0 R15: 0000000000000000 [ 140.231038] atomisp-isp2 0000:00:03.0: hmm_init Failed to create sysfs
The problem is that dummy_ptr == 0 is a valid value. So, change the logic which checks if dummy_ptr was allocated.
At this point, atomisp now gives WARN_ON() in hmm_free() [2] on atomisp reload by rmmod/insmod. Again, the check is wrong there.
So, change both checks for mmgr_EXCEPTION, which is the error value when HMM allocation fails, and initialize dummy_ptr with such value.
[1] added on commit
d9ab83953fa7 ("media: atomisp: don't cause a warn if probe failed")
[2] added on commit
b83cc378dfc4 ("atomisp: clean up the hmm init/cleanup indirections")
--- drivers/staging/media/atomisp/pci/hmm/hmm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/media/atomisp/pci/hmm/hmm.c +4 -3
@@ -39,7 +39,7 @@struct hmm_bo_device bo_device;struct hmm_pool dynamic_pool;struct hmm_pool reserved_pool; -static ia_css_ptr dummy_ptr; +static ia_css_ptr dummy_ptr = mmgr_EXCEPTION;static bool hmm_initialized;struct _hmm_mem_stat hmm_mem_stat;
@@ -209,7 +209,7 @@ int hmm_init(void)void hmm_cleanup (void ) { -if (!dummy_ptr) +if (dummy_ptr == mmgr_EXCEPTION)return ;sysfs_remove_group (&atomisp_dev->kobj, atomisp_attribute_group);
@@ -288,7 +288,8 @@ void hmm_free(ia_css_ptr virt)dev_dbg (atomisp_dev,"%s: free 0x%08x\n" , __func__, virt); -WARN_ON (!virt); +if (WARN_ON (virt == mmgr_EXCEPTION)) +return ; bo =hmm_bo_device_search_start (&bo_device, (unsigned int )virt);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 911/1126 ARM: ftrace: avoid redundant loads or clobbering IP
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit d11967870815b5ab89843980e35aab616c97c463 ]
Tweak the ftrace return paths to avoid redundant loads of SP, as well as unnecessary clobbering of IP.
This also fixes the inconsistency of using MOV to perform a function return, which is sub-optimal on recent micro-architectures but more importantly, does not perform an interworking return, unlike compiler generated function returns in Thumb2 builds.
Let's fix this by popping PC from the stack like most ordinary code does.
--- arch/arm/kernel/entry-ftrace.S | 51 +++++++++++++++------------------- 1 file changed, 22 insertions(+), 29 deletions(-)
arch/arm/kernel/entry-ftrace.S +22 -29
@@ -22,10 +22,7 @@ * mcount can be thought of as a function called in the middle of a subroutine * call. As such, it needs to be transparent for both the caller and the * callee: the original lr needs to be restored when leaving mcount, and no - * registers should be clobbered. (In the __gnu_mcount_nc implementation, we - * clobber the ip register. This is OK because the ARM calling convention - * allows it to be clobbered in subroutines and doesn't use it to hold - * parameters.) + * registers should be clobbered. * * When using dynamic ftrace, we patch out the mcount call by a "pop {lr}" * instead of the __gnu_mcount_nc call (see arch/arm/kernel/ftrace.c).
@@ -70,26 +67,25 @@ .macro __ftrace_regs_caller - sub sp, sp, #8 @ space for PC and CPSR OLD_R0, + str lr, [sp, #-8]! @ store LR as PC and make space for CPSR/OLD_R0, @ OLD_R0 will overwrite previous LR - add ip, sp, #12 @ move in IP the value of SP as it was - @ before the push {lr} of the mcount mechanism + ldr lr, [sp, #8] @ get previous LR - str lr, [sp, #0] @ store LR instead of PC + str r0, [sp, #8] @ write r0 as OLD_R0 over previous LR - ldr lr, [sp, #8] @ get previous LR + str lr, [sp, #-4]! @ store previous LR as LR - str r0, [sp, #8] @ write r0 as OLD_R0 over previous LR + add lr, sp, #16 @ move in LR the value of SP as it was + @ before the push {lr} of the mcount mechanism - stmdb sp!, {ip, lr} - stmdb sp!, {r0-r11, lr} + push {r0-r11, ip, lr} @ stack content at this point: @ 0 4 48 52 56 60 64 68 72 - @ R0 | R1 | ... | LR | SP + 4 | previous LR | LR | PSR | OLD_R0 | + @ R0 | R1 | ... | IP | SP + 4 | previous LR | LR | PSR | OLD_R0 | - mov r3, sp @ struct pt_regs* + mov r3, sp @ struct pt_regs* ldr r2, =function_trace_op ldr r2, [r2] @ pointer to the current
@@ -112,11 +108,9 @@ ftrace_graph_regs_call: #endif @ pop saved regs - ldmia sp!, {r0-r12} @ restore r0 through r12 - ldr ip, [sp, #8] @ restore PC - ldr lr, [sp, #4] @ restore LR - ldr sp, [sp, #0] @ restore SP - mov pc, ip @ return + pop {r0-r11, ip, lr} @ restore r0 through r12 + ldr lr, [sp], #4 @ restore LR + ldr pc, [sp], #12 .endm #ifdef CONFIG_FUNCTION_GRAPH_TRACER
@@ -132,11 +126,9 @@ ftrace_graph_regs_call: bl prepare_ftrace_return @ pop registers saved in ftrace_regs_caller - ldmia sp!, {r0-r12} @ restore r0 through r12 - ldr ip, [sp, #8] @ restore PC - ldr lr, [sp, #4] @ restore LR - ldr sp, [sp, #0] @ restore SP - mov pc, ip @ return + pop {r0-r11, ip, lr} @ restore r0 through r12 + ldr lr, [sp], #4 @ restore LR + ldr pc, [sp], #12 .endm #endif
@@ -202,16 +194,17 @@ ftrace_graph_call\suffix: .endm .macro mcount_exit - ldmia sp!, {r0-r3, ip, lr} - ret ip + ldmia sp!, {r0-r3} + ldr lr, [sp, #4] + ldr pc, [sp], #8 .endm ENTRY(__gnu_mcount_nc) UNWIND(.fnstart) #ifdef CONFIG_DYNAMIC_FTRACE - mov ip, lr - ldmia sp!, {lr} - ret ip + push {lr} + ldr lr, [sp, #4] + ldr pc, [sp], #8 #else __mcount #endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 912/1126 ALSA: hda: Fix driver index handling at re-binding
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 69458e2c27800da7697c87ed908b65323ef3f3bd ]
HD-audio driver handles the multiple instances and keeps the static index that is incremented at each probe. This becomes a problem when user tries to re-bind the device via sysfs multiple times; as the device index isn't cleared unlike rmmod case, it points to the next element at re-binding, and eventually later you can't probe any more when it reaches to SNDRV_CARDS_MAX (usually 32).
This patch is an attempt to improve the handling at rebinding. Instead of a static device index, now we keep a bitmap and assigns to the first zero bit position. At the driver remove, in return, the bitmap slot is cleared again, so that it'll be available for the next probe.
--- sound/pci/hda/hda_intel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/pci/hda/hda_intel.c +7 -3
@@ -2066,14 +2066,16 @@ static const struct hda_controller_ops pci_hda_ops = { .position_check = azx_position_check, }; +static DECLARE_BITMAP(probed_devs, SNDRV_CARDS); +static int azx_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) { -static int dev;struct snd_card *card;struct hda_intel *hda;struct azx *chip;bool schedule_probe; +int dev;int err;if (pci_match_id (driver_denylist, pci)) {
@@ -2081,10 +2083,11 @@ static int azx_probe(struct pci_dev *pci,return -ENODEV ; } + dev =find_first_zero_bit (probed_devs,SNDRV_CARDS );if (dev >=SNDRV_CARDS )return -ENODEV ;if (!enable[dev]) { - dev++; +set_bit (dev, probed_devs);return -ENOENT ; }
@@ -2151,7 +2154,7 @@ static int azx_probe(struct pci_dev *pci,if (schedule_probe)schedule_delayed_work (&hda->probe_work,0 ); - dev++; +set_bit (dev, probed_devs);if (chip->disabled)complete_all (&hda->probe_wait);return 0 ;
@@ -2374,6 +2377,7 @@ static void azx_remove(struct pci_dev *pci)cancel_delayed_work_sync (&hda->probe_work);device_lock (&pci->dev); +clear_bit (chip->dev_index, probed_devs);pci_set_drvdata (pci,NULL );snd_card_free (card); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 913/1126 ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk
In reply to Greg Kroah-HartmanFrom: Abel Vesa <[email protected]>
[ Upstream commit 4cb7df64c732b2b9918424095c11660c2a8c4a33 ]
The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), but according to the reference manual, there is no such gate. Moreover, the consumer driver of the mentioned clock might gate it and leave the ECSPI2 (the true owner of that gate) hanging. So lets use the audio_mclk_post_div, which is the parent.
--- arch/arm/boot/dts/imx7-colibri.dtsi | 4 ++-- arch/arm/boot/dts/imx7-mba7.dtsi | 2 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- arch/arm/boot/dts/imx7d-pico-hobbit.dts | 4 ++-- arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++-- arch/arm/boot/dts/imx7d-sdb.dts | 4 ++-- arch/arm/boot/dts/imx7s-warp.dts | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +2 -2
@@ -40,7 +40,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&codec>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -293,7 +293,7 @@ compatible = "fsl,sgtl5000"; #sound-dai-cells = <0>; reg = <0x0a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai1_mclk>; VDDA-supply = <®_module_3v3_avdd>;
arch/arm/boot/dts/imx7-mba7.dtsi +1 -1
@@ -302,7 +302,7 @@ tlv320aic32x4: audio-codec@18 { compatible = "ti,tlv320aic32x4"; reg = <0x18>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; ldoin-supply = <®_audio_3v3>; iov-supply = <®_audio_3v3>;
arch/arm/boot/dts/imx7d-nitrogen7.dts +1 -1
@@ -288,7 +288,7 @@ codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; wlf,shared-lrclk; };
arch/arm/boot/dts/imx7d-pico-hobbit.dts +2 -2
@@ -31,7 +31,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&sgtl5000>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -41,7 +41,7 @@ #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_vref_1v8>; };
arch/arm/boot/dts/imx7d-pico-pi.dts +2 -2
@@ -31,7 +31,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&sgtl5000>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -41,7 +41,7 @@ #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_vref_1v8>; };
arch/arm/boot/dts/imx7d-sdb.dts +2 -2
@@ -385,14 +385,14 @@ codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; wlf,shared-lrclk; wlf,hp-cfg = <2 2 3>; wlf,gpio-cfg = <1 3>; assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>, <&clks IMX7D_PLL_AUDIO_POST_DIV>, - <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; assigned-clock-rates = <0>, <884736000>, <12288000>; };
arch/arm/boot/dts/imx7s-warp.dts +2 -2
@@ -75,7 +75,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&codec>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -232,7 +232,7 @@ #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai1_mclk>; VDDA-supply = <&vgen4_reg>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 914/1126 arm64: defconfig: build imx-sdma as a module
In reply to Greg Kroah-HartmanFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit e95622289f263662240544a9f0009b25c19e64d4 ]
This avoids firmware load error and sysfs fallback reported as follows:
[ 0.199448] imx-sdma 302c0000.dma-controller: Direct firmware load for imx/sdma/sdma-imx7d.bin failed with error -2 [ 0.199487] imx-sdma 302c0000.dma-controller: Falling back to sysfs fallback for: imx/sdma/sdma-imx7d.bin
--- arch/arm64/configs/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/configs/defconfig +1 -1
@@ -939,7 +939,7 @@ CONFIG_DMADEVICES=y CONFIG_DMA_BCM2835=y CONFIG_DMA_SUN6I=m CONFIG_FSL_EDMA=y -CONFIG_IMX_SDMA=y +CONFIG_IMX_SDMA=m CONFIG_K3_DMA=y CONFIG_MV_XOR=y CONFIG_MV_XOR_V2=y
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 915/1126 video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
In reply to Greg Kroah-HartmanFrom: Jing Yao <[email protected]>
[ Upstream commit f63658a59c3d439c8ad7b290f8ec270980e0f384 ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c +4 -4
@@ -409,7 +409,7 @@ static ssize_t dsicm_num_errors_show(struct device *dev,if (r)return r; -return snprintf (buf,PAGE_SIZE ,"%d\n" , errors); +return sysfs_emit (buf,"%d\n" , errors); } static ssize_t dsicm_hw_revision_show(struct device *dev,
@@ -439,7 +439,7 @@ static ssize_t dsicm_hw_revision_show(struct device *dev,if (r)return r; -return snprintf (buf,PAGE_SIZE ,"%02x.%02x.%02x\n" , id1, id2, id3); +return sysfs_emit (buf,"%02x.%02x.%02x\n" , id1, id2, id3); } static ssize_t dsicm_store_ulps(struct device *dev,
@@ -487,7 +487,7 @@ static ssize_t dsicm_show_ulps(struct device *dev, t = ddata->ulps_enabled;mutex_unlock (&ddata->lock); -return snprintf (buf,PAGE_SIZE ,"%u\n" , t); +return sysfs_emit (buf,"%u\n" , t); } static ssize_t dsicm_store_ulps_timeout(struct device *dev,
@@ -532,7 +532,7 @@ static ssize_t dsicm_show_ulps_timeout(struct device *dev, t = ddata->ulps_timeout;mutex_unlock (&ddata->lock); -return snprintf (buf,PAGE_SIZE ,"%u\n" , t); +return sysfs_emit (buf,"%u\n" , t); } static DEVICE_ATTR(num_dsi_errors, S_IRUGO, dsicm_num_errors_show, NULL);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 916/1126 video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
In reply to Greg Kroah-HartmanFrom: Jing Yao <[email protected]>
[ Upstream commit c07a039cbb96748f54c02995bae8131cc9a73b0a ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- .../video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c +2 -2
@@ -169,7 +169,7 @@ static ssize_t tpo_td043_vmirror_show(struct device *dev, {struct panel_drv_data *ddata =dev_get_drvdata (dev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ddata->vmirror); +return sysfs_emit (buf,"%d\n" , ddata->vmirror); } static ssize_t tpo_td043_vmirror_store(struct device *dev,
@@ -199,7 +199,7 @@ static ssize_t tpo_td043_mode_show(struct device *dev, {struct panel_drv_data *ddata =dev_get_drvdata (dev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ddata->mode); +return sysfs_emit (buf,"%d\n" , ddata->mode); } static ssize_t tpo_td043_mode_store(struct device *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 917/1126 video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit
In reply to Greg Kroah-HartmanFrom: Jing Yao <[email protected]>
[ Upstream commit 81a998288956d09d7a7a2303d47e4d60ad55c401 ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- drivers/video/fbdev/udlfb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/udlfb.c +4 -4
@@ -1426,7 +1426,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->bytes_rendered)); }
@@ -1434,7 +1434,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->bytes_identical)); }
@@ -1442,7 +1442,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->bytes_sent)); }
@@ -1450,7 +1450,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->cpu_kcycles_used)); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 918/1126 ARM: dts: bcm2711: Add the missing L1/L2 cache information
In reply to Greg Kroah-HartmanFrom: Richard Schleich <[email protected]>
[ Upstream commit 618682b350990f8f1bee718949c4b3858711eb58 ]
This patch fixes the kernel warning "cacheinfo: Unable to detect cache hierarchy for CPU 0" for the bcm2711 on newer kernel versions.
--- arch/arm/boot/dts/bcm2711.dtsi | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
arch/arm/boot/dts/bcm2711.dtsi +50 -0
@@ -459,12 +459,26 @@ #size-cells = <0>; enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/100095/0003 + * /Level-1-Memory-System/About-the-L1-memory-system?lang=en + * Source for d/i-cache-size + * https://www.raspberrypi.com/documentation/computers + * /processors.html#bcm2711 + */ cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a72"; reg = <0>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000d8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; }; cpu1: cpu@1 {
@@ -473,6 +487,13 @@ reg = <1>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; }; cpu2: cpu@2 {
@@ -481,6 +502,13 @@ reg = <2>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; }; cpu3: cpu@3 {
@@ -489,6 +517,28 @@ reg = <3>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000f0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; + }; + + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/100095/0003 + * /Level-2-Memory-System/About-the-L2-memory-system?lang=en + * Source for d/i-cache-size + * https://www.raspberrypi.com/documentation/computers + * /processors.html#bcm2711 + */ + l2: l2-cache0 { + compatible = "cache"; + cache-size = <0x100000>; + cache-line-size = <64>; + cache-sets = <1024>; // 1MiB(size)/64(line-size)=16384ways/16-way set + cache-level = <2>; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 919/1126 ASoC: soc-core: skip zero num_dai component in searching dai name
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea ]
In the case like dmaengine which's not a dai but as a component, the num_dai is zero, dmaengine component has the same component_of_node as cpu dai, when cpu dai component is not ready, but dmaengine component is ready, try to get cpu dai name, the snd_soc_get_dai_name() return -EINVAL, not -EPROBE_DEFER, that cause below error:
asoc-simple-card <card name>: parse error -22
asoc-simple-card: probe of <card name> failed with error -22
The sound card failed to probe.
So this patch fixes the issue above by skipping the zero num_dai component in searching dai name.
--- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-core.c +1 -1
@@ -3233,7 +3233,7 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args,for_each_component (pos) {struct device_node *component_of_node =soc_component_to_node (pos); -if (component_of_node != args->np) +if (component_of_node != args->np || !pos->num_dai)continue ; ret =snd_soc_component_of_xlate_dai_name (pos, args, dai_name);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 920/1126 ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit ce6a70bfce21bb4edb7c0f29ecfb0522fa34ab71 ]
Huawei D15 uses SSP_CODEC(0).
--- sound/soc/intel/boards/sof_es8336.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/sof_es8336.c +8 -0
@@ -247,6 +247,14 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = { SOF_ES8336_TGL_GPIO_QUIRK | SOF_ES8336_ENABLE_DMIC) }, + { + .callback = sof_es8336_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "HUAWEI"), + DMI_MATCH(DMI_BOARD_NAME, "BOHB-WAX9-PCB-B2"), + }, + .driver_data = (void *)SOF_ES8336_SSP_CODEC(0) + }, {} };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 921/1126 media: imx-jpeg: fix a bug of accessing array out of bounds
In reply to Greg Kroah-HartmanFrom: Ming Qian <[email protected]>
[ Upstream commit 97558d170a1236280407e8d29a7d095d2c2ed554 ]
When error occurs in parsing jpeg, the slot isn't acquired yet, it may be the default value MXC_MAX_SLOTS.
If the driver access the slot using the incorrect slot number, it will access array out of bounds.
The result is the driver will change num_domains, which follows slot_data in struct mxc_jpeg_dev.
Then the driver won't detach the pm domain at rmmod, which will lead to kernel panic when trying to insmod again.
--- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/platform/imx-jpeg/mxc-jpeg.c +0 -1
@@ -954,7 +954,6 @@ static void mxc_jpeg_device_run(void *priv) jpeg_src_buf->jpeg_parse_error = true; }if (jpeg_src_buf->jpeg_parse_error) { - jpeg->slot_data[ctx->slot].used = false;v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_ERROR );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 922/1126 media: cx88-mpeg: clear interrupt status register before streaming video
In reply to Greg Kroah-HartmanFrom: Daniel González Cabanelas <[email protected]>
[ Upstream commit 56cb61f70e547e1b0cdfe6ff5a1f1ce6242e6d96 ]
Some cx88 video cards may have transport stream status interrupts set to 1 from cold start, causing errors like this:
cx88xx: cx88_print_irqbits: core:irq mpeg [0x100000] ts_err?*
cx8802: cx8802_mpeg_irq: mpeg:general errors: 0x00100000
According to CX2388x datasheet, the interrupt status register should be cleared before enabling IRQs to stream video.
Fix it by clearing the Transport Stream Interrupt Status register.
--- drivers/media/pci/cx88/cx88-mpeg.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/cx88/cx88-mpeg.c +3 -0
@@ -162,6 +162,9 @@ int cx8802_start_dma(struct cx8802_dev *dev,cx_write (MO_TS_GPCNTRL ,GP_COUNT_CONTROL_RESET ); q->count =0 ; +/* clear interrupt status register */ +cx_write (MO_TS_INTSTAT ,0x1f1111 ); +/* enable irqs */ dprintk (1 ,"setting the interrupt mask\n" );cx_set (MO_PCI_INTMSK , core->pci_irqmask |PCI_INT_TSINT );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 923/1126 ASoC: rt5682s: Fix the wrong jack type detected
In reply to Greg Kroah-HartmanFrom: Derek Fang <[email protected]>
[ Upstream commit c07ac3ee76e5e5506bca9c03fbbb15e40ab28430 ]
Some powers were changed during the jack insert detection and clk's enable/disable in CCF.
If in parallel, the influence has a chance to detect the wrong jack type.
We refer to the below commit of the variant codec (rt5682) to fix this issue.
ASoC: rt5682: Fix deadlock on resume
1. Remove rt5682s_headset_detect in rt5682s_jd_check_handler and use jack_detect_work instead of.
2. Use dapm mutex used in CCF to protect most of jack_detect_work.
--- sound/soc/codecs/rt5682s.c | 26 +++++++++----------------- sound/soc/codecs/rt5682s.h | 1 - 2 files changed, 9 insertions(+), 18 deletions(-)
sound/soc/codecs/rt5682s.c +9 -17
@@ -822,6 +822,7 @@ static void rt5682s_jack_detect_handler(struct work_struct *work) {struct rt5682s_priv *rt5682s = container_of(work, struct rt5682s_priv, jack_detect_work.work); +struct snd_soc_dapm_context *dapm;int val, btn_type; if (!rt5682s->component || !rt5682s->component->card ||
@@ -832,7 +833,9 @@ static void rt5682s_jack_detect_handler(struct work_struct *work)return ; } -mutex_lock (&rt5682s->jdet_mutex); + dapm =snd_soc_component_get_dapm (rt5682s->component); + +snd_soc_dapm_mutex_lock (dapm);mutex_lock (&rt5682s->calibrate_mutex); val =snd_soc_component_read (rt5682s->component,RT5682S_AJD1_CTRL )
@@ -889,6 +892,9 @@ static void rt5682s_jack_detect_handler(struct work_struct *work) rt5682s->irq_work_delay_time =50 ; } +mutex_unlock (&rt5682s->calibrate_mutex); +snd_soc_dapm_mutex_unlock (dapm); +snd_soc_jack_report (rt5682s->hs_jack, rt5682s->jack_type,SND_JACK_HEADSET |SND_JACK_BTN_0 |SND_JACK_BTN_1 |SND_JACK_BTN_2 |SND_JACK_BTN_3 );
@@ -898,9 +904,6 @@ static void rt5682s_jack_detect_handler(struct work_struct *work)schedule_delayed_work (&rt5682s->jd_check_work,0 ); else cancel_delayed_work_sync(&rt5682s->jd_check_work); - -mutex_unlock (&rt5682s->calibrate_mutex); -mutex_unlock (&rt5682s->jdet_mutex); }static void rt5682s_jd_check_handler (struct work_struct *work)
@@ -908,14 +911,9 @@ static void rt5682s_jd_check_handler(struct work_struct *work)struct rt5682s_priv *rt5682s = container_of(work, struct rt5682s_priv, jd_check_work.work); -if (snd_soc_component_read (rt5682s->component,RT5682S_AJD1_CTRL ) - &RT5682S_JDH_RS_MASK ) { +if (snd_soc_component_read (rt5682s->component,RT5682S_AJD1_CTRL ) &RT5682S_JDH_RS_MASK ) {/* jack out */ - rt5682s->jack_type =rt5682s_headset_detect (rt5682s->component,0 ); - -snd_soc_jack_report (rt5682s->hs_jack, rt5682s->jack_type, -SND_JACK_HEADSET |SND_JACK_BTN_0 |SND_JACK_BTN_1 | -SND_JACK_BTN_2 |SND_JACK_BTN_3 ); +schedule_delayed_work (&rt5682s->jack_detect_work,0 ); }else {schedule_delayed_work (&rt5682s->jd_check_work,500 ); }
@@ -1323,7 +1321,6 @@ static int rt5682s_hp_amp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) {struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm); -struct rt5682s_priv *rt5682s =snd_soc_component_get_drvdata (component);switch (event) {case SND_SOC_DAPM_POST_PMU :
@@ -1339,8 +1336,6 @@ static int rt5682s_hp_amp_event(struct snd_soc_dapm_widget *w,snd_soc_component_write (component,RT5682S_BIAS_CUR_CTRL_11 ,0x6666 );snd_soc_component_write (component,RT5682S_BIAS_CUR_CTRL_12 ,0xa82a ); -mutex_lock (&rt5682s->jdet_mutex); - snd_soc_component_update_bits(component, RT5682S_HP_CTRL_2, RT5682S_HPO_L_PATH_MASK | RT5682S_HPO_R_PATH_MASK | RT5682S_HPO_SEL_IP_EN_SW, RT5682S_HPO_L_PATH_EN |
@@ -1348,8 +1343,6 @@ static int rt5682s_hp_amp_event(struct snd_soc_dapm_widget *w,usleep_range (5000 ,10000 );snd_soc_component_update_bits (component,RT5682S_HP_AMP_DET_CTL_1 ,RT5682S_CP_SW_SIZE_MASK ,RT5682S_CP_SW_SIZE_L |RT5682S_CP_SW_SIZE_S ); - -mutex_unlock (&rt5682s->jdet_mutex);break ;case SND_SOC_DAPM_POST_PMD :
@@ -3103,7 +3096,6 @@ static int rt5682s_i2c_probe(struct i2c_client *i2c,mutex_init (&rt5682s->calibrate_mutex);mutex_init (&rt5682s->sar_mutex); -mutex_init (&rt5682s->jdet_mutex);rt5682s_calibrate (rt5682s); regmap_update_bits(rt5682s->regmap, RT5682S_MICBIAS_2,
sound/soc/codecs/rt5682s.h +0 -1
@@ -1446,7 +1446,6 @@ struct rt5682s_priv {struct delayed_work jd_check_work;struct mutex calibrate_mutex;struct mutex sar_mutex; -struct mutex jdet_mutex;#ifdef CONFIG_COMMON_CLK struct clk_hw dai_clks_hw[RT5682S_DAI_NUM_CLKS ];
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 924/1126 ARM: tegra: transformer: Drop reg-shift for Tegra HS UART
In reply to Greg Kroah-HartmanFrom: Svyatoslav Ryhel <[email protected]>
[ Upstream commit 79b788bfc787b60699d46b9e273b42ebe18336b3 ]
When the Tegra High-Speed UART is used instead of the regular UART, the reg-shift property is implied from the compatible string and should not be explicitly listed.
--- arch/arm/boot/dts/tegra20-asus-tf101.dts | 2 ++ arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi | 2 ++ arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2 ++ 3 files changed, 6 insertions(+)
arch/arm/boot/dts/tegra20-asus-tf101.dts +2 -0
@@ -442,11 +442,13 @@ serial@70006040 { compatible = "nvidia,tegra20-hsuart"; + /delete-property/ reg-shift; /* GPS BCM4751 */ }; serial@70006200 { compatible = "nvidia,tegra20-hsuart"; + /delete-property/ reg-shift; status = "okay"; /* Azurewave AW-NH615 BCM4329B1 */
arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi +2 -0
@@ -1080,6 +1080,7 @@ serial@70006040 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; /* Broadcom GPS BCM47511 */
@@ -1087,6 +1088,7 @@ serial@70006200 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; nvidia,adjust-baud-rates = <0 9600 100>,
arch/arm/boot/dts/tegra30-pegatron-chagall.dts +2 -0
@@ -1103,6 +1103,7 @@ uartb: serial@70006040 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; /* Broadcom GPS BCM47511 */
@@ -1110,6 +1111,7 @@ uartc: serial@70006200 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; nvidia,adjust-baud-rates = <0 9600 100>,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 925/1126 uaccess: fix type mismatch warnings from access_ok()
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 23fc539e81295b14b50c6ccc5baeb4f3d59d822d ]
On some architectures, access_ok() does not do any argument type checking, so replacing the definition with a generic one causes a few warnings for harmless issues that were never caught before.
Fix the ones that I found either through my own test builds or that were reported by the 0-day bot.
--- arch/arc/kernel/process.c | 2 +- arch/arm/kernel/swp_emulate.c | 2 +- arch/arm/kernel/traps.c | 2 +- arch/csky/kernel/perf_callchain.c | 2 +- arch/csky/kernel/signal.c | 2 +- arch/nios2/kernel/signal.c | 20 +++++++++++--------- arch/powerpc/lib/sstep.c | 4 ++-- arch/riscv/kernel/perf_callchain.c | 4 ++-- arch/sparc/kernel/signal_32.c | 2 +- lib/test_lockup.c | 4 ++-- 10 files changed, 23 insertions(+), 21 deletions(-)
arch/arc/kernel/process.c +1 -1
@@ -43,7 +43,7 @@ SYSCALL_DEFINE0(arc_gettls)return task_thread_info (current)->thr_ptr; } -SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new) +SYSCALL_DEFINE3(arc_usr_cmpxchg, int __user *, uaddr, int, expected, int, new) {struct pt_regs *regs =current_pt_regs ();u32 uval;
arch/arm/kernel/swp_emulate.c +1 -1
@@ -195,7 +195,7 @@ static int swp_handler(struct pt_regs *regs, unsigned int instr) destreg, EXTRACT_REG_NUM(instr, RT2_OFFSET), data);/* Check access in reasonable access range for both SWP and SWPB */ -if (!access_ok ((address & ~3 ),4 )) { +if (!access_ok ((void __user *)(address & ~3 ),4 )) {pr_debug ("SWP{B} emulation: access to %p not allowed!\n" , (void *)address); res = -EFAULT ;
arch/arm/kernel/traps.c +1 -1
@@ -577,7 +577,7 @@ do_cache_op(unsigned long start, unsigned long end, int flags)if (end < start || flags)return -EINVAL ; -if (!access_ok (start, end - start)) +if (!access_ok ((void __user *)start, end - start))return -EFAULT ;return __do_cache_op (start, end);
arch/csky/kernel/perf_callchain.c +1 -1
@@ -49,7 +49,7 @@ static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry, {struct stackframe buftail;unsigned long lr =0 ; -unsigned long *user_frame_tail = (unsigned long *)fp; +unsigned long __user *user_frame_tail = (unsigned long __user *)fp;/* Check accessibility of one struct frame_tail beyond */ if (!access_ok (user_frame_tail,sizeof (buftail)))
arch/csky/kernel/signal.c +1 -1
@@ -136,7 +136,7 @@ static inline void __user *get_sigframe(struct ksignal *ksig,static int setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) { -struct rt_sigframe *frame; +struct rt_sigframe __user *frame;int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame));
arch/nios2/kernel/signal.c +11 -9
@@ -36,10 +36,10 @@ struct rt_sigframe {static inline int rt_restore_ucontext (struct pt_regs *regs,struct switch_stack *sw, -struct ucontext *uc,int *pr2) +struct ucontext __user *uc,int *pr2) {int temp; -unsigned long *gregs = uc->uc_mcontext.gregs; +unsigned long __user *gregs = uc->uc_mcontext.gregs;int err;/* Always make any pending restarted system calls return -EINTR */
@@ -102,10 +102,11 @@ asmlinkage int do_rt_sigreturn(struct switch_stack *sw) {struct pt_regs *regs = (struct pt_regs *)(sw +1 );/* Verify, can we follow the stack back */ -struct rt_sigframe *frame = (struct rt_sigframe *) regs->sp; +struct rt_sigframe __user *frame;sigset_t set;int rval; + frame = (struct rt_sigframe __user *) regs->sp;if (!access_ok (frame,sizeof (*frame))) goto badframe;
@@ -124,10 +125,10 @@ asmlinkage int do_rt_sigreturn(struct switch_stack *sw)return 0 ; } -static inline int rt_setup_ucontext (struct ucontext *uc,struct pt_regs *regs) +static inline int rt_setup_ucontext (struct ucontext __user *uc,struct pt_regs *regs) {struct switch_stack *sw = (struct switch_stack *)regs -1 ; -unsigned long *gregs = uc->uc_mcontext.gregs; +unsigned long __user *gregs = uc->uc_mcontext.gregs;int err =0 ; err |=__put_user (MCONTEXT_VERSION , &uc->uc_mcontext.version);
@@ -162,8 +163,9 @@ static inline int rt_setup_ucontext(struct ucontext *uc, struct pt_regs *regs)return err; } -static inline void *get_sigframe (struct ksignal *ksig,struct pt_regs *regs, -size_t frame_size) +static inline void __user *get_sigframe (struct ksignal *ksig, +struct pt_regs *regs, +size_t frame_size) {unsigned long usp;
@@ -174,13 +176,13 @@ static inline void *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, usp =sigsp (usp, ksig);/* Verify, is it 32 or 64 bit aligned */ -return (void *)((usp - frame_size) &-8UL ); +return (void __user *)((usp - frame_size) &-8UL ); }static int setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) { -struct rt_sigframe *frame; +struct rt_sigframe __user *frame;int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame));
arch/powerpc/lib/sstep.c +2 -2
@@ -112,9 +112,9 @@ static nokprobe_inline long address_ok(struct pt_regs *regs, {if (!user_mode (regs))return 1 ; -if (__access_ok (ea, nb)) +if (access_ok ((void __user *)ea, nb))return 1 ; -if (__access_ok (ea,1 )) +if (access_ok ((void __user *)ea,1 ))/* Access overlaps the end of the user region */ regs->dar =TASK_SIZE_MAX -1 ;else
arch/riscv/kernel/perf_callchain.c +2 -2
@@ -15,8 +15,8 @@ static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry, {struct stackframe buftail;unsigned long ra =0 ; -unsigned long *user_frame_tail = - (unsigned long *)(fp -sizeof (struct stackframe )); +unsigned long __user *user_frame_tail = + (unsigned long __user *)(fp -sizeof (struct stackframe ));/* Check accessibility of one struct frame_tail beyond */ if (!access_ok (user_frame_tail,sizeof (buftail)))
arch/sparc/kernel/signal_32.c +1 -1
@@ -65,7 +65,7 @@ struct rt_signal_frame {*/ static inline bool invalid_frame_pointer (void __user *fp,int fplen) { -if ((((unsigned long ) fp) &15 ) || !__access_ok ((unsigned long )fp, fplen)) +if ((((unsigned long ) fp) &15 ) || !access_ok (fp, fplen))return true;return false;
lib/test_lockup.c +2 -2
@@ -417,8 +417,8 @@ static bool test_kernel_ptr(unsigned long addr, int size)return false;/* should be at least readable kernel address */ -if (access_ok (ptr,1 ) || -access_ok (ptr + size -1 ,1 ) || +if (access_ok ((void __user *)ptr,1 ) || +access_ok ((void __user *)ptr + size -1 ,1 ) ||get_kernel_nofault (buf, ptr) ||get_kernel_nofault (buf, ptr + size -1 )) {pr_err ("invalid kernel ptr: %#lx\n" , addr);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 926/1126 lib/test_lockup: fix kernel pointer check for separate address spaces
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 5a06fcb15b43d1f7bf740c672950122331cb5655 ]
test_kernel_ptr() uses access_ok() to figure out if a given address points to user space instead of kernel space. However on architectures that set CONFIG_ALTERNATE_USER_ADDRESS_SPACE, a pointer can be valid for both, and the check always fails because access_ok() returns true.
Make the check for user space pointers conditional on the type of address space layout.
--- lib/test_lockup.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
lib/test_lockup.c +8 -3
@@ -417,9 +417,14 @@ static bool test_kernel_ptr(unsigned long addr, int size)return false;/* should be at least readable kernel address */ -if (access_ok ((void __user *)ptr,1 ) || -access_ok ((void __user *)ptr + size -1 ,1 ) || -get_kernel_nofault (buf, ptr) || +if (!IS_ENABLED (CONFIG_ALTERNATE_USER_ADDRESS_SPACE ) && + (access_ok ((void __user *)ptr,1 ) || +access_ok ((void __user *)ptr + size -1 ,1 ))) { +pr_err ("user space ptr invalid in kernel: %#lx\n" , addr); +return true; + } + +if (get_kernel_nofault (buf, ptr) ||get_kernel_nofault (buf, ptr + size -1 )) {pr_err ("invalid kernel ptr: %#lx\n" , addr);return true;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 927/1126 ARM: tegra: tamonten: Fix I2C3 pad setting
In reply to Greg Kroah-HartmanFrom: Richard Leitner <[email protected]>
[ Upstream commit 0092c25b541a5422d7e71892a13c55ee91abc34b ]
This patch fixes the tristate configuration for i2c3 function assigned to the dtf pins on the Tamonten Tegra20 SoM.
--- arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra20-tamonten.dtsi +3 -3
@@ -183,8 +183,8 @@ }; conf_ata { nvidia,pins = "ata", "atb", "atc", "atd", "ate", - "cdev1", "cdev2", "dap1", "dtb", "gma", - "gmb", "gmc", "gmd", "gme", "gpu7", + "cdev1", "cdev2", "dap1", "dtb", "dtf", + "gma", "gmb", "gmc", "gmd", "gme", "gpu7", "gpv", "i2cp", "irrx", "irtx", "pta", "rm", "slxa", "slxk", "spia", "spib", "uac";
@@ -203,7 +203,7 @@ }; conf_crtp { nvidia,pins = "crtp", "dap2", "dap3", "dap4", - "dtc", "dte", "dtf", "gpu", "sdio1", + "dtc", "dte", "gpu", "sdio1", "slxc", "slxd", "spdi", "spdo", "spig", "uda"; nvidia,pull = <TEGRA_PIN_PULL_NONE>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 928/1126 ARM: mmp: Fix failure to remove sram device
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 4036b29a146b2749af3bb213b003eb69f3e5ecc4 ]
Make sure in .probe() to set driver data before the function is left to make it possible in .remove() to undo the actions done.
This fixes a potential memory leak and stops returning an error code in .remove() that is ignored by the driver core anyhow.
--- arch/arm/mach-mmp/sram.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/arm/mach-mmp/sram.c +12 -10
@@ -72,6 +72,8 @@ static int sram_probe(struct platform_device *pdev)if (!info)return -ENOMEM ; +platform_set_drvdata (pdev, info); + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (res ==NULL ) {dev_err (&pdev->dev,"no memory resource defined\n" );
@@ -107,8 +109,6 @@ static int sram_probe(struct platform_device *pdev)list_add (&info->node, &sram_bank_list);mutex_unlock (&sram_lock); -platform_set_drvdata (pdev, info); -dev_info (&pdev->dev,"initialized\n" );return 0 ;
@@ -127,17 +127,19 @@ static int sram_remove(struct platform_device *pdev)struct sram_bank_info *info; info =platform_get_drvdata (pdev); -if (info ==NULL ) -return -ENODEV ; -mutex_lock (&sram_lock); -list_del (&info->node); -mutex_unlock (&sram_lock); +if (info->sram_size) { +mutex_lock (&sram_lock); +list_del (&info->node); +mutex_unlock (&sram_lock); + +gen_pool_destroy (info->gpool); +iounmap (info->sram_virt); +kfree (info->pool_name); + } -gen_pool_destroy (info->gpool); -iounmap (info->sram_virt); -kfree (info->pool_name);kfree (info); +return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 929/1126 ASoC: amd: vg: fix for pm resume callback sequence
In reply to Greg Kroah-HartmanFrom: Vijendar Mukunda <[email protected]>
[ Upstream commit 83b713619ee1b15e09eae11a92a7f3305534223d ]
The previous condition is used to cross check only the active stream status for I2S HS instance playback and capture use cases.
Modified logic to invoke sequence for two i2s controller instances.
This also fixes warnings reported by kernel robot:
"warning: variable 'frmt_val' set but not used" "warning: variable 'reg_val' set but not used"
--- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 66 +++++++++++++-------------- 1 file changed, 33 insertions(+), 33 deletions(-)
sound/soc/amd/vangogh/acp5x-pcm-dma.c +33 -33
@@ -426,51 +426,51 @@ static int acp5x_audio_remove(struct platform_device *pdev)static int __maybe_unused acp5x_pcm_resume (struct device *dev) {struct i2s_dev_data *adata; -u32 val, reg_val, frmt_val; +struct i2s_stream_instance *rtd; +u32 val; - reg_val =0 ; - frmt_val =0 ; adata =dev_get_drvdata (dev);if (adata->play_stream && adata->play_stream->runtime) { -struct i2s_stream_instance *rtd = - adata->play_stream->runtime->private_data; + rtd = adata->play_stream->runtime->private_data;config_acp5x_dma (rtd,SNDRV_PCM_STREAM_PLAYBACK ); -switch (rtd->i2s_instance) { -case I2S_HS_INSTANCE : - reg_val =ACP_HSTDM_ITER ; - frmt_val =ACP_HSTDM_TXFRMT ; -break ; -case I2S_SP_INSTANCE : -default : - reg_val =ACP_I2STDM_ITER ; - frmt_val =ACP_I2STDM_TXFRMT ; +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_HSTDM_ITER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_HSTDM_TXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_HSTDM_ITER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_HSTDM_ITER ); + } + } +if (adata->i2ssp_play_stream && adata->i2ssp_play_stream->runtime) { + rtd = adata->i2ssp_play_stream->runtime->private_data; +config_acp5x_dma (rtd,SNDRV_PCM_STREAM_PLAYBACK ); +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_I2STDM_ITER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_I2STDM_TXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_I2STDM_ITER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_I2STDM_ITER ); } -acp_writel ((rtd->xfer_resolution <<3 ), - rtd->acp5x_base + reg_val); }if (adata->capture_stream && adata->capture_stream->runtime) { -struct i2s_stream_instance *rtd = - adata->capture_stream->runtime->private_data; + rtd = adata->capture_stream->runtime->private_data;config_acp5x_dma (rtd,SNDRV_PCM_STREAM_CAPTURE ); -switch (rtd->i2s_instance) { -case I2S_HS_INSTANCE : - reg_val =ACP_HSTDM_IRER ; - frmt_val =ACP_HSTDM_RXFRMT ; -break ; -case I2S_SP_INSTANCE : -default : - reg_val =ACP_I2STDM_IRER ; - frmt_val =ACP_I2STDM_RXFRMT ; +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_HSTDM_IRER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_HSTDM_RXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_HSTDM_IRER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_HSTDM_IRER ); } -acp_writel ((rtd->xfer_resolution <<3 ), - rtd->acp5x_base + reg_val); } -if (adata->tdm_mode ==TDM_ENABLE ) { -acp_writel (adata->tdm_fmt, adata->acp5x_base + frmt_val); - val =acp_readl (adata->acp5x_base + reg_val); -acp_writel (val |0x2 , adata->acp5x_base + reg_val); +if (adata->i2ssp_capture_stream && adata->i2ssp_capture_stream->runtime) { + rtd = adata->i2ssp_capture_stream->runtime->private_data; +config_acp5x_dma (rtd,SNDRV_PCM_STREAM_CAPTURE ); +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_I2STDM_IRER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_I2STDM_RXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_I2STDM_IRER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_I2STDM_IRER ); + } }acp_writel (1 , adata->acp5x_base +ACP_EXTERNAL_INTR_ENB );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 930/1126 ASoC: amd: vangogh: fix uninitialized symbol warning in machine driver
In reply to Greg Kroah-HartmanFrom: Vijendar Mukunda <[email protected]>
[ Upstream commit 6f989800639a7a29ab9a02e165b04dc144dd4f2b ]
Fixed below smatch static checker warning. sound/soc/amd/vangogh/acp5x-mach.c:190 acp5x_cs35l41_hw_params()
error: uninitialized symbol 'ret'.
--- sound/soc/amd/vangogh/acp5x-mach.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/amd/vangogh/acp5x-mach.c +1 -0
@@ -165,6 +165,7 @@ static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream,unsigned int num_codecs = rtd->num_codecs;unsigned int bclk_val; + ret =0 ;for (i =0 ; i < num_codecs; i++) { codec_dai =asoc_rtd_to_codec (rtd, i); if ((strcmp(codec_dai->name, "spi-VLV1776:00") == 0) ||
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 931/1126 video: fbdev: sm712fb: Fix crash in smtcfb_write()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 4f01d09b2bbfbcb47b3eb305560a7f4857a32260 ]
When the sm712fb driver writes three bytes to the framebuffer, the driver will crash:
BUG: unable to handle page fault for address: ffffc90001ffffff
RIP: 0010:smtcfb_write+0x454/0x5b0
Call Trace:
vfs_write+0x291/0xd60
? do_sys_openat2+0x27d/0x350
? __fget_light+0x54/0x340
ksys_write+0xce/0x190
do_syscall_64+0x43/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xaeFix it by removing the open-coded endianness fixup-code.
--- drivers/video/fbdev/sm712fb.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/video/fbdev/sm712fb.c +4 -17
@@ -1119,7 +1119,7 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf, count = total_size - p; } - buffer =kmalloc ((count >PAGE_SIZE ) ?PAGE_SIZE : count,GFP_KERNEL ); + buffer =kmalloc (PAGE_SIZE ,GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -1137,24 +1137,11 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf,break ; } -for (i = c >>2 ; i--;) { -fb_writel (big_swap (*src), dst++); +for (i = (c +3 ) >>2 ; i--;) { +fb_writel (big_swap (*src), dst); + dst++; src++; } -if (c &3 ) { -u8 *src8 = (u8 *)src; -u8 __iomem *dst8 = (u8 __iomem *)dst; - -for (i = c &3 ; i--;) { -if (i &1 ) { -fb_writeb (*src8++, ++dst8); - }else { -fb_writeb (*src8++, --dst8); - dst8 +=2 ; - } - } - dst = (u32 __iomem *)dst8; - } *ppos += c; buf += c;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 932/1126 media: i2c: ov5648: Fix lockdep error
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit d4cb5d3c4cee28aa89b02bc33d930a6cf75e7f79 ]
ov5648_state_init() calls ov5648_state_mipi_configure() which uses __v4l2_ctrl_s_ctrl[_int64](). This means that sensor->mutex (which is also sensor->ctrls.handler.lock) must be locked before calling ov5648_state_init().
ov5648_state_mipi_configure() is also used in other places where the lock is already held so it cannot be changed itself.
Note this is based on an identical (tested) fix for the ov8865 driver, this has only been compile-tested.
--- drivers/media/i2c/ov5648.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/i2c/ov5648.c +8 -2
@@ -1778,8 +1778,14 @@ static int ov5648_state_configure(struct ov5648_sensor *sensor,static int ov5648_state_init (struct ov5648_sensor *sensor) { -return ov5648_state_configure (sensor, &ov5648_modes[0 ], - ov5648_mbus_codes[0 ]); +int ret; + +mutex_lock (&sensor->mutex); + ret =ov5648_state_configure (sensor, &ov5648_modes[0 ], + ov5648_mbus_codes[0 ]); +mutex_unlock (&sensor->mutex); + +return ret; }/* Sensor Base */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 933/1126 media: Revert "media: em28xx: add missing em28xx_close_extension"
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit fde18c3bac3f964d8333ae53b304d8fee430502b ]
This reverts commit 2c98b8a3458df03abdc6945bbef67ef91d181938.
Reverted patch causes problems with Hauppauge WinTV dualHD as Maximilian reported [1]. Since quick solution didn't come up let's just revert it to make this device work with upstream kernels.
--- drivers/media/usb/em28xx/em28xx-cards.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/media/usb/em28xx/em28xx-cards.c +1 -4
@@ -4150,11 +4150,8 @@ static void em28xx_usb_disconnect(struct usb_interface *intf)em28xx_close_extension (dev); -if (dev->dev_next) { -em28xx_close_extension (dev->dev_next); +if (dev->dev_next)em28xx_release_resources (dev->dev_next); - } -em28xx_release_resources (dev);if (dev->dev_next) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 934/1126 media: hdpvr: initialize dev->worker at hdpvr_register_videodev
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 07922937e9a580825f9965c46fd15e23ba5754b6 ]
hdpvr_register_videodev is responsible to initialize a worker in hdpvr_device. However, the worker is only initialized at hdpvr_start_streaming other than hdpvr_register_videodev. When hdpvr_probe does not initialize its worker, the hdpvr_disconnect will encounter one WARN in flush_work.The stack trace is as follows:
hdpvr_disconnect+0xb8/0xf2 drivers/media/usb/hdpvr/hdpvr-core.c:425 usb_unbind_interface+0xbf/0x3a0 drivers/usb/core/driver.c:458 __device_release_driver drivers/base/dd.c:1206 [inline] device_release_driver_internal+0x22a/0x230 drivers/base/dd.c:1237 bus_remove_device+0x108/0x160 drivers/base/bus.c:529 device_del+0x1fe/0x510 drivers/base/core.c:3592 usb_disable_device+0xd1/0x1d0 drivers/usb/core/message.c:1419 usb_disconnect+0x109/0x330 drivers/usb/core/hub.c:2228
Fix this by moving the initialization of dev->worker to the starting of hdpvr_register_videodev
--- drivers/media/usb/hdpvr/hdpvr-video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/usb/hdpvr/hdpvr-video.c +3 -1
@@ -308,7 +308,6 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev) dev->status =STATUS_STREAMING ; -INIT_WORK (&dev->worker, hdpvr_transmit_buffers);schedule_work (&dev->worker); v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
@@ -1165,6 +1164,9 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,bool ac3 = dev->flags &HDPVR_FLAG_AC3_CAP ;int res; +// initialize dev->worker +INIT_WORK (&dev->worker, hdpvr_transmit_buffers); + dev->cur_std =V4L2_STD_525_60 ; dev->width =720 ; dev->height =480 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 935/1126 ASoC: SOF: debug: clarify operator precedence
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 9188812539d1d9a13dac690c95ec657259859ba4 ]
cppcheck warning:
for '&' and '?'. [clarifyCalculation]
char *level = flags & SOF_DBG_DUMP_OPTIONAL ? KERN_DEBUG : KERN_ERR;
^sound/soc/sof/debug.c:398:46: style: Clarify calculation precedence
--- sound/soc/sof/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/debug.c +1 -1
@@ -960,7 +960,7 @@ static void snd_sof_dbg_print_fw_state(struct snd_sof_dev *sdev, const char *levvoid snd_sof_dsp_dbg_dump (struct snd_sof_dev *sdev,const char *msg,u32 flags) { -char *level = flags &SOF_DBG_DUMP_OPTIONAL ?KERN_DEBUG :KERN_ERR ; +char *level = (flags &SOF_DBG_DUMP_OPTIONAL ) ?KERN_DEBUG :KERN_ERR ;bool print_all =sof_debug_check_flag (SOF_DBG_PRINT_ALL_DUMPS );if (flags &SOF_DBG_DUMP_OPTIONAL && !print_all)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 936/1126 ASoC: Intel: sof_sdw: fix quirks for 2022 HP Spectre x360 13"
In reply to Greg Kroah-HartmanFrom: Anthony I Gilea <[email protected]>
[ Upstream commit ce73ef6ec67104d1fcc4c5911d77ce83288a0998 ]
HP changed the DMI identification for 2022 devices:
Product Name: HP Spectre x360 Conv 13-ap0001na
Product Name: 8709
This patch relaxes the DMI_MATCH criterion to work with all versions of this product.
--- drivers/soundwire/dmi-quirks.c | 2 +- sound/soc/intel/boards/sof_sdw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/dmi-quirks.c +1 -1
@@ -59,7 +59,7 @@ static const struct dmi_system_id adr_remap_quirk_table[] = { { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "HP"), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"), }, .driver_data = (void *)intel_tgl_bios, },
sound/soc/intel/boards/sof_sdw.c +1 -1
@@ -185,7 +185,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .callback = sof_sdw_quirk_cb, .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"HP" ), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"), }, .driver_data = (void *)(SOF_SDW_TGL_HDMI | SOF_SDW_PCH_DMIC |
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 937/1126 ASoC: SOF: Intel: hda: retrieve DMIC number for I2S boards
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 92c1b7c0f780f0084f7b114be316ae4e182676e5 ]
We currently extract the DMIC number only for HDaudio or SoundWire platforms. For I2S/TDM platforms, this wasn't necessary until now, but with devices with ES8336 we need to find a solution to detect dmics more reliably than with a DMI quirk.
--- sound/soc/sof/intel/hda.c | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-)
sound/soc/sof/intel/hda.c +25 -21
@@ -432,11 +432,9 @@ static char *hda_model;module_param (hda_model, charp,0444 );MODULE_PARM_DESC (hda_model,"Use the given HDA board model." ); -#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) ||IS_ENABLED (CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE ) -static int hda_dmic_num =-1 ; -module_param_named (dmic_num, hda_dmic_num, int,0444 ); +static int dmic_num_override =-1 ; +module_param_named (dmic_num, dmic_num_override, int,0444 );MODULE_PARM_DESC (dmic_num,"SOF HDA DMIC number" ); -#endif #if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA )static bool hda_codec_use_common_hdmi =IS_ENABLED (CONFIG_SND_HDA_CODEC_HDMI );
@@ -644,24 +642,35 @@ static int hda_init(struct snd_sof_dev *sdev)return ret; } -#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) ||IS_ENABLED (CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE ) - -static int check_nhlt_dmic (struct snd_sof_dev *sdev) +static int check_dmic_num (struct snd_sof_dev *sdev) {struct nhlt_acpi_table *nhlt; -int dmic_num; +int dmic_num =0 ; nhlt =intel_nhlt_init (sdev->dev);if (nhlt) { dmic_num =intel_nhlt_get_dmic_geo (sdev->dev, nhlt);intel_nhlt_free (nhlt); -if (dmic_num >=1 && dmic_num <=4 ) -return dmic_num; } -return 0 ; +/* allow for module parameter override */ +if (dmic_num_override !=-1 ) { +dev_dbg (sdev->dev, +"overriding DMICs detected in NHLT tables %d by kernel param %d\n" , + dmic_num, dmic_num_override); + dmic_num = dmic_num_override; + } + +if (dmic_num <0 || dmic_num >4 ) { +dev_dbg (sdev->dev,"invalid dmic_number %d\n" , dmic_num); + dmic_num =0 ; + } + +return dmic_num; } +#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) ||IS_ENABLED (CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE ) + static const char *fixup_tplg_name(struct snd_sof_dev *sdev, const char *sof_tplg_filename, const char *idisp_str,
@@ -697,16 +706,8 @@ static int dmic_topology_fixup(struct snd_sof_dev *sdev,const char *dmic_str;int dmic_num; -/* first check NHLT for DMICs */ - dmic_num =check_nhlt_dmic (sdev); - -/* allow for module parameter override */ -if (hda_dmic_num !=-1 ) { -dev_dbg (sdev->dev, -"overriding DMICs detected in NHLT tables %d by kernel param %d\n" , - dmic_num, hda_dmic_num); - dmic_num = hda_dmic_num; - } +/* first check for DMICs (using NHLT or module parameter) */ + dmic_num =check_dmic_num (sdev);switch (dmic_num) {case 1 :
@@ -1392,6 +1393,9 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)if (!sof_pdata->tplg_filename) sof_pdata->tplg_filename = mach->sof_tplg_filename; +/* report to machine driver if any DMICs are found */ + mach->mach_params.dmic_num =check_dmic_num (sdev); +if (mach->link_mask) { mach->mach_params.links = mach->links; mach->mach_params.link_mask = mach->link_mask;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 938/1126 ALSA: intel-nhlt: add helper to detect SSP link mask
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 0c470db0399e17310ed2ba54dd1c25cfa16ce0d3 ]
The NHLT information can be used to figure out which SSPs are enabled in a platform.
The 'SSP' link type is too broad for machine drivers, since it can cover the Bluetooth sideband and the analog audio codec connections, so this helper exposes a parameter to filter with the device type (DEVICE_I2S refers to analog audio codec in NHLT parlance).
The helper returns a mask, since more than one SSP may be used for analog audio, e.g. the NHLT spec describes the use of SSP0 for amplifiers and SSP1 for headset codec. Note that if more than one bit is set, it's impossible to determine which SSP is connected to what external component. Additional platform-specific information based on e.g. DMI quirks would still be required in the machine driver to configure the relevant dailinks.
--- include/sound/intel-nhlt.h | 22 +++++++++++++++------- sound/hda/intel-nhlt.c | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-)
include/sound/intel-nhlt.h +15 -7
@@ -18,6 +18,13 @@ enum nhlt_link_type {NHLT_LINK_INVALID }; +enum nhlt_device_type { +NHLT_DEVICE_BT =0 , +NHLT_DEVICE_DMIC =1 , +NHLT_DEVICE_I2S =4 , +NHLT_DEVICE_INVALID +}; +#if IS_ENABLED (CONFIG_ACPI ) &&IS_ENABLED (CONFIG_SND_INTEL_NHLT ) struct wav_fmt {
@@ -41,13 +48,6 @@ struct wav_fmt_ext {u8 sub_fmt[16 ]; } __packed; -enum nhlt_device_type { -NHLT_DEVICE_BT =0 , -NHLT_DEVICE_DMIC =1 , -NHLT_DEVICE_I2S =4 , -NHLT_DEVICE_INVALID -}; -struct nhlt_specific_cfg {u32 size;u8 caps[];
@@ -133,6 +133,9 @@ void intel_nhlt_free(struct nhlt_acpi_table *addr);int intel_nhlt_get_dmic_geo (struct device *dev,struct nhlt_acpi_table *nhlt);bool intel_nhlt_has_endpoint_type (struct nhlt_acpi_table *nhlt,u8 link_type); + +int intel_nhlt_ssp_endpoint_mask (struct nhlt_acpi_table *nhlt,u8 device_type); +struct nhlt_specific_cfg * intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, u32 bus_id, u8 link_type, u8 vbps, u8 bps,
@@ -163,6 +166,11 @@ static inline bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt,return false; } +static inline int intel_nhlt_ssp_endpoint_mask (struct nhlt_acpi_table *nhlt,u8 device_type) +{ +return 0 ; +} +static inline struct nhlt_specific_cfg * intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, u32 bus_id, u8 link_type, u8 vbps, u8 bps,
sound/hda/intel-nhlt.c +22 -0
@@ -130,6 +130,28 @@ bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt, u8 link_type) }EXPORT_SYMBOL (intel_nhlt_has_endpoint_type); +int intel_nhlt_ssp_endpoint_mask (struct nhlt_acpi_table *nhlt,u8 device_type) +{ +struct nhlt_endpoint *epnt; +int ssp_mask =0 ; +int i; + +if (!nhlt || (device_type !=NHLT_DEVICE_BT && device_type !=NHLT_DEVICE_I2S )) +return 0 ; + + epnt = (struct nhlt_endpoint *)nhlt->desc; +for (i =0 ; i < nhlt->endpoint_count; i++) { +if (epnt->linktype ==NHLT_LINK_SSP && epnt->device_type == device_type) { +/* for SSP the virtual bus id is the SSP port */ + ssp_mask |=BIT (epnt->virtual_bus_id); + } + epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length); + } + +return ssp_mask; +} +EXPORT_SYMBOL (intel_nhlt_ssp_endpoint_mask); +static struct nhlt_specific_cfg *nhlt_get_specific_cfg (struct device *dev,struct nhlt_fmt *fmt,u8 num_ch,u32 rate,u8 vbps,u8 bps)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 939/1126 ALSA: intel-dsp-config: add more ACPI HIDs for ES83x6 devices
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit de24d97fb845ffd2229811ee256438e42b5a8d12 ]
We only saw ESSX8336 so far, but now with reports of 'ESSX8326' we need to expand to a full list. Let's reuse the 'snd_soc_acpi_codecs' structure to store the information.
--- sound/hda/intel-dsp-config.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-)
sound/hda/intel-dsp-config.c +22 -9
@@ -11,6 +11,7 @@#include <sound/core.h> #include <sound/intel-dsp-config.h> #include <sound/intel-nhlt.h> +#include <sound/soc-acpi.h> static int dsp_driver;
@@ -31,7 +32,12 @@ struct config_entry {u16 device;u8 acpi_hid[ACPI_ID_LEN ];const struct dmi_system_id *dmi_table; -u8 codec_hid[ACPI_ID_LEN ]; +const struct snd_soc_acpi_codecs *codec_hid; +}; + +static const struct snd_soc_acpi_codecs __maybe_unused essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, };/*
@@ -77,7 +83,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x5a98, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, #endif #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
@@ -163,7 +169,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x3198, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, },#endif
@@ -251,7 +257,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x02c8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -280,7 +286,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x06c8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -327,7 +333,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x4dc8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
@@ -353,7 +359,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0xa0c8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -414,8 +420,15 @@ static const struct config_entry *snd_intel_dsp_find_configcontinue ;if (table->dmi_table && !dmi_check_system (table->dmi_table))continue ; -if (table->codec_hid[0 ] && !acpi_dev_present (table->codec_hid,NULL ,-1 )) -continue ; +if (table->codec_hid) { +int i; + +for (i =0 ; i < table->codec_hid->num_codecs; i++) +if (acpi_dev_present (table->codec_hid->codecs[i],NULL ,-1 )) +break ; +if (i == table->codec_hid->num_codecs) +continue ; + }return table; }return NULL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 940/1126 ASoC: Intel: soc-acpi: add more ACPI HIDs for ES83x6 devices
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 1cedb6eabf0f2dd8285d3bb0ce1abd2369529084 ]
We only saw ESSX8336 so far, but now with reports of 'ESSX8326' we need to expand to a full list. Let's reuse the 'snd_soc_acpi_codecs' structure to store the information.
Note that ES8326 will need a dedicated codec driver, but the plan is to use the same machine driver for all Everest Audio devices.
--- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-cml-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-glk-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-)
sound/soc/intel/common/soc-acpi-intel-bxt-match.c +6 -1
@@ -41,6 +41,11 @@ static struct snd_soc_acpi_mach *apl_quirk(void *arg)return mach; } +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs bxt_codecs = { .num_codecs =1 , .codecs = {"MX98357A" }
@@ -83,7 +88,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { .sof_tplg_filename = "sof-apl-tdf8532.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-apl.ri", .sof_tplg_filename = "sof-apl-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-cml-match.c +6 -1
@@ -9,6 +9,11 @@#include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs rt1011_spk_codecs = { .num_codecs =1 , .codecs = {"10EC1011" }
@@ -82,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = { .sof_tplg_filename = "sof-cml-da7219-max98390.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-cml.ri", .sof_tplg_filename = "sof-cml-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-glk-match.c +6 -1
@@ -9,6 +9,11 @@#include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs glk_codecs = { .num_codecs =1 , .codecs = {"MX98357A" }
@@ -58,7 +63,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = { .sof_tplg_filename = "sof-glk-cs42l42.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-glk.ri", .sof_tplg_filename = "sof-glk-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-jsl-match.c +6 -1
@@ -9,6 +9,11 @@#include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs jsl_7219_98373_codecs = { .num_codecs =1 , .codecs = {"MX98373" }
@@ -87,7 +92,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { .sof_tplg_filename = "sof-jsl-cs42l42-mx98360a.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-jsl.ri", .sof_tplg_filename = "sof-jsl-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-tgl-match.c +6 -1
@@ -10,6 +10,11 @@#include <sound/soc-acpi-intel-match.h> #include "soc-acpi-intel-sdw-mockup-match.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs tgl_codecs = { .num_codecs =1 , .codecs = {"MX98357A" }
@@ -389,7 +394,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-es8336.tplg",
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 941/1126 ALSA: intel-dspconfig: add ES8336 support for CNL
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit cded07a2dccd5493696a3adce175f01e413423c6 ]
We're missing this check for the CNL PCI id
--- sound/hda/intel-dsp-config.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/hda/intel-dsp-config.c +5 -0
@@ -199,6 +199,11 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SOF, + .device = 0x09dc8, + .codec_hid = &essx_83x6, + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x9dc8,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 942/1126 ASoC: Intel: Revert "ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021"
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 1b5283483a782f6560999d8d5965b1874d104812 ]
This reverts commit ce6a70bfce21bb4edb7c0f29ecfb0522fa34ab71.
The next patch will add run-time detection of the required SSP and this hard-coded quirk is not needed.
--- sound/soc/intel/boards/sof_es8336.c | 8 -------- 1 file changed, 8 deletions(-)
sound/soc/intel/boards/sof_es8336.c +0 -8
@@ -247,14 +247,6 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = { SOF_ES8336_TGL_GPIO_QUIRK | SOF_ES8336_ENABLE_DMIC) }, - { - .callback = sof_es8336_quirk_cb, - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "HUAWEI"), - DMI_MATCH(DMI_BOARD_NAME, "BOHB-WAX9-PCB-B2"), - }, - .driver_data = (void *)SOF_ES8336_SSP_CODEC(0) - }, {} };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 943/1126 ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 651c304df7f6e3fbb4779527efa3eb128ef91329 ]
Since we see a proliferation of devices with various configurations, we want to automatically set the DMIC and SSP information. This patch relies on the information extracted from NHLT and partially reverts existing DMI quirks added by commit a164137ce91a ("ASoC: Intel: add machine driver for SOF+ES8336")
Note that NHLT can report multiple SSPs, choosing from the ssp_link_mask in an MSB-first manner was found experimentally to work fine.
The only thing that cannot be detected is the GPIO type, and users may want to use the quirk override parameter if the 'wrong' solution is provided.
--- sound/soc/intel/boards/sof_es8336.c | 56 +++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 15 deletions(-)
sound/soc/intel/boards/sof_es8336.c +41 -15
@@ -228,24 +228,25 @@ static int sof_es8336_quirk_cb(const struct dmi_system_id *id)return 1 ; } +/* +* this table should only be used to add GPIO or jack-detection quirks +* that cannot be detected from ACPI tables. The SSP and DMIC +* information are providing by the platform driver and are aligned +* with the topology used. +* +* If the GPIO support is missing, the quirk parameter can be used to +* enable speakers. In that case it's recommended to keep the SSP and DMIC +* information consistent, overriding the SSP and DMIC can only be done +* if the topology file is modified as well. +*/ static const struct dmi_system_id sof_es8336_quirk_table[] = { - { - .callback = sof_es8336_quirk_cb, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"CHUWI Innovation And Technology" ), -DMI_MATCH (DMI_BOARD_NAME ,"Hi10 X" ), - }, - .driver_data = (void *)SOF_ES8336_SSP_CODEC (2 ) - }, { .callback = sof_es8336_quirk_cb, .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"IP3 tech" ),DMI_MATCH (DMI_BOARD_NAME ,"WN1" ), }, - .driver_data = (void *)(SOF_ES8336_SSP_CODEC (0 ) | -SOF_ES8336_TGL_GPIO_QUIRK | -SOF_ES8336_ENABLE_DMIC ) + .driver_data = (void *)(SOF_ES8336_TGL_GPIO_QUIRK ) }, {} };
@@ -470,11 +471,33 @@ static int sof_es8336_probe(struct platform_device *pdev) card = &sof_es8336_card; card->dev = dev; -if (!dmi_check_system (sof_es8336_quirk_table)) - quirk =SOF_ES8336_SSP_CODEC (2 ); +/* check GPIO DMI quirks */ +dmi_check_system (sof_es8336_quirk_table); -if (quirk &SOF_ES8336_ENABLE_DMIC ) - dmic_be_num =2 ; +if (!mach->mach_params.i2s_link_mask) { +dev_warn (dev,"No I2S link information provided, using SSP0. This may need to be modified with the quirk module parameter\n" ); + }else { +/* +* Set configuration based on platform NHLT. +* In this machine driver, we can only support one SSP for the +* ES8336 link, the else-if below are intentional. +* In some cases multiple SSPs can be reported by NHLT, starting MSB-first +* seems to pick the right connection. +*/ +unsigned long ssp =0 ; + +if (mach->mach_params.i2s_link_mask &BIT (2 )) + ssp =SOF_ES8336_SSP_CODEC (2 ); +else if (mach->mach_params.i2s_link_mask &BIT (1 )) + ssp =SOF_ES8336_SSP_CODEC (1 ); +else if (mach->mach_params.i2s_link_mask &BIT (0 )) + ssp =SOF_ES8336_SSP_CODEC (0 ); + + quirk |= ssp; + } + +if (mach->mach_params.dmic_num) + quirk |=SOF_ES8336_ENABLE_DMIC ;if (quirk_override !=-1 ) { dev_info(dev, "Overriding quirk 0x%lx => 0x%x\n",
@@ -483,6 +506,9 @@ static int sof_es8336_probe(struct platform_device *pdev) }log_quirks (dev); +if (quirk &SOF_ES8336_ENABLE_DMIC ) + dmic_be_num =2 ; + sof_es8336_card.num_links += dmic_be_num + hdmi_num; dai_links = sof_card_dai_links_create(dev, SOF_ES8336_SSP_CODEC(quirk),
Signature · 1 line
2.34.1
Re: [PATCH 5.17 0943/1126] ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP
Hi
Quoted 10 lines · Greg Kroah-Hartman
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit
651c304df7f6e3fbb4779527efa3eb128ef91329]Since we see a proliferation of devices with various configurations, we want to automatically set the DMIC and SSP information. This patch relies on the information extracted from NHLT and partially reverts existing DMI quirks added by commit
a164137ce91a("ASoC: Intel: add machine driver for SOF+ES8336")
Quoted 7 lines
Note that NHLT can report multiple SSPs, choosing from the
ssp_link_maskin an MSB-first manner was found experimentally to work fine.The only thing that cannot be detected is the GPIO type, and users may want to use the quirk override parameter if the 'wrong' solution is provided.
[...]
This patch, as part of v5.17.2-rc1 seems to introduce a build failure on x86_64 (with CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m):
LD [M] sound/soc/intel/boards/snd-soc-sof_rt5682.o
LD [M] sound/soc/intel/boards/snd-soc-sof_cs42l42.o
CC [M] sound/soc/intel/boards/sof_es8336.o
/build/linux-5.17/sound/soc/intel/boards/sof_es8336.c: In function 'sof_es8336_probe':
/build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:482:32: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'?
482 | if (!mach->mach_params.i2s_link_mask) {
| ^~~~~~~~~~~~~
| link_mask
/build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:494:39: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'?
494 | if (mach->mach_params.i2s_link_mask & BIT(2))
| ^~~~~~~~~~~~~
| link_mask
/build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:496:44: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'?
496 | else if (mach->mach_params.i2s_link_mask & BIT(1))
| ^~~~~~~~~~~~~
| link_mask
/build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:498:45: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'?
498 | else if (mach->mach_params.i2s_link_mask & BIT(0))
| ^~~~~~~~~~~~~
| link_maskmake[4]: *** [/build/linux-5.17/scripts/Makefile.build:288: sound/soc/intel/boards/sof_es8336.o] Error 1
Reverting just this patch lets the build, using the same buildconfig, succeed again.
Regards
Stefan Lippers-Hollmann
Greg Kroah-Hartman
maintainerRe: [PATCH 5.17 0943/1126] ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP
Quoted 45 lines · Stefan Lippers-Hollmann
Hi
Quoted 10 lines · Greg Kroah-Hartman
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit
651c304df7f6e3fbb4779527efa3eb128ef91329]Since we see a proliferation of devices with various configurations, we want to automatically set the DMIC and SSP information. This patch relies on the information extracted from NHLT and partially reverts existing DMI quirks added by commit
a164137ce91a("ASoC: Intel: add machine driver for SOF+ES8336")Quoted 7 lines
Note that NHLT can report multiple SSPs, choosing from the
ssp_link_maskin an MSB-first manner was found experimentally to work fine.The only thing that cannot be detected is the GPIO type, and users may want to use the quirk override parameter if the 'wrong' solution is provided.
[...]
This patch, as part of v5.17.2-rc1 seems to introduce a build failure on
x86_64(withCONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m):LD [M] sound/soc/intel/boards/snd-soc-sof_rt5682.o LD [M] sound/soc/intel/boards/snd-soc-sof_cs42l42.o CC [M] sound/soc/intel/boards/sof_es8336.o /build/linux-5.17/sound/soc/intel/boards/sof_es8336.c: In function 'sof_es8336_probe': /build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:482:32: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'? 482 | if (!mach->mach_params.i2s_link_mask) { | ^~~~~~~~~~~~~ | link_mask /build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:494:39: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'? 494 | if (mach->mach_params.i2s_link_mask & BIT(2)) | ^~~~~~~~~~~~~ | link_mask /build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:496:44: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'? 496 | else if (mach->mach_params.i2s_link_mask & BIT(1)) | ^~~~~~~~~~~~~ | link_mask /build/linux-5.17/sound/soc/intel/boards/sof_es8336.c:498:45: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'? 498 | else if (mach->mach_params.i2s_link_mask & BIT(0)) | ^~~~~~~~~~~~~ | link_mask
Quoted 4 lines
make[4]: *** [/build/linux-5.17/scripts/Makefile.build:288:
sound/soc/intel/boards/sof_es8336.o] Error 1Reverting just this patch lets the build, using the same buildconfig, succeed again.
Offending commit now dropped, thanks!
greg k-h
Re: [PATCH 5.17 0943/1126] ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP
In reply to Greg Kroah-HartmanQuoted 19 lines · Greg Kroah-Hartman
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit
651c304df7f6e3fbb4779527efa3eb128ef91329]Since we see a proliferation of devices with various configurations, we want to automatically set the DMIC and SSP information. This patch relies on the information extracted from NHLT and partially reverts existing DMI quirks added by commit
a164137ce91a("ASoC: Intel: add machine driver for SOF+ES8336")Note that NHLT can report multiple SSPs, choosing from the
ssp_link_maskin an MSB-first manner was found experimentally to work fine.The only thing that cannot be detected is the GPIO type, and users may want to use the quirk override parameter if the 'wrong' solution is provided.
Quoted 7 lines
Signed-off-by Pierre-Louis Bossart <[email protected]>Reviewed-by Bard Liao <[email protected]>Reviewed-by Péter Ujfalusi <[email protected]>Signed-off-by Mark Brown <[email protected]>Signed-off-by Sasha Levin <[email protected]>
It seems this patch is missing a dependent patch in the backport, specifically commit 679aa83a0fb70dcbf9e97cbdfd573e6fc8bf9b1a ASoC: soc-acpi: add information on I2S/TDM link mask
sound/soc/intel/boards/sof_es8336.c: In function 'sof_es8336_probe':sound/soc/intel/boards/sof_es8336.c:482:32: error: 'struct snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you mean 'link_mask'?
482 | if (!mach->mach_params.i2s_link_mask) {
| ^~~~~~~~~~~~~
| link_mask
sound/soc/intel/boards/sof_es8336.c:494:39: error: 'struct
snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you
mean 'link_mask'?
494 | if (mach->mach_params.i2s_link_mask & BIT(2))
| ^~~~~~~~~~~~~
| link_mask
sound/soc/intel/boards/sof_es8336.c:496:44: error: 'struct
snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you
mean 'link_mask'?
496 | else if (mach->mach_params.i2s_link_mask & BIT(1))
| ^~~~~~~~~~~~~
| link_mask
sound/soc/intel/boards/sof_es8336.c:498:45: error: 'struct
snd_soc_acpi_mach_params' has no member named 'i2s_link_mask'; did you
mean 'link_mask'?
498 | else if (mach->mach_params.i2s_link_mask & BIT(0))
| ^~~~~~~~~~~~~
| link_maskmake[4]: *** [scripts/Makefile.build:288:sound/soc/intel/boards/sof_es8336.o] Error 1
Justin
Quoted 97 lines
sound/soc/intel/boards/sof_es8336.c | 56 +++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 15 deletions(-)sound/soc/intel/boards/sof_es8336.c +41
-16@@ -228,24 +228,25 @@ static int sof_es8336_quirk_cb(const struct dmi_system_id *id)return 1 ; } +/* +* this table should only be used to add GPIO or jack-detection quirks +* that cannot be detected from ACPI tables. The SSP and DMIC +* information are providing by the platform driver and are aligned +* with the topology used. +* +* If the GPIO support is missing, the quirk parameter can be used to +* enable speakers. In that case it's recommended to keep the SSP and DMIC +* information consistent, overriding the SSP and DMIC can only be done +* if the topology file is modified as well. +*/ static const struct dmi_system_id sof_es8336_quirk_table[] = { - { - .callback = sof_es8336_quirk_cb, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"CHUWI Innovation And Technology" ), -DMI_MATCH (DMI_BOARD_NAME ,"Hi10 X" ), - }, - .driver_data = (void *)SOF_ES8336_SSP_CODEC (2 ) - }, { .callback = sof_es8336_quirk_cb, .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"IP3 tech" ),DMI_MATCH (DMI_BOARD_NAME ,"WN1" ), }, - .driver_data = (void *)(SOF_ES8336_SSP_CODEC (0 ) | -SOF_ES8336_TGL_GPIO_QUIRK | -SOF_ES8336_ENABLE_DMIC ) + .driver_data = (void *)(SOF_ES8336_TGL_GPIO_QUIRK ) }, {} };@@ -470,11 +471,33 @@ static int sof_es8336_probe(struct platform_device *pdev) card = &sof_es8336_card; card->dev = dev; -if (!dmi_check_system (sof_es8336_quirk_table)) - quirk =SOF_ES8336_SSP_CODEC (2 ); +/* check GPIO DMI quirks */ +dmi_check_system (sof_es8336_quirk_table); -if (quirk &SOF_ES8336_ENABLE_DMIC ) - dmic_be_num =2 ; +if (!mach->mach_params.i2s_link_mask) { +dev_warn (dev,"No I2S link information provided, using SSP0. This may need to be modified with the quirk module parameter\n" ); + }else { +/* +* Set configuration based on platform NHLT. +* In this machine driver, we can only support one SSP for the +* ES8336 link, the else-if below are intentional. +* In some cases multiple SSPs can be reported by NHLT, starting MSB-first +* seems to pick the right connection. +*/ +unsigned long ssp =0 ; + +if (mach->mach_params.i2s_link_mask &BIT (2 )) + ssp =SOF_ES8336_SSP_CODEC (2 ); +else if (mach->mach_params.i2s_link_mask &BIT (1 )) + ssp =SOF_ES8336_SSP_CODEC (1 ); +else if (mach->mach_params.i2s_link_mask &BIT (0 )) + ssp =SOF_ES8336_SSP_CODEC (0 ); + + quirk |= ssp; + } + +if (mach->mach_params.dmic_num) + quirk |=SOF_ES8336_ENABLE_DMIC ;if (quirk_override !=-1 ) { dev_info(dev, "Overriding quirk 0x%lx => 0x%x\n",@@ -483,6 +506,9 @@ static int sof_es8336_probe(struct platform_device *pdev) }log_quirks (dev); +if (quirk &SOF_ES8336_ENABLE_DMIC ) + dmic_be_num =2 ; + sof_es8336_card.num_links += dmic_be_num + hdmi_num; dai_links = sof_card_dai_links_create(dev, SOF_ES8336_SSP_CODEC(quirk), --2.34.1
Greg Kroah-Hartman
maintainerPATCH 944/1126 ASoC: Intel: sof_es8336: log all quirks
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 9c818d849192491a8799b1cb14ca0f7aead4fb09 ]
We only logged the SSP quirk, make sure the GPIO and DMIC quirks are exposed.
--- sound/soc/intel/boards/sof_es8336.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/intel/boards/sof_es8336.c +6 -1
@@ -63,7 +63,12 @@ static const struct acpi_gpio_mapping *gpio_mapping = acpi_es8336_gpios;static void log_quirks (struct device *dev) { -dev_info (dev,"quirk SSP%ld" ,SOF_ES8336_SSP_CODEC (quirk)); +dev_info (dev,"quirk mask %#lx\n" , quirk); +dev_info (dev,"quirk SSP%ld\n" ,SOF_ES8336_SSP_CODEC (quirk)); +if (quirk &SOF_ES8336_ENABLE_DMIC ) +dev_info (dev,"quirk DMIC enabled\n" ); +if (quirk &SOF_ES8336_TGL_GPIO_QUIRK ) +dev_info (dev,"quirk TGL GPIO enabled\n" ); } static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 945/1126 tracing: Have TRACE_DEFINE_ENUM affect trace event types as well
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
[ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ]
The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to their actual value when they are exported to user space via the trace event format file.
Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT macro) have the enums converted. But the enums can be used to denote array size:
field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0;
The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know that information to know how to parse the array.
Have the array indexes also be parsed as well.
--- kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
kernel/trace/trace_events.c +28 -0
@@ -2637,6 +2637,33 @@ static void update_event_printk(struct trace_event_call *call, } } +static void update_event_fields (struct trace_event_call *call, +struct trace_eval_map *map) +{ +struct ftrace_event_field *field; +struct list_head *head; +char *ptr; +int len =strlen (map->eval_string); + + head =trace_get_fields (call); +list_for_each_entry (field, head, link) { + ptr =strchr (field->type,'[' ); +if (!ptr) +continue ; + ptr++; + +if (!isalpha (*ptr) && *ptr !='_' ) +continue ; + +if (strncmp (map->eval_string, ptr, len) !=0 ) +continue ; + + ptr =eval_replace (ptr, map, len); +/* enum/sizeof string smaller than value */ +WARN_ON_ONCE (!ptr); + } +} +void trace_event_eval_update (struct trace_eval_map **map,int len) {struct trace_event_call *call, *p;
@@ -2672,6 +2699,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) first = false; }update_event_printk (call, map[i]); +update_event_fields (call, map[i]); } } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 946/1126 mmc: host: Return an error when ->enable_sdio_irq() ops is missing
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
[ Upstream commit d6c9219ca1139b74541b2a98cee47a3426d754a9 ]
Even if the current WARN() notifies the user that something is severely wrong, we can still end up in a PANIC() when trying to invoke the missing ->enable_sdio_irq() ops. Therefore, let's also return an error code and prevent the host from being added.
While at it, move the code into a separate function to prepare for subsequent changes and for further host caps validations.
--- drivers/mmc/core/host.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/mmc/core/host.c +13 -2
@@ -588,6 +588,16 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)EXPORT_SYMBOL (mmc_alloc_host); +static int mmc_validate_host_caps (struct mmc_host *host) +{ +if (host->caps &MMC_CAP_SDIO_IRQ && !host->ops->enable_sdio_irq) { +dev_warn (host->parent,"missing ->enable_sdio_irq() ops\n" ); +return -EINVAL ; + } + +return 0 ; +} +/** * mmc_add_host - initialise host hardware * @host: mmc host
@@ -600,8 +610,9 @@ int mmc_add_host(struct mmc_host *host) {int err; -WARN_ON ((host->caps &MMC_CAP_SDIO_IRQ ) && - !host->ops->enable_sdio_irq); + err =mmc_validate_host_caps (host); +if (err) +return err; err =device_add (&host->class_dev);if (err)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 947/1126 ASoC: mediatek: Fix error handling in mt8183_da7219_max98357_dev_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 28a265a1ee11febeec5ea73a804f30dcec3181ca ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths. Fix this by calling of_node_put() in error handling too.
--- .../mediatek/mt8183/mt8183-da7219-max98357.c | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-)
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +16 -7
@@ -695,8 +695,11 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) } card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); -if (!card) -return -EINVAL ; +if (!card) { + ret = -EINVAL ; + goto put_platform_node; + } + card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node,
@@ -761,12 +764,15 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)if (!mt8183_da7219_max98357_headset_dev.dlc.of_node) {dev_err (&pdev->dev,"Property 'mediatek,headset-codec' missing/invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_hdmi_codec; } priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; +if (!priv) { + ret = -ENOMEM ; + goto put_hdmi_codec; + }snd_soc_card_set_drvdata (card, priv);
@@ -775,13 +781,16 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) ret =PTR_ERR (pinctrl);dev_err (&pdev->dev,"%s failed to select default state %d\n" , __func__, ret); -return ret; + goto put_hdmi_codec; } ret =devm_snd_soc_register_card (&pdev->dev, card); -of_node_put (platform_node); + +put_hdmi_codec:of_node_put (hdmi_codec); +put_platform_node: +of_node_put (platform_node);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 948/1126 media: atomisp: fix bad usage at error handling logic
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit fc0b582c858ed73f94c8f3375c203ea46f1f7402 ]
As warned by sparse:
atomisp: drivers/staging/media/atomisp/pci/atomisp_acc.c:508 atomisp_acc_load_extensions() warn: iterator used outside loop: 'acc_fw'
The acc_fw interactor is used outside the loop, at the error handling logic. On most cases, this is actually safe there, but, if atomisp_css_set_acc_parameters() has an error, an attempt to use it will pick an invalid value for acc_fw.
--- .../staging/media/atomisp/pci/atomisp_acc.c | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_acc.c +19 -9
@@ -439,6 +439,18 @@ int atomisp_acc_s_mapped_arg(struct atomisp_sub_device *asd,return 0 ; } +static void atomisp_acc_unload_some_extensions (struct atomisp_sub_device *asd, +int i, +struct atomisp_acc_fw *acc_fw) +{ +while (--i >=0 ) { +if (acc_fw->flags & acc_flag_to_pipe[i].flag) { +atomisp_css_unload_acc_extension (asd, acc_fw->fw, + acc_flag_to_pipe[i].pipe_id); + } + } +} +/* * Appends the loaded acceleration binary extensions to the * current ISP mode. Must be called just before sh_css_start().
@@ -479,16 +491,20 @@ int atomisp_acc_load_extensions(struct atomisp_sub_device *asd) acc_fw->fw, acc_flag_to_pipe[i].pipe_id, acc_fw->type); -if (ret) +if (ret) { +atomisp_acc_unload_some_extensions (asd, i, acc_fw); goto error; + } ext_loaded = true; } } ret =atomisp_css_set_acc_parameters (acc_fw); -if (ret <0 ) +if (ret <0 ) { +atomisp_acc_unload_some_extensions (asd, i, acc_fw); goto error; + } }if (!ext_loaded)
@@ -497,6 +513,7 @@ int atomisp_acc_load_extensions(struct atomisp_sub_device *asd) ret =atomisp_css_update_stream (asd);if (ret) {dev_err (isp->dev,"%s: update stream failed.\n" , __func__); +atomisp_acc_unload_extensions (asd); goto error; }
@@ -504,13 +521,6 @@ int atomisp_acc_load_extensions(struct atomisp_sub_device *asd)return 0 ; error: -while (--i >=0 ) { -if (acc_fw->flags & acc_flag_to_pipe[i].flag) { -atomisp_css_unload_acc_extension (asd, acc_fw->fw, - acc_flag_to_pipe[i].pipe_id); - } - } -list_for_each_entry_continue_reverse (acc_fw, &asd->acc.fw, list) {if (acc_fw->type !=ATOMISP_ACC_FW_LOAD_TYPE_OUTPUT && acc_fw->type !=ATOMISP_ACC_FW_LOAD_TYPE_VIEWFINDER )
Signature · 1 line
2.34.1